Merge pull request #1 from pydata/master

updating my own fork with up-to-date changes from master

Author: denfromufa

.binstar.yml

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

.gitattributes

@@ -13,3 +13,4 @@
 *.dta binary
 *.xls binary
 *.xlsx binary
+pandas/_version.py export-subst

.gitignore

@@ -17,6 +17,7 @@
 .idea
 .vagrant
 .noseids
+.ipynb_checkpoints
 
 # Compiled source #
 ###################
@@ -41,6 +42,8 @@ doc/_build
 dist
 # Egg metadata
 *.egg-info
+.eggs
+
 # tox testing tool
 .tox
 # rope
@@ -55,7 +58,7 @@ dist
 ######################
 .directory
 .gdb_history
-.DS_Store?
+.DS_Store
 ehthumbs.db
 Icon?
 Thumbs.db
@@ -76,9 +79,9 @@ scikits
 *.c
 *.cpp
 
-# Things specific to this project #
-###################################
-pandas/version.py
+# Performance Testing #
+#######################
+asv_bench/
 
 # Documentation generated files #
 #################################

.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"
@@ -67,13 +86,6 @@ matrix:
       - CLIPBOARD=xsel
       - BUILD_TYPE=conda
       - JOB_NAME: "34_slow"
-    - python: 3.2
-      env:
-      - NOSE_ARGS="not slow and not network and not disabled"
-      - FULL_DEPS=true
-      - CLIPBOARD_GUI=qt4
-      - BUILD_TYPE=pydata
-      - JOB_NAME: "32_nslow"
     - python: 2.7
       env:
       - EXPERIMENTAL=true
@@ -84,13 +96,6 @@ matrix:
       - BUILD_TYPE=pydata
       - PANDAS_TESTING_MODE="deprecate"
     allow_failures:
-      - python: 3.2
-        env:
-        - NOSE_ARGS="not slow and not network and not disabled"
-        - FULL_DEPS=true
-        - CLIPBOARD_GUI=qt4
-        - BUILD_TYPE=pydata
-        - JOB_NAME: "32_nslow"
       - python: 2.7
         env:
         - NOSE_ARGS="slow and not network and not disabled"
@@ -115,6 +120,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"
@@ -143,10 +166,12 @@ before_script:
 
 script:
   - echo "script"
+  - ci/run_build_docs.sh &
   - ci/script.sh
 # 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