diff --git a/.github/workflows/standard.yml b/.github/workflows/standard.yml index 82e73c7a..af25c9c4 100644 --- a/.github/workflows/standard.yml +++ b/.github/workflows/standard.yml @@ -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: diff --git a/docs-requirements.txt b/docs-requirements.txt index 603abf3f..7f73d832 100644 --- a/docs-requirements.txt +++ b/docs-requirements.txt @@ -4,3 +4,5 @@ sphinx sphinx_rtd_theme sphinxcontrib-jquery pypandoc +# Temporary pin, xraylib 4.1.3 (pcdscalc) incompatible +numpy <2 diff --git a/docs/source/upcoming_release_notes/386-maint_numpy2_pypi.rst b/docs/source/upcoming_release_notes/386-maint_numpy2_pypi.rst new file mode 100644 index 00000000..bdfb4774 --- /dev/null +++ b/docs/source/upcoming_release_notes/386-maint_numpy2_pypi.rst @@ -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