Skip to content

Commit 631d830

Browse files
datapythonistaPingviinituutti
authored andcommitted
CI: Moving CI dependencies to "ci/deps" (pandas-dev#23526)
1 parent eed8f86 commit 631d830

21 files changed

+18
-18
lines changed

.circleci/config.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ jobs:
2121

2222
environment:
2323
JOB: "3.6_LOCALE"
24-
ENV_FILE: "ci/circle-36-locale.yaml"
24+
ENV_FILE: "ci/deps/circle-36-locale.yaml"
2525
LOCALE_OVERRIDE: "zh_CN.UTF-8"
2626
MINICONDA_DIR: /home/ubuntu/miniconda3
2727
steps:

.travis.yml

+9-9
Original file line numberDiff line numberDiff line change
@@ -34,28 +34,28 @@ matrix:
3434
include:
3535
- dist: trusty
3636
env:
37-
- JOB="3.7" ENV_FILE="ci/travis-37.yaml" TEST_ARGS="--skip-slow --skip-network"
37+
- JOB="3.7" ENV_FILE="ci/deps/travis-37.yaml" TEST_ARGS="--skip-slow --skip-network"
3838

3939
- dist: trusty
4040
env:
41-
- JOB="2.7, locale, slow, old NumPy" ENV_FILE="ci/travis-27-locale.yaml" LOCALE_OVERRIDE="zh_CN.UTF-8" SLOW=true
41+
- JOB="2.7, locale, slow, old NumPy" ENV_FILE="ci/deps/travis-27-locale.yaml" LOCALE_OVERRIDE="zh_CN.UTF-8" SLOW=true
4242
addons:
4343
apt:
4444
packages:
4545
- language-pack-zh-hans
4646
- dist: trusty
4747
env:
48-
- JOB="2.7" ENV_FILE="ci/travis-27.yaml" TEST_ARGS="--skip-slow"
48+
- JOB="2.7" ENV_FILE="ci/deps/travis-27.yaml" TEST_ARGS="--skip-slow"
4949
addons:
5050
apt:
5151
packages:
5252
- python-gtk2
5353
- dist: trusty
5454
env:
55-
- JOB="3.6, lint, coverage" ENV_FILE="ci/travis-36.yaml" TEST_ARGS="--skip-slow --skip-network" PANDAS_TESTING_MODE="deprecate" COVERAGE=true LINT=true
55+
- JOB="3.6, lint, coverage" ENV_FILE="ci/deps/travis-36.yaml" TEST_ARGS="--skip-slow --skip-network" PANDAS_TESTING_MODE="deprecate" COVERAGE=true LINT=true
5656
- dist: trusty
5757
env:
58-
- JOB="3.7, NumPy dev" ENV_FILE="ci/travis-37-numpydev.yaml" TEST_ARGS="--skip-slow --skip-network -W error" PANDAS_TESTING_MODE="deprecate"
58+
- JOB="3.7, NumPy dev" ENV_FILE="ci/deps/travis-37-numpydev.yaml" TEST_ARGS="--skip-slow --skip-network -W error" PANDAS_TESTING_MODE="deprecate"
5959
addons:
6060
apt:
6161
packages:
@@ -64,19 +64,19 @@ matrix:
6464
# In allow_failures
6565
- dist: trusty
6666
env:
67-
- JOB="3.6, slow" ENV_FILE="ci/travis-36-slow.yaml" SLOW=true
67+
- JOB="3.6, slow" ENV_FILE="ci/deps/travis-36-slow.yaml" SLOW=true
6868

6969
# In allow_failures
7070
- dist: trusty
7171
env:
72-
- JOB="3.6, doc" ENV_FILE="ci/travis-36-doc.yaml" DOC=true
72+
- JOB="3.6, doc" ENV_FILE="ci/deps/travis-36-doc.yaml" DOC=true
7373
allow_failures:
7474
- dist: trusty
7575
env:
76-
- JOB="3.6, slow" ENV_FILE="ci/travis-36-slow.yaml" SLOW=true
76+
- JOB="3.6, slow" ENV_FILE="ci/deps/travis-36-slow.yaml" SLOW=true
7777
- dist: trusty
7878
env:
79-
- JOB="3.6, doc" ENV_FILE="ci/travis-36-doc.yaml" DOC=true
79+
- JOB="3.6, doc" ENV_FILE="ci/deps/travis-36-doc.yaml" DOC=true
8080

8181
before_install:
8282
- echo "before_install"

ci/azure/linux.yml

+4-4
Original file line numberDiff line numberDiff line change
@@ -10,20 +10,20 @@ jobs:
1010
maxParallel: 11
1111
matrix:
1212
py27_np_19:
13-
ENV_FILE: ci/azure-27-compat.yaml
13+
ENV_FILE: ci/deps/azure-27-compat.yaml
1414
CONDA_PY: "27"
1515
CONDA_ENV: pandas
1616
TEST_ARGS: "--skip-slow --skip-network"
1717

1818
py36_locale:
19-
ENV_FILE: ci/azure-37-locale.yaml
19+
ENV_FILE: ci/deps/azure-37-locale.yaml
2020
CONDA_PY: "37"
2121
CONDA_ENV: pandas
2222
TEST_ARGS: "--skip-slow --skip-network"
2323
LOCALE_OVERRIDE: "zh_CN.UTF-8"
2424

2525
py36_locale_slow:
26-
ENV_FILE: ci/azure-36-locale_slow.yaml
26+
ENV_FILE: ci/deps/azure-36-locale_slow.yaml
2727
CONDA_PY: "36"
2828
CONDA_ENV: pandas
2929
TEST_ARGS: "--only-slow --skip-network"
@@ -53,4 +53,4 @@ jobs:
5353
- task: PublishTestResults@2
5454
inputs:
5555
testResultsFiles: 'test-data-*.xml'
56-
testRunTitle: 'Linux'
56+
testRunTitle: 'Linux'

ci/azure/macos.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ jobs:
1010
maxParallel: 11
1111
matrix:
1212
py35_np_120:
13-
ENV_FILE: ci/azure-macos-35.yaml
13+
ENV_FILE: ci/deps/azure-macos-35.yaml
1414
CONDA_PY: "35"
1515
CONDA_ENV: pandas
1616
TEST_ARGS: "--skip-slow --skip-network"

ci/azure/windows-py27.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ jobs:
1010
maxParallel: 11
1111
matrix:
1212
py36_np121:
13-
ENV_FILE: ci/azure-windows-27.yaml
13+
ENV_FILE: ci/deps/azure-windows-27.yaml
1414
CONDA_PY: "27"
1515
CONDA_ENV: pandas
1616

ci/azure/windows.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ jobs:
1010
maxParallel: 11
1111
matrix:
1212
py36_np14:
13-
ENV_FILE: ci/azure-windows-36.yaml
13+
ENV_FILE: ci/deps/azure-windows-36.yaml
1414
CONDA_PY: "36"
1515
CONDA_ENV: pandas
1616

File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.

ci/incremental/setup_conda_environment.cmd

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ conda list
1313
@rem Clean up any left-over from a previous build
1414
conda remove --all -q -y -n %CONDA_ENV%
1515
@rem Scipy, CFFI, jinja2 and IPython are optional dependencies, but exercised in the test suite
16-
conda env create -n %CONDA_ENV% --file=ci\azure-windows-%CONDA_PY%.yaml
16+
conda env create -n %CONDA_ENV% --file=ci\deps\azure-windows-%CONDA_PY%.yaml
1717

1818
call activate %CONDA_ENV%
1919
conda list

0 commit comments

Comments
 (0)