diff --git a/Makefile b/Makefile index 56e11c69f50..7e6c2af83ab 100644 --- a/Makefile +++ b/Makefile @@ -343,7 +343,7 @@ CONFIGURE_DEPENDENCIES = \ build/pkgs/*/spkg-configure.m4 \ build/pkgs/*/type build/pkgs/*/SPKG.rst \ build/pkgs/*/checksums.ini build/pkgs/*/requirements.txt \ - build/pkgs/*/install-requires.txt build/pkgs/*/package-version.txt \ + build/pkgs/*/version_requirements.txt build/pkgs/*/package-version.txt \ build/pkgs/*/spkg-install build/pkgs/*/spkg-install.in # SPKG_INFO_DEPENDENCIES is the list of files that influence the run of 'sage-spkg-info' and hence @@ -351,7 +351,7 @@ CONFIGURE_DEPENDENCIES = \ SPKG_INFO_DEPENDENCIES = \ build/pkgs/*/type build/pkgs/*/SPKG.rst \ build/pkgs/*/requirements.txt \ - build/pkgs/*/install-requires.txt build/pkgs/*/package-version.txt \ + build/pkgs/*/version_requirements.txt build/pkgs/*/package-version.txt \ build/pkgs/*/distros/*.txt configure: bootstrap src/doc/bootstrap $(CONFIGURE_DEPENDENCIES) $(SPKG_INFO_DEPENDENCIES) diff --git a/bootstrap b/bootstrap index 7d54c8e7734..14eb56c9981 100755 --- a/bootstrap +++ b/bootstrap @@ -105,7 +105,7 @@ EOF SPKG_TREE_VAR="$(sed "s/#.*//;" "$DIR/trees.txt")" else SPKG_TREE_VAR=SAGE_LOCAL - if test -f "$DIR/requirements.txt" -o -f "$DIR/install-requires.txt"; then + if test -f "$DIR/requirements.txt" -o -f "$DIR/version_requirements.txt"; then # A Python package SPKG_TREE_VAR=SAGE_VENV echo "define(>>>SPKG_INSTALL_REQUIRES_${pkgname}<<<, >>>$(echo $(sage-get-system-packages install-requires ${pkgname}))<<<)dnl" >> m4/sage_spkg_versions.m4 diff --git a/bootstrap-conda b/bootstrap-conda index 97a21fad567..62d7557a9b5 100755 --- a/bootstrap-conda +++ b/bootstrap-conda @@ -132,11 +132,11 @@ echo >&2 $0:$LINENO: generate conda environment files ( echo >&4 " - pip:" echo >&5 " - pip:" - for PKG_BASE in $(sage-package list :standard: :optional: --has-file requirements.txt --no-file distros/conda.txt --no-file src; sage-package list :standard: :optional: --has-file install-requires.txt --no-file requirements.txt --no-file distros/conda.txt --no-file src); do + for PKG_BASE in $(sage-package list :standard: :optional: --has-file requirements.txt --no-file distros/conda.txt --no-file src; sage-package list :standard: :optional: --has-file version_requirements.txt --no-file requirements.txt --no-file distros/conda.txt --no-file src); do PKG_SCRIPTS=build/pkgs/$PKG_BASE SYSTEM_PACKAGES_FILE=$PKG_SCRIPTS/requirements.txt if [ ! -f $SYSTEM_PACKAGES_FILE ]; then - SYSTEM_PACKAGES_FILE=$PKG_SCRIPTS/install-requires.txt + SYSTEM_PACKAGES_FILE=$PKG_SCRIPTS/version_requirements.txt fi PKG_TYPE=$(cat $PKG_SCRIPTS/type) if grep -q SAGERUNTIME $PKG_SCRIPTS/dependencies $PKG_SCRIPTS/dependencies_order_only 2>/dev/null; then diff --git a/build/bin/sage-get-system-packages b/build/bin/sage-get-system-packages index bac1925f291..5e455c6daa3 100755 --- a/build/bin/sage-get-system-packages +++ b/build/bin/sage-get-system-packages @@ -14,21 +14,21 @@ fi case "$SYSTEM" in install-requires) - # Collect install-requires.txt (falling back to requirements.txt) and output it in the format - # needed by setup.cfg [options] install_requires= - SYSTEM_PACKAGES_FILE_NAMES="install-requires.txt requirements.txt" + # Collect version_requirements.txt (falling back to requirements.txt) and output it in the format + # needed by setup.cfg [options] version_requirements= + SYSTEM_PACKAGES_FILE_NAMES="version_requirements.txt requirements.txt" STRIP_COMMENTS="sed s/#.*//;/^[[:space:]]*$/d;" COLLECT= ;; install-requires-toml) - # Collect install-requires.txt (falling back to requirements.txt) and output it in the format + # Collect version_requirements.txt (falling back to requirements.txt) and output it in the format # needed by pyproject.toml [build-system] requires= - SYSTEM_PACKAGES_FILE_NAMES="install-requires.txt requirements.txt" + SYSTEM_PACKAGES_FILE_NAMES="version_requirements.txt requirements.txt" STRIP_COMMENTS="sed s/#.*//;/^[[:space:]]*$/d;s/^/'/;s/$/',/;" COLLECT= ;; pip) - SYSTEM_PACKAGES_FILE_NAMES="requirements.txt install-requires.txt" + SYSTEM_PACKAGES_FILE_NAMES="requirements.txt version_requirements.txt" STRIP_COMMENTS='sed s/#.*//;s/[[:space:]]//g;' COLLECT=echo ;; diff --git a/build/bin/sage-spkg-info b/build/bin/sage-spkg-info index 5f6456aa846..dd289fee4d3 100755 --- a/build/bin/sage-spkg-info +++ b/build/bin/sage-spkg-info @@ -54,7 +54,7 @@ echo echo "Version Information" echo "-------------------" echo -for a in package-version.txt requirements.txt install-requires.txt; do +for a in package-version.txt requirements.txt version_requirements.txt; do if [ -f "$PKG_SCRIPTS"/"$a" ]; then echo "$a::" echo diff --git a/build/pkgs/alabaster/install-requires.txt b/build/pkgs/alabaster/version_requirements.txt similarity index 100% rename from build/pkgs/alabaster/install-requires.txt rename to build/pkgs/alabaster/version_requirements.txt diff --git a/build/pkgs/anyio/install-requires.txt b/build/pkgs/anyio/version_requirements.txt similarity index 100% rename from build/pkgs/anyio/install-requires.txt rename to build/pkgs/anyio/version_requirements.txt diff --git a/build/pkgs/appdirs/install-requires.txt b/build/pkgs/appdirs/version_requirements.txt similarity index 100% rename from build/pkgs/appdirs/install-requires.txt rename to build/pkgs/appdirs/version_requirements.txt diff --git a/build/pkgs/appnope/install-requires.txt b/build/pkgs/appnope/version_requirements.txt similarity index 100% rename from build/pkgs/appnope/install-requires.txt rename to build/pkgs/appnope/version_requirements.txt diff --git a/build/pkgs/argon2_cffi/install-requires.txt b/build/pkgs/argon2_cffi/version_requirements.txt similarity index 100% rename from build/pkgs/argon2_cffi/install-requires.txt rename to build/pkgs/argon2_cffi/version_requirements.txt diff --git a/build/pkgs/argon2_cffi_bindings/install-requires.txt b/build/pkgs/argon2_cffi_bindings/version_requirements.txt similarity index 100% rename from build/pkgs/argon2_cffi_bindings/install-requires.txt rename to build/pkgs/argon2_cffi_bindings/version_requirements.txt diff --git a/build/pkgs/arrow/install-requires.txt b/build/pkgs/arrow/version_requirements.txt similarity index 100% rename from build/pkgs/arrow/install-requires.txt rename to build/pkgs/arrow/version_requirements.txt diff --git a/build/pkgs/asttokens/install-requires.txt b/build/pkgs/asttokens/version_requirements.txt similarity index 100% rename from build/pkgs/asttokens/install-requires.txt rename to build/pkgs/asttokens/version_requirements.txt diff --git a/build/pkgs/async_lru/install-requires.txt b/build/pkgs/async_lru/version_requirements.txt similarity index 100% rename from build/pkgs/async_lru/install-requires.txt rename to build/pkgs/async_lru/version_requirements.txt diff --git a/build/pkgs/attrs/install-requires.txt b/build/pkgs/attrs/version_requirements.txt similarity index 100% rename from build/pkgs/attrs/install-requires.txt rename to build/pkgs/attrs/version_requirements.txt diff --git a/build/pkgs/babel/install-requires.txt b/build/pkgs/babel/version_requirements.txt similarity index 100% rename from build/pkgs/babel/install-requires.txt rename to build/pkgs/babel/version_requirements.txt diff --git a/build/pkgs/beautifulsoup4/install-requires.txt b/build/pkgs/beautifulsoup4/version_requirements.txt similarity index 100% rename from build/pkgs/beautifulsoup4/install-requires.txt rename to build/pkgs/beautifulsoup4/version_requirements.txt diff --git a/build/pkgs/beniget/install-requires.txt b/build/pkgs/beniget/version_requirements.txt similarity index 100% rename from build/pkgs/beniget/install-requires.txt rename to build/pkgs/beniget/version_requirements.txt diff --git a/build/pkgs/bleach/install-requires.txt b/build/pkgs/bleach/version_requirements.txt similarity index 100% rename from build/pkgs/bleach/install-requires.txt rename to build/pkgs/bleach/version_requirements.txt diff --git a/build/pkgs/cachetools/install-requires.txt b/build/pkgs/cachetools/version_requirements.txt similarity index 100% rename from build/pkgs/cachetools/install-requires.txt rename to build/pkgs/cachetools/version_requirements.txt diff --git a/build/pkgs/calver/install-requires.txt b/build/pkgs/calver/version_requirements.txt similarity index 100% rename from build/pkgs/calver/install-requires.txt rename to build/pkgs/calver/version_requirements.txt diff --git a/build/pkgs/certifi/install-requires.txt b/build/pkgs/certifi/version_requirements.txt similarity index 100% rename from build/pkgs/certifi/install-requires.txt rename to build/pkgs/certifi/version_requirements.txt diff --git a/build/pkgs/cffi/install-requires.txt b/build/pkgs/cffi/version_requirements.txt similarity index 100% rename from build/pkgs/cffi/install-requires.txt rename to build/pkgs/cffi/version_requirements.txt diff --git a/build/pkgs/chardet/install-requires.txt b/build/pkgs/chardet/version_requirements.txt similarity index 100% rename from build/pkgs/chardet/install-requires.txt rename to build/pkgs/chardet/version_requirements.txt diff --git a/build/pkgs/charset_normalizer/install-requires.txt b/build/pkgs/charset_normalizer/version_requirements.txt similarity index 100% rename from build/pkgs/charset_normalizer/install-requires.txt rename to build/pkgs/charset_normalizer/version_requirements.txt diff --git a/build/pkgs/colorama/install-requires.txt b/build/pkgs/colorama/version_requirements.txt similarity index 100% rename from build/pkgs/colorama/install-requires.txt rename to build/pkgs/colorama/version_requirements.txt diff --git a/build/pkgs/comm/install-requires.txt b/build/pkgs/comm/version_requirements.txt similarity index 100% rename from build/pkgs/comm/install-requires.txt rename to build/pkgs/comm/version_requirements.txt diff --git a/build/pkgs/contourpy/install-requires.txt b/build/pkgs/contourpy/version_requirements.txt similarity index 100% rename from build/pkgs/contourpy/install-requires.txt rename to build/pkgs/contourpy/version_requirements.txt diff --git a/build/pkgs/conway_polynomials/install-requires.txt b/build/pkgs/conway_polynomials/version_requirements.txt similarity index 100% rename from build/pkgs/conway_polynomials/install-requires.txt rename to build/pkgs/conway_polynomials/version_requirements.txt diff --git a/build/pkgs/cppy/install-requires.txt b/build/pkgs/cppy/version_requirements.txt similarity index 100% rename from build/pkgs/cppy/install-requires.txt rename to build/pkgs/cppy/version_requirements.txt diff --git a/build/pkgs/cvxopt/install-requires.txt b/build/pkgs/cvxopt/version_requirements.txt similarity index 100% rename from build/pkgs/cvxopt/install-requires.txt rename to build/pkgs/cvxopt/version_requirements.txt diff --git a/build/pkgs/cvxpy/install-requires.txt b/build/pkgs/cvxpy/version_requirements.txt similarity index 100% rename from build/pkgs/cvxpy/install-requires.txt rename to build/pkgs/cvxpy/version_requirements.txt diff --git a/build/pkgs/cycler/install-requires.txt b/build/pkgs/cycler/version_requirements.txt similarity index 100% rename from build/pkgs/cycler/install-requires.txt rename to build/pkgs/cycler/version_requirements.txt diff --git a/build/pkgs/cylp/install-requires.txt b/build/pkgs/cylp/version_requirements.txt similarity index 100% rename from build/pkgs/cylp/install-requires.txt rename to build/pkgs/cylp/version_requirements.txt diff --git a/build/pkgs/cypari/install-requires.txt b/build/pkgs/cypari/version_requirements.txt similarity index 100% rename from build/pkgs/cypari/install-requires.txt rename to build/pkgs/cypari/version_requirements.txt diff --git a/build/pkgs/cysignals/install-requires.txt b/build/pkgs/cysignals/version_requirements.txt similarity index 100% rename from build/pkgs/cysignals/install-requires.txt rename to build/pkgs/cysignals/version_requirements.txt diff --git a/build/pkgs/cython/install-requires.txt b/build/pkgs/cython/version_requirements.txt similarity index 100% rename from build/pkgs/cython/install-requires.txt rename to build/pkgs/cython/version_requirements.txt diff --git a/build/pkgs/database_cubic_hecke/install-requires.txt b/build/pkgs/database_cubic_hecke/version_requirements.txt similarity index 100% rename from build/pkgs/database_cubic_hecke/install-requires.txt rename to build/pkgs/database_cubic_hecke/version_requirements.txt diff --git a/build/pkgs/database_knotinfo/install-requires.txt b/build/pkgs/database_knotinfo/version_requirements.txt similarity index 100% rename from build/pkgs/database_knotinfo/install-requires.txt rename to build/pkgs/database_knotinfo/version_requirements.txt diff --git a/build/pkgs/dateutil/install-requires.txt b/build/pkgs/dateutil/version_requirements.txt similarity index 100% rename from build/pkgs/dateutil/install-requires.txt rename to build/pkgs/dateutil/version_requirements.txt diff --git a/build/pkgs/debugpy/install-requires.txt b/build/pkgs/debugpy/version_requirements.txt similarity index 100% rename from build/pkgs/debugpy/install-requires.txt rename to build/pkgs/debugpy/version_requirements.txt diff --git a/build/pkgs/decorator/install-requires.txt b/build/pkgs/decorator/version_requirements.txt similarity index 100% rename from build/pkgs/decorator/install-requires.txt rename to build/pkgs/decorator/version_requirements.txt diff --git a/build/pkgs/defusedxml/install-requires.txt b/build/pkgs/defusedxml/version_requirements.txt similarity index 100% rename from build/pkgs/defusedxml/install-requires.txt rename to build/pkgs/defusedxml/version_requirements.txt diff --git a/build/pkgs/distlib/install-requires.txt b/build/pkgs/distlib/version_requirements.txt similarity index 100% rename from build/pkgs/distlib/install-requires.txt rename to build/pkgs/distlib/version_requirements.txt diff --git a/build/pkgs/docutils/install-requires.txt b/build/pkgs/docutils/version_requirements.txt similarity index 100% rename from build/pkgs/docutils/install-requires.txt rename to build/pkgs/docutils/version_requirements.txt diff --git a/build/pkgs/dot2tex/install-requires.txt b/build/pkgs/dot2tex/version_requirements.txt similarity index 100% rename from build/pkgs/dot2tex/install-requires.txt rename to build/pkgs/dot2tex/version_requirements.txt diff --git a/build/pkgs/ecos_python/install-requires.txt b/build/pkgs/ecos_python/version_requirements.txt similarity index 100% rename from build/pkgs/ecos_python/install-requires.txt rename to build/pkgs/ecos_python/version_requirements.txt diff --git a/build/pkgs/editables/install-requires.txt b/build/pkgs/editables/version_requirements.txt similarity index 100% rename from build/pkgs/editables/install-requires.txt rename to build/pkgs/editables/version_requirements.txt diff --git a/build/pkgs/entrypoints/install-requires.txt b/build/pkgs/entrypoints/version_requirements.txt similarity index 100% rename from build/pkgs/entrypoints/install-requires.txt rename to build/pkgs/entrypoints/version_requirements.txt diff --git a/build/pkgs/exceptiongroup/install-requires.txt b/build/pkgs/exceptiongroup/version_requirements.txt similarity index 100% rename from build/pkgs/exceptiongroup/install-requires.txt rename to build/pkgs/exceptiongroup/version_requirements.txt diff --git a/build/pkgs/executing/install-requires.txt b/build/pkgs/executing/version_requirements.txt similarity index 100% rename from build/pkgs/executing/install-requires.txt rename to build/pkgs/executing/version_requirements.txt diff --git a/build/pkgs/fastjsonschema/install-requires.txt b/build/pkgs/fastjsonschema/version_requirements.txt similarity index 100% rename from build/pkgs/fastjsonschema/install-requires.txt rename to build/pkgs/fastjsonschema/version_requirements.txt diff --git a/build/pkgs/filelock/install-requires.txt b/build/pkgs/filelock/version_requirements.txt similarity index 100% rename from build/pkgs/filelock/install-requires.txt rename to build/pkgs/filelock/version_requirements.txt diff --git a/build/pkgs/flit_core/install-requires.txt b/build/pkgs/flit_core/version_requirements.txt similarity index 100% rename from build/pkgs/flit_core/install-requires.txt rename to build/pkgs/flit_core/version_requirements.txt diff --git a/build/pkgs/fonttools/install-requires.txt b/build/pkgs/fonttools/version_requirements.txt similarity index 100% rename from build/pkgs/fonttools/install-requires.txt rename to build/pkgs/fonttools/version_requirements.txt diff --git a/build/pkgs/fpylll/install-requires.txt b/build/pkgs/fpylll/version_requirements.txt similarity index 100% rename from build/pkgs/fpylll/install-requires.txt rename to build/pkgs/fpylll/version_requirements.txt diff --git a/build/pkgs/fqdn/install-requires.txt b/build/pkgs/fqdn/version_requirements.txt similarity index 100% rename from build/pkgs/fqdn/install-requires.txt rename to build/pkgs/fqdn/version_requirements.txt diff --git a/build/pkgs/furo/install-requires.txt b/build/pkgs/furo/version_requirements.txt similarity index 100% rename from build/pkgs/furo/install-requires.txt rename to build/pkgs/furo/version_requirements.txt diff --git a/build/pkgs/gap_jupyter/install-requires.txt b/build/pkgs/gap_jupyter/version_requirements.txt similarity index 100% rename from build/pkgs/gap_jupyter/install-requires.txt rename to build/pkgs/gap_jupyter/version_requirements.txt diff --git a/build/pkgs/gast/install-requires.txt b/build/pkgs/gast/version_requirements.txt similarity index 100% rename from build/pkgs/gast/install-requires.txt rename to build/pkgs/gast/version_requirements.txt diff --git a/build/pkgs/gmpy2/install-requires.txt b/build/pkgs/gmpy2/version_requirements.txt similarity index 100% rename from build/pkgs/gmpy2/install-requires.txt rename to build/pkgs/gmpy2/version_requirements.txt diff --git a/build/pkgs/gnumake_tokenpool/install-requires.txt b/build/pkgs/gnumake_tokenpool/version_requirements.txt similarity index 100% rename from build/pkgs/gnumake_tokenpool/install-requires.txt rename to build/pkgs/gnumake_tokenpool/version_requirements.txt diff --git a/build/pkgs/h11/install-requires.txt b/build/pkgs/h11/version_requirements.txt similarity index 100% rename from build/pkgs/h11/install-requires.txt rename to build/pkgs/h11/version_requirements.txt diff --git a/build/pkgs/hatch_fancy_pypi_readme/install-requires.txt b/build/pkgs/hatch_fancy_pypi_readme/version_requirements.txt similarity index 100% rename from build/pkgs/hatch_fancy_pypi_readme/install-requires.txt rename to build/pkgs/hatch_fancy_pypi_readme/version_requirements.txt diff --git a/build/pkgs/hatch_vcs/install-requires.txt b/build/pkgs/hatch_vcs/version_requirements.txt similarity index 100% rename from build/pkgs/hatch_vcs/install-requires.txt rename to build/pkgs/hatch_vcs/version_requirements.txt diff --git a/build/pkgs/hatchling/install-requires.txt b/build/pkgs/hatchling/version_requirements.txt similarity index 100% rename from build/pkgs/hatchling/install-requires.txt rename to build/pkgs/hatchling/version_requirements.txt diff --git a/build/pkgs/httpcore/install-requires.txt b/build/pkgs/httpcore/version_requirements.txt similarity index 100% rename from build/pkgs/httpcore/install-requires.txt rename to build/pkgs/httpcore/version_requirements.txt diff --git a/build/pkgs/httpx/install-requires.txt b/build/pkgs/httpx/version_requirements.txt similarity index 100% rename from build/pkgs/httpx/install-requires.txt rename to build/pkgs/httpx/version_requirements.txt diff --git a/build/pkgs/idna/install-requires.txt b/build/pkgs/idna/version_requirements.txt similarity index 100% rename from build/pkgs/idna/install-requires.txt rename to build/pkgs/idna/version_requirements.txt diff --git a/build/pkgs/imagesize/install-requires.txt b/build/pkgs/imagesize/version_requirements.txt similarity index 100% rename from build/pkgs/imagesize/install-requires.txt rename to build/pkgs/imagesize/version_requirements.txt diff --git a/build/pkgs/importlib_metadata/install-requires.txt b/build/pkgs/importlib_metadata/version_requirements.txt similarity index 100% rename from build/pkgs/importlib_metadata/install-requires.txt rename to build/pkgs/importlib_metadata/version_requirements.txt diff --git a/build/pkgs/importlib_resources/install-requires.txt b/build/pkgs/importlib_resources/version_requirements.txt similarity index 100% rename from build/pkgs/importlib_resources/install-requires.txt rename to build/pkgs/importlib_resources/version_requirements.txt diff --git a/build/pkgs/ipykernel/install-requires.txt b/build/pkgs/ipykernel/version_requirements.txt similarity index 100% rename from build/pkgs/ipykernel/install-requires.txt rename to build/pkgs/ipykernel/version_requirements.txt diff --git a/build/pkgs/ipympl/install-requires.txt b/build/pkgs/ipympl/version_requirements.txt similarity index 100% rename from build/pkgs/ipympl/install-requires.txt rename to build/pkgs/ipympl/version_requirements.txt diff --git a/build/pkgs/ipython/install-requires.txt b/build/pkgs/ipython/version_requirements.txt similarity index 100% rename from build/pkgs/ipython/install-requires.txt rename to build/pkgs/ipython/version_requirements.txt diff --git a/build/pkgs/ipython_genutils/install-requires.txt b/build/pkgs/ipython_genutils/version_requirements.txt similarity index 100% rename from build/pkgs/ipython_genutils/install-requires.txt rename to build/pkgs/ipython_genutils/version_requirements.txt diff --git a/build/pkgs/ipywidgets/install-requires.txt b/build/pkgs/ipywidgets/version_requirements.txt similarity index 100% rename from build/pkgs/ipywidgets/install-requires.txt rename to build/pkgs/ipywidgets/version_requirements.txt diff --git a/build/pkgs/isoduration/install-requires.txt b/build/pkgs/isoduration/version_requirements.txt similarity index 100% rename from build/pkgs/isoduration/install-requires.txt rename to build/pkgs/isoduration/version_requirements.txt diff --git a/build/pkgs/jedi/install-requires.txt b/build/pkgs/jedi/version_requirements.txt similarity index 100% rename from build/pkgs/jedi/install-requires.txt rename to build/pkgs/jedi/version_requirements.txt diff --git a/build/pkgs/jinja2/install-requires.txt b/build/pkgs/jinja2/version_requirements.txt similarity index 100% rename from build/pkgs/jinja2/install-requires.txt rename to build/pkgs/jinja2/version_requirements.txt diff --git a/build/pkgs/json5/install-requires.txt b/build/pkgs/json5/version_requirements.txt similarity index 100% rename from build/pkgs/json5/install-requires.txt rename to build/pkgs/json5/version_requirements.txt diff --git a/build/pkgs/jsonpointer/install-requires.txt b/build/pkgs/jsonpointer/version_requirements.txt similarity index 100% rename from build/pkgs/jsonpointer/install-requires.txt rename to build/pkgs/jsonpointer/version_requirements.txt diff --git a/build/pkgs/jsonschema/install-requires.txt b/build/pkgs/jsonschema/version_requirements.txt similarity index 100% rename from build/pkgs/jsonschema/install-requires.txt rename to build/pkgs/jsonschema/version_requirements.txt diff --git a/build/pkgs/jsonschema_specifications/install-requires.txt b/build/pkgs/jsonschema_specifications/version_requirements.txt similarity index 100% rename from build/pkgs/jsonschema_specifications/install-requires.txt rename to build/pkgs/jsonschema_specifications/version_requirements.txt diff --git a/build/pkgs/jupymake/install-requires.txt b/build/pkgs/jupymake/version_requirements.txt similarity index 100% rename from build/pkgs/jupymake/install-requires.txt rename to build/pkgs/jupymake/version_requirements.txt diff --git a/build/pkgs/jupyter_client/install-requires.txt b/build/pkgs/jupyter_client/version_requirements.txt similarity index 100% rename from build/pkgs/jupyter_client/install-requires.txt rename to build/pkgs/jupyter_client/version_requirements.txt diff --git a/build/pkgs/jupyter_core/install-requires.txt b/build/pkgs/jupyter_core/version_requirements.txt similarity index 100% rename from build/pkgs/jupyter_core/install-requires.txt rename to build/pkgs/jupyter_core/version_requirements.txt diff --git a/build/pkgs/jupyter_events/install-requires.txt b/build/pkgs/jupyter_events/version_requirements.txt similarity index 100% rename from build/pkgs/jupyter_events/install-requires.txt rename to build/pkgs/jupyter_events/version_requirements.txt diff --git a/build/pkgs/jupyter_jsmol/install-requires.txt b/build/pkgs/jupyter_jsmol/version_requirements.txt similarity index 100% rename from build/pkgs/jupyter_jsmol/install-requires.txt rename to build/pkgs/jupyter_jsmol/version_requirements.txt diff --git a/build/pkgs/jupyter_lsp/install-requires.txt b/build/pkgs/jupyter_lsp/version_requirements.txt similarity index 100% rename from build/pkgs/jupyter_lsp/install-requires.txt rename to build/pkgs/jupyter_lsp/version_requirements.txt diff --git a/build/pkgs/jupyter_server/install-requires.txt b/build/pkgs/jupyter_server/version_requirements.txt similarity index 100% rename from build/pkgs/jupyter_server/install-requires.txt rename to build/pkgs/jupyter_server/version_requirements.txt diff --git a/build/pkgs/jupyter_server_terminals/install-requires.txt b/build/pkgs/jupyter_server_terminals/version_requirements.txt similarity index 100% rename from build/pkgs/jupyter_server_terminals/install-requires.txt rename to build/pkgs/jupyter_server_terminals/version_requirements.txt diff --git a/build/pkgs/jupyter_sphinx/install-requires.txt b/build/pkgs/jupyter_sphinx/version_requirements.txt similarity index 100% rename from build/pkgs/jupyter_sphinx/install-requires.txt rename to build/pkgs/jupyter_sphinx/version_requirements.txt diff --git a/build/pkgs/jupyterlab/install-requires.txt b/build/pkgs/jupyterlab/version_requirements.txt similarity index 100% rename from build/pkgs/jupyterlab/install-requires.txt rename to build/pkgs/jupyterlab/version_requirements.txt diff --git a/build/pkgs/jupyterlab_mathjax2/install-requires.txt b/build/pkgs/jupyterlab_mathjax2/version_requirements.txt similarity index 100% rename from build/pkgs/jupyterlab_mathjax2/install-requires.txt rename to build/pkgs/jupyterlab_mathjax2/version_requirements.txt diff --git a/build/pkgs/jupyterlab_pygments/install-requires.txt b/build/pkgs/jupyterlab_pygments/version_requirements.txt similarity index 100% rename from build/pkgs/jupyterlab_pygments/install-requires.txt rename to build/pkgs/jupyterlab_pygments/version_requirements.txt diff --git a/build/pkgs/jupyterlab_server/install-requires.txt b/build/pkgs/jupyterlab_server/version_requirements.txt similarity index 100% rename from build/pkgs/jupyterlab_server/install-requires.txt rename to build/pkgs/jupyterlab_server/version_requirements.txt diff --git a/build/pkgs/jupyterlab_widgets/install-requires.txt b/build/pkgs/jupyterlab_widgets/version_requirements.txt similarity index 100% rename from build/pkgs/jupyterlab_widgets/install-requires.txt rename to build/pkgs/jupyterlab_widgets/version_requirements.txt diff --git a/build/pkgs/kiwisolver/install-requires.txt b/build/pkgs/kiwisolver/version_requirements.txt similarity index 100% rename from build/pkgs/kiwisolver/install-requires.txt rename to build/pkgs/kiwisolver/version_requirements.txt diff --git a/build/pkgs/lrcalc_python/install-requires.txt b/build/pkgs/lrcalc_python/version_requirements.txt similarity index 100% rename from build/pkgs/lrcalc_python/install-requires.txt rename to build/pkgs/lrcalc_python/version_requirements.txt diff --git a/build/pkgs/markupsafe/install-requires.txt b/build/pkgs/markupsafe/version_requirements.txt similarity index 100% rename from build/pkgs/markupsafe/install-requires.txt rename to build/pkgs/markupsafe/version_requirements.txt diff --git a/build/pkgs/mathics/install-requires.txt b/build/pkgs/mathics/version_requirements.txt similarity index 100% rename from build/pkgs/mathics/install-requires.txt rename to build/pkgs/mathics/version_requirements.txt diff --git a/build/pkgs/mathics_scanner/install-requires.txt b/build/pkgs/mathics_scanner/version_requirements.txt similarity index 100% rename from build/pkgs/mathics_scanner/install-requires.txt rename to build/pkgs/mathics_scanner/version_requirements.txt diff --git a/build/pkgs/matplotlib/install-requires.txt b/build/pkgs/matplotlib/version_requirements.txt similarity index 100% rename from build/pkgs/matplotlib/install-requires.txt rename to build/pkgs/matplotlib/version_requirements.txt diff --git a/build/pkgs/matplotlib_inline/install-requires.txt b/build/pkgs/matplotlib_inline/version_requirements.txt similarity index 100% rename from build/pkgs/matplotlib_inline/install-requires.txt rename to build/pkgs/matplotlib_inline/version_requirements.txt diff --git a/build/pkgs/matroid_database/install-requires.txt b/build/pkgs/matroid_database/version_requirements.txt similarity index 100% rename from build/pkgs/matroid_database/install-requires.txt rename to build/pkgs/matroid_database/version_requirements.txt diff --git a/build/pkgs/memory_allocator/install-requires.txt b/build/pkgs/memory_allocator/version_requirements.txt similarity index 100% rename from build/pkgs/memory_allocator/install-requires.txt rename to build/pkgs/memory_allocator/version_requirements.txt diff --git a/build/pkgs/meson/install-requires.txt b/build/pkgs/meson/version_requirements.txt similarity index 100% rename from build/pkgs/meson/install-requires.txt rename to build/pkgs/meson/version_requirements.txt diff --git a/build/pkgs/meson_python/install-requires.txt b/build/pkgs/meson_python/version_requirements.txt similarity index 100% rename from build/pkgs/meson_python/install-requires.txt rename to build/pkgs/meson_python/version_requirements.txt diff --git a/build/pkgs/mistune/install-requires.txt b/build/pkgs/mistune/version_requirements.txt similarity index 100% rename from build/pkgs/mistune/install-requires.txt rename to build/pkgs/mistune/version_requirements.txt diff --git a/build/pkgs/mpmath/install-requires.txt b/build/pkgs/mpmath/version_requirements.txt similarity index 100% rename from build/pkgs/mpmath/install-requires.txt rename to build/pkgs/mpmath/version_requirements.txt diff --git a/build/pkgs/nbclient/install-requires.txt b/build/pkgs/nbclient/version_requirements.txt similarity index 100% rename from build/pkgs/nbclient/install-requires.txt rename to build/pkgs/nbclient/version_requirements.txt diff --git a/build/pkgs/nbconvert/install-requires.txt b/build/pkgs/nbconvert/version_requirements.txt similarity index 100% rename from build/pkgs/nbconvert/install-requires.txt rename to build/pkgs/nbconvert/version_requirements.txt diff --git a/build/pkgs/nbformat/install-requires.txt b/build/pkgs/nbformat/version_requirements.txt similarity index 100% rename from build/pkgs/nbformat/install-requires.txt rename to build/pkgs/nbformat/version_requirements.txt diff --git a/build/pkgs/nest_asyncio/install-requires.txt b/build/pkgs/nest_asyncio/version_requirements.txt similarity index 100% rename from build/pkgs/nest_asyncio/install-requires.txt rename to build/pkgs/nest_asyncio/version_requirements.txt diff --git a/build/pkgs/networkx/install-requires.txt b/build/pkgs/networkx/version_requirements.txt similarity index 100% rename from build/pkgs/networkx/install-requires.txt rename to build/pkgs/networkx/version_requirements.txt diff --git a/build/pkgs/notebook/install-requires.txt b/build/pkgs/notebook/version_requirements.txt similarity index 100% rename from build/pkgs/notebook/install-requires.txt rename to build/pkgs/notebook/version_requirements.txt diff --git a/build/pkgs/notebook_shim/install-requires.txt b/build/pkgs/notebook_shim/version_requirements.txt similarity index 100% rename from build/pkgs/notebook_shim/install-requires.txt rename to build/pkgs/notebook_shim/version_requirements.txt diff --git a/build/pkgs/notedown/install-requires.txt b/build/pkgs/notedown/version_requirements.txt similarity index 100% rename from build/pkgs/notedown/install-requires.txt rename to build/pkgs/notedown/version_requirements.txt diff --git a/build/pkgs/numpy/install-requires.txt b/build/pkgs/numpy/version_requirements.txt similarity index 100% rename from build/pkgs/numpy/install-requires.txt rename to build/pkgs/numpy/version_requirements.txt diff --git a/build/pkgs/osqp_python/install-requires.txt b/build/pkgs/osqp_python/version_requirements.txt similarity index 100% rename from build/pkgs/osqp_python/install-requires.txt rename to build/pkgs/osqp_python/version_requirements.txt diff --git a/build/pkgs/overrides/install-requires.txt b/build/pkgs/overrides/version_requirements.txt similarity index 100% rename from build/pkgs/overrides/install-requires.txt rename to build/pkgs/overrides/version_requirements.txt diff --git a/build/pkgs/p_group_cohomology/install-requires.txt b/build/pkgs/p_group_cohomology/version_requirements.txt similarity index 100% rename from build/pkgs/p_group_cohomology/install-requires.txt rename to build/pkgs/p_group_cohomology/version_requirements.txt diff --git a/build/pkgs/packaging/install-requires.txt b/build/pkgs/packaging/version_requirements.txt similarity index 100% rename from build/pkgs/packaging/install-requires.txt rename to build/pkgs/packaging/version_requirements.txt diff --git a/build/pkgs/palettable/install-requires.txt b/build/pkgs/palettable/version_requirements.txt similarity index 100% rename from build/pkgs/palettable/install-requires.txt rename to build/pkgs/palettable/version_requirements.txt diff --git a/build/pkgs/pandoc_attributes/install-requires.txt b/build/pkgs/pandoc_attributes/version_requirements.txt similarity index 100% rename from build/pkgs/pandoc_attributes/install-requires.txt rename to build/pkgs/pandoc_attributes/version_requirements.txt diff --git a/build/pkgs/pandocfilters/install-requires.txt b/build/pkgs/pandocfilters/version_requirements.txt similarity index 100% rename from build/pkgs/pandocfilters/install-requires.txt rename to build/pkgs/pandocfilters/version_requirements.txt diff --git a/build/pkgs/pari_jupyter/install-requires.txt b/build/pkgs/pari_jupyter/version_requirements.txt similarity index 100% rename from build/pkgs/pari_jupyter/install-requires.txt rename to build/pkgs/pari_jupyter/version_requirements.txt diff --git a/build/pkgs/parso/install-requires.txt b/build/pkgs/parso/version_requirements.txt similarity index 100% rename from build/pkgs/parso/install-requires.txt rename to build/pkgs/parso/version_requirements.txt diff --git a/build/pkgs/pathspec/install-requires.txt b/build/pkgs/pathspec/version_requirements.txt similarity index 100% rename from build/pkgs/pathspec/install-requires.txt rename to build/pkgs/pathspec/version_requirements.txt diff --git a/build/pkgs/pexpect/install-requires.txt b/build/pkgs/pexpect/version_requirements.txt similarity index 100% rename from build/pkgs/pexpect/install-requires.txt rename to build/pkgs/pexpect/version_requirements.txt diff --git a/build/pkgs/pickleshare/install-requires.txt b/build/pkgs/pickleshare/version_requirements.txt similarity index 100% rename from build/pkgs/pickleshare/install-requires.txt rename to build/pkgs/pickleshare/version_requirements.txt diff --git a/build/pkgs/pillow/install-requires.txt b/build/pkgs/pillow/version_requirements.txt similarity index 100% rename from build/pkgs/pillow/install-requires.txt rename to build/pkgs/pillow/version_requirements.txt diff --git a/build/pkgs/pint/install-requires.txt b/build/pkgs/pint/version_requirements.txt similarity index 100% rename from build/pkgs/pint/install-requires.txt rename to build/pkgs/pint/version_requirements.txt diff --git a/build/pkgs/pip/install-requires.txt b/build/pkgs/pip/version_requirements.txt similarity index 100% rename from build/pkgs/pip/install-requires.txt rename to build/pkgs/pip/version_requirements.txt diff --git a/build/pkgs/pkgconfig/install-requires.txt b/build/pkgs/pkgconfig/version_requirements.txt similarity index 100% rename from build/pkgs/pkgconfig/install-requires.txt rename to build/pkgs/pkgconfig/version_requirements.txt diff --git a/build/pkgs/platformdirs/install-requires.txt b/build/pkgs/platformdirs/version_requirements.txt similarity index 100% rename from build/pkgs/platformdirs/install-requires.txt rename to build/pkgs/platformdirs/version_requirements.txt diff --git a/build/pkgs/pluggy/install-requires.txt b/build/pkgs/pluggy/version_requirements.txt similarity index 100% rename from build/pkgs/pluggy/install-requires.txt rename to build/pkgs/pluggy/version_requirements.txt diff --git a/build/pkgs/ply/install-requires.txt b/build/pkgs/ply/version_requirements.txt similarity index 100% rename from build/pkgs/ply/install-requires.txt rename to build/pkgs/ply/version_requirements.txt diff --git a/build/pkgs/pplpy/install-requires.txt b/build/pkgs/pplpy/version_requirements.txt similarity index 100% rename from build/pkgs/pplpy/install-requires.txt rename to build/pkgs/pplpy/version_requirements.txt diff --git a/build/pkgs/primecountpy/install-requires.txt b/build/pkgs/primecountpy/version_requirements.txt similarity index 100% rename from build/pkgs/primecountpy/install-requires.txt rename to build/pkgs/primecountpy/version_requirements.txt diff --git a/build/pkgs/prometheus_client/install-requires.txt b/build/pkgs/prometheus_client/version_requirements.txt similarity index 100% rename from build/pkgs/prometheus_client/install-requires.txt rename to build/pkgs/prometheus_client/version_requirements.txt diff --git a/build/pkgs/prompt_toolkit/install-requires.txt b/build/pkgs/prompt_toolkit/version_requirements.txt similarity index 100% rename from build/pkgs/prompt_toolkit/install-requires.txt rename to build/pkgs/prompt_toolkit/version_requirements.txt diff --git a/build/pkgs/psutil/install-requires.txt b/build/pkgs/psutil/version_requirements.txt similarity index 100% rename from build/pkgs/psutil/install-requires.txt rename to build/pkgs/psutil/version_requirements.txt diff --git a/build/pkgs/ptyprocess/install-requires.txt b/build/pkgs/ptyprocess/version_requirements.txt similarity index 100% rename from build/pkgs/ptyprocess/install-requires.txt rename to build/pkgs/ptyprocess/version_requirements.txt diff --git a/build/pkgs/pure_eval/install-requires.txt b/build/pkgs/pure_eval/version_requirements.txt similarity index 100% rename from build/pkgs/pure_eval/install-requires.txt rename to build/pkgs/pure_eval/version_requirements.txt diff --git a/build/pkgs/py/install-requires.txt b/build/pkgs/py/version_requirements.txt similarity index 100% rename from build/pkgs/py/install-requires.txt rename to build/pkgs/py/version_requirements.txt diff --git a/build/pkgs/pybind11/install-requires.txt b/build/pkgs/pybind11/version_requirements.txt similarity index 100% rename from build/pkgs/pybind11/install-requires.txt rename to build/pkgs/pybind11/version_requirements.txt diff --git a/build/pkgs/pycosat/install-requires.txt b/build/pkgs/pycosat/version_requirements.txt similarity index 100% rename from build/pkgs/pycosat/install-requires.txt rename to build/pkgs/pycosat/version_requirements.txt diff --git a/build/pkgs/pycparser/install-requires.txt b/build/pkgs/pycparser/version_requirements.txt similarity index 100% rename from build/pkgs/pycparser/install-requires.txt rename to build/pkgs/pycparser/version_requirements.txt diff --git a/build/pkgs/pycryptosat/install-requires.txt b/build/pkgs/pycryptosat/version_requirements.txt similarity index 100% rename from build/pkgs/pycryptosat/install-requires.txt rename to build/pkgs/pycryptosat/version_requirements.txt diff --git a/build/pkgs/pygments/install-requires.txt b/build/pkgs/pygments/version_requirements.txt similarity index 100% rename from build/pkgs/pygments/install-requires.txt rename to build/pkgs/pygments/version_requirements.txt diff --git a/build/pkgs/pygraphviz/install-requires.txt b/build/pkgs/pygraphviz/version_requirements.txt similarity index 100% rename from build/pkgs/pygraphviz/install-requires.txt rename to build/pkgs/pygraphviz/version_requirements.txt diff --git a/build/pkgs/pynormaliz/install-requires.txt b/build/pkgs/pynormaliz/version_requirements.txt similarity index 100% rename from build/pkgs/pynormaliz/install-requires.txt rename to build/pkgs/pynormaliz/version_requirements.txt diff --git a/build/pkgs/pyparsing/install-requires.txt b/build/pkgs/pyparsing/version_requirements.txt similarity index 100% rename from build/pkgs/pyparsing/install-requires.txt rename to build/pkgs/pyparsing/version_requirements.txt diff --git a/build/pkgs/pyproject_api/install-requires.txt b/build/pkgs/pyproject_api/version_requirements.txt similarity index 100% rename from build/pkgs/pyproject_api/install-requires.txt rename to build/pkgs/pyproject_api/version_requirements.txt diff --git a/build/pkgs/pyproject_metadata/install-requires.txt b/build/pkgs/pyproject_metadata/version_requirements.txt similarity index 100% rename from build/pkgs/pyproject_metadata/install-requires.txt rename to build/pkgs/pyproject_metadata/version_requirements.txt diff --git a/build/pkgs/pyrsistent/install-requires.txt b/build/pkgs/pyrsistent/version_requirements.txt similarity index 100% rename from build/pkgs/pyrsistent/install-requires.txt rename to build/pkgs/pyrsistent/version_requirements.txt diff --git a/build/pkgs/pyscipopt/install-requires.txt b/build/pkgs/pyscipopt/version_requirements.txt similarity index 100% rename from build/pkgs/pyscipopt/install-requires.txt rename to build/pkgs/pyscipopt/version_requirements.txt diff --git a/build/pkgs/pysingular/install-requires.txt b/build/pkgs/pysingular/version_requirements.txt similarity index 100% rename from build/pkgs/pysingular/install-requires.txt rename to build/pkgs/pysingular/version_requirements.txt diff --git a/build/pkgs/python_igraph/install-requires.txt b/build/pkgs/python_igraph/version_requirements.txt similarity index 100% rename from build/pkgs/python_igraph/install-requires.txt rename to build/pkgs/python_igraph/version_requirements.txt diff --git a/build/pkgs/python_json_logger/install-requires.txt b/build/pkgs/python_json_logger/version_requirements.txt similarity index 100% rename from build/pkgs/python_json_logger/install-requires.txt rename to build/pkgs/python_json_logger/version_requirements.txt diff --git a/build/pkgs/pythran/install-requires.txt b/build/pkgs/pythran/version_requirements.txt similarity index 100% rename from build/pkgs/pythran/install-requires.txt rename to build/pkgs/pythran/version_requirements.txt diff --git a/build/pkgs/pytz/install-requires.txt b/build/pkgs/pytz/version_requirements.txt similarity index 100% rename from build/pkgs/pytz/install-requires.txt rename to build/pkgs/pytz/version_requirements.txt diff --git a/build/pkgs/pytz_deprecation_shim/install-requires.txt b/build/pkgs/pytz_deprecation_shim/version_requirements.txt similarity index 100% rename from build/pkgs/pytz_deprecation_shim/install-requires.txt rename to build/pkgs/pytz_deprecation_shim/version_requirements.txt diff --git a/build/pkgs/pyyaml/install-requires.txt b/build/pkgs/pyyaml/version_requirements.txt similarity index 100% rename from build/pkgs/pyyaml/install-requires.txt rename to build/pkgs/pyyaml/version_requirements.txt diff --git a/build/pkgs/pyzmq/install-requires.txt b/build/pkgs/pyzmq/version_requirements.txt similarity index 100% rename from build/pkgs/pyzmq/install-requires.txt rename to build/pkgs/pyzmq/version_requirements.txt diff --git a/build/pkgs/qdldl_python/install-requires.txt b/build/pkgs/qdldl_python/version_requirements.txt similarity index 100% rename from build/pkgs/qdldl_python/install-requires.txt rename to build/pkgs/qdldl_python/version_requirements.txt diff --git a/build/pkgs/referencing/install-requires.txt b/build/pkgs/referencing/version_requirements.txt similarity index 100% rename from build/pkgs/referencing/install-requires.txt rename to build/pkgs/referencing/version_requirements.txt diff --git a/build/pkgs/requests/install-requires.txt b/build/pkgs/requests/version_requirements.txt similarity index 100% rename from build/pkgs/requests/install-requires.txt rename to build/pkgs/requests/version_requirements.txt diff --git a/build/pkgs/rfc3339_validator/install-requires.txt b/build/pkgs/rfc3339_validator/version_requirements.txt similarity index 100% rename from build/pkgs/rfc3339_validator/install-requires.txt rename to build/pkgs/rfc3339_validator/version_requirements.txt diff --git a/build/pkgs/rfc3986_validator/install-requires.txt b/build/pkgs/rfc3986_validator/version_requirements.txt similarity index 100% rename from build/pkgs/rfc3986_validator/install-requires.txt rename to build/pkgs/rfc3986_validator/version_requirements.txt diff --git a/build/pkgs/rpy2/install-requires.txt b/build/pkgs/rpy2/version_requirements.txt similarity index 100% rename from build/pkgs/rpy2/install-requires.txt rename to build/pkgs/rpy2/version_requirements.txt diff --git a/build/pkgs/rst2ipynb/install-requires.txt b/build/pkgs/rst2ipynb/version_requirements.txt similarity index 100% rename from build/pkgs/rst2ipynb/install-requires.txt rename to build/pkgs/rst2ipynb/version_requirements.txt diff --git a/build/pkgs/sage_conf/install-requires.txt b/build/pkgs/sage_conf/version_requirements.txt similarity index 100% rename from build/pkgs/sage_conf/install-requires.txt rename to build/pkgs/sage_conf/version_requirements.txt diff --git a/build/pkgs/sage_docbuild/install-requires.txt b/build/pkgs/sage_docbuild/version_requirements.txt similarity index 100% rename from build/pkgs/sage_docbuild/install-requires.txt rename to build/pkgs/sage_docbuild/version_requirements.txt diff --git a/build/pkgs/sage_numerical_backends_coin/install-requires.txt b/build/pkgs/sage_numerical_backends_coin/version_requirements.txt similarity index 100% rename from build/pkgs/sage_numerical_backends_coin/install-requires.txt rename to build/pkgs/sage_numerical_backends_coin/version_requirements.txt diff --git a/build/pkgs/sage_numerical_backends_cplex/install-requires.txt b/build/pkgs/sage_numerical_backends_cplex/version_requirements.txt similarity index 100% rename from build/pkgs/sage_numerical_backends_cplex/install-requires.txt rename to build/pkgs/sage_numerical_backends_cplex/version_requirements.txt diff --git a/build/pkgs/sage_numerical_backends_gurobi/install-requires.txt b/build/pkgs/sage_numerical_backends_gurobi/version_requirements.txt similarity index 100% rename from build/pkgs/sage_numerical_backends_gurobi/install-requires.txt rename to build/pkgs/sage_numerical_backends_gurobi/version_requirements.txt diff --git a/build/pkgs/sage_setup/install-requires.txt b/build/pkgs/sage_setup/version_requirements.txt similarity index 100% rename from build/pkgs/sage_setup/install-requires.txt rename to build/pkgs/sage_setup/version_requirements.txt diff --git a/build/pkgs/sage_sws2rst/install-requires.txt b/build/pkgs/sage_sws2rst/version_requirements.txt similarity index 100% rename from build/pkgs/sage_sws2rst/install-requires.txt rename to build/pkgs/sage_sws2rst/version_requirements.txt diff --git a/build/pkgs/sagelib/install-requires.txt b/build/pkgs/sagelib/version_requirements.txt similarity index 100% rename from build/pkgs/sagelib/install-requires.txt rename to build/pkgs/sagelib/version_requirements.txt diff --git a/build/pkgs/sagemath_bliss/install-requires.txt b/build/pkgs/sagemath_bliss/version_requirements.txt similarity index 100% rename from build/pkgs/sagemath_bliss/install-requires.txt rename to build/pkgs/sagemath_bliss/version_requirements.txt diff --git a/build/pkgs/sagemath_categories/install-requires.txt b/build/pkgs/sagemath_categories/version_requirements.txt similarity index 100% rename from build/pkgs/sagemath_categories/install-requires.txt rename to build/pkgs/sagemath_categories/version_requirements.txt diff --git a/build/pkgs/sagemath_coxeter3/install-requires.txt b/build/pkgs/sagemath_coxeter3/version_requirements.txt similarity index 100% rename from build/pkgs/sagemath_coxeter3/install-requires.txt rename to build/pkgs/sagemath_coxeter3/version_requirements.txt diff --git a/build/pkgs/sagemath_environment/install-requires.txt b/build/pkgs/sagemath_environment/version_requirements.txt similarity index 100% rename from build/pkgs/sagemath_environment/install-requires.txt rename to build/pkgs/sagemath_environment/version_requirements.txt diff --git a/build/pkgs/sagemath_mcqd/install-requires.txt b/build/pkgs/sagemath_mcqd/version_requirements.txt similarity index 100% rename from build/pkgs/sagemath_mcqd/install-requires.txt rename to build/pkgs/sagemath_mcqd/version_requirements.txt diff --git a/build/pkgs/sagemath_meataxe/install-requires.txt b/build/pkgs/sagemath_meataxe/version_requirements.txt similarity index 100% rename from build/pkgs/sagemath_meataxe/install-requires.txt rename to build/pkgs/sagemath_meataxe/version_requirements.txt diff --git a/build/pkgs/sagemath_objects/install-requires.txt b/build/pkgs/sagemath_objects/version_requirements.txt similarity index 100% rename from build/pkgs/sagemath_objects/install-requires.txt rename to build/pkgs/sagemath_objects/version_requirements.txt diff --git a/build/pkgs/sagemath_repl/install-requires.txt b/build/pkgs/sagemath_repl/version_requirements.txt similarity index 100% rename from build/pkgs/sagemath_repl/install-requires.txt rename to build/pkgs/sagemath_repl/version_requirements.txt diff --git a/build/pkgs/sagemath_sirocco/install-requires.txt b/build/pkgs/sagemath_sirocco/version_requirements.txt similarity index 100% rename from build/pkgs/sagemath_sirocco/install-requires.txt rename to build/pkgs/sagemath_sirocco/version_requirements.txt diff --git a/build/pkgs/sagemath_tdlib/install-requires.txt b/build/pkgs/sagemath_tdlib/version_requirements.txt similarity index 100% rename from build/pkgs/sagemath_tdlib/install-requires.txt rename to build/pkgs/sagemath_tdlib/version_requirements.txt diff --git a/build/pkgs/sagenb_export/install-requires.txt b/build/pkgs/sagenb_export/version_requirements.txt similarity index 100% rename from build/pkgs/sagenb_export/install-requires.txt rename to build/pkgs/sagenb_export/version_requirements.txt diff --git a/build/pkgs/sagetex/install-requires.txt b/build/pkgs/sagetex/version_requirements.txt similarity index 100% rename from build/pkgs/sagetex/install-requires.txt rename to build/pkgs/sagetex/version_requirements.txt diff --git a/build/pkgs/scipy/install-requires.txt b/build/pkgs/scipy/version_requirements.txt similarity index 100% rename from build/pkgs/scipy/install-requires.txt rename to build/pkgs/scipy/version_requirements.txt diff --git a/build/pkgs/scs/install-requires.txt b/build/pkgs/scs/version_requirements.txt similarity index 100% rename from build/pkgs/scs/install-requires.txt rename to build/pkgs/scs/version_requirements.txt diff --git a/build/pkgs/send2trash/install-requires.txt b/build/pkgs/send2trash/version_requirements.txt similarity index 100% rename from build/pkgs/send2trash/install-requires.txt rename to build/pkgs/send2trash/version_requirements.txt diff --git a/build/pkgs/setuptools/install-requires.txt b/build/pkgs/setuptools/version_requirements.txt similarity index 100% rename from build/pkgs/setuptools/install-requires.txt rename to build/pkgs/setuptools/version_requirements.txt diff --git a/build/pkgs/setuptools_scm/install-requires.txt b/build/pkgs/setuptools_scm/version_requirements.txt similarity index 100% rename from build/pkgs/setuptools_scm/install-requires.txt rename to build/pkgs/setuptools_scm/version_requirements.txt diff --git a/build/pkgs/singular_jupyter/install-requires.txt b/build/pkgs/singular_jupyter/version_requirements.txt similarity index 100% rename from build/pkgs/singular_jupyter/install-requires.txt rename to build/pkgs/singular_jupyter/version_requirements.txt diff --git a/build/pkgs/six/install-requires.txt b/build/pkgs/six/version_requirements.txt similarity index 100% rename from build/pkgs/six/install-requires.txt rename to build/pkgs/six/version_requirements.txt diff --git a/build/pkgs/sniffio/install-requires.txt b/build/pkgs/sniffio/version_requirements.txt similarity index 100% rename from build/pkgs/sniffio/install-requires.txt rename to build/pkgs/sniffio/version_requirements.txt diff --git a/build/pkgs/snowballstemmer/install-requires.txt b/build/pkgs/snowballstemmer/version_requirements.txt similarity index 100% rename from build/pkgs/snowballstemmer/install-requires.txt rename to build/pkgs/snowballstemmer/version_requirements.txt diff --git a/build/pkgs/soupsieve/install-requires.txt b/build/pkgs/soupsieve/version_requirements.txt similarity index 100% rename from build/pkgs/soupsieve/install-requires.txt rename to build/pkgs/soupsieve/version_requirements.txt diff --git a/build/pkgs/sphinx/install-requires.txt b/build/pkgs/sphinx/version_requirements.txt similarity index 100% rename from build/pkgs/sphinx/install-requires.txt rename to build/pkgs/sphinx/version_requirements.txt diff --git a/build/pkgs/sphinx_basic_ng/install-requires.txt b/build/pkgs/sphinx_basic_ng/version_requirements.txt similarity index 100% rename from build/pkgs/sphinx_basic_ng/install-requires.txt rename to build/pkgs/sphinx_basic_ng/version_requirements.txt diff --git a/build/pkgs/sphinx_copybutton/install-requires.txt b/build/pkgs/sphinx_copybutton/version_requirements.txt similarity index 100% rename from build/pkgs/sphinx_copybutton/install-requires.txt rename to build/pkgs/sphinx_copybutton/version_requirements.txt diff --git a/build/pkgs/sphinx_inline_tabs/install-requires.txt b/build/pkgs/sphinx_inline_tabs/version_requirements.txt similarity index 100% rename from build/pkgs/sphinx_inline_tabs/install-requires.txt rename to build/pkgs/sphinx_inline_tabs/version_requirements.txt diff --git a/build/pkgs/sphinxcontrib_applehelp/install-requires.txt b/build/pkgs/sphinxcontrib_applehelp/version_requirements.txt similarity index 100% rename from build/pkgs/sphinxcontrib_applehelp/install-requires.txt rename to build/pkgs/sphinxcontrib_applehelp/version_requirements.txt diff --git a/build/pkgs/sphinxcontrib_devhelp/install-requires.txt b/build/pkgs/sphinxcontrib_devhelp/version_requirements.txt similarity index 100% rename from build/pkgs/sphinxcontrib_devhelp/install-requires.txt rename to build/pkgs/sphinxcontrib_devhelp/version_requirements.txt diff --git a/build/pkgs/sphinxcontrib_htmlhelp/install-requires.txt b/build/pkgs/sphinxcontrib_htmlhelp/version_requirements.txt similarity index 100% rename from build/pkgs/sphinxcontrib_htmlhelp/install-requires.txt rename to build/pkgs/sphinxcontrib_htmlhelp/version_requirements.txt diff --git a/build/pkgs/sphinxcontrib_jsmath/install-requires.txt b/build/pkgs/sphinxcontrib_jsmath/version_requirements.txt similarity index 100% rename from build/pkgs/sphinxcontrib_jsmath/install-requires.txt rename to build/pkgs/sphinxcontrib_jsmath/version_requirements.txt diff --git a/build/pkgs/sphinxcontrib_qthelp/install-requires.txt b/build/pkgs/sphinxcontrib_qthelp/version_requirements.txt similarity index 100% rename from build/pkgs/sphinxcontrib_qthelp/install-requires.txt rename to build/pkgs/sphinxcontrib_qthelp/version_requirements.txt diff --git a/build/pkgs/sphinxcontrib_serializinghtml/install-requires.txt b/build/pkgs/sphinxcontrib_serializinghtml/version_requirements.txt similarity index 100% rename from build/pkgs/sphinxcontrib_serializinghtml/install-requires.txt rename to build/pkgs/sphinxcontrib_serializinghtml/version_requirements.txt diff --git a/build/pkgs/sphinxcontrib_websupport/install-requires.txt b/build/pkgs/sphinxcontrib_websupport/version_requirements.txt similarity index 100% rename from build/pkgs/sphinxcontrib_websupport/install-requires.txt rename to build/pkgs/sphinxcontrib_websupport/version_requirements.txt diff --git a/build/pkgs/stack_data/install-requires.txt b/build/pkgs/stack_data/version_requirements.txt similarity index 100% rename from build/pkgs/stack_data/install-requires.txt rename to build/pkgs/stack_data/version_requirements.txt diff --git a/build/pkgs/symengine_py/install-requires.txt b/build/pkgs/symengine_py/version_requirements.txt similarity index 100% rename from build/pkgs/symengine_py/install-requires.txt rename to build/pkgs/symengine_py/version_requirements.txt diff --git a/build/pkgs/sympy/install-requires.txt b/build/pkgs/sympy/version_requirements.txt similarity index 100% rename from build/pkgs/sympy/install-requires.txt rename to build/pkgs/sympy/version_requirements.txt diff --git a/build/pkgs/terminado/install-requires.txt b/build/pkgs/terminado/version_requirements.txt similarity index 100% rename from build/pkgs/terminado/install-requires.txt rename to build/pkgs/terminado/version_requirements.txt diff --git a/build/pkgs/texttable/install-requires.txt b/build/pkgs/texttable/version_requirements.txt similarity index 100% rename from build/pkgs/texttable/install-requires.txt rename to build/pkgs/texttable/version_requirements.txt diff --git a/build/pkgs/tinycss2/install-requires.txt b/build/pkgs/tinycss2/version_requirements.txt similarity index 100% rename from build/pkgs/tinycss2/install-requires.txt rename to build/pkgs/tinycss2/version_requirements.txt diff --git a/build/pkgs/tomli/install-requires.txt b/build/pkgs/tomli/version_requirements.txt similarity index 100% rename from build/pkgs/tomli/install-requires.txt rename to build/pkgs/tomli/version_requirements.txt diff --git a/build/pkgs/tornado/install-requires.txt b/build/pkgs/tornado/version_requirements.txt similarity index 100% rename from build/pkgs/tornado/install-requires.txt rename to build/pkgs/tornado/version_requirements.txt diff --git a/build/pkgs/tox/install-requires.txt b/build/pkgs/tox/version_requirements.txt similarity index 100% rename from build/pkgs/tox/install-requires.txt rename to build/pkgs/tox/version_requirements.txt diff --git a/build/pkgs/traitlets/install-requires.txt b/build/pkgs/traitlets/version_requirements.txt similarity index 100% rename from build/pkgs/traitlets/install-requires.txt rename to build/pkgs/traitlets/version_requirements.txt diff --git a/build/pkgs/trove_classifiers/install-requires.txt b/build/pkgs/trove_classifiers/version_requirements.txt similarity index 100% rename from build/pkgs/trove_classifiers/install-requires.txt rename to build/pkgs/trove_classifiers/version_requirements.txt diff --git a/build/pkgs/types_python_dateutil/install-requires.txt b/build/pkgs/types_python_dateutil/version_requirements.txt similarity index 100% rename from build/pkgs/types_python_dateutil/install-requires.txt rename to build/pkgs/types_python_dateutil/version_requirements.txt diff --git a/build/pkgs/typing_extensions/install-requires.txt b/build/pkgs/typing_extensions/version_requirements.txt similarity index 100% rename from build/pkgs/typing_extensions/install-requires.txt rename to build/pkgs/typing_extensions/version_requirements.txt diff --git a/build/pkgs/tzdata/install-requires.txt b/build/pkgs/tzdata/version_requirements.txt similarity index 100% rename from build/pkgs/tzdata/install-requires.txt rename to build/pkgs/tzdata/version_requirements.txt diff --git a/build/pkgs/tzlocal/install-requires.txt b/build/pkgs/tzlocal/version_requirements.txt similarity index 100% rename from build/pkgs/tzlocal/install-requires.txt rename to build/pkgs/tzlocal/version_requirements.txt diff --git a/build/pkgs/uri_template/install-requires.txt b/build/pkgs/uri_template/version_requirements.txt similarity index 100% rename from build/pkgs/uri_template/install-requires.txt rename to build/pkgs/uri_template/version_requirements.txt diff --git a/build/pkgs/urllib3/install-requires.txt b/build/pkgs/urllib3/version_requirements.txt similarity index 100% rename from build/pkgs/urllib3/install-requires.txt rename to build/pkgs/urllib3/version_requirements.txt diff --git a/build/pkgs/virtualenv/install-requires.txt b/build/pkgs/virtualenv/version_requirements.txt similarity index 100% rename from build/pkgs/virtualenv/install-requires.txt rename to build/pkgs/virtualenv/version_requirements.txt diff --git a/build/pkgs/wcwidth/install-requires.txt b/build/pkgs/wcwidth/version_requirements.txt similarity index 100% rename from build/pkgs/wcwidth/install-requires.txt rename to build/pkgs/wcwidth/version_requirements.txt diff --git a/build/pkgs/webcolors/install-requires.txt b/build/pkgs/webcolors/version_requirements.txt similarity index 100% rename from build/pkgs/webcolors/install-requires.txt rename to build/pkgs/webcolors/version_requirements.txt diff --git a/build/pkgs/webencodings/install-requires.txt b/build/pkgs/webencodings/version_requirements.txt similarity index 100% rename from build/pkgs/webencodings/install-requires.txt rename to build/pkgs/webencodings/version_requirements.txt diff --git a/build/pkgs/websocket_client/install-requires.txt b/build/pkgs/websocket_client/version_requirements.txt similarity index 100% rename from build/pkgs/websocket_client/install-requires.txt rename to build/pkgs/websocket_client/version_requirements.txt diff --git a/build/pkgs/wheel/install-requires.txt b/build/pkgs/wheel/version_requirements.txt similarity index 100% rename from build/pkgs/wheel/install-requires.txt rename to build/pkgs/wheel/version_requirements.txt diff --git a/build/pkgs/widgetsnbextension/install-requires.txt b/build/pkgs/widgetsnbextension/version_requirements.txt similarity index 100% rename from build/pkgs/widgetsnbextension/install-requires.txt rename to build/pkgs/widgetsnbextension/version_requirements.txt diff --git a/build/pkgs/zipp/install-requires.txt b/build/pkgs/zipp/version_requirements.txt similarity index 100% rename from build/pkgs/zipp/install-requires.txt rename to build/pkgs/zipp/version_requirements.txt diff --git a/build/sage_bootstrap/app.py b/build/sage_bootstrap/app.py index 794665baf4e..96bca3a6d8c 100644 --- a/build/sage_bootstrap/app.py +++ b/build/sage_bootstrap/app.py @@ -258,7 +258,7 @@ def update_latest(self, package_name, commit=False): pkg = Package(package_name) dist_name = pkg.distribution_name if dist_name is None: - log.debug('%s does not have Python distribution info in install-requires.txt' % pkg) + log.debug('%s does not have Python distribution info in version_requirements.txt' % pkg) return if pkg.tarball_pattern.endswith('.whl'): source = 'wheel' @@ -279,7 +279,7 @@ def update_latest_cls(self, package_name_or_class, commit=False): 'cypari' # Name conflict ] # Restrict to normal Python packages - pc = PackageClass(package_name_or_class, has_files=['checksums.ini', 'install-requires.txt']) + pc = PackageClass(package_name_or_class, has_files=['checksums.ini', 'version_requirements.txt']) if not pc.names: log.warn('nothing to do (does not name a normal Python package)') for package_name in sorted(pc.names): diff --git a/build/sage_bootstrap/creator.py b/build/sage_bootstrap/creator.py index a7455b2ba26..a738d772215 100644 --- a/build/sage_bootstrap/creator.py +++ b/build/sage_bootstrap/creator.py @@ -110,9 +110,9 @@ def set_python_data_and_scripts(self, pypi_package_name=None, source='normal'): Write the file ``dependencies`` and other files for Python packages. If ``source`` is ``"normal"``, write the files ``spkg-install.in`` and - ``install-requires.txt``. + ``version_requirements.txt``. - If ``source`` is ``"wheel"``, write the file ``install-requires.txt``. + If ``source`` is ``"wheel"``, write the file ``version_requirements.txt``. If ``source`` is ``"pip"``, write the file ``requirements.txt``. @@ -126,12 +126,12 @@ def set_python_data_and_scripts(self, pypi_package_name=None, source='normal'): if source == 'normal': with open(os.path.join(self.path, 'spkg-install.in'), 'w+') as f: f.write('cd src\nsdh_pip_install .\n') - with open(os.path.join(self.path, 'install-requires.txt'), 'w+') as f: + with open(os.path.join(self.path, 'version_requirements.txt'), 'w+') as f: f.write('{0}\n'.format(pypi_package_name)) # Remove this file, which would mark the package as a pip package. self._remove_files(['requirements.txt']) elif source == 'wheel': - with open(os.path.join(self.path, 'install-requires.txt'), 'w+') as f: + with open(os.path.join(self.path, 'version_requirements.txt'), 'w+') as f: f.write('{0}\n'.format(pypi_package_name)) # Remove this file, which would mark the package as a pip package. self._remove_files(['requirements.txt']) diff --git a/build/sage_bootstrap/package.py b/build/sage_bootstrap/package.py index 8c76f71a8ea..aea31e4b6a4 100644 --- a/build/sage_bootstrap/package.py +++ b/build/sage_bootstrap/package.py @@ -46,7 +46,7 @@ def __init__(self, package_name): self._init_checksum() self._init_version() self._init_type() - self._init_install_requires() + self._init_version_requirements() self._init_dependencies() self._init_trees() @@ -344,7 +344,7 @@ def trees(self): """ if self.__trees is not None: return self.__trees - if self.__install_requires is not None: + if self.__version_requirements is not None: return 'SAGE_VENV' if self.has_file('requirements.txt'): return 'SAGE_VENV' @@ -355,9 +355,9 @@ def distribution_name(self): """ Return the Python distribution name or ``None`` for non-Python packages """ - if self.__install_requires is None: + if self.__version_requirements is None: return None - for line in self.__install_requires.split('\n'): + for line in self.__version_requirements.split('\n'): line = line.strip() if line.startswith('#'): continue @@ -510,12 +510,12 @@ def _init_type(self): ] self.__type = package_type - def _init_install_requires(self): + def _init_version_requirements(self): try: - with open(os.path.join(self.path, 'install-requires.txt')) as f: - self.__install_requires = f.read().strip() + with open(os.path.join(self.path, 'version_requirements.txt')) as f: + self.__version_requirements = f.read().strip() except IOError: - self.__install_requires = None + self.__version_requirements = None def _init_dependencies(self): try: diff --git a/m4/sage_python_package_check.m4 b/m4/sage_python_package_check.m4 index 508495329e9..6465a67d7c0 100644 --- a/m4/sage_python_package_check.m4 +++ b/m4/sage_python_package_check.m4 @@ -8,7 +8,7 @@ # Determine if the system copy of a python package can be used by sage. # # This macro uses setuptools.version's pkg_resources to check that the -# "install-requires.txt" file for the named package is satisfied, and +# "version_requirements.txt" file for the named package is satisfied, and # it can typically fail in four ways: # # 1. If --enable-system-site-packages was not passed to ./configure, @@ -19,7 +19,7 @@ # # 4. If setuptools is not available to the system python, # -# 5. If the contents of install-requires.txt are not met (wrong +# 5. If the contents of version_requirements.txt are not met (wrong # version, no version, etc.) by the system python. # # In any of those cases, we set sage_spkg_install_$package to "yes" @@ -56,7 +56,7 @@ AC_DEFUN([SAGE_PYTHON_PACKAGE_CHECK], [ config.venv dnl 2>&AS_MESSAGE_LOG_FD], [ AC_MSG_RESULT(yes) - dnl strip all comments from install-requires.txt; this should leave + dnl strip all comments from version_requirements.txt; this should leave dnl only a single line containing the version specification for this dnl package. Afterwards, convert all double-quotes to single quotes. dnl Both work, but only single quotes are documented. However, at the @@ -67,7 +67,7 @@ AC_DEFUN([SAGE_PYTHON_PACKAGE_CHECK], [ SAGE_PKG_VERSPEC=$(sed \ -e '/^#/d' \ -e "s/\"/'/g" \ - "./build/pkgs/$1/install-requires.txt" + "./build/pkgs/$1/version_requirements.txt" ) AC_MSG_CHECKING([for python package $1 ("${SAGE_PKG_VERSPEC}")]) diff --git a/src/bin/sage-update-version b/src/bin/sage-update-version index 3b7358d2929..c6680918a36 100755 --- a/src/bin/sage-update-version +++ b/src/bin/sage-update-version @@ -43,9 +43,9 @@ for version_file in "$SAGE_ROOT"/pkgs/*/VERSION.txt; do fi done -# Update install-requires.txt for all distribution packages +# Update version_requirements.txt for all distribution packages ( cd "$SAGE_ROOT"/build/pkgs/ && for spkg in sage*; do - if [ -f "$spkg"/install-requires.txt -a -d "$spkg"/src ]; then + if [ -f "$spkg"/version_requirements.txt -a -d "$spkg"/src ]; then ( echo "# This file is updated on every release by the sage-update-version script" # Normalize the package name to PyPI convention (dashes, not underscores) if [ "$spkg" = sagelib ]; then @@ -58,7 +58,7 @@ done version=${version//.beta/b} version=${version//.rc/rc} # ~= asks for a compatible release. https://peps.python.org/pep-0440/#compatible-release - echo "$pkg ~= $version" ) > "$spkg"/install-requires.txt + echo "$pkg ~= $version" ) > "$spkg"/version_requirements.txt fi done ) @@ -121,7 +121,7 @@ git commit -m "Updated SageMath version to $SAGE_VERSION" -- \ "$SAGE_SRC/bin/sage-version.sh" \ "$SAGE_ROOT/build/pkgs/configure/checksums.ini" \ "$SAGE_ROOT/build/pkgs/configure/package-version.txt" \ - "$SAGE_ROOT/build/pkgs/*/install-requires.txt" \ + "$SAGE_ROOT/build/pkgs/*/version_requirements.txt" \ "$SAGE_ROOT"/pkgs/*/VERSION.txt \ "$SAGE_ROOT/.upstream.d/20-github.com-sagemath-sage-releases" \ || die "Error committing to the repository." diff --git a/src/doc/en/developer/packaging.rst b/src/doc/en/developer/packaging.rst index f627e969ee4..6775650ab7f 100644 --- a/src/doc/en/developer/packaging.rst +++ b/src/doc/en/developer/packaging.rst @@ -623,18 +623,18 @@ For example, the ``scipy`` ``spkg-check.in`` file contains the line exec python3 spkg-check.py -Abstract requirements: The ``install-requires.txt`` file -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +Abstract requirements: The ``version_requirements.txt`` file +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ All ``normal`` Python packages and all ``wheel`` packages must have a file -``install-requires.txt``. For ``pip`` packages, the file is optional; if +``version_requirements.txt``. For ``pip`` packages, the file is optional; if it is missing, the ``requirements.txt`` file is used instead. -If a Python package is available on PyPI, the ``install-requires.txt`` file must +If a Python package is available on PyPI, the ``version_requirements.txt`` file must contain the name of the package as it is known to PyPI. Optionally, -``install-requires.txt`` can encode version constraints (such as lower +``version_requirements.txt`` can encode version constraints (such as lower and upper bounds). The constraints are in the format of the ``install_requires`` key of `setup.cfg `_ @@ -661,7 +661,7 @@ For example: $ cat build/pkgs/sphinx/package-version.txt 3.1.2.p0 - $ cat build/pkgs/sphinx/install-requires.txt + $ cat build/pkgs/sphinx/version_requirements.txt # gentoo uses 3.2.1 sphinx >=3, <3.3 @@ -669,7 +669,7 @@ The comments may include links to GitHub Issues/PRs, as in the following example .. CODE-BLOCK:: bash - $ cat build/pkgs/packaging/install-requires.txt + $ cat build/pkgs/packaging/version_requirements.txt packaging >=18.0 # Issue #30975: packaging 20.5 is known to work # but we have to silence "DeprecationWarning: Creating a LegacyVersion" @@ -933,7 +933,7 @@ Where packages are installed The Sage distribution has the notion of several installation trees. - ``$SAGE_VENV`` is the default installation tree for all Python packages, i.e., - normal packages with an ``install-requires.txt``, wheel packages, and pip packages + normal packages with an ``version_requirements.txt``, wheel packages, and pip packages with a ``requirements.txt``. - ``$SAGE_LOCAL`` is the default installation tree for all non-Python packages. @@ -1073,7 +1073,7 @@ The ``dependencies`` file may need editing (watch out for warnings regarding ``--no-deps`` that Sage issues during installation of the package!). Also you may want to set lower and upper bounds for acceptable package versions -in the file ``install-requires.txt``. (Make sure that the version in +in the file ``version_requirements.txt``. (Make sure that the version in ``package-version.txt`` falls within this acceptable version range!) By default, when the package is available as a platform-independent @@ -1113,7 +1113,7 @@ For Python packages available from PyPI, there is another shortcut:: When preparing the update, check that any lower and upper bounds for acceptable package versions that may be declared in the file -``install-requires.txt`` are still correct, and update them as needed. +``version_requirements.txt`` are still correct, and update them as needed. The version in ``package-version.txt`` always needs to fall within the version range! diff --git a/src/doc/en/developer/packaging_sage_library.rst b/src/doc/en/developer/packaging_sage_library.rst index 048a14ced5c..137ba0d7c32 100644 --- a/src/doc/en/developer/packaging_sage_library.rst +++ b/src/doc/en/developer/packaging_sage_library.rst @@ -512,7 +512,7 @@ Version constraints of dependencies ----------------------------------- The version information for dependencies comes from the files -``build/pkgs/*/install-requires.txt`` and +``build/pkgs/*/version_requirements.txt`` and ``build/pkgs/*/package-version.txt``. We use the `m4 `_ macro processor to insert the version information in the generated files