pandas-dev · charlesdong1991 · Nov 22, 2018 · Nov 22, 2018 · Nov 22, 2018 · Nov 22, 2018
diff --git a/.travis.yml b/.travis.yml
@@ -104,6 +104,7 @@ before_script:
   - ci/before_script_travis.sh
 
 script:
+  - source activate pandas-dev
   - echo "script start"
   - ci/run_build_docs.sh
   - ci/script_single.sh
@@ -115,7 +116,7 @@ after_success:
 
 after_script:
   - echo "after_script start"
-  - source activate pandas && pushd /tmp && python -c "import pandas; pandas.show_versions();" && popd
+  - source activate pandas-dev && pushd /tmp && python -c "import pandas; pandas.show_versions();" && popd
   - if [ -e test-data-single.xml ]; then
     ci/print_skipped.py test-data-single.xml;
     fi

diff --git a/ci/build_docs.sh b/ci/build_docs.sh
@@ -12,8 +12,6 @@ if [ "$DOC" ]; then
 
     echo "Will build docs"
 
-    source activate pandas
-
     echo ###############################
     echo # Log file for the doc build  #
     echo ###############################

diff --git a/ci/deps/azure-27-compat.yaml b/ci/deps/azure-27-compat.yaml
@@ -1,4 +1,4 @@
-name: pandas
+name: pandas-dev
 channels:
   - defaults
   - conda-forge

diff --git a/ci/deps/azure-36-locale_slow.yaml b/ci/deps/azure-36-locale_slow.yaml
@@ -1,4 +1,4 @@
-name: pandas
+name: pandas-dev
 channels:
   - defaults
   - conda-forge

diff --git a/ci/deps/azure-37-locale.yaml b/ci/deps/azure-37-locale.yaml
@@ -1,4 +1,4 @@
-name: pandas
+name: pandas-dev
 channels:
   - defaults
   - conda-forge

diff --git a/ci/deps/azure-macos-35.yaml b/ci/deps/azure-macos-35.yaml
@@ -1,4 +1,4 @@
-name: pandas
+name: pandas-dev
 channels:
   - defaults
 dependencies:

diff --git a/ci/deps/azure-windows-27.yaml b/ci/deps/azure-windows-27.yaml
@@ -1,4 +1,4 @@
-name: pandas
+name: pandas-dev
 channels:
   - defaults
   - conda-forge

diff --git a/ci/deps/azure-windows-36.yaml b/ci/deps/azure-windows-36.yaml
@@ -1,4 +1,4 @@
-name: pandas
+name: pandas-dev
 channels:
   - defaults
   - conda-forge

diff --git a/ci/deps/circle-36-locale.yaml b/ci/deps/circle-36-locale.yaml
@@ -1,4 +1,4 @@
-name: pandas
+name: pandas-dev
 channels:
   - defaults
   - conda-forge

diff --git a/ci/deps/travis-27-locale.yaml b/ci/deps/travis-27-locale.yaml
@@ -1,4 +1,4 @@
-name: pandas
+name: pandas-dev
 channels:
   - defaults
   - conda-forge

diff --git a/ci/deps/travis-27.yaml b/ci/deps/travis-27.yaml
@@ -1,4 +1,4 @@
-name: pandas
+name: pandas-dev
 channels:
   - defaults
   - conda-forge

diff --git a/ci/deps/travis-36-doc.yaml b/ci/deps/travis-36-doc.yaml
@@ -1,4 +1,4 @@
-name: pandas
+name: pandas-dev
 channels:
   - defaults
   - conda-forge

diff --git a/ci/deps/travis-36-slow.yaml b/ci/deps/travis-36-slow.yaml
@@ -1,4 +1,4 @@
-name: pandas
+name: pandas-dev
 channels:
   - defaults
   - conda-forge

diff --git a/ci/deps/travis-36.yaml b/ci/deps/travis-36.yaml
@@ -1,4 +1,4 @@
-name: pandas
+name: pandas-dev
 channels:
   - defaults
   - conda-forge

