Restore CI after PY2 drop by h-vetinari · Pull Request #25752 · pandas-dev/pandas (original) (raw)

OK, here's the diff to the commit in ci compared to before #24942 got merged.

This should allow easier discussion of what this PR does compared to the CI up until very recently.

(pandas-dev) C:\Users\[...]\pddev>git diff 65c0441a41b2dcaeebb648274d30978419a8661a -- ci/

diff --git a/ci/azure/posix.yml b/ci/azure/posix.yml index b9e0cd0b9..7119054cf 100644 --- a/ci/azure/posix.yml +++ b/ci/azure/posix.yml @@ -9,20 +9,20 @@ jobs: strategy: matrix: ${{ if eq(parameters.name, 'macOS') }}:

```
   py35_np_120:
```

   py35_macos:
     ENV_FILE: ci/deps/azure-macos-35.yaml
     CONDA_PY: "35"
     PATTERN: "not slow and not network"

 ${{ if eq(parameters.name, 'Linux') }}:

```
   py27_np_120:
```

     ENV_FILE: ci/deps/azure-27-compat.yaml

```
     CONDA_PY: "27"
```

```
   py35_compat:
```

     ENV_FILE: ci/deps/azure-35-compat.yaml

     CONDA_PY: "35"
     PATTERN: "not slow and not network"

```
   py27_locale_slow_old_np:
```

     ENV_FILE: ci/deps/azure-27-locale.yaml

```
     CONDA_PY: "27"
```

```
   py36_locale_slow_old_np:
```

     ENV_FILE: ci/deps/azure-36-locale.yaml

     CONDA_PY: "36"
     PATTERN: "slow"
     LOCALE_OVERRIDE: "zh_CN.UTF-8"
     EXTRA_APT: "language-pack-zh-hans"

diff --git a/ci/azure/windows.yml b/ci/azure/windows.yml index cece00202..cd5879bf5 100644 --- a/ci/azure/windows.yml +++ b/ci/azure/windows.yml @@ -12,9 +12,9 @@ jobs: ENV_FILE: ci/deps/azure-windows-36.yaml CONDA_PY: "36"

```
 py27_np121:
```

   ENV_FILE: ci/deps/azure-windows-27.yaml

```
   CONDA_PY: "27"
```

```
 py37_np141:
```

   ENV_FILE: ci/deps/azure-windows-37.yaml

```
   CONDA_PY: "37"
```
steps:
- task: CondaEnvironment@1

@@ -22,13 +22,6 @@ jobs: updateConda: no packageSpecs: ''

- powershell: |
```
   $wc = New-Object net.webclient
```

   $wc.Downloadfile("https://download.microsoft.com/download/7/9/6/796EF2E4-801B-4FC4-AB28-B59FBF6D907B/VCForPython27.msi", "VCForPython27.msi")

   Start-Process "VCForPython27.msi" /qn -Wait

 displayName: 'Install VC 9.0 only for Python 2.7'

 condition: eq(variables.CONDA_PY, '27')

- script: |
    ci\\incremental\\setup_conda_environment.cmd
  displayName: 'Before Install'

diff --git a/ci/deps/azure-27-compat.yaml b/ci/deps/azure-35-compat.yaml similarity index 59% rename from ci/deps/azure-27-compat.yaml rename to ci/deps/azure-35-compat.yaml index a7784f17d..05436e799 100644 --- a/ci/deps/azure-27-compat.yaml +++ b/ci/deps/azure-35-compat.yaml @@ -3,26 +3,27 @@ channels:

defaults
conda-forge dependencies:

- beautifulsoup4==4.4.1
- bottleneck=1.2.0
- cython=0.28.2
- hypothesis>=3.58.0
- jinja2=2.8
- numexpr=2.6.1
- numpy=1.12.0

- openpyxl=2.5.5

- openpyxl=2.2.6
- pytables=3.4.2
- python-dateutil=2.5.0

- python=2.7*
- pytz=2013b

- python=3.5*
- pytz=2015.4
- scipy=0.18.1
- xlrd=1.0.0

- xlsxwriter=0.5.2
- xlwt=0.7.5

- xlsxwriter=0.7.7
- xlwt=1.0.0
universal

- pytest>=4.0.2
- pytest-xdist
- pytest-mock
- isort
- pip:

for python 3.5, pytest>=4.0.2 is not available in conda
- pytest>=4.0.2
- html5lib==1.0b2

- beautifulsoup4==4.2.1
- hypothesis>=3.58.0

diff --git a/ci/deps/azure-27-locale.yaml b/ci/deps/azure-36-locale.yaml similarity index 74% rename from ci/deps/azure-27-locale.yaml rename to ci/deps/azure-36-locale.yaml index 8636a63d0..c74d56443 100644 --- a/ci/deps/azure-27-locale.yaml +++ b/ci/deps/azure-36-locale.yaml @@ -3,6 +3,7 @@ channels:

defaults
conda-forge dependencies:

- beautifulsoup4==4.5.1
- bottleneck=1.2.0
- cython=0.28.2
- lxml @@ -11,14 +12,13 @@ dependencies:
- openpyxl=2.4.0
- python-dateutil
- python-blosc

- python=2.7
- pytz
- pytz=2013b

- python=3.6
- pytz=2016.10
- scipy

