Trac #32707: flit_core: Update to 3.4.0; setuptools_scm: Update to 6.3.2

Release Manager · Release Manager · commit e8ab458165ec · 2021-10-19T22:34:16.000+02:00
https://flit.readthedocs.io/en/latest/history.html#version-3-4 This simplifies the dependencies and removes a "circular dependency" warning from the output during build. URL: https://trac.sagemath.org/32707 Reported by: mkoeppe Ticket author(s): Matthias Koeppe Reviewer(s): Volker Braun
diff --git a/build/pkgs/backcall/dependencies b/build/pkgs/backcall/dependencies
@@ -1,4 +1,4 @@
-$(PYTHON) | $(PYTHON_TOOLCHAIN) flit_core toml
+$(PYTHON) | $(PYTHON_TOOLCHAIN) flit_core tomli
 
 ----------
 All lines of this file are ignored except the first.
diff --git a/build/pkgs/flit_core/checksums.ini b/build/pkgs/flit_core/checksums.ini
@@ -1,5 +1,5 @@
 tarball=flit_core-VERSION.tar.gz
-sha1=cc89ef0fef30582845dc40d73dda7fa3bfa494cd
-md5=697eb7da76b4eb5833bbf8bb97131879
-cksum=4051177318
+sha1=941603f1734b9b4af74954429ef51f97540f30e5
+md5=a4bb11b54bcf029ec2cd5cb981c07ded
+cksum=2905595733
 upstream_url=https://pypi.io/packages/source/f/flit_core/flit_core-VERSION.tar.gz
diff --git a/build/pkgs/flit_core/package-version.txt b/build/pkgs/flit_core/package-version.txt
@@ -1 +1 @@
-3.3.0
+3.4.0
diff --git a/build/pkgs/importlib_metadata/dependencies b/build/pkgs/importlib_metadata/dependencies
@@ -1,4 +1,4 @@
-$(PYTHON) zipp typing_extensions | $(PYTHON_TOOLCHAIN) toml
+$(PYTHON) zipp typing_extensions | $(PYTHON_TOOLCHAIN) tomli
 
 ----------
 All lines of this file are ignored except the first.
diff --git a/build/pkgs/setuptools_scm/checksums.ini b/build/pkgs/setuptools_scm/checksums.ini
@@ -1,5 +1,5 @@
 tarball=setuptools_scm-VERSION.tar.gz
-sha1=6d793de55ec500f7516802830f903cbc460a7999
-md5=7e17d25fd5bc5b128cfe2964a2e4cd5b
-cksum=1288889703
+sha1=a4f02fddae697614e356cadfddb6241cc7737f38
+md5=32918d8ac566360c21411e0b3556c695
+cksum=1450556136
 upstream_url=https://pypi.io/packages/source/s/setuptools_scm/setuptools_scm-VERSION.tar.gz
diff --git a/build/pkgs/setuptools_scm/package-version.txt b/build/pkgs/setuptools_scm/package-version.txt
@@ -1 +1 @@
-6.3.1
+6.3.2
diff --git a/build/pkgs/toml/spkg-configure.m4 b/build/pkgs/toml/spkg-configure.m4
@@ -0,0 +1,7 @@
+SAGE_SPKG_CONFIGURE([toml], [
+    sage_spkg_install_toml=yes
+  ], [dnl REQUIRED-CHECK
+    AC_REQUIRE([SAGE_SPKG_CONFIGURE_TOX])
+    dnl toml is only needed when we cannot use system tox.
+    AS_VAR_SET([SPKG_REQUIRE], [$sage_spkg_install_tox])
+  ])
diff --git a/build/pkgs/tomli/dependencies b/build/pkgs/tomli/dependencies
@@ -1,4 +1,4 @@
-$(PYTHON) | pip flit_core toml
+$(PYTHON) | pip flit_core
 
 ----------
 All lines of this file are ignored except the first.
diff --git a/build/pkgs/tomli/spkg-install.in b/build/pkgs/tomli/spkg-install.in
@@ -1,2 +1,4 @@
 cd src
+# tomli's build system, flit_core, has a runtime dependency on tomli.
+export PYTHONPATH="$(pwd)"
 sdh_pip_install .

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-$(PYTHON) \| $(PYTHON_TOOLCHAIN) flit_core toml`
	`1`	`+$(PYTHON) \| $(PYTHON_TOOLCHAIN) flit_core tomli`
`2`	`2`
`3`	`3`	`----------`
`4`	`4`	`All lines of this file are ignored except the first.`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-$(PYTHON) zipp typing_extensions \| $(PYTHON_TOOLCHAIN) toml`
	`1`	`+$(PYTHON) zipp typing_extensions \| $(PYTHON_TOOLCHAIN) tomli`
`2`	`2`
`3`	`3`	`----------`
`4`	`4`	`All lines of this file are ignored except the first.`