From de39b63d1de6a94c6e1eba88f121183839c2715b Mon Sep 17 00:00:00 2001 From: Zachary Lentz Date: Thu, 27 Jun 2024 14:19:31 -0700 Subject: [PATCH 1/4] CI: temporarily drop numpy to under 2 in pypy builds --- .github/workflows/standard.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) 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: From 0d29701b1b7f01ce5515587667557054aa6ca6dc Mon Sep 17 00:00:00 2001 From: Zachary Lentz Date: Thu, 27 Jun 2024 14:21:19 -0700 Subject: [PATCH 2/4] DOC: pre-release notes --- .../386-maint_numpy2_pypi.rst | 23 +++++++++++++++++++ 1 file changed, 23 insertions(+) create mode 100644 docs/source/upcoming_release_notes/386-maint_numpy2_pypi.rst 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 From 98181cf559483db3f7417578522eeab9bf18cbbb Mon Sep 17 00:00:00 2001 From: Zachary Lentz Date: Thu, 27 Jun 2024 14:28:22 -0700 Subject: [PATCH 3/4] BLD: pin back numpy in docs requirements for CI docs build --- docs-requirements.txt | 2 ++ 1 file changed, 2 insertions(+) diff --git a/docs-requirements.txt b/docs-requirements.txt index 603abf3f..74ebf315 100644 --- a/docs-requirements.txt +++ b/docs-requirements.txt @@ -4,3 +4,5 @@ sphinx sphinx_rtd_theme sphinxcontrib-jquery pypandoc +# Temporary pin, can remove once it installs without this +numpy <2 From 7b0a5821aa08203037c585e4f39dbf47c22f383c Mon Sep 17 00:00:00 2001 From: Zachary Lentz Date: Thu, 27 Jun 2024 14:52:29 -0700 Subject: [PATCH 4/4] DOC: comment verbosity Co-authored-by: Robert Tang-Kong <35379409+tangkong@users.noreply.github.com> --- docs-requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs-requirements.txt b/docs-requirements.txt index 74ebf315..7f73d832 100644 --- a/docs-requirements.txt +++ b/docs-requirements.txt @@ -4,5 +4,5 @@ sphinx sphinx_rtd_theme sphinxcontrib-jquery pypandoc -# Temporary pin, can remove once it installs without this +# Temporary pin, xraylib 4.1.3 (pcdscalc) incompatible numpy <2