diff --git a/ci/deps/travis-37-numpydev.yaml b/ci/deps/travis-37-numpydev.yaml
@@ -1,4 +1,4 @@
-name: pandas
+name: pandas-dev
 channels:
   - defaults
 dependencies:

diff --git a/ci/deps/travis-37.yaml b/ci/deps/travis-37.yaml
@@ -1,4 +1,4 @@
-name: pandas
+name: pandas-dev
 channels:
   - defaults
   - conda-forge

diff --git a/ci/incremental/build.cmd b/ci/incremental/build.cmd
@@ -1,5 +1,5 @@
 @rem https://github.com/numba/numba/blob/master/buildscripts/incremental/build.cmd
-call activate %CONDA_ENV%
+
 
 @rem Build numba extensions without silencing compile errors
 python setup.py build_ext -q --inplace

diff --git a/ci/incremental/build.sh b/ci/incremental/build.sh
@@ -1,6 +1,5 @@
 #!/bin/bash
 
-source activate $CONDA_ENV
 
 # Make sure any error below is reported as such
 set -v -e

diff --git a/ci/incremental/setup_conda_environment.cmd b/ci/incremental/setup_conda_environment.cmd
@@ -11,11 +11,10 @@ call deactivate
 @rem Display root environment (for debugging)
 conda list
 @rem Clean up any left-over from a previous build
-conda remove --all -q -y -n %CONDA_ENV%
+conda remove -all -q -y -n pandas-dev
 @rem Scipy, CFFI, jinja2 and IPython are optional dependencies, but exercised in the test suite
-conda env create -n %CONDA_ENV% --file=ci\deps\azure-windows-%CONDA_PY%.yaml
+conda env create --file=ci\deps\azure-windows-%CONDA_PY%.yaml
 
-call activate %CONDA_ENV%
 conda list
 
 if %errorlevel% neq 0 exit /b %errorlevel%
diff --git a/ci/incremental/setup_conda_environment.sh b/ci/incremental/setup_conda_environment.sh
@@ -5,23 +5,20 @@ set -v -e
 CONDA_INSTALL="conda install -q -y"
 PIP_INSTALL="pip install -q"
 
+
 # Deactivate any environment
 source deactivate
 # Display root environment (for debugging)
 conda list
 # Clean up any left-over from a previous build
 # (note workaround for https://github.com/conda/conda/issues/2679:
 #  `conda env remove` issue)
-conda remove --all -q -y -n $CONDA_ENV
+conda remove --all -q -y -n pandas-dev
 
 echo
 echo "[create env]"
-time conda env create -q -n "${CONDA_ENV}" --file="${ENV_FILE}" || exit 1
+time conda env create -q --file="${ENV_FILE}" || exit 1
 
-# Activate first
-set +v
-source activate $CONDA_ENV
-set -v
 
 # remove any installed pandas package
 # w/o removing anything else

diff --git a/ci/script_single.sh b/ci/script_single.sh
@@ -2,7 +2,6 @@
 
 echo "[script_single]"
 
-source activate pandas
 
 if [ -n "$LOCALE_OVERRIDE" ]; then
     echo "Setting LC_ALL and LANG to $LOCALE_OVERRIDE"

diff --git a/ci/upload_coverage.sh b/ci/upload_coverage.sh
@@ -5,7 +5,6 @@ if [ -z "$COVERAGE" ]; then
    exit 0
 fi
 
