Skip to content

Commit

Permalink
Merge pull request #386 from ZLLentz/maint_numpy2_pypi
Browse files Browse the repository at this point in the history
CI: temporarily drop numpy to under 2 in pypi builds
  • Loading branch information
ZLLentz authored Jun 27, 2024
2 parents 2c0f300 + 67c4258 commit 00e39a3
Show file tree
Hide file tree
Showing 3 changed files with 27 additions and 1 deletion.
3 changes: 2 additions & 1 deletion .github/workflows/standard.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,8 @@ jobs:
# Extras to be installed only for conda-based testing:
conda-testing-extras: "ipython=8.4.0"
# Extras to be installed only for pip-based testing:
pip-testing-extras: "ipython==8.4.0"
# Set numpy<2 for now, remove when xraylib updates
pip-testing-extras: "ipython==8.4.0 numpy<2"
# System packages to be installed only for conda-based testing:
conda-system-packages: ""
# System packages to be installed only for pip-based testing:
Expand Down
2 changes: 2 additions & 0 deletions docs-requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -4,3 +4,5 @@ sphinx
sphinx_rtd_theme
sphinxcontrib-jquery
pypandoc
# Temporary pin, xraylib 4.1.3 (pcdscalc) incompatible
numpy <2
23 changes: 23 additions & 0 deletions docs/source/upcoming_release_notes/386-maint_numpy2_pypi.rst
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
386 maint_numpy2_pypi
#################

API Changes
-----------
- N/A

Features
--------
- N/A

Bugfixes
--------
- N/A

Maintenance
-----------
- Fix an issue where an upstream numpy 2 incompatibilty was
breaking the pypi builds.

Contributors
------------
- zllentz

0 comments on commit 00e39a3

Please sign in to comment.