Merge branch 'master' into feature/flake8-rst

# Conflicts:
#	ci/code_checks.sh

Author: FHaase

.circleci/config.yml

@@ -1,39 +1,6 @@
 version: 2
 jobs:
 
-  # --------------------------------------------------------------------------
-  # 0. py27_compat
-  # --------------------------------------------------------------------------
-  py27_compat:
-    docker:
-      - image: continuumio/miniconda:latest
-      # databases configuration
-      - image: circleci/postgres:9.6.5-alpine-ram
-        environment:
-            POSTGRES_USER: postgres
-            POSTGRES_DB: pandas_nosetest
-      - image: circleci/mysql:8-ram
-        environment:
-          MYSQL_USER: "root"
-          MYSQL_HOST: "localhost"
-          MYSQL_ALLOW_EMPTY_PASSWORD: "true"
-          MYSQL_DATABASE: "pandas_nosetest"
-    environment:
-      JOB: "2.7_COMPAT"
-      ENV_FILE: "ci/circle-27-compat.yaml"
-      LOCALE_OVERRIDE: "it_IT.UTF-8"
-      MINICONDA_DIR: /home/ubuntu/miniconda3
-    steps:
-      - checkout
-      - run:
-          name: build
-          command: |
-            ./ci/install_circle.sh
-            ./ci/show_circle.sh
-      - run:
-          name: test
-          command: ./ci/run_circle.sh  --skip-slow --skip-network
-
   # --------------------------------------------------------------------------
   # 1. py36_locale
   # --------------------------------------------------------------------------
@@ -62,86 +29,14 @@ jobs:
       - run:
           name: build
           command: |
-            ./ci/install_circle.sh
-            ./ci/show_circle.sh
+            ./ci/circle/install_circle.sh
+            ./ci/circle/show_circle.sh
       - run:
           name: test
-          command: ./ci/run_circle.sh  --skip-slow --skip-network
-
-  # --------------------------------------------------------------------------
-  # 2. py36_locale_slow
-  # --------------------------------------------------------------------------
-  py36_locale_slow:
-    docker:
-      - image: continuumio/miniconda:latest
-      # databases configuration
-      - image: circleci/postgres:9.6.5-alpine-ram
-        environment:
-            POSTGRES_USER: postgres
-            POSTGRES_DB: pandas_nosetest
-      - image: circleci/mysql:8-ram
-        environment:
-          MYSQL_USER: "root"
-          MYSQL_HOST: "localhost"
-          MYSQL_ALLOW_EMPTY_PASSWORD: "true"
-          MYSQL_DATABASE: "pandas_nosetest"
-
-    environment:
-      JOB: "3.6_LOCALE_SLOW"
-      ENV_FILE: "ci/circle-36-locale_slow.yaml"
-      LOCALE_OVERRIDE: "zh_CN.UTF-8"
-      MINICONDA_DIR: /home/ubuntu/miniconda3
-    steps:
-      - checkout
-      - run:
-          name: build
-          command: |
-            ./ci/install_circle.sh
-            ./ci/show_circle.sh
-      - run:
-          name: test
-          command: ./ci/run_circle.sh  --only-slow --skip-network
-
-  # --------------------------------------------------------------------------
-  # 3. py35_ascii
-  # --------------------------------------------------------------------------
-  py35_ascii:
-    docker:
-      - image: continuumio/miniconda:latest
-      # databases configuration
-      - image: circleci/postgres:9.6.5-alpine-ram
-        environment:
-            POSTGRES_USER: postgres
-            POSTGRES_DB: pandas_nosetest
-      - image: circleci/mysql:8-ram
-        environment:
-          MYSQL_USER: "root"
-          MYSQL_HOST: "localhost"
-          MYSQL_ALLOW_EMPTY_PASSWORD: "true"
-          MYSQL_DATABASE: "pandas_nosetest"
-
-    environment:
-      JOB: "3.5_ASCII"
-      ENV_FILE: "ci/circle-35-ascii.yaml"
-      LOCALE_OVERRIDE: "C"
-      MINICONDA_DIR: /home/ubuntu/miniconda3
-    steps:
-      - checkout
-      - run:
-          name: build
-          command: |
-            ./ci/install_circle.sh
-            ./ci/show_circle.sh
-      - run:
-          name: test
-          command: ./ci/run_circle.sh  --skip-slow --skip-network
-
+          command: ./ci/circle/run_circle.sh  --skip-slow --skip-network
 
 workflows:
   version: 2
   build_and_test:
     jobs:
