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 for NumPy 1.26 #7101

Merged
merged 1 commit into from Sep 7, 2023
Merged

Fix for NumPy 1.26 #7101

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
5 changes: 3 additions & 2 deletions .github/workflows/test_nightlies_on_main.yml
View file
Open in desktop
Expand Up @@ -11,9 +11,10 @@ permissions:

env:
PIP_FLAGS: >-
--extra-index-url
https://pypi.anaconda.org/scientific-python-nightly-wheels/simple
--upgrade
--pre
--index-url https://pypi.anaconda.org/scientific-python-nightly-wheels/simple
--extra-index-url https://pypi.org/simple
MINIMUM_REQUIREMENTS: 0
BUILD_DOCS: 0
PYTHONOPTIMIZE: 0
Expand Down
10 changes: 0 additions & 10 deletions .github/workflows/wheels_recipe.yml
View file
Open in desktop
Expand Up @@ -32,11 +32,6 @@ jobs:
python-version: "3.9"
- name: Install cibuildwheel
run: python -m pip install cibuildwheel
- name: Temporarily upperpin NumPy
run: |
sed -i 's/numpy>=1.22/numpy>=1.22,<1.26/g' requirements/default.txt # FIXME: Remove
sed -i 's/numpy>=1.22/numpy>=1.22,<1.26/g' requirements/build.txt # FIXME: Remove
sed -i 's/numpy>=1.22/numpy>=1.22,<1.26/g' pyproject.toml # FIXME: Remove
- name: Build the wheel
run: python -m cibuildwheel --output-dir dist
env:
Expand Down Expand Up @@ -75,11 +70,6 @@ jobs:
platforms: arm64
- name: Install cibuildwheel
run: python -m pip install cibuildwheel
- name: Temporarily upperpin NumPy
run: |
sed -i 's/numpy>=1.22/numpy>=1.22,<1.26/g' requirements/default.txt # FIXME: Remove
sed -i 's/numpy>=1.22/numpy>=1.22,<1.26/g' requirements/build.txt # FIXME: Remove
sed -i 's/numpy>=1.22/numpy>=1.22,<1.26/g' pyproject.toml # FIXME: Remove
- name: Build the wheel
run: python -m cibuildwheel --output-dir dist
env:
Expand Down
2 changes: 0 additions & 2 deletions azure-pipelines.yml
View file
Open in desktop
Expand Up @@ -84,13 +84,11 @@ jobs:
echo "PIP_CACHE_DIR: $PIP_CACHE_DIR"

# Install the build and runtime dependencies of the project
sed -i 's/numpy>=1.22/numpy>=1.22,<1.26/g' requirements/build.txt # FIXME: Remove
$PYTHON -m pip install ${PIP_FLAGS} -r requirements/build.txt
$PYTHON -m pip list

# Disable C99 complex if PyWavelets needs to be built from source.
# The compiler used will be MSVC, but C99 may be detected improperly
sed -i 's/numpy>=1.22/numpy>=1.22,<1.26/g' requirements/build.txt # FIXME: Remove
USE_C99_COMPLEX=0 $PYTHON -m pip install ${PIP_FLAGS} -r requirements/default.txt

$PYTHON -m pip list
Expand Down
3 changes: 0 additions & 3 deletions tools/github/before_install.sh
View file
Open in desktop
Expand Up @@ -29,9 +29,6 @@ if [[ $MINIMUM_REQUIREMENTS == 1 ]]; then
done
fi

perl -pi -e 's/numpy>=1.22/numpy>=1.22,<1.26/g' requirements/default.txt
perl -pi -e 's/numpy>=1.22/numpy>=1.22,<1.26/g' requirements/build.txt

python -m pip install --upgrade pip

# Install build time requirements
Expand Down