Merge branch 'master' into tdi_plot_fix

Author: jgoppert

.github/CONTRIBUTING.md

@@ -19,6 +19,7 @@
 .noseids
 .ipynb_checkpoints
 .tags
+.cache/
 
 # Compiled source #
 ###################
@@ -56,6 +57,8 @@ dist
 **/wheelhouse/*
 # coverage
 .coverage
+coverage.xml
+coverage_html_report
 
 # OS generated files #
 ######################

.gitignore

@@ -32,7 +32,7 @@ matrix:
       env:
         - PYTHON_VERSION=3.5
         - JOB_NAME: "35_osx"
-        - NOSE_ARGS="not slow and not network and not disabled"
+        - TEST_ARGS="--skip-slow --skip-network"
         - BUILD_TYPE=conda
         - JOB_TAG=_OSX
         - TRAVIS_PYTHON_VERSION=3.5
@@ -42,7 +42,7 @@ matrix:
       env:
         - PYTHON_VERSION=2.7
         - JOB_NAME: "27_slow_nnet_LOCALE"
-        - NOSE_ARGS="slow and not network and not disabled"
+        - TEST_ARGS="--only-slow --skip-network"
         - LOCALE_OVERRIDE="zh_CN.UTF-8"
         - FULL_DEPS=true
         - JOB_TAG=_LOCALE
@@ -56,7 +56,7 @@ matrix:
       env:
         - PYTHON_VERSION=2.7
         - JOB_NAME: "27_nslow"
-        - NOSE_ARGS="not slow and not disabled"
+        - TEST_ARGS="--skip-slow"
         - FULL_DEPS=true
         - CLIPBOARD_GUI=gtk2
         - LINT=true
@@ -70,7 +70,7 @@ matrix:
       env:
         - PYTHON_VERSION=3.5
         - JOB_NAME: "35_nslow"
-        - NOSE_ARGS="not slow and not network and not disabled"
+        - TEST_ARGS="--skip-slow --skip-network"
         - FULL_DEPS=true
         - CLIPBOARD=xsel
         - COVERAGE=true
@@ -84,7 +84,7 @@ matrix:
       env:
         - PYTHON_VERSION=3.6
         - JOB_NAME: "36"
-        - NOSE_ARGS="not slow and not network and not disabled"
+        - TEST_ARGS="--skip-slow --skip-network"
         - PANDAS_TESTING_MODE="deprecate"
       addons:
         apt:
@@ -96,7 +96,7 @@ matrix:
       env:
         - PYTHON_VERSION=2.7
         - JOB_NAME: "27_nslow_nnet_COMPAT"
-        - NOSE_ARGS="not slow and not network and not disabled"
+        - TEST_ARGS="--skip-slow --skip-network"
         - LOCALE_OVERRIDE="it_IT.UTF-8"
         - INSTALL_TEST=true
         - JOB_TAG=_COMPAT
@@ -112,7 +112,7 @@ matrix:
         - PYTHON_VERSION=2.7
         - JOB_NAME: "27_slow"
         - JOB_TAG=_SLOW
-        - NOSE_ARGS="slow and not network and not disabled"
+        - TEST_ARGS="--only-slow --skip-network"
         - FULL_DEPS=true
         - CACHE_NAME="27_slow"
         - USE_CACHE=true
@@ -122,7 +122,7 @@ matrix:
         - PYTHON_VERSION=2.7
         - JOB_NAME: "27_build_test_conda"
         - JOB_TAG=_BUILD_TEST
-        - NOSE_ARGS="not slow and not disabled"
+        - TEST_ARGS="--skip-slow"
         - FULL_DEPS=true
         - BUILD_TEST=true
         - CACHE_NAME="27_build_test_conda"
@@ -132,7 +132,8 @@ matrix:
       env:
         - PYTHON_VERSION=3.4
         - JOB_NAME: "34_nslow"
-        - NOSE_ARGS="not slow and not disabled"
+        - LOCALE_OVERRIDE="zh_CN.UTF-8"
+        - TEST_ARGS="--skip-slow"
         - FULL_DEPS=true
         - CLIPBOARD=xsel
         - CACHE_NAME="34_nslow"
@@ -141,13 +142,14 @@ matrix:
         apt:
           packages:
           - xsel
+          - language-pack-zh-hans
 #    In allow_failures
     - python: 3.4
       env:
         - PYTHON_VERSION=3.4
         - JOB_NAME: "34_slow"
         - JOB_TAG=_SLOW
-        - NOSE_ARGS="slow and not network and not disabled"
+        - TEST_ARGS="--only-slow --skip-network"
         - FULL_DEPS=true
         - CLIPBOARD=xsel
         - CACHE_NAME="34_slow"
@@ -162,7 +164,7 @@ matrix:
         - PYTHON_VERSION=3.5
         - JOB_NAME: "35_numpy_dev"
         - JOB_TAG=_NUMPY_DEV
-        - NOSE_ARGS="not slow and not network and not disabled"
+        - TEST_ARGS="--skip-slow --skip-network"
         - PANDAS_TESTING_MODE="deprecate"
         - CACHE_NAME="35_numpy_dev"
         - USE_CACHE=true
@@ -177,7 +179,7 @@ matrix:
         - PYTHON_VERSION=3.5
         - JOB_NAME: "35_ascii"
         - JOB_TAG=_ASCII
-        - NOSE_ARGS="not slow and not network and not disabled"
+        - TEST_ARGS="--skip-slow --skip-network"
         - LOCALE_OVERRIDE="C"
         - CACHE_NAME="35_ascii"
         - USE_CACHE=true
@@ -197,7 +199,7 @@ matrix:
         - PYTHON_VERSION=2.7
         - JOB_NAME: "27_slow"
         - JOB_TAG=_SLOW
-        - NOSE_ARGS="slow and not network and not disabled"
+        - TEST_ARGS="--only-slow --skip-network"
         - FULL_DEPS=true
         - CACHE_NAME="27_slow"
         - USE_CACHE=true
@@ -206,7 +208,7 @@ matrix:
         - PYTHON_VERSION=3.4
         - JOB_NAME: "34_slow"
         - JOB_TAG=_SLOW
-        - NOSE_ARGS="slow and not network and not disabled"
+        - TEST_ARGS="--only-slow --skip-network"
         - FULL_DEPS=true
         - CLIPBOARD=xsel
         - CACHE_NAME="34_slow"
@@ -220,7 +222,7 @@ matrix:
         - PYTHON_VERSION=2.7
         - JOB_NAME: "27_build_test_conda"
         - JOB_TAG=_BUILD_TEST
-        - NOSE_ARGS="not slow and not disabled"
+        - TEST_ARGS="--skip-slow"
         - FULL_DEPS=true
         - BUILD_TEST=true
         - CACHE_NAME="27_build_test_conda"
@@ -229,7 +231,8 @@ matrix:
         env:
           - PYTHON_VERSION=3.4
           - JOB_NAME: "34_nslow"
-          - NOSE_ARGS="not slow and not disabled"
+          - LOCALE_OVERRIDE="zh_CN.UTF-8"
+          - TEST_ARGS="--skip-slow"
           - FULL_DEPS=true
           - CLIPBOARD=xsel
           - CACHE_NAME="34_nslow"
@@ -238,12 +241,13 @@ matrix:
           apt:
             packages:
             - xsel
+            - language-pack-zh-hans
       - python: 3.5
         env:
           - PYTHON_VERSION=3.5
           - JOB_NAME: "35_numpy_dev"
           - JOB_TAG=_NUMPY_DEV
-          - NOSE_ARGS="not slow and not network and not disabled"
+          - TEST_ARGS="--skip-slow --skip-network"
           - PANDAS_TESTING_MODE="deprecate"
           - CACHE_NAME="35_numpy_dev"
           - USE_CACHE=true
@@ -256,7 +260,7 @@ matrix:
         env:
         - PYTHON_VERSION=2.7
         - JOB_NAME: "27_nslow_nnet_COMPAT"
-        - NOSE_ARGS="not slow and not network and not disabled"
+        - TEST_ARGS="--skip-slow --skip-network"
         - LOCALE_OVERRIDE="it_IT.UTF-8"
         - INSTALL_TEST=true
         - JOB_TAG=_COMPAT
@@ -271,7 +275,7 @@ matrix:
         - PYTHON_VERSION=3.5
         - JOB_NAME: "35_ascii"
         - JOB_TAG=_ASCII
-        - NOSE_ARGS="not slow and not network and not disabled"
+        - TEST_ARGS="--skip-slow --skip-network"
         - LOCALE_OVERRIDE="C"
         - CACHE_NAME="35_ascii"
         - USE_CACHE=true
@@ -311,12 +315,13 @@ install:
 
 before_script:
   - source activate pandas && pip install codecov
-  - ci/install_db.sh
+  - ci/install_db_travis.sh
 
 script:
   - echo "script start"
   - ci/run_build_docs.sh
-  - ci/script.sh
+  - ci/script_single.sh
+  - ci/script_multi.sh
   - ci/lint.sh
   - echo "script done"
 
@@ -327,5 +332,6 @@ after_script:
   - echo "after_script start"
   - ci/install_test.sh
   - source activate pandas && python -c "import pandas; pandas.show_versions();"
-  - ci/print_skipped.py /tmp/nosetests.xml
+  - ci/print_skipped.py /tmp/single.xml
+  - ci/print_skipped.py /tmp/multiple.xml
   - echo "after_script done"

.travis.yml

@@ -7,7 +7,6 @@ include setup.py
 graft doc
 prune doc/build
 
-graft examples
 graft pandas
 
 global-exclude *.so

MANIFEST.in

@@ -14,22 +14,23 @@ environment:
     # /E:ON and /V:ON options are not enabled in the batch script intepreter
     # See: http://stackoverflow.com/a/13751649/163740
     CMD_IN_ENV: "cmd /E:ON /V:ON /C .\\ci\\run_with_env.cmd"
+    clone_folder: C:\projects\pandas
 
   matrix:
 
-    - CONDA_ROOT: "C:\\Miniconda3.5_64"
+    - CONDA_ROOT: "C:\\Miniconda3_64"
       PYTHON_VERSION: "3.6"
       PYTHON_ARCH: "64"
       CONDA_PY: "36"
-      CONDA_NPY: "111"
+      CONDA_NPY: "112"
 
-    - CONDA_ROOT: "C:\\Miniconda3.5_64"
+    - CONDA_ROOT: "C:\\Miniconda3_64"
       PYTHON_VERSION: "2.7"
       PYTHON_ARCH: "64"
       CONDA_PY: "27"
       CONDA_NPY: "110"
 
-    - CONDA_ROOT: "C:\\Miniconda3.5_64"
+    - CONDA_ROOT: "C:\\Miniconda3_64"
       PYTHON_VERSION: "3.5"
       PYTHON_ARCH: "64"
       CONDA_PY: "35"
@@ -65,8 +66,7 @@ install:
 
   # install our build environment
   - cmd: conda config --set show_channel_urls true --set always_yes true --set changeps1 false
-  #- cmd: conda update -q conda
-  - cmd: conda install conda=4.2.15
+  - cmd: conda update -q conda
   - cmd: conda config --set ssl_verify false
 
   # add the pandas channel *before* defaults to have defaults take priority
@@ -78,22 +78,19 @@ install:
   # this is now the downloaded conda...
   - cmd: conda info -a
 
-  # build em using the local source checkout in the correct windows env
-  - cmd: '%CMD_IN_ENV% conda build ci\appveyor.recipe -q'
-
   # create our env
-  - cmd: conda create -q -n pandas python=%PYTHON_VERSION% nose
+  - cmd: conda create -q -n pandas python=%PYTHON_VERSION% cython pytest
   - cmd: activate pandas
   - SET REQ=ci\requirements-%PYTHON_VERSION%-%PYTHON_ARCH%.run
   - cmd: echo "installing requirements from %REQ%"
   - cmd: conda install -n pandas -q --file=%REQ%
   - cmd: conda list -n pandas
   - cmd: echo "installing requirements from %REQ% - done"
-  - ps: conda install -n pandas (conda build ci\appveyor.recipe -q --output)
+
+  # build em using the local source checkout in the correct windows env
+  - cmd: '%CMD_IN_ENV% python setup.py build_ext --inplace'
 
 test_script:
   # tests
-  - cd \
   - cmd: activate pandas
-  - cmd: conda list
-  - cmd: nosetests --exe -A "not slow and not network and not disabled" pandas
+  - cmd: test.bat

appveyor.yml

@@ -433,6 +433,20 @@ def time_frame_from_records_generator_nrows(self):
 
 
 
+#-----------------------------------------------------------------------------
+# nunique
+
+class frame_nunique(object):
+
+    def setup(self):
+        self.data = np.random.randn(10000, 1000)
+        self.df = DataFrame(self.data)
+
+    def time_frame_nunique(self):
+        self.df.nunique()
+
+
+
 #-----------------------------------------------------------------------------
 # duplicated
 

asv_bench/benchmarks/frame_methods.py

@@ -251,6 +251,22 @@ def time_groupby_int_count(self):
         self.df.groupby(['key1', 'key2']).count()
 
 
+#----------------------------------------------------------------------
+# nunique() speed
+
+class groupby_nunique(object):
+
+    def setup(self):
+        self.n = 10000
+        self.df = DataFrame({'key1': randint(0, 500, size=self.n),
+                             'key2': randint(0, 100, size=self.n),
+                             'ints': randint(0, 1000, size=self.n),
+                             'ints2': randint(0, 1000, size=self.n), })
+
+    def time_groupby_nunique(self):
+        self.df.groupby(['key1', 'key2']).nunique()
+
+
 #----------------------------------------------------------------------
 # group with different functions per column
 

asv_bench/benchmarks/groupby.py

@@ -88,7 +88,7 @@ def setup(self):
 
     def time_getitem_scalar(self):
         self.ts[self.dt]
-    
+
 
 class DataFrameIndexing(object):
     goal_time = 0.2
@@ -189,6 +189,15 @@ def setup(self):
         self.eps_C = 5
         self.eps_D = 5000
         self.mdt2 = self.mdt.set_index(['A', 'B', 'C', 'D']).sortlevel()
+        self.miint = MultiIndex.from_product(
+            [np.arange(1000),
+             np.arange(1000)], names=['one', 'two'])
+
+        import string
+        self.mistring = MultiIndex.from_product(
+            [np.arange(1000),
+             np.arange(20), list(string.ascii_letters)],
+            names=['one', 'two', 'three'])
 
     def time_series_xs_mi_ix(self):
         self.s.ix[999]
@@ -197,7 +206,24 @@ def time_frame_xs_mi_ix(self):
         self.df.ix[999]
 
     def time_multiindex_slicers(self):
-        self.mdt2.loc[self.idx[(self.test_A - self.eps_A):(self.test_A + self.eps_A), (self.test_B - self.eps_B):(self.test_B + self.eps_B), (self.test_C - self.eps_C):(self.test_C + self.eps_C), (self.test_D - self.eps_D):(self.test_D + self.eps_D)], :]
+        self.mdt2.loc[self.idx[
+            (self.test_A - self.eps_A):(self.test_A + self.eps_A),
+            (self.test_B - self.eps_B):(self.test_B + self.eps_B),
+            (self.test_C - self.eps_C):(self.test_C + self.eps_C),
+            (self.test_D - self.eps_D):(self.test_D + self.eps_D)], :]
+
+    def time_multiindex_get_indexer(self):
+        self.miint.get_indexer(
+            np.array([(0, 10), (0, 11), (0, 12),
+                      (0, 13), (0, 14), (0, 15),
+                      (0, 16), (0, 17), (0, 18),
+                      (0, 19)], dtype=object))
+
+    def time_multiindex_string_get_loc(self):
+        self.mistring.get_loc((999, 19, 'Z'))
+
+    def time_is_monotonic(self):
+        self.miint.is_monotonic
 
 
 class PanelIndexing(object):