Merge branch 'master' into groupby_pctchange_bug · pandas-dev/pandas@1f1f705 (original) (raw)

82 files changed

lines changed

Original file line number Diff line number Diff line change
@@ -26,7 +26,13 @@ jobs:
26 26 name: build
27 27 command: |
28 28 ./ci/circle/install_circle.sh
29 - ./ci/circle/show_circle.sh
29 + export PATH="$MINICONDA_DIR/bin:$PATH"
30 + source activate pandas-dev
31 + python -c "import pandas; pandas.show_versions();"
30 32 - run:
31 33 name: test
32 -command: ./ci/circle/run_circle.sh --skip-slow --skip-network
34 +command: |
35 + export PATH="$MINICONDA_DIR/bin:$PATH"
36 + source activate pandas-dev
37 + echo "pytest --strict --durations=10 --color=no --junitxml=$CIRCLE_TEST_REPORTS/reports/junit.xml --skip-slow --skip-network pandas"
38 + pytest --strict --durations=10 --color=no --junitxml=$CIRCLE_TEST_REPORTS/reports/junit.xml --skip-slow --skip-network pandas
Original file line number Diff line number Diff line change
@@ -105,6 +105,7 @@ before_script:
105 105
106 106 script:
107 107 - echo "script start"
108 + - source activate pandas-dev
108 109 - ci/run_build_docs.sh
109 110 - ci/script_single.sh
110 111 - ci/script_multi.sh
@@ -115,7 +116,7 @@ after_success:
115 116
116 117 after_script:
117 118 - echo "after_script start"
118 - - source activate pandas && pushd /tmp && python -c "import pandas; pandas.show_versions();" && popd
119 + - source activate pandas-dev && pushd /tmp && python -c "import pandas; pandas.show_versions();" && popd
119 120 - if [ -e test-data-single.xml ]; then
120 121 ci/print_skipped.py test-data-single.xml;
121 122 fi
Original file line number Diff line number Diff line change
@@ -12,21 +12,19 @@ jobs:
12 12 py27_np_19:
13 13 ENV_FILE: ci/deps/azure-27-compat.yaml
14 14 CONDA_PY: "27"
15 -CONDA_ENV: pandas
16 15 TEST_ARGS: "--skip-slow --skip-network"
17 16
18 -py36_locale:
17 +py37_locale:
19 18 ENV_FILE: ci/deps/azure-37-locale.yaml
20 19 CONDA_PY: "37"
21 -CONDA_ENV: pandas
22 20 TEST_ARGS: "--skip-slow --skip-network"
23 21 LOCALE_OVERRIDE: "zh_CN.UTF-8"
24 22
25 23 py36_locale_slow:
26 24 ENV_FILE: ci/deps/azure-36-locale_slow.yaml
27 25 CONDA_PY: "36"
28 -CONDA_ENV: pandas
29 26 TEST_ARGS: "--only-slow --skip-network"
27 +LOCALE_OVERRIDE: "it_IT.UTF-8"
30 28
31 29 steps:
32 30 - script: |
@@ -39,17 +37,19 @@ jobs:
39 37 displayName: 'Before Install'
40 38 - script: |
41 39 export PATH=$HOME/miniconda3/bin:$PATH
40 + source activate pandas-dev
42 41 ci/incremental/build.sh
43 42 displayName: 'Build'
44 43 - script: |
45 44 export PATH=$HOME/miniconda3/bin:$PATH
45 + source activate pandas-dev
46 46 ci/script_single.sh
47 47 ci/script_multi.sh
48 48 echo "[Test done]"
49 49 displayName: 'Test'
50 50 - script: |
51 51 export PATH=$HOME/miniconda3/bin:$PATH
52 - source activate pandas && pushd /tmp && python -c "import pandas; pandas.show_versions();" && popd
52 + source activate pandas-dev && pushd /tmp && python -c "import pandas; pandas.show_versions();" && popd
53 53 - task: PublishTestResults@2
54 54 inputs:
55 55 testResultsFiles: 'test-data-*.xml'
Original file line number Diff line number Diff line change
@@ -12,7 +12,6 @@ jobs:
12 12 py35_np_120:
13 13 ENV_FILE: ci/deps/azure-macos-35.yaml
14 14 CONDA_PY: "35"
15 -CONDA_ENV: pandas
16 15 TEST_ARGS: "--skip-slow --skip-network"
17 16
18 17 steps:
@@ -26,17 +25,19 @@ jobs:
26 25 displayName: 'Before Install'
27 26 - script: |
28 27 export PATH=$HOME/miniconda3/bin:$PATH
28 + source activate pandas-dev
29 29 ci/incremental/build.sh
30 30 displayName: 'Build'
31 31 - script: |
32 32 export PATH=$HOME/miniconda3/bin:$PATH
33 + source activate pandas-dev
33 34 ci/script_single.sh
34 35 ci/script_multi.sh
35 36 echo "[Test done]"
36 37 displayName: 'Test'
37 38 - script: |
38 39 export PATH=$HOME/miniconda3/bin:$PATH
39 - source activate pandas && pushd /tmp && python -c "import pandas; pandas.show_versions();" && popd
40 + source activate pandas-dev && pushd /tmp && python -c "import pandas; pandas.show_versions();" && popd
40 41 - task: PublishTestResults@2
41 42 inputs:
42 43 testResultsFiles: 'test-data-*.xml'
@@ -65,4 +66,4 @@ jobs:
65 66 # note that this will produce $LASTEXITCODE=1
66 67 Write-Error "$($matches[1]) tests failed"
67 68 }
68 - displayName: Check for test failures
69 + displayName: Check for test failures
Original file line number Diff line number Diff line change
@@ -12,7 +12,6 @@ jobs:
12 12 py36_np121:
13 13 ENV_FILE: ci/deps/azure-windows-27.yaml
14 14 CONDA_PY: "27"
15 -CONDA_ENV: pandas
16 15
17 16 steps:
18 17 - task: CondaEnvironment@1
@@ -33,10 +32,11 @@ jobs:
33 32 ci\\incremental\\setup_conda_environment.cmd
34 33 displayName: 'Before Install'
35 34 - script: |
35 + call activate pandas-dev
36 36 ci\\incremental\\build.cmd
37 37 displayName: 'Build'
38 38 - script: |
39 - call activate %CONDA_ENV%
39 + call activate pandas-dev
40 40 pytest --junitxml=test-data.xml --skip-slow --skip-network pandas -n 2 -r sxX --strict --durations=10 %*
41 41 displayName: 'Test'
42 42 - task: PublishTestResults@2
Original file line number Diff line number Diff line change
@@ -12,7 +12,6 @@ jobs:
12 12 py36_np14:
13 13 ENV_FILE: ci/deps/azure-windows-36.yaml
14 14 CONDA_PY: "36"
15 -CONDA_ENV: pandas
16 15
17 16 steps:
18 17 - task: CondaEnvironment@1
@@ -24,10 +23,11 @@ jobs:
24 23 ci\\incremental\\setup_conda_environment.cmd
25 24 displayName: 'Before Install'
26 25 - script: |
26 + call activate pandas-dev
27 27 ci\\incremental\\build.cmd
28 28 displayName: 'Build'
29 29 - script: |
30 - call activate %CONDA_ENV%
30 + call activate pandas-dev
31 31 pytest --junitxml=test-data.xml --skip-slow --skip-network pandas -n 2 -r sxX --strict --durations=10 %*
32 32 displayName: 'Test'
33 33 - task: PublishTestResults@2
@@ -46,4 +46,4 @@ jobs:
46 46 # note that this will produce $LASTEXITCODE=1
47 47 Write-Error "$($matches[1]) tests failed"
48 48 }
49 - displayName: Check for test failures
49 + displayName: Check for test failures
Original file line number Diff line number Diff line change
@@ -12,8 +12,6 @@ if [ "$DOC" ]; then
12 12
13 13 echo "Will build docs"
14 14
15 -source activate pandas
16 -
17 15 echo ###############################
18 16 echo # Log file for the doc build #
19 17 echo ###############################
Original file line number Diff line number Diff line change
@@ -60,9 +60,9 @@ fi
60 60
61 61 # create envbuild deps
62 62 echo "[create env]"
63 -time conda env create -q -n pandas --file="${ENV_FILE}" |
63 +time conda env create -q --file="${ENV_FILE}" |
64 64
65 -source activate pandas
65 +source activate pandas-dev
66 66
67 67 # remove any installed pandas package
68 68 # w/o removing anything else
Original file line number Diff line number Diff line change
@@ -20,7 +20,6 @@ echo "inside $0"
20 20 [[ -z "$1" | "$1" == "lint" "$1" == "patterns"
21 21 | { echo "Unknown command 1.Usage:1. Usage: 1.Usage:0 [lint patterns doctests
22 22
23 -source activate pandas
24 23 BASE_DIR="$(dirname $0)/.."
25 24 RET=0
26 25 CHECK=$1
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
1 -name: pandas
1 +name: pandas-dev
2 2 channels:
3 3 - defaults
4 4 - conda-forge
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
1 -name: pandas
1 +name: pandas-dev
2 2 channels:
3 3 - defaults
4 4 - conda-forge
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
1 -name: pandas
1 +name: pandas-dev
2 2 channels:
3 3 - defaults
4 4 - conda-forge
@@ -18,7 +18,7 @@ dependencies:
18 18 - pymysql
19 19 - pytables
20 20 - python-dateutil
21 - - python=3.6*
21 + - python=3.7*
22 22 - pytz
23 23 - s3fs
24 24 - scipy
@@ -30,6 +30,6 @@ dependencies:
30 30 # universal
31 31 - pytest
32 32 - pytest-xdist
33 - - moto
34 33 - pip:
35 34 - hypothesis>=3.58.0
35 + - moto # latest moto in conda-forge fails with 3.7, move to conda dependencies when this is fixed
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
1 -name: pandas
1 +name: pandas-dev
2 2 channels:
3 3 - defaults
4 4 dependencies:
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
1 -name: pandas
1 +name: pandas-dev
2 2 channels:
3 3 - defaults
4 4 - conda-forge
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
1 -name: pandas
1 +name: pandas-dev
2 2 channels:
3 3 - defaults
4 4 - conda-forge
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
1 -name: pandas
1 +name: pandas-dev
2 2 channels:
3 3 - defaults
4 4 - conda-forge
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
1 -name: pandas
1 +name: pandas-dev
2 2 channels:
3 3 - defaults
4 4 - conda-forge
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
1 -name: pandas
1 +name: pandas-dev
2 2 channels:
3 3 - defaults
4 4 - conda-forge
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
1 -name: pandas
1 +name: pandas-dev
2 2 channels:
3 3 - defaults
4 4 - conda-forge
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
1 -name: pandas
1 +name: pandas-dev
2 2 channels:
3 3 - defaults
4 4 - conda-forge
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
1 -name: pandas
1 +name: pandas-dev
2 2 channels:
3 3 - defaults
4 4 - conda-forge
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
1 -name: pandas
1 +name: pandas-dev
2 2 channels:
3 3 - defaults
4 4 dependencies:
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
1 -name: pandas
1 +name: pandas-dev
2 2 channels:
3 3 - defaults
4 4 - conda-forge
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
1 1 @rem https://github.com/numba/numba/blob/master/buildscripts/incremental/build.cmd
2 -call activate %CONDA_ENV%
3 2
4 3 @rem Build numba extensions without silencing compile errors
5 4 python setup.py build_ext -q --inplace
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
1 1 #!/bin/bash
2 2
3 -source activate $CONDA_ENV
4 -
5 3 # Make sure any error below is reported as such
6 4 set -v -e
7 5
Original file line number Diff line number Diff line change
@@ -11,11 +11,11 @@ call deactivate
11 11 @rem Display root environment (for debugging)
12 12 conda list
13 13 @rem Clean up any left-over from a previous build
14 -conda remove --all -q -y -n %CONDA_ENV%
14 +conda remove --all -q -y -n pandas-dev
15 15 @rem Scipy, CFFI, jinja2 and IPython are optional dependencies, but exercised in the test suite
16 -conda env create -n %CONDA_ENV% --file=ci\deps\azure-windows-%CONDA_PY%.yaml
16 +conda env create --file=ci\deps\azure-windows-%CONDA_PY%.yaml
17 17
18 -call activate %CONDA_ENV%
18 +call activate pandas-dev
19 19 conda list
20 20
21 21 if %errorlevel% neq 0 exit /b %errorlevel%
Original file line number Diff line number Diff line change
@@ -5,22 +5,22 @@ set -v -e
5 5 CONDA_INSTALL="conda install -q -y"
6 6 PIP_INSTALL="pip install -q"
7 7
8 +
8 9 # Deactivate any environment
9 10 source deactivate
10 11 # Display root environment (for debugging)
11 12 conda list
12 13 # Clean up any left-over from a previous build
13 14 # (note workaround for https://github.com/conda/conda/issues/2679:
14 15 # `conda env remove` issue)
15 -conda remove --all -q -y -n $CONDA_ENV
16 +conda remove --all -q -y -n pandas-dev
16 17
17 18 echo
18 19 echo "[create env]"
19 -time conda env create -q -n "${CONDA_ENV}" --file="${ENV_FILE}" |
20 +time conda env create -q --file="${ENV_FILE}" |
20 21
21 -# Activate first
22 22 set +v
23 -source activate $CONDA_ENV
23 +source activate pandas-dev
24 24 set -v
25 25
26 26 # remove any installed pandas package
Original file line number Diff line number Diff line change
@@ -80,9 +80,9 @@ echo
80 80 echo "[create env]"
81 81
82 82 # create our environment
83 -time conda env create -q -n pandas --file="${ENV_FILE}" |
83 +time conda env create -q --file="${ENV_FILE}" |
84 84
85 -source activate pandas
85 +source activate pandas-dev
86 86
87 87 # remove any installed pandas package
88 88 # w/o removing anything else