From cb936287ff70f278eb3040d38007c47ae6b05360 Mon Sep 17 00:00:00 2001 From: Boud Roukema Date: Tue, 18 Mar 2025 07:19:56 +0100 Subject: Configuration: Updated setuptools-rust and added semantic-version Summary: this will not affect any analysis. Until this commit, the old version of 'setuptools-rust' did not install with the updated Python version (see [1]). With this commit, 'setuptools-rust' is upgraded to version 1.10.2 (from 1.1.2) and 'semantic-version' 2.10.0 (needed by 'setuptools-rust') is added. In addition this commit: - removes a duplicate rule for building 'cycler' in 'python.mk'. - comments all the un-commented '*-url' variables of 'urls.conf'. [1] https://savannah.nongnu.org/bugs/?61731 --- reproduce/software/make/python.mk | 25 ++++++++++++++----------- 1 file changed, 14 insertions(+), 11 deletions(-) (limited to 'reproduce/software/make') diff --git a/reproduce/software/make/python.mk b/reproduce/software/make/python.mk index 76fc252..c017fd2 100644 --- a/reproduce/software/make/python.mk +++ b/reproduce/software/make/python.mk @@ -527,13 +527,6 @@ $(ipydir)/future-$(future-version): \ $(call pybuild, tar -xf, future-$(future-version), , \ Future $(future-version)) -$(ipydir)/cycler-$(cycler-version): $(ipydir)/six-$(six-version) - tarball=cycler-$(cycler-version).tar.lz - $(call import-source, $(cycler-url), $(cycler-checksum)) - $(call pybuild, tar -xf, cycler-$(cycler-version), , \ - Cycler $(cycler-version), GPEP517) - echo "Cycler $(cycler-version)" > $@ - $(ipydir)/galsim-$(galsim-version): \ $(ipydir)/future-$(future-version) \ $(ipydir)/astropy-$(astropy-version) \ @@ -968,6 +961,15 @@ $(ipydir)/secretstorage-$(secretstorage-version): \ $(call pybuild, tar -xf, SecretStorage-$(secretstorage-version), , \ SecretStorage $(secretstorage-version)) +$(ipydir)/semantic-version-$(semantic-version-version): \ + $(ipydir)/setuptools-$(setuptools-version) + tarball=semantic-version-$(semantic-version-version).tar.lz + $(call import-source, $(semantic-version-url), \ + $(semantic-version-checksum)) + $(call pybuild, tar -xf, \ + semantic-version-$(semantic-version-version), , \ + Semantic-version $(semantic-version-version), GPEP517) + $(ipydir)/setuptools-$(setuptools-version): \ $(ipydir)/gpep517-$(gpep517-version) \ $(ipydir)/python-installer-$(python-installer-version) @@ -984,12 +986,13 @@ $(ipydir)/setuptools-scm-$(setuptools-scm-version): \ Setuptools-scm $(setuptools-scm-version), GPEP517) $(ipydir)/setuptools-rust-$(setuptools-rust-version): \ - $(ipydir)/gpep517-$(gpep517-version) \ - $(ipydir)/python-installer-$(python-installer-version) + $(ipydir)/setuptools-scm-$(setuptools-scm-version) \ + $(ipydir)/semantic-version-$(semantic-version-version) tarball=setuptools-rust-$(setuptools-rust-version).tar.lz - $(call import-source, $(setuptools-rust-url), $(setuptools-rust-checksum)) + $(call import-source, $(setuptools-rust-url), \ + $(setuptools-rust-checksum)) $(call pybuild, tar -xf, setuptools-rust-$(setuptools-rust-version), , \ - Setuptools-scm $(setuptools-rust-version)) + Setuptools-rust $(setuptools-rust-version), GPEP517) $(ipydir)/sip_tpv-$(sip_tpv-version): \ $(ipydir)/sympy-$(sympy-version) \ -- cgit v1.2.1