- sqlalchemy=0.8.1

- sqlalchemy=1.1.4
- xlrd=1.0.0

- xlsxwriter=0.5.2
- xlwt=0.7.5

- xlsxwriter=0.9.4
- xlwt=1.2.0
universal
- pytest>=4.0.2
- pytest-xdist @@ -27,4 +27,3 @@ dependencies:
- isort
- pip:
  - html5lib==1.0b2

- beautifulsoup4==4.2.1

diff --git a/ci/deps/azure-windows-36.yaml b/ci/deps/azure-windows-36.yaml index 8517d340f..5ce55a4cb 100644 --- a/ci/deps/azure-windows-36.yaml +++ b/ci/deps/azure-windows-36.yaml @@ -15,7 +15,7 @@ dependencies:

pyarrow
pytables
python-dateutil
- python=3.6.6

- python=3.6.*
- pytz
- scipy
- xlrd diff --git a/ci/deps/azure-windows-27.yaml b/ci/deps/azure-windows-37.yaml similarity index 81% rename from ci/deps/azure-windows-27.yaml rename to ci/deps/azure-windows-37.yaml index f40efdfca..96ddc1d62 100644 --- a/ci/deps/azure-windows-27.yaml +++ b/ci/deps/azure-windows-37.yaml @@ -5,17 +5,17 @@ channels: dependencies:
- beautifulsoup4
- bottleneck

- dateutil
- gcsfs
- html5lib
- jinja2=2.8

- jinja2
- lxml

- matplotlib=2.0.1

- matplotlib=3.0.1
- numexpr

- numpy=1.12*

- numpy=1.14.*
- openpyxl
- pytables

- python=2.7.*

- python=3.7.*
- python-dateutil
- pytz
- s3fs
- scipy diff --git a/ci/deps/travis-27.yaml b/ci/deps/travis-35.yaml similarity index 71% rename from ci/deps/travis-27.yaml rename to ci/deps/travis-35.yaml index a910af36a..8ae0bf6a0 100644 --- a/ci/deps/travis-27.yaml +++ b/ci/deps/travis-35.yaml @@ -6,11 +6,9 @@ dependencies:
- beautifulsoup4
- bottleneck
- cython=0.28.2

- fastparquet>=0.2.1
- gcsfs
- html5lib
- ipython
- jemalloc=4.5.0.post
- jinja2=2.8
- lxml
- matplotlib=2.2.2 @@ -24,28 +22,27 @@ dependencies:
- py
- pyarrow=0.9.0
- PyCrypto
- pymysql=0.6.3

- pymysql=0.6.6
- pytables
- blosc=1.14.3
- python-blosc
- python-dateutil=2.5.0

- python=2.7*
- pytz=2013b
- s3fs

- python=3.5*
- pytz=2015.4
- scipy

- sqlalchemy=0.9.6

- sqlalchemy=1.0.8
- s3fs
- xarray=0.9.6
- xlrd=1.0.0

- xlsxwriter=0.5.2
- xlwt=0.7.5

- xlsxwriter=0.7.7
- xlwt=1.0.0
universal

- pytest>=4.0.2
- pytest-xdist
- pytest-mock
- moto==1.3.4

- moto
- hypothesis>=3.58.0
- isort
- pip:

- backports.lzma

not available for python 3.5 through conda
- pandas-gbq

- pathlib

- pytest>=4.0.2

diff --git a/ci/deps/travis-36-doc.yaml b/ci/deps/travis-36-doc.yaml index 6f33bc58a..8015f7bdc 100644 --- a/ci/deps/travis-36-doc.yaml +++ b/ci/deps/travis-36-doc.yaml @@ -15,12 +15,12 @@ dependencies:

ipywidgets
lxml
matplotlib
- nbconvert

- nbconvert>=5.4.1
- nbformat
- nbsphinx

- notebook

- notebook>=5.7.5
- numexpr

- numpy=1.13*

- numpy
- numpydoc
- openpyxl
- pandoc diff --git a/ci/run_with_env.cmd b/ci/run_with_env.cmd index 848f4608c..0661039a2 100644 --- a/ci/run_with_env.cmd +++ b/ci/run_with_env.cmd @@ -1,5 +1,5 @@ :: EXPECTED ENV VARS: PYTHON_ARCH (either x86 or x64) -:: CONDA_PY (either 27, 33, 35 etc. - only major version is extracted)

+:: CONDA_PY (either 35, 36 etc. - only major version is extracted) :: :: :: To build extensions for 64 bit Python 3, we need to configure environment @@ -45,7 +45,7 @@ SET WIN_SDK_ROOT=C:\Program Files\Microsoft SDKs\Windows SET MAJOR_PYTHON_VERSION=%CONDA_PY:~0,1%

IF "%CONDA_PY:~2,1%" == "" (

:: CONDA_PY style, such as 27, 34 etc.

:: CONDA_PY style, such as 36, 37 etc. SET MINOR_PYTHON_VERSION=%CONDA_PY:~~1,1% ) ELSE ( IF "%CONDA_PY:~~3,1%" == "." (

Restore CI after PY2 drop by h-vetinari · Pull Request #25752 · pandas-dev/pandas (original) (raw)

universal

for python 3.5, pytest>=4.0.2 is not available in conda

universal

universal

not available for python 3.5 through conda