-source activate pandas
 
 echo "uploading coverage"
 bash <(curl -s https://codecov.io/bash) -Z -c -F single -f /tmp/cov-single.xml

diff --git a/pandas/core/algorithms.py b/pandas/core/algorithms.py
@@ -3,40 +3,31 @@
 intended for public consumption
 """
 from __future__ import division
-from warnings import warn, catch_warnings, simplefilter
+
 from textwrap import dedent
+from warnings import catch_warnings, simplefilter, warn
 
 import numpy as np
 
+from pandas._libs import algos, hashtable as htable, lib
+from pandas._libs.tslib import iNaT
+from pandas.util._decorators import Appender, Substitution, deprecate_kwarg
+
 from pandas.core.dtypes.cast import (
-    maybe_promote, construct_1d_object_array_from_listlike)
-from pandas.core.dtypes.generic import (
-    ABCSeries, ABCIndex,
-    ABCIndexClass)
+    construct_1d_object_array_from_listlike, maybe_promote)
 from pandas.core.dtypes.common import (
-    is_array_like,
-    is_unsigned_integer_dtype, is_signed_integer_dtype,
-    is_integer_dtype, is_complex_dtype,
-    is_object_dtype,
-    is_extension_array_dtype,
-    is_categorical_dtype, is_sparse,
-    is_period_dtype,
-    is_numeric_dtype, is_float_dtype,
-    is_bool_dtype, needs_i8_conversion,
-    is_datetimetz,
-    is_datetime64_any_dtype, is_datetime64tz_dtype,
-    is_timedelta64_dtype, is_datetimelike,
-    is_interval_dtype, is_scalar, is_list_like,
-    ensure_platform_int, ensure_object,
-    ensure_float64, ensure_uint64,
-    ensure_int64)
+    ensure_float64, ensure_int64, ensure_object, ensure_platform_int,
+    ensure_uint64, is_array_like, is_bool_dtype, is_categorical_dtype,
+    is_complex_dtype, is_datetime64_any_dtype, is_datetime64tz_dtype,
+    is_datetimelike, is_datetimetz, is_extension_array_dtype, is_float_dtype,
+    is_integer_dtype, is_interval_dtype, is_list_like, is_numeric_dtype,
+    is_object_dtype, is_period_dtype, is_scalar, is_signed_integer_dtype,
+    is_sparse, is_timedelta64_dtype, is_unsigned_integer_dtype,
+    needs_i8_conversion)
+from pandas.core.dtypes.generic import ABCIndex, ABCIndexClass, ABCSeries
 from pandas.core.dtypes.missing import isna, na_value_for_dtype
 
 from pandas.core import common as com
-from pandas._libs import algos, lib, hashtable as htable
-from pandas._libs.tslib import iNaT
-from pandas.util._decorators import (Appender, Substitution,
-                                     deprecate_kwarg)
 
 _shared_docs = {}
 

diff --git a/pandas/core/apply.py b/pandas/core/apply.py
@@ -1,15 +1,15 @@
 import warnings
+
 import numpy as np
-from pandas import compat
+
 from pandas._libs import reduction
-from pandas.core.dtypes.generic import ABCSeries
-from pandas.core.dtypes.common import (
-    is_extension_type,
-    is_dict_like,
-    is_list_like,
-    is_sequence)
+import pandas.compat as compat
 from pandas.util._decorators import cache_readonly
 
+from pandas.core.dtypes.common import (
+    is_dict_like, is_extension_type, is_list_like, is_sequence)
+from pandas.core.dtypes.generic import ABCSeries
+
 from pandas.io.formats.printing import pprint_thing
 
 

diff --git a/pandas/core/base.py b/pandas/core/base.py
@@ -1,32 +1,28 @@
 """
 Base and utility classes for pandas objects.
 """
-import warnings
 import textwrap
-from pandas import compat
-from pandas.compat import builtins
-import numpy as np
+import warnings
 
-from pandas.core.dtypes.missing import isna
-from pandas.core.dtypes.generic import ABCDataFrame, ABCSeries, ABCIndexClass
-from pandas.core.dtypes.common import (
-    is_datetimelike,
-    is_object_dtype,
-    is_list_like,
-    is_scalar,
-    is_extension_type,
-    is_extension_array_dtype)
+import numpy as np
 
-from pandas.util._validators import validate_bool_kwarg
-from pandas.errors import AbstractMethodError
-from pandas.core import common as com, algorithms
-import pandas.core.nanops as nanops
 import pandas._libs.lib as lib
+import pandas.compat as compat
+from pandas.compat import PYPY, OrderedDict, builtins
 from pandas.compat.numpy import function as nv
-from pandas.compat import PYPY, OrderedDict
-from pandas.util._decorators import Appender, cache_readonly, Substitution
+from pandas.errors import AbstractMethodError
+from pandas.util._decorators import Appender, Substitution, cache_readonly
+from pandas.util._validators import validate_bool_kwarg
 
+from pandas.core.dtypes.common import (
+    is_datetimelike, is_extension_array_dtype, is_extension_type, is_list_like,
+    is_object_dtype, is_scalar)
+from pandas.core.dtypes.generic import ABCDataFrame, ABCIndexClass, ABCSeries
+from pandas.core.dtypes.missing import isna
+
+from pandas.core import algorithms, common as com
 from pandas.core.accessor import DirNamesMixin
+import pandas.core.nanops as nanops
 
 _shared_docs = dict()
 _indexops_doc_kwargs = dict(klass='IndexOpsMixin', inplace='',

diff --git a/pandas/core/categorical.py b/pandas/core/categorical.py
@@ -1,8 +1,9 @@
 import warnings
 
+from pandas.core.dtypes.dtypes import CategoricalDtype  # noqa
+
+from pandas.core.arrays import Categorical  # noqa
+
 # TODO: Remove after 0.23.x
 warnings.warn("'pandas.core' is private. Use 'pandas.Categorical'",
               FutureWarning, stacklevel=2)
-
-from pandas.core.arrays import Categorical  # noqa
-from pandas.core.dtypes.dtypes import CategoricalDtype  # noqa
diff --git a/pandas/core/common.py b/pandas/core/common.py
@@ -4,25 +4,23 @@
 Note: pandas.core.common is *not* part of the public API.
 """
 
+import collections
 from datetime import datetime, timedelta
 from functools import partial
 import inspect
-import collections
 
 import numpy as np
+
 from pandas._libs import lib, tslibs
+import pandas.compat as compat
+from pandas.compat import PY36, OrderedDict, iteritems
 
-from pandas import compat
-from pandas.compat import iteritems, PY36, OrderedDict
-from pandas.core.dtypes.generic import (
-    ABCSeries, ABCIndex, ABCIndexClass
-)
+from pandas.core.dtypes.cast import construct_1d_object_array_from_listlike
 from pandas.core.dtypes.common import (
-    is_integer, is_bool_dtype, is_extension_array_dtype, is_array_like
-)
+    is_array_like, is_bool_dtype, is_extension_array_dtype, is_integer)
+from pandas.core.dtypes.generic import ABCIndex, ABCIndexClass, ABCSeries
 from pandas.core.dtypes.inference import _iterable_not_string
 from pandas.core.dtypes.missing import isna, isnull, notnull  # noqa
