Merge remote-tracking branch 'pydata/master'

Author: craustin

.binstar.yml

@@ -0,0 +1,38 @@
+package: pandas
+user: jreback
+
+platform:
+ #- osx-64
+ #- linux-32
+ - linux-64
+ - win-64
+ #- win-32
+
+engine:
+ #- python=2.6
+ - python=2.7
+ #- python=3.3
+ #- python=3.4
+
+before_script:
+  - python -V
+
+script:
+  - conda build conda.recipe --quiet
+
+iotimeout: 600
+
+build_targets: conda
+
+notifications:
+  email:
+    recipients: ['[email protected]']
+
+---
+platform: win-32
+engine: python=2.6
+exclude: true
+---
+platform: win-64
+engine: python=2.6
+exclude: true

.gitignore

@@ -55,7 +55,7 @@ dist
 ######################
 .directory
 .gdb_history
-.DS_Store?
+.DS_Store
 ehthumbs.db
 Icon?
 Thumbs.db

.travis.yml

@@ -22,6 +22,7 @@ matrix:
       - LOCALE_OVERRIDE="it_IT.UTF-8"
       - BUILD_TYPE=conda
       - JOB_NAME: "26_nslow_nnet"
+      - INSTALL_TEST=true
     - python: 2.7
       env:
       - NOSE_ARGS="slow and not network and not disabled"
@@ -30,6 +31,24 @@ matrix:
       - JOB_TAG=_LOCALE
       - BUILD_TYPE=conda
       - JOB_NAME: "27_slow_nnet_LOCALE"
+    - python: 2.7
+      env:
+      - NOSE_ARGS="not slow and not disabled"
+      - FULL_DEPS=true
+      - CLIPBOARD_GUI=gtk2
+      - BUILD_TYPE=conda
+      - JOB_NAME: "27_build_test"
+      - JOB_TAG=_BUILD_TEST
+      - BUILD_TEST=true
+    - python: 2.7
+      env:
+      - NOSE_ARGS="not slow and not disabled"
+      - FULL_DEPS=true
+      - CLIPBOARD_GUI=gtk2
+      - BUILD_TYPE=pydata
+      - JOB_NAME: "27_build_test"
+      - JOB_TAG=_BUILD_TEST
+      - BUILD_TEST=true
     - python: 2.7
       env:
       - NOSE_ARGS="not slow and not disabled"
@@ -115,6 +134,24 @@ matrix:
         - NUMPY_BUILD=master
         - BUILD_TYPE=pydata
         - PANDAS_TESTING_MODE="deprecate"
+      - python: 2.7
+        env:
+        - NOSE_ARGS="not slow and not disabled"
+        - FULL_DEPS=true
+        - CLIPBOARD_GUI=gtk2
+        - BUILD_TYPE=conda
+        - JOB_NAME: "27_build_test"
+        - JOB_TAG=_BUILD_TEST
+        - BUILD_TEST=true
+      - python: 2.7
+        env:
+        - NOSE_ARGS="not slow and not disabled"
+        - FULL_DEPS=true
+        - CLIPBOARD_GUI=gtk2
+        - BUILD_TYPE=pydata
+        - JOB_NAME: "27_build_test"
+        - JOB_TAG=_BUILD_TEST
+        - BUILD_TEST=true
 
 before_install:
   - echo "before_install"
@@ -147,6 +184,7 @@ script:
 # nothing here, or failed tests won't fail travis
 
 after_script:
+  - ci/install_test.sh
   - if [ -f /tmp/doc.log ]; then cat /tmp/doc.log; fi
   - source activate pandas && ci/print_versions.py
   - ci/print_skipped.py /tmp/nosetests.xml