-      - py27_compat
       - py36_locale
-      - py36_locale_slow
-      - py35_ascii

.travis.yml

@@ -116,10 +116,10 @@ after_success:
 after_script:
   - echo "after_script start"
   - source activate pandas && pushd /tmp && python -c "import pandas; pandas.show_versions();" && popd
-  - if [ -e /tmp/single.xml ]; then
-    ci/print_skipped.py /tmp/single.xml;
+  - if [ -e test-data-single.xml ]; then
+    ci/print_skipped.py test-data-single.xml;
     fi
-  - if [ -e /tmp/multiple.xml ]; then
-    ci/print_skipped.py /tmp/multiple.xml;
+  - if [ -e test-data-multiple.xml ]; then
+    ci/print_skipped.py test-data-multiple.xml;
     fi
   - echo "after_script done"

asv_bench/benchmarks/algorithms.py

@@ -15,8 +15,6 @@
 
 class Factorize(object):
 
-    goal_time = 0.2
-
     params = [True, False]
     param_names = ['sort']
 
@@ -38,8 +36,6 @@ def time_factorize_string(self, sort):
 
 class Duplicated(object):
 
-    goal_time = 0.2
-
     params = ['first', 'last', False]
     param_names = ['keep']
 
@@ -61,8 +57,6 @@ def time_duplicated_string(self, keep):
 
 class DuplicatedUniqueIndex(object):
 
-    goal_time = 0.2
-
     def setup(self):
         N = 10**5
         self.idx_int_dup = pd.Int64Index(np.arange(N * 5))
@@ -75,8 +69,6 @@ def time_duplicated_unique_int(self):
 
 class Match(object):
 
-    goal_time = 0.2
-
     def setup(self):
         self.uniques = tm.makeStringIndex(1000).values
         self.all = self.uniques.repeat(10)
@@ -88,8 +80,6 @@ def time_match_string(self):
 
 class Hashing(object):
 
-    goal_time = 0.2
-
     def setup_cache(self):
         N = 10**5
 

asv_bench/benchmarks/attrs_caching.py

@@ -8,8 +8,6 @@
 
 class DataFrameAttributes(object):
 
-    goal_time = 0.2
-
     def setup(self):
         self.df = DataFrame(np.random.randn(10, 6))
         self.cur_index = self.df.index
@@ -23,8 +21,6 @@ def time_set_index(self):
 
 class CacheReadonly(object):
 
-    goal_time = 0.2
-
     def setup(self):
 
         class Foo:

asv_bench/benchmarks/binary_ops.py

@@ -9,8 +9,6 @@
 
 class Ops(object):
 
-    goal_time = 0.2
-
     params = [[True, False], ['default', 1]]
     param_names = ['use_numexpr', 'threads']
 
@@ -42,8 +40,6 @@ def teardown(self, use_numexpr, threads):
 
 class Ops2(object):
 
-    goal_time = 0.2
-
     def setup(self):
         N = 10**3
         self.df = DataFrame(np.random.randn(N, N))
@@ -81,8 +77,6 @@ def time_frame_float_mod(self):
 
 class Timeseries(object):
 
-    goal_time = 0.2
-
     params = [None, 'US/Eastern']
     param_names = ['tz']
 