-from pandas.core.dtypes.cast import construct_1d_object_array_from_listlike
 
 
 class SettingWithCopyError(ValueError):

diff --git a/pandas/core/config.py b/pandas/core/config.py
@@ -48,13 +48,13 @@
 
 """
 
-import re
-
 from collections import namedtuple
 from contextlib import contextmanager
+import re
 import warnings
-from pandas.compat import map, lmap, u
+
 import pandas.compat as compat
+from pandas.compat import lmap, map, u
 
 DeprecatedOption = namedtuple('DeprecatedOption', 'key msg rkey removal_ver')
 RegisteredOption = namedtuple('RegisteredOption',

diff --git a/pandas/core/config_init.py b/pandas/core/config_init.py
@@ -10,8 +10,10 @@
 
 """
 import pandas.core.config as cf
-from pandas.core.config import (is_int, is_bool, is_text, is_instance_factory,
-                                is_one_of_factory, is_callable)
+from pandas.core.config import (
+    is_bool, is_callable, is_instance_factory, is_int, is_one_of_factory,
+    is_text)
+
 from pandas.io.formats.console import detect_console_encoding
 from pandas.io.formats.terminal import is_terminal
-Original file line number
+Diff line change
@@ Expand Up / @@ -5,7 +5,6 @@ if [ -z "$COVERAGE" ]; then @@
        exit 0
     fi
-    source activate pandas
     echo "uploading coverage"
     bash <(curl -s https://codecov.io/bash) -Z -c -F single -f /tmp/cov-single.xml
@@ Expand Down @@