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.

Sign up for GitHub

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

Jump to bottom

Fix incompatible requirements #71

Closed
wants to merge 2 commits into from
Closed

Fix incompatible requirements #71

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
72ad950
Fix incompatible requirements
radoering Jun 19, 2023
f393a4a
remove python 3.6 from CI (not available anymore)
h-vetinari Jun 22, 2023
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
2 changes: 1 addition & 1 deletion .github/workflows/main.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ jobs:
max-parallel: 4
matrix:
os: [ 'windows-latest', 'macos-latest', 'ubuntu-latest' ]
python: [ '3.6', '3.7', '3.8', '3.9', '3.10', '3.11-dev' ]
python: [ '3.7', '3.8', '3.9', '3.10', '3.11' ]
arch: [ 'x64', 'x86' ]
exclude:
- os: macos-latest
Expand Down
14 changes: 7 additions & 7 deletions setup.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,9 @@ install_requires =
# tests for this package.

# AIX requires fixes contained in numpy 1.16
numpy==1.16.0; python_version=='3.5' and platform_system=='AIX'
numpy==1.16.0; python_version=='3.6' and platform_system=='AIX'
numpy==1.16.0; python_version=='3.7' and platform_system=='AIX'
numpy==1.16.0; python_version=='3.5' and platform_system=='AIX' and (platform_machine!='aarch64' or platform_python_implementation == 'PyPy')
numpy==1.16.0; python_version=='3.6' and platform_system=='AIX' and (platform_machine=='loongarch64' or platform_machine!='aarch64' and platform_python_implementation != 'PyPy')
numpy==1.16.0; python_version=='3.7' and platform_system=='AIX' and (platform_machine=='loongarch64' or platform_machine!='aarch64' and platform_python_implementation != 'PyPy')
Comment on lines +26 to +27
Copy link
Member

Choose a reason for hiding this comment

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

I don't fully understand yet why this condition is necessary, but if you're mixing and and or, please add brackets, so we don't have to do operator precedence in our heads.


# IBM i requires fixes contained in numpy 1.23.3. Only Python 3.6 and 3.9
# are supported on IBM i system, so we're ignoring other Python versions here
Expand All @@ -42,16 +42,16 @@ install_requires =
# arm64 on Darwin supports Python 3.8 and above requires numpy>=1.21.0
# (first version with arm64 wheels available)
numpy==1.21.0; python_version=='3.7' and platform_machine=='arm64' and platform_system=='Darwin'
numpy==1.21.0; python_version=='3.8' and platform_machine=='arm64' and platform_system=='Darwin'
numpy==1.21.0; python_version=='3.9' and platform_machine=='arm64' and platform_system=='Darwin'
numpy==1.21.0; python_version=='3.8' and platform_machine=='arm64' and platform_system=='Darwin' and platform_python_implementation != 'PyPy'
numpy==1.21.0; python_version=='3.9' and platform_machine=='arm64' and platform_system=='Darwin' and platform_system!='OS400'

# Python 3.8 on s390x requires at least 1.17.5, see gh-29
numpy==1.17.5; python_version=='3.8' and platform_machine=='s390x' and platform_python_implementation != 'PyPy'

# loongarch64 requires numpy>=1.22.0
# Note that 1.22.0 broke support for using the Python limited C API
# (https://github.com/numpy/numpy/pull/20818), so we use 1.22.2 instead
numpy==1.22.2; platform_machine=='loongarch64' and python_version<'3.11'
numpy==1.22.2; platform_machine=='loongarch64' and python_version>='3.8' and python_version<'3.11' and platform_system!='OS400'

# default numpy requirements
numpy==1.13.3; python_version=='3.5' and platform_machine not in 'aarch64|loongarch64' and platform_system!='AIX'
Expand All @@ -66,7 +66,7 @@ install_requires =

# PyPy requirements
numpy==1.19.0; python_version=='3.6' and platform_machine!='loongarch64' and platform_python_implementation=='PyPy'
numpy==1.20.0; python_version=='3.7' and platform_machine!='loongarch64' and platform_python_implementation=='PyPy'
numpy==1.20.0; python_version=='3.7' and platform_machine!='loongarch64' and platform_python_implementation=='PyPy' and (platform_machine!='arm64' or platform_system!='Darwin')
numpy==1.22.2; python_version=='3.8' and platform_machine!='loongarch64' and platform_python_implementation=='PyPy'

# For Python versions which aren't yet officially supported,
Expand Down