@@ -109,8 +103,6 @@ def time_timestamp_ops_diff_with_shift(self, tz):
 
 class AddOverflowScalar(object):
 
-    goal_time = 0.2
-
     params = [1, -1, 0]
     param_names = ['scalar']
 
@@ -124,8 +116,6 @@ def time_add_overflow_scalar(self, scalar):
 
 class AddOverflowArray(object):
 
-    goal_time = 0.2
-
     def setup(self):
         N = 10**6
         self.arr = np.arange(N)

asv_bench/benchmarks/categoricals.py

@@ -14,8 +14,6 @@
 
 class Concat(object):
 
-    goal_time = 0.2
-
     def setup(self):
         N = 10**5
         self.s = pd.Series(list('aabbcd') * N).astype('category')
@@ -32,8 +30,6 @@ def time_union(self):
 
 class Constructor(object):
 
-    goal_time = 0.2
-
     def setup(self):
         N = 10**5
         self.categories = list('abcde')
@@ -75,8 +71,6 @@ def time_from_codes_all_int8(self):
 
 class ValueCounts(object):
 
-    goal_time = 0.2
-
     params = [True, False]
     param_names = ['dropna']
 
@@ -91,8 +85,6 @@ def time_value_counts(self, dropna):
 
 class Repr(object):
 
-    goal_time = 0.2
-
     def setup(self):
         self.sel = pd.Series(['s1234']).astype('category')
 
@@ -102,8 +94,6 @@ def time_rendering(self):
 
 class SetCategories(object):
 
-    goal_time = 0.2
-
     def setup(self):
         n = 5 * 10**5
         arr = ['s%04d' % i for i in np.random.randint(0, n // 10, size=n)]
@@ -115,8 +105,6 @@ def time_set_categories(self):
 
 class Rank(object):
 
-    goal_time = 0.2
-
     def setup(self):
         N = 10**5
         ncats = 100
@@ -154,8 +142,6 @@ def time_rank_int_cat_ordered(self):
 
 class Isin(object):
 
-    goal_time = 0.2
-
     params = ['object', 'int64']
     param_names = ['dtype']
 
@@ -195,8 +181,6 @@ def time_categorical_series_is_monotonic_decreasing(self):
 
 class Contains(object):
 
-    goal_time = 0.2
-
     def setup(self):
         N = 10**5
         self.ci = tm.makeCategoricalIndex(N)
@@ -212,7 +196,6 @@ def time_categorical_contains(self):
 
 class CategoricalSlicing(object):
 
-    goal_time = 0.2
     params = ['monotonic_incr', 'monotonic_decr', 'non_monotonic']
     param_names = ['index']
 

asv_bench/benchmarks/ctors.py

@@ -5,8 +5,6 @@
 
 class SeriesConstructors(object):
 
-    goal_time = 0.2
-
     param_names = ["data_fmt", "with_index"]
     params = [[lambda x: x,
                list,
@@ -30,8 +28,6 @@ def time_series_constructor(self, data_fmt, with_index):
 
 class SeriesDtypesConstructors(object):
 
-    goal_time = 0.2
-
     def setup(self):
         N = 10**4
         self.arr = np.random.randn(N, N)
@@ -54,8 +50,6 @@ def time_dtindex_from_index_with_series(self):
 
 class MultiIndexConstructor(object):
 
-    goal_time = 0.2
-
     def setup(self):
         N = 10**4
         self.iterables = [tm.makeStringIndex(N), range(20)]

asv_bench/benchmarks/eval.py

@@ -8,8 +8,6 @@
 
 class Eval(object):
 
-    goal_time = 0.2
-
     params = [['numexpr', 'python'], [1, 'all']]
     param_names = ['engine', 'threads']
 
@@ -41,8 +39,6 @@ def teardown(self, engine, threads):
 
 class Query(object):
 
-    goal_time = 0.2
-
     def setup(self):
         N = 10**6
         halfway = (N // 2) - 1