Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Appearance settings

Commit eafd63a

Browse filesBrowse files
terencehonlesterencehonles
committed
MNT Support and test Python 3.9
The following were used as references when updating pyproject.toml: - scipy/scipy#12940 - scikit-image/scikit-image#4920 - scikit-image/scikit-image#4920 (comment)
1 parent f77fb72 commit eafd63a
Copy full SHA for eafd63a

File tree

5 files changed

+30
-11
lines changed
Filter options

5 files changed

+30
-11
lines changed

‎.github/workflows/check-manifest.yml

Copy file name to clipboardExpand all lines: .github/workflows/check-manifest.yml
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ jobs:
1111
- uses: actions/checkout@v2
1212
- uses: actions/setup-python@v2
1313
with:
14-
python-version: '3.8'
14+
python-version: '3.9'
1515
- name: Install dependencies
1616
# scipy and cython are required to build sdist
1717
run: |

‎azure-pipelines.yml

Copy file name to clipboardExpand all lines: azure-pipelines.yml
+2-2Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jobs:
1515
steps:
1616
- task: UsePythonVersion@0
1717
inputs:
18-
versionSpec: '3.8'
18+
versionSpec: '3.9'
1919
- bash: |
2020
pip install flake8 mypy==0.782
2121
displayName: Install linters
@@ -129,7 +129,7 @@ jobs:
129129
# It runs tests requiring lightgbm, pandas and PyAMG.
130130
pylatest_pip_openblas_pandas:
131131
DISTRIB: 'conda-pip-latest'
132-
PYTHON_VERSION: '3.8'
132+
PYTHON_VERSION: '3.9'
133133
PANDAS_VERSION: 'none'
134134
CHECK_PYTEST_SOFT_DEPENDENCY: 'true'
135135
TEST_DOCSTRINGS: 'true'

‎build_tools/azure/install.sh

Copy file name to clipboardExpand all lines: build_tools/azure/install.sh
+4-1Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,10 @@ elif [[ "$DISTRIB" == "conda-pip-latest" ]]; then
8484
setup_ccache
8585
python -m pip install -U pip
8686

87-
python -m pip install pandas matplotlib pyamg scikit-image
87+
# optionally install scikit-image
88+
python -m pip install --only-binary :all: sckit-image || true
89+
90+
python -m pip install pandas matplotlib pyamg
8891
# do not install dependencies for lightgbm since it requires scikit-learn
8992
# and install a version less than 3.0.0 until the issue #18316 is solved.
9093
python -m pip install "lightgbm<3.0.0" --no-deps

‎pyproject.toml

Copy file name to clipboardExpand all lines: pyproject.toml
+22-7Lines changed: 22 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,27 @@ requires = [
44
"setuptools",
55
"wheel",
66
"Cython>=0.28.5",
7-
"numpy==1.13.3; python_version=='3.6' and platform_system!='AIX' and platform_python_implementation == 'CPython'",
8-
"numpy==1.14.0; python_version=='3.6' and platform_system!='AIX' and platform_python_implementation != 'CPython'",
9-
"numpy==1.14.5; python_version=='3.7' and platform_system!='AIX'",
10-
"numpy==1.17.3; python_version>='3.8' and platform_system!='AIX'",
11-
"numpy==1.16.0; python_version=='3.6' and platform_system=='AIX'",
12-
"numpy==1.16.0; python_version=='3.7' and platform_system=='AIX'",
13-
"numpy==1.17.3; python_version>='3.8' and platform_system=='AIX'",
7+
8+
# PyPy needs numpy >= 1.14.0
9+
# platform_python_implementation!='CPython' not needed >= Python 3.7 which is numpy 1.14.5
10+
"numpy==1.13.3; python_version=='3.6' and platform_machine!='aarch64' and platform_system!='AIX' and platform_python_implementation=='CPython'",
11+
"numpy==1.14.0; python_version=='3.6' and platform_machine!='aarch64' and platform_system!='AIX' and platform_python_implementation!='CPython'",
12+
13+
# AIX needs numpy >= 1.16.0
14+
# platform_system!='AIX' not needed >= Python 3.8 which is numpy 1.17.3
15+
"numpy==1.16.0; python_version=='3.6' and platform_machine!='aarch64' and platform_system=='AIX'",
16+
"numpy==1.16.0; python_version=='3.7' and platform_machine!='aarch64' and platform_system=='AIX'",
17+
18+
# ARM needs numpy >= 1.19.0
19+
# platform_machine!='aarch64' not needed >= Python 3.9 which is numpy 1.19.3
20+
"numpy==1.19.0; python_version=='3.6' and platform_machine=='aarch64'",
21+
"numpy==1.19.0; python_version=='3.7' and platform_machine=='aarch64'",
22+
"numpy==1.19.0; python_version=='3.8' and platform_machine=='aarch64'",
23+
24+
# default numpy requirements
25+
"numpy==1.14.5; python_version=='3.7' and platform_machine!='aarch64' and platform_system!='AIX'",
26+
"numpy==1.17.3; python_version=='3.8' and platform_machine!='aarch64'",
27+
"numpy==1.19.3; python_version=='3.9'",
28+
1429
"scipy>=0.19.1",
1530
]

‎setup.py

Copy file name to clipboardExpand all lines: setup.py
+1Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -240,6 +240,7 @@ def setup_package():
240240
'Programming Language :: Python :: 3.6',
241241
'Programming Language :: Python :: 3.7',
242242
'Programming Language :: Python :: 3.8',
243+
'Programming Language :: Python :: 3.9',
243244
('Programming Language :: Python :: '
244245
'Implementation :: CPython'),
245246
('Programming Language :: Python :: '

0 commit comments

Comments
0 (0)
Morty Proxy This is a proxified and sanitized view of the page, visit original site.