sagelib: Add importlib_metadata, importlib_resources as dependencies

sagemath · Dec 8, 2022 · b9ac6a2 · b9ac6a2
1 parent 10dbc18
commit b9ac6a2
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 3 deletions.
diff --git a/build/pkgs/sagelib/dependencies b/build/pkgs/sagelib/dependencies
@@ -1,4 +1,4 @@
-FORCE $(SCRIPTS) arb boost_cropped $(BLAS) brial cliquer cypari cysignals cython ecl eclib ecm flint libgd gap giac givaro glpk gmpy2 gsl iml jinja2 jupyter_core lcalc lrcalc_python libbraiding libhomfly libpng linbox m4ri m4rie memory_allocator mpc mpfi mpfr $(MP_LIBRARY) ntl numpy pari pip pkgconfig planarity ppl pplpy primesieve primecount primecountpy pycygwin $(PYTHON) requests rw sage_conf singular symmetrica typing_extensions zn_poly $(PCFILES) | $(PYTHON_TOOLCHAIN) sage_setup
+FORCE $(SCRIPTS) arb boost_cropped $(BLAS) brial cliquer cypari cysignals cython ecl eclib ecm flint libgd gap giac givaro glpk gmpy2 gsl iml importlib_metadata importlib_resources jinja2 jupyter_core lcalc lrcalc_python libbraiding libhomfly libpng linbox m4ri m4rie memory_allocator mpc mpfi mpfr $(MP_LIBRARY) ntl numpy pari pip pkgconfig planarity ppl pplpy primesieve primecount primecountpy pycygwin $(PYTHON) requests rw sage_conf singular symmetrica typing_extensions zn_poly $(PCFILES) | $(PYTHON_TOOLCHAIN) sage_setup
 
 ----------
 All lines of this file are ignored except the first.

diff --git a/src/doc/en/developer/coding_in_python.rst b/src/doc/en/developer/coding_in_python.rst
@@ -33,8 +33,9 @@ using one of two mechanisms:
   Sage library code that uses type annotations should include this
   ``__future__`` import and follow PEP 563.
 
-- The Sage distribution includes the backport packages ``importlib_metadata``,
-  ``importlib_resources``, and ``typing_extensions``.
+- Backport packages ``importlib_metadata``, ``importlib_resources``, and
+  ``typing_extensions``; the Sage library declares these packages as
+  dependencies.
 
 Meta-ticket :trac:`29756` keeps track of newer Python features and serves
 as a starting point for discussions on how to make use of them in the

diff --git a/src/requirements.txt.m4 b/src/requirements.txt.m4
@@ -20,6 +20,8 @@ dnl ... but building bdist_wheel of cypari2 fails with recent pip... https://git
 cysignals==esyscmd(`printf $(sed "s/[.]p.*//;" ../cysignals/package-version.txt)')
 Cython==esyscmd(`printf $(sed "s/[.]p.*//;" ../cython/package-version.txt)')
 gmpy2==esyscmd(`printf $(sed "s/[.]p.*//;" ../gmpy2/package-version.txt)')
+importlib_metadata==esyscmd(`printf $(sed "s/[.]p.*//;" ../importlib_metadata/package-version.txt)')
+importlib_resources==esyscmd(`printf $(sed "s/[.]p.*//;" ../importlib_resources/package-version.txt)')
 jinja2==esyscmd(`printf $(sed "s/[.]p.*//;" ../jinja2/package-version.txt)')
 dnl ... for sage_setup.autogen.interpreters
 jupyter_core==esyscmd(`printf $(sed "s/[.]p.*//;" ../jupyter_core/package-version.txt)')

diff --git a/src/setup.cfg.m4 b/src/setup.cfg.m4
@@ -38,6 +38,8 @@ dnl From build/pkgs/sagelib/dependencies
         cysignals      \
         cython         \
         gmpy2          \
+        importlib_metadata \
+        importlib_resources \
         jinja2         \
         jupyter_core   \
         lrcalc_python  \