Skip to content

Commit 83f2583

Browse files
authored
DEPS: drop Python 3.7 and NumPy 1.17 from tests (#41678) (#41989)
1 parent 97ed8ee commit 83f2583

31 files changed

+271
-258
lines changed

.github/workflows/database.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -19,15 +19,15 @@ env:
1919
COVERAGE: true
2020

2121
jobs:
22-
Linux_py37_IO:
22+
Linux_py38_IO:
2323
runs-on: ubuntu-latest
2424
defaults:
2525
run:
2626
shell: bash -l {0}
2727

2828
strategy:
2929
matrix:
30-
ENV_FILE: [ci/deps/actions-37-db-min.yaml, ci/deps/actions-37-db.yaml]
30+
ENV_FILE: [ci/deps/actions-38-db-min.yaml, ci/deps/actions-38-db.yaml]
3131
fail-fast: false
3232

3333
concurrency:

.github/workflows/posix.yml

+4-5
Original file line numberDiff line numberDiff line change
@@ -25,14 +25,13 @@ jobs:
2525
strategy:
2626
matrix:
2727
settings: [
28-
[actions-37-minimum_versions.yaml, "not slow and not network and not clipboard", "", "", "", "", ""],
29-
[actions-37.yaml, "not slow and not network and not clipboard", "", "", "", "", ""],
30-
[actions-37-locale_slow.yaml, "slow", "language-pack-it xsel", "it_IT.utf8", "it_IT.utf8", "", ""],
31-
[actions-37-slow.yaml, "slow", "", "", "", "", ""],
28+
[actions-38-minimum_versions.yaml, "not slow and not network and not clipboard", "", "", "", "", ""],
29+
[actions-38-locale_slow.yaml, "slow", "language-pack-it xsel", "it_IT.utf8", "it_IT.utf8", "", ""],
3230
[actions-38.yaml, "not slow and not network and not clipboard", "", "", "", "", ""],
3331
[actions-38-slow.yaml, "slow", "", "", "", "", ""],
3432
[actions-38-locale.yaml, "not slow and not network", "language-pack-zh-hans xsel", "zh_CN.utf8", "zh_CN.utf8", "", ""],
35-
[actions-38-numpydev.yaml, "not slow and not network", "xsel", "", "", "deprecate", "-W error"],
33+
[actions-39-slow.yaml, "slow", "", "", "", "", ""],
34+
[actions-39-numpydev.yaml, "not slow and not network", "xsel", "", "", "deprecate", "-W error"],
3635
[actions-39.yaml, "not slow and not network and not clipboard", "", "", "", "", ""]
3736
]
3837
fail-fast: false

.github/workflows/sdist.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ jobs:
2323
strategy:
2424
fail-fast: false
2525
matrix:
26-
python-version: ["3.7", "3.8", "3.9"]
26+
python-version: ["3.8", "3.9"]
2727

2828
steps:
2929
- uses: actions/checkout@v2

azure-pipelines.yml

+3-3
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ jobs:
2929
name: Windows
3030
vmImage: vs2017-win2016
3131

32-
- job: py37_32bit
32+
- job: py38_32bit
3333
pool:
3434
vmImage: ubuntu-18.04
3535

@@ -38,7 +38,7 @@ jobs:
3838
docker pull quay.io/pypa/manylinux2014_i686
3939
docker run -v $(pwd):/pandas quay.io/pypa/manylinux2014_i686 \
4040
/bin/bash -xc "cd pandas && \
41-
/opt/python/cp37-cp37m/bin/python -m venv ~/virtualenvs/pandas-dev && \
41+
/opt/python/cp38-cp38/bin/python -m venv ~/virtualenvs/pandas-dev && \
4242
. ~/virtualenvs/pandas-dev/bin/activate && \
4343
python -m pip install --no-deps -U pip wheel setuptools && \
4444
pip install cython numpy python-dateutil pytz pytest pytest-xdist hypothesis pytest-azurepipelines && \
@@ -52,4 +52,4 @@ jobs:
5252
inputs:
5353
testResultsFiles: '**/test-*.xml'
5454
failTaskOnFailedTests: true
55-
testRunTitle: 'Publish test results for Python 3.7-32 bit full Linux'
55+
testRunTitle: 'Publish test results for Python 3.8-32 bit full Linux'

ci/azure/posix.yml

+3-3
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,9 @@ jobs:
99
strategy:
1010
matrix:
1111
${{ if eq(parameters.name, 'macOS') }}:
12-
py37_macos:
13-
ENV_FILE: ci/deps/azure-macos-37.yaml
14-
CONDA_PY: "37"
12+
py38_macos:
13+
ENV_FILE: ci/deps/azure-macos-38.yaml
14+
CONDA_PY: "38"
1515
PATTERN: "not slow and not network"
1616

1717
steps:

ci/azure/windows.yml

+6-10
Original file line numberDiff line numberDiff line change
@@ -8,15 +8,15 @@ jobs:
88
vmImage: ${{ parameters.vmImage }}
99
strategy:
1010
matrix:
11-
py37_np17:
12-
ENV_FILE: ci/deps/azure-windows-37.yaml
13-
CONDA_PY: "37"
14-
PATTERN: "not slow and not network"
15-
PYTEST_WORKERS: 2 # GH-42236
16-
1711
py38_np18:
1812
ENV_FILE: ci/deps/azure-windows-38.yaml
1913
CONDA_PY: "38"
14+
PATTERN: "not slow and not network"
15+
PYTEST_WORKERS: 2 # GH-42236
16+
17+
py39:
18+
ENV_FILE: ci/deps/azure-windows-39.yaml
19+
CONDA_PY: "39"
2020
PATTERN: "not slow and not network and not high_memory"
2121
PYTEST_WORKERS: 2 # GH-42236
2222

@@ -25,26 +25,22 @@ jobs:
2525
Write-Host "##vso[task.prependpath]$env:CONDA\Scripts"
2626
Write-Host "##vso[task.prependpath]$HOME/miniconda3/bin"
2727
displayName: 'Add conda to PATH'
28-
2928
- script: conda update -q -n base conda
3029
displayName: 'Update conda'
3130

3231
- bash: |
3332
conda env create -q --file ci\\deps\\azure-windows-$(CONDA_PY).yaml
3433
displayName: 'Create anaconda environment'
35-
3634
- bash: |
3735
source activate pandas-dev
3836
conda list
3937
python setup.py build_ext -q -j 4
4038
python -m pip install --no-build-isolation -e .
4139
displayName: 'Build'
42-
4340
- bash: |
4441
source activate pandas-dev
4542
ci/run_tests.sh
4643
displayName: 'Test'
47-
4844
- task: PublishTestResults@2
4945
condition: succeededOrFailed()
5046
inputs:

ci/deps/actions-37-locale_slow.yaml

-30
This file was deleted.

ci/deps/actions-37-minimum_versions.yaml

-31
This file was deleted.

ci/deps/actions-37.yaml

-28
This file was deleted.

ci/deps/actions-37-db-min.yaml renamed to ci/deps/actions-38-db-min.yaml

+11-12
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,14 @@ name: pandas-dev
22
channels:
33
- conda-forge
44
dependencies:
5-
- python=3.7.*
5+
- python=3.8
66

77
# tools
88
- cython>=0.29.21
99
- pytest>=6.0
1010
- pytest-cov
11-
- pytest-xdist>=1.21
12-
- hypothesis>=3.58.0
11+
- pytest-xdist>=1.31
12+
- hypothesis>=5.5.3
1313

1414
# required
1515
- numpy<1.20 # GH#39541 compat for pyarrow<3
@@ -18,31 +18,30 @@ dependencies:
1818

1919
# optional
2020
- beautifulsoup4
21-
- blosc=1.17.0
21+
- blosc=1.20.1
2222
- python-blosc
2323
- fastparquet=0.4.0
2424
- html5lib
2525
- ipython
2626
- jinja2
27-
- lxml=4.3.0
27+
- lxml=4.5.0
2828
- matplotlib
2929
- nomkl
3030
- numexpr
3131
- openpyxl
3232
- pandas-gbq
33-
- google-cloud-bigquery>=1.27.2 # GH 36436
3433
- protobuf>=3.12.4
3534
- pyarrow=0.17.1 # GH 38803
36-
- pytables>=3.5.1
35+
- pytables>=3.6.1
3736
- scipy
38-
- xarray=0.12.3
39-
- xlrd<2.0
37+
- xarray=0.15.1
38+
- xlrd
4039
- xlsxwriter
4140
- xlwt
4241
- moto
4342
- flask
4443

4544
# sql
46-
- psycopg2=2.7
47-
- pymysql=0.8.1
48-
- sqlalchemy=1.3.0
45+
- psycopg2=2.8.4
46+
- pymysql=0.10.1
47+
- sqlalchemy=1.3.11

ci/deps/actions-37-db.yaml renamed to ci/deps/actions-38-db.yaml

+5-6
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,13 @@ name: pandas-dev
22
channels:
33
- conda-forge
44
dependencies:
5-
- python=3.7.*
5+
- python=3.8
66

77
# tools
88
- cython>=0.29.21
99
- pytest>=6.0
10-
- pytest-xdist>=1.21
11-
- hypothesis>=3.58.0
10+
- pytest-xdist>=1.31
11+
- hypothesis>=5.5.3
1212
- pytest-cov>=2.10.1 # this is only needed in the coverage build, ref: GH 35737
1313

1414
# pandas dependencies
@@ -25,11 +25,10 @@ dependencies:
2525
- flask
2626
- nomkl
2727
- numexpr
28-
- numpy=1.17.*
28+
- numpy=1.18
2929
- odfpy
3030
- openpyxl
3131
- pandas-gbq
32-
- google-cloud-bigquery>=1.27.2 # GH 36436
3332
- psycopg2
3433
- pyarrow>=0.17.0
3534
- pymysql
@@ -43,7 +42,7 @@ dependencies:
4342
- sqlalchemy
4443
- statsmodels
4544
- xarray
46-
- xlrd<2.0
45+
- xlrd
4746
- xlsxwriter
4847
- xlwt
4948
- pip

ci/deps/actions-38-locale.yaml

+4-4
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,15 @@ name: pandas-dev
22
channels:
33
- conda-forge
44
dependencies:
5-
- python=3.8.*
5+
- python=3.8
66

77
# tools
88
- cython>=0.29.21
99
- pytest>=6.0
1010
- pytest-cov
11-
- pytest-xdist>=1.21
11+
- pytest-xdist>=1.31
1212
- pytest-asyncio>=0.12.0
13-
- hypothesis>=3.58.0
13+
- hypothesis>=5.5.3
1414

1515
# pandas dependencies
1616
- beautifulsoup4
@@ -31,7 +31,7 @@ dependencies:
3131
- pytz
3232
- scipy
3333
- xarray
34-
- xlrd<2.0
34+
- xlrd
3535
- xlsxwriter
3636
- xlwt
3737
- moto

ci/deps/actions-38-locale_slow.yaml

+30
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
name: pandas-dev
2+
channels:
3+
- defaults
4+
- conda-forge
5+
dependencies:
6+
- python=3.8
7+
8+
# tools
9+
- cython>=0.29.21
10+
- pytest>=6.0
11+
- pytest-cov
12+
- pytest-xdist>=1.31
13+
- hypothesis>=5.5.3
14+
15+
# pandas dependencies
16+
- beautifulsoup4=4.8.2
17+
- bottleneck=1.3.1
18+
- lxml
19+
- matplotlib=3.3.2
20+
- numpy=1.18
21+
- openpyxl=3.0.2
22+
- python-dateutil
23+
- python-blosc
24+
- pytz=2020.1
25+
- scipy
26+
- sqlalchemy=1.3.11
27+
- xlrd=2.0.1
28+
- xlsxwriter=1.2.2
29+
- xlwt=1.3.0
30+
- html5lib=1.1

0 commit comments

Comments
 (0)