Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

DEPS: drop Python 3.7 and NumPy 1.17 from tests (#41678) #41989

Merged
merged 45 commits into from
Jul 4, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
45 commits
Select commit Hold shift + click to select a range
a8133dd
DEPS: drop Python 3.7 and NumPy 1.17
fangchenli Jun 13, 2021
6a265b6
update CI
fangchenli Jun 13, 2021
f33fffc
fix version
fangchenli Jun 13, 2021
e0046e8
fix version
fangchenli Jun 13, 2021
b9ddd76
fix 32-bit build
fangchenli Jun 13, 2021
7f1ff20
fix 32-bit build
fangchenli Jun 13, 2021
7bdf47c
Merge remote-tracking branch 'upstream/master' into drop-py37
fangchenli Jun 14, 2021
c4ac216
adjust min version
fangchenli Jun 14, 2021
de9005b
adjust min versions
fangchenli Jun 15, 2021
09cd1ac
Merge remote-tracking branch 'upstream/master' into drop-py37
fangchenli Jun 15, 2021
8999a92
adjust min versions
fangchenli Jun 15, 2021
3865792
Merge remote-tracking branch 'upstream/master' into drop-py37
fangchenli Jun 15, 2021
c29a70b
add whatsnew note
fangchenli Jun 15, 2021
c6c8405
revert changes in code
fangchenli Jun 15, 2021
f94dffe
revert changes in code
fangchenli Jun 15, 2021
69650cd
update python version in install.rst
fangchenli Jun 15, 2021
c6798bf
revert changes in code
fangchenli Jun 15, 2021
32cfed6
revert changes in code
fangchenli Jun 15, 2021
2d0c22b
Merge remote-tracking branch 'upstream/master' into drop-py37
fangchenli Jun 15, 2021
7213ed8
stop testing gcsfs
fangchenli Jun 15, 2021
0387028
resolve confilict
fangchenli Jun 16, 2021
73bcece
Merge remote-tracking branch 'upstream/master' into drop-py37
fangchenli Jun 16, 2021
aecc234
resolve conflict
fangchenli Jun 16, 2021
5fc49f7
update min ver
fangchenli Jun 16, 2021
f15e10a
Merge remote-tracking branch 'upstream/master' into drop-py37
fangchenli Jun 17, 2021
1cbeb05
fix job name
fangchenli Jun 17, 2021
13d433b
Merge remote-tracking branch 'upstream/master' into drop-py37
fangchenli Jun 17, 2021
3acc1bd
Merge remote-tracking branch 'upstream/master' into drop-py37
fangchenli Jun 17, 2021
3689fd0
Merge remote-tracking branch 'upstream/master' into drop-py37
fangchenli Jun 18, 2021
533dbf6
Merge remote-tracking branch 'upstream/master' into drop-py37
fangchenli Jun 20, 2021
53894d0
Merge branch 'master' into drop-py37
fangchenli Jun 22, 2021
b42c340
remove py37 sdist
fangchenli Jun 22, 2021
2d853b9
resolve conflict
fangchenli Jun 29, 2021
f0e6ccc
resolve conflict
fangchenli Jun 29, 2021
3a090d7
Merge remote-tracking branch 'upstream/master' into drop-py37
fangchenli Jun 29, 2021
ab6f27b
resolve conflict
fangchenli Jun 29, 2021
2a41987
pin fsspec
fangchenli Jun 29, 2021
2638d30
Merge remote-tracking branch 'upstream/master' into drop-py37
fangchenli Jun 29, 2021
4540545
Merge remote-tracking branch 'upstream/master' into drop-py37
fangchenli Jul 2, 2021
b5a3e8b
update whatsnew
fangchenli Jul 2, 2021
62a56b7
Merge remote-tracking branch 'upstream/master' into drop-py37
fangchenli Jul 2, 2021
eeafda9
Update doc/source/whatsnew/v1.4.0.rst
fangchenli Jul 3, 2021
bd005a2
add -W error flag back
fangchenli Jul 3, 2021
47170a4
Merge remote-tracking branch 'upstream/master' into drop-py37
fangchenli Jul 4, 2021
c97059f
add comment
fangchenli Jul 4, 2021
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/database.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,15 +19,15 @@ env:
COVERAGE: true

jobs:
Linux_py37_IO:
Linux_py38_IO:
runs-on: ubuntu-latest
defaults:
run:
shell: bash -l {0}

strategy:
matrix:
ENV_FILE: [ci/deps/actions-37-db-min.yaml, ci/deps/actions-37-db.yaml]
ENV_FILE: [ci/deps/actions-38-db-min.yaml, ci/deps/actions-38-db.yaml]
fail-fast: false

concurrency:
Expand Down
9 changes: 4 additions & 5 deletions .github/workflows/posix.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,14 +25,13 @@ jobs:
strategy:
matrix:
settings: [
[actions-37-minimum_versions.yaml, "not slow and not network and not clipboard", "", "", "", "", ""],
[actions-37.yaml, "not slow and not network and not clipboard", "", "", "", "", ""],
[actions-37-locale_slow.yaml, "slow", "language-pack-it xsel", "it_IT.utf8", "it_IT.utf8", "", ""],
[actions-37-slow.yaml, "slow", "", "", "", "", ""],
[actions-38-minimum_versions.yaml, "not slow and not network and not clipboard", "", "", "", "", ""],
[actions-38-locale_slow.yaml, "slow", "language-pack-it xsel", "it_IT.utf8", "it_IT.utf8", "", ""],
[actions-38.yaml, "not slow and not network and not clipboard", "", "", "", "", ""],
[actions-38-slow.yaml, "slow", "", "", "", "", ""],
[actions-38-locale.yaml, "not slow and not network", "language-pack-zh-hans xsel", "zh_CN.utf8", "zh_CN.utf8", "", ""],
[actions-38-numpydev.yaml, "not slow and not network", "xsel", "", "", "deprecate", "-W error"],
[actions-39-slow.yaml, "slow", "", "", "", "", ""],
[actions-39-numpydev.yaml, "not slow and not network", "xsel", "", "", "deprecate", "-W error"],
[actions-39.yaml, "not slow and not network and not clipboard", "", "", "", "", ""]
]
fail-fast: false
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/sdist.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ jobs:
strategy:
fail-fast: false
matrix:
python-version: ["3.7", "3.8", "3.9"]
python-version: ["3.8", "3.9"]

steps:
- uses: actions/checkout@v2
Expand Down
6 changes: 3 additions & 3 deletions azure-pipelines.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ jobs:
name: Windows
vmImage: vs2017-win2016

- job: py37_32bit
- job: py38_32bit
pool:
vmImage: ubuntu-18.04

Expand All @@ -38,7 +38,7 @@ jobs:
docker pull quay.io/pypa/manylinux2014_i686
docker run -v $(pwd):/pandas quay.io/pypa/manylinux2014_i686 \
/bin/bash -xc "cd pandas && \
/opt/python/cp37-cp37m/bin/python -m venv ~/virtualenvs/pandas-dev && \
/opt/python/cp38-cp38/bin/python -m venv ~/virtualenvs/pandas-dev && \
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ABI change in Python 3.8, from cp3xm to cp3x.

. ~/virtualenvs/pandas-dev/bin/activate && \
python -m pip install --no-deps -U pip wheel setuptools && \
pip install cython numpy python-dateutil pytz pytest pytest-xdist hypothesis pytest-azurepipelines && \
Expand All @@ -52,4 +52,4 @@ jobs:
inputs:
testResultsFiles: '**/test-*.xml'
failTaskOnFailedTests: true
testRunTitle: 'Publish test results for Python 3.7-32 bit full Linux'
testRunTitle: 'Publish test results for Python 3.8-32 bit full Linux'
6 changes: 3 additions & 3 deletions ci/azure/posix.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@ jobs:
strategy:
matrix:
${{ if eq(parameters.name, 'macOS') }}:
py37_macos:
ENV_FILE: ci/deps/azure-macos-37.yaml
CONDA_PY: "37"
py38_macos:
ENV_FILE: ci/deps/azure-macos-38.yaml
CONDA_PY: "38"
PATTERN: "not slow and not network"

steps:
Expand Down
16 changes: 6 additions & 10 deletions ci/azure/windows.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,15 +8,15 @@ jobs:
vmImage: ${{ parameters.vmImage }}
strategy:
matrix:
py37_np17:
ENV_FILE: ci/deps/azure-windows-37.yaml
CONDA_PY: "37"
PATTERN: "not slow and not network"
PYTEST_WORKERS: 2 # GH-42236

py38_np18:
ENV_FILE: ci/deps/azure-windows-38.yaml
CONDA_PY: "38"
PATTERN: "not slow and not network"
PYTEST_WORKERS: 2 # GH-42236

py39:
ENV_FILE: ci/deps/azure-windows-39.yaml
CONDA_PY: "39"
PATTERN: "not slow and not network and not high_memory"
PYTEST_WORKERS: 2 # GH-42236

Expand All @@ -25,26 +25,22 @@ jobs:
Write-Host "##vso[task.prependpath]$env:CONDA\Scripts"
Write-Host "##vso[task.prependpath]$HOME/miniconda3/bin"
displayName: 'Add conda to PATH'

- script: conda update -q -n base conda
displayName: 'Update conda'

- bash: |
conda env create -q --file ci\\deps\\azure-windows-$(CONDA_PY).yaml
displayName: 'Create anaconda environment'

- bash: |
source activate pandas-dev
conda list
python setup.py build_ext -q -j 4
python -m pip install --no-build-isolation -e .
displayName: 'Build'

- bash: |
source activate pandas-dev
ci/run_tests.sh
displayName: 'Test'

- task: PublishTestResults@2
condition: succeededOrFailed()
inputs:
Expand Down
30 changes: 0 additions & 30 deletions ci/deps/actions-37-locale_slow.yaml

This file was deleted.

31 changes: 0 additions & 31 deletions ci/deps/actions-37-minimum_versions.yaml

This file was deleted.

28 changes: 0 additions & 28 deletions ci/deps/actions-37.yaml

This file was deleted.

23 changes: 11 additions & 12 deletions ci/deps/actions-37-db-min.yaml → ci/deps/actions-38-db-min.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,14 @@ name: pandas-dev
channels:
- conda-forge
dependencies:
- python=3.7.*
- python=3.8

# tools
- cython>=0.29.21
- pytest>=6.0
- pytest-cov
- pytest-xdist>=1.21
- hypothesis>=3.58.0
- pytest-xdist>=1.31
- hypothesis>=5.5.3

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

# optional
- beautifulsoup4
- blosc=1.17.0
- blosc=1.20.1
- python-blosc
- fastparquet=0.4.0
- html5lib
- ipython
- jinja2
- lxml=4.3.0
- lxml=4.5.0
- matplotlib
- nomkl
- numexpr
- openpyxl
- pandas-gbq
- google-cloud-bigquery>=1.27.2 # GH 36436
- protobuf>=3.12.4
- pyarrow=0.17.1 # GH 38803
- pytables>=3.5.1
- pytables>=3.6.1
- scipy
- xarray=0.12.3
- xlrd<2.0
- xarray=0.15.1
- xlrd
- xlsxwriter
- xlwt
- moto
- flask

# sql
- psycopg2=2.7
- pymysql=0.8.1
- sqlalchemy=1.3.0
- psycopg2=2.8.4
- pymysql=0.10.1
- sqlalchemy=1.3.11
11 changes: 5 additions & 6 deletions ci/deps/actions-37-db.yaml → ci/deps/actions-38-db.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,13 @@ name: pandas-dev
channels:
- conda-forge
dependencies:
- python=3.7.*
- python=3.8

# tools
- cython>=0.29.21
- pytest>=6.0
- pytest-xdist>=1.21
- hypothesis>=3.58.0
- pytest-xdist>=1.31
- hypothesis>=5.5.3
- pytest-cov>=2.10.1 # this is only needed in the coverage build, ref: GH 35737

# pandas dependencies
Expand All @@ -25,11 +25,10 @@ dependencies:
- flask
- nomkl
- numexpr
- numpy=1.17.*
- numpy=1.18
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

do we need this as 1.18.*?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I believe 1.18.* and 1.18 are equivalent. They both resolve to the latest 1.18 version.

- odfpy
- openpyxl
- pandas-gbq
- google-cloud-bigquery>=1.27.2 # GH 36436
- psycopg2
- pyarrow>=0.17.0
- pymysql
Expand All @@ -43,7 +42,7 @@ dependencies:
- sqlalchemy
- statsmodels
- xarray
- xlrd<2.0
- xlrd
- xlsxwriter
- xlwt
- pip
Expand Down
8 changes: 4 additions & 4 deletions ci/deps/actions-38-locale.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,15 @@ name: pandas-dev
channels:
- conda-forge
dependencies:
- python=3.8.*
- python=3.8

# tools
- cython>=0.29.21
- pytest>=6.0
- pytest-cov
- pytest-xdist>=1.21
- pytest-xdist>=1.31
- pytest-asyncio>=0.12.0
- hypothesis>=3.58.0
- hypothesis>=5.5.3

# pandas dependencies
- beautifulsoup4
Expand All @@ -31,7 +31,7 @@ dependencies:
- pytz
- scipy
- xarray
- xlrd<2.0
- xlrd
fangchenli marked this conversation as resolved.
Show resolved Hide resolved
- xlsxwriter
- xlwt
- moto
Expand Down
30 changes: 30 additions & 0 deletions ci/deps/actions-38-locale_slow.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
name: pandas-dev
channels:
- defaults
- conda-forge
dependencies:
- python=3.8

# tools
- cython>=0.29.21
- pytest>=6.0
- pytest-cov
- pytest-xdist>=1.31
- hypothesis>=5.5.3

# pandas dependencies
- beautifulsoup4=4.8.2
- bottleneck=1.3.1
- lxml
- matplotlib=3.3.2
- numpy=1.18
- openpyxl=3.0.2
- python-dateutil
- python-blosc
- pytz=2020.1
- scipy
- sqlalchemy=1.3.11
- xlrd=2.0.1
- xlsxwriter=1.2.2
- xlwt=1.3.0
- html5lib=1.1
Loading