Skip to content

Commit 3a71185

Browse files
datapythonistadatapythonista
committed
Merge remote-tracking branch 'upstream/master' into azure_lint
2 parents 991304d + ee283fa commit 3a71185

File tree

196 files changed

+10458
-9849
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

196 files changed

+10458
-9849
lines changed

‎.circleci/config.yml‎

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,13 @@ jobs:
2626
name: build
2727
command: |
2828
./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();"
3032
- run:
3133
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

‎.travis.yml‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -105,6 +105,7 @@ before_script:
105105

106106
script:
107107
- echo "script start"
108+
- source activate pandas-dev
108109
- ci/run_build_docs.sh
109110
- ci/script_single.sh
110111
- ci/script_multi.sh
@@ -114,7 +115,7 @@ after_success:
114115

115116
after_script:
116117
- echo "after_script start"
117-
- source activate pandas && pushd /tmp && python -c "import pandas; pandas.show_versions();" && popd
118+
- source activate pandas-dev && pushd /tmp && python -c "import pandas; pandas.show_versions();" && popd
118119
- if [ -e test-data-single.xml ]; then
119120
ci/print_skipped.py test-data-single.xml;
120121
fi

‎README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -171,7 +171,7 @@ pip install pandas
171171
```
172172

173173
## Dependencies
174-
- [NumPy](https://www.numpy.org): 1.9.0 or higher
174+
- [NumPy](https://www.numpy.org): 1.12.0 or higher
175175
- [python-dateutil](https://labix.org/python-dateutil): 2.5.0 or higher
176176
- [pytz](https://pythonhosted.org/pytz): 2011k or higher
177177

‎ci/azure/linux.yml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -9,24 +9,22 @@ jobs:
99
strategy:
1010
maxParallel: 11
1111
matrix:
12-
py27_np_19:
12+
py27_np_120:
1313
ENV_FILE: ci/deps/azure-27-compat.yaml
1414
CONDA_PY: "27"
15-
CONDA_ENV: pandas
1615
TEST_ARGS: "--skip-slow --skip-network"
1716

18-
py36_locale:
17+
py37_locale:
1918
ENV_FILE: ci/deps/azure-37-locale.yaml
2019
CONDA_PY: "37"
21-
CONDA_ENV: pandas
2220
TEST_ARGS: "--skip-slow --skip-network"
2321
LOCALE_OVERRIDE: "zh_CN.UTF-8"
2422

2523
py36_locale_slow:
2624
ENV_FILE: ci/deps/azure-36-locale_slow.yaml
2725
CONDA_PY: "36"
28-
CONDA_ENV: pandas
2926
TEST_ARGS: "--only-slow --skip-network"
27+
LOCALE_OVERRIDE: "it_IT.UTF-8"
3028

3129
steps:
3230
- script: |
@@ -39,17 +37,19 @@ jobs:
3937
displayName: 'Before Install'
4038
- script: |
4139
export PATH=$HOME/miniconda3/bin:$PATH
40+
source activate pandas-dev
4241
ci/incremental/build.sh
4342
displayName: 'Build'
4443
- script: |
4544
export PATH=$HOME/miniconda3/bin:$PATH
45+
source activate pandas-dev
4646
ci/script_single.sh
4747
ci/script_multi.sh
4848
echo "[Test done]"
4949
displayName: 'Test'
5050
- script: |
5151
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
5353
- task: PublishTestResults@2
5454
inputs:
5555
testResultsFiles: 'test-data-*.xml'

‎ci/azure/macos.yml‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@ jobs:
1212
py35_np_120:
1313
ENV_FILE: ci/deps/azure-macos-35.yaml
1414
CONDA_PY: "35"
15-
CONDA_ENV: pandas
1615
TEST_ARGS: "--skip-slow --skip-network"
1716

1817
steps:
@@ -26,17 +25,19 @@ jobs:
2625
displayName: 'Before Install'
2726
- script: |
2827
export PATH=$HOME/miniconda3/bin:$PATH
28+
source activate pandas-dev
2929
ci/incremental/build.sh
3030
displayName: 'Build'
3131
- script: |
3232
export PATH=$HOME/miniconda3/bin:$PATH
33+
source activate pandas-dev
3334
ci/script_single.sh
3435
ci/script_multi.sh
3536
echo "[Test done]"
3637
displayName: 'Test'
3738
- script: |
3839
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
4041
- task: PublishTestResults@2
4142
inputs:
4243
testResultsFiles: 'test-data-*.xml'
@@ -65,4 +66,4 @@ jobs:
6566
# note that this will produce $LASTEXITCODE=1
6667
Write-Error "$($matches[1]) tests failed"
6768
}
68-
displayName: Check for test failures
69+
displayName: Check for test failures

‎ci/azure/windows-py27.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@ jobs:
1212
py36_np121:
1313
ENV_FILE: ci/deps/azure-windows-27.yaml
1414
CONDA_PY: "27"
15-
CONDA_ENV: pandas
1615

1716
steps:
1817
- task: CondaEnvironment@1
@@ -33,10 +32,11 @@ jobs:
3332
ci\\incremental\\setup_conda_environment.cmd
3433
displayName: 'Before Install'
3534
- script: |
35+
call activate pandas-dev
3636
ci\\incremental\\build.cmd
3737
displayName: 'Build'
3838
- script: |
39-
call activate %CONDA_ENV%
39+
call activate pandas-dev
4040
pytest --junitxml=test-data.xml --skip-slow --skip-network pandas -n 2 -r sxX --strict --durations=10 %*
4141
displayName: 'Test'
4242
- task: PublishTestResults@2

‎ci/azure/windows.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@ jobs:
1212
py36_np14:
1313
ENV_FILE: ci/deps/azure-windows-36.yaml
1414
CONDA_PY: "36"
15-
CONDA_ENV: pandas
1615

1716
steps:
1817
- task: CondaEnvironment@1
@@ -24,10 +23,11 @@ jobs:
2423
ci\\incremental\\setup_conda_environment.cmd
2524
displayName: 'Before Install'
2625
- script: |
26+
call activate pandas-dev
2727
ci\\incremental\\build.cmd
2828
displayName: 'Build'
2929
- script: |
30-
call activate %CONDA_ENV%
30+
call activate pandas-dev
3131
pytest --junitxml=test-data.xml --skip-slow --skip-network pandas -n 2 -r sxX --strict --durations=10 %*
3232
displayName: 'Test'
3333
- task: PublishTestResults@2
@@ -46,4 +46,4 @@ jobs:
4646
# note that this will produce $LASTEXITCODE=1
4747
Write-Error "$($matches[1]) tests failed"
4848
}
49-
displayName: Check for test failures
49+
displayName: Check for test failures

‎ci/build_docs.sh‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,6 @@ if [ "$DOC" ]; then
1212

1313
echo "Will build docs"
1414

15-
source activate pandas
16-
1715
echo ###############################
1816
echo # Log file for the doc build #
1917
echo ###############################

‎ci/circle/install_circle.sh‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -60,9 +60,9 @@ fi
6060

6161
# create envbuild deps
6262
echo "[create env]"
63-
time conda env create -q -n pandas --file="${ENV_FILE}" || exit 1
63+
time conda env create -q --file="${ENV_FILE}" || exit 1
6464

65-
source activate pandas
65+
source activate pandas-dev
6666

6767
# remove any installed pandas package
6868
# w/o removing anything else

‎ci/circle/run_circle.sh‎

Lines changed: 0 additions & 9 deletions
This file was deleted.

0 commit comments

Comments
 (0)