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 6dc223a

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 f0e9d29 commit 6dc223a
Copy full SHA for 6dc223a

File tree

5 files changed

+18
-10
lines changed
Filter options

5 files changed

+18
-10
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
+7Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -84,6 +84,13 @@ elif [[ "$DISTRIB" == "conda-pip-latest" ]]; then
8484
setup_ccache
8585
python -m pip install -U pip
8686

87+
# NOTE(honles): scikit-image does not include pyproject.toml in it's
88+
# current release and these are what it needs to build.
89+
# This can be removed when
90+
# https://github.com/scikit-image/scikit-image/pull/5016
91+
# is released.
92+
python -m pip install wheel setuptools Cython>=0.29.18 numpy
93+
8794
python -m pip install pandas matplotlib pyamg scikit-image
8895
# do not install dependencies for lightgbm since it requires scikit-learn
8996
# and install a version less than 3.0.0 until the issue #18316 is solved.

‎pyproject.toml

Copy file name to clipboardExpand all lines: pyproject.toml
+7-7Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,12 @@ 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+
# We follow scipy for much of these pinnings
8+
# https://github.com/scipy/scipy/blob/master/pyproject.toml
9+
"numpy==1.16.5; python_version=='3.6'",
10+
"numpy==1.16.5; python_version=='3.7'",
11+
"numpy==1.17.3; python_version=='3.8'",
12+
# do not pin numpy on future versions of python to avoid incompatible numpy and python versions
13+
"numpy; python_version>='3.9'",
1414
"scipy>=0.19.1",
1515
]

‎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.