From 0e953c1bbd3150ee9598375419947c4b1ec4283c Mon Sep 17 00:00:00 2001 From: Matthias Koeppe Date: Fri, 1 Sep 2023 23:59:36 -0700 Subject: [PATCH 01/11] build/pkgs/tox: Update, update dependencies --- build/pkgs/cachetools/SPKG.rst | 18 ++++++++++++++++++ build/pkgs/cachetools/checksums.ini | 5 +++++ build/pkgs/{toml => cachetools}/dependencies | 0 build/pkgs/cachetools/install-requires.txt | 1 + build/pkgs/cachetools/package-version.txt | 1 + build/pkgs/{toml => cachetools}/type | 0 build/pkgs/chardet/SPKG.rst | 18 ++++++++++++++++++ build/pkgs/chardet/checksums.ini | 5 +++++ build/pkgs/chardet/dependencies | 4 ++++ build/pkgs/chardet/install-requires.txt | 1 + build/pkgs/chardet/package-version.txt | 1 + build/pkgs/chardet/type | 1 + build/pkgs/colorama/SPKG.rst | 16 ++++++++++++++++ build/pkgs/colorama/checksums.ini | 5 +++++ build/pkgs/colorama/dependencies | 4 ++++ build/pkgs/colorama/install-requires.txt | 1 + build/pkgs/colorama/package-version.txt | 1 + build/pkgs/colorama/type | 1 + build/pkgs/distlib/checksums.ini | 6 +++--- build/pkgs/distlib/package-version.txt | 2 +- build/pkgs/editables/checksums.ini | 6 +++--- build/pkgs/editables/package-version.txt | 2 +- build/pkgs/filelock/SPKG.rst | 6 ++---- build/pkgs/filelock/checksums.ini | 10 +++++----- build/pkgs/filelock/package-version.txt | 2 +- build/pkgs/filelock/spkg-install.in | 2 -- build/pkgs/packaging/checksums.ini | 6 +++--- build/pkgs/packaging/package-version.txt | 2 +- build/pkgs/platformdirs/checksums.ini | 6 +++--- build/pkgs/platformdirs/package-version.txt | 2 +- build/pkgs/pluggy/SPKG.rst | 2 +- build/pkgs/pluggy/checksums.ini | 10 +++++----- build/pkgs/pluggy/package-version.txt | 2 +- build/pkgs/pluggy/spkg-install.in | 2 -- build/pkgs/pyproject_api/SPKG.rst | 16 ++++++++++++++++ build/pkgs/pyproject_api/checksums.ini | 5 +++++ build/pkgs/pyproject_api/dependencies | 4 ++++ build/pkgs/pyproject_api/install-requires.txt | 1 + build/pkgs/pyproject_api/package-version.txt | 1 + build/pkgs/pyproject_api/type | 1 + build/pkgs/toml/SPKG.rst | 18 ------------------ build/pkgs/toml/checksums.ini | 5 ----- build/pkgs/toml/distros/conda.txt | 1 - build/pkgs/toml/distros/void.txt | 1 - build/pkgs/toml/install-requires.txt | 1 - build/pkgs/toml/package-version.txt | 1 - build/pkgs/toml/spkg-configure.m4 | 7 ------- build/pkgs/toml/spkg-install.in | 2 -- build/pkgs/tox/SPKG.rst | 2 -- build/pkgs/tox/checksums.ini | 10 +++++----- build/pkgs/tox/dependencies | 2 +- build/pkgs/tox/install-requires.txt | 2 +- build/pkgs/tox/package-version.txt | 2 +- build/pkgs/tox/spkg-install.in | 2 -- build/pkgs/virtualenv/SPKG.rst | 2 -- build/pkgs/virtualenv/checksums.ini | 10 +++++----- build/pkgs/virtualenv/dependencies | 2 +- build/pkgs/virtualenv/package-version.txt | 2 +- build/pkgs/virtualenv/spkg-install.in | 2 -- 59 files changed, 157 insertions(+), 96 deletions(-) create mode 100644 build/pkgs/cachetools/SPKG.rst create mode 100644 build/pkgs/cachetools/checksums.ini rename build/pkgs/{toml => cachetools}/dependencies (100%) create mode 100644 build/pkgs/cachetools/install-requires.txt create mode 100644 build/pkgs/cachetools/package-version.txt rename build/pkgs/{toml => cachetools}/type (100%) create mode 100644 build/pkgs/chardet/SPKG.rst create mode 100644 build/pkgs/chardet/checksums.ini create mode 100644 build/pkgs/chardet/dependencies create mode 100644 build/pkgs/chardet/install-requires.txt create mode 100644 build/pkgs/chardet/package-version.txt create mode 100644 build/pkgs/chardet/type create mode 100644 build/pkgs/colorama/SPKG.rst create mode 100644 build/pkgs/colorama/checksums.ini create mode 100644 build/pkgs/colorama/dependencies create mode 100644 build/pkgs/colorama/install-requires.txt create mode 100644 build/pkgs/colorama/package-version.txt create mode 100644 build/pkgs/colorama/type delete mode 100644 build/pkgs/filelock/spkg-install.in delete mode 100644 build/pkgs/pluggy/spkg-install.in create mode 100644 build/pkgs/pyproject_api/SPKG.rst create mode 100644 build/pkgs/pyproject_api/checksums.ini create mode 100644 build/pkgs/pyproject_api/dependencies create mode 100644 build/pkgs/pyproject_api/install-requires.txt create mode 100644 build/pkgs/pyproject_api/package-version.txt create mode 100644 build/pkgs/pyproject_api/type delete mode 100644 build/pkgs/toml/SPKG.rst delete mode 100644 build/pkgs/toml/checksums.ini delete mode 100644 build/pkgs/toml/distros/conda.txt delete mode 100644 build/pkgs/toml/distros/void.txt delete mode 100644 build/pkgs/toml/install-requires.txt delete mode 100644 build/pkgs/toml/package-version.txt delete mode 100644 build/pkgs/toml/spkg-configure.m4 delete mode 100644 build/pkgs/toml/spkg-install.in delete mode 100644 build/pkgs/tox/spkg-install.in delete mode 100644 build/pkgs/virtualenv/spkg-install.in diff --git a/build/pkgs/cachetools/SPKG.rst b/build/pkgs/cachetools/SPKG.rst new file mode 100644 index 00000000000..30035dfd3cd --- /dev/null +++ b/build/pkgs/cachetools/SPKG.rst @@ -0,0 +1,18 @@ +cachetools: Extensible memoizing collections and decorators +=========================================================== + +Description +----------- + +Extensible memoizing collections and decorators + +License +------- + +MIT + +Upstream Contact +---------------- + +https://pypi.org/project/cachetools/ + diff --git a/build/pkgs/cachetools/checksums.ini b/build/pkgs/cachetools/checksums.ini new file mode 100644 index 00000000000..0ffe70b3b2f --- /dev/null +++ b/build/pkgs/cachetools/checksums.ini @@ -0,0 +1,5 @@ +tarball=cachetools-VERSION-py3-none-any.whl +sha1=f7deaa4b10ae6d8955c83b0573e5b80f84e5d87a +md5=7375eb8031ea2c95b91d2406c29e9379 +cksum=3631496040 +upstream_url=https://pypi.io/packages/py3/c/cachetools/cachetools-VERSION-py3-none-any.whl diff --git a/build/pkgs/toml/dependencies b/build/pkgs/cachetools/dependencies similarity index 100% rename from build/pkgs/toml/dependencies rename to build/pkgs/cachetools/dependencies diff --git a/build/pkgs/cachetools/install-requires.txt b/build/pkgs/cachetools/install-requires.txt new file mode 100644 index 00000000000..50d14084a9b --- /dev/null +++ b/build/pkgs/cachetools/install-requires.txt @@ -0,0 +1 @@ +cachetools diff --git a/build/pkgs/cachetools/package-version.txt b/build/pkgs/cachetools/package-version.txt new file mode 100644 index 00000000000..c7cb1311a64 --- /dev/null +++ b/build/pkgs/cachetools/package-version.txt @@ -0,0 +1 @@ +5.3.1 diff --git a/build/pkgs/toml/type b/build/pkgs/cachetools/type similarity index 100% rename from build/pkgs/toml/type rename to build/pkgs/cachetools/type diff --git a/build/pkgs/chardet/SPKG.rst b/build/pkgs/chardet/SPKG.rst new file mode 100644 index 00000000000..6e5a717cca5 --- /dev/null +++ b/build/pkgs/chardet/SPKG.rst @@ -0,0 +1,18 @@ +chardet: Universal encoding detector for Python 3 +================================================= + +Description +----------- + +Universal encoding detector for Python 3 + +License +------- + +LGPL + +Upstream Contact +---------------- + +https://pypi.org/project/chardet/ + diff --git a/build/pkgs/chardet/checksums.ini b/build/pkgs/chardet/checksums.ini new file mode 100644 index 00000000000..9911b1d139e --- /dev/null +++ b/build/pkgs/chardet/checksums.ini @@ -0,0 +1,5 @@ +tarball=chardet-VERSION-py3-none-any.whl +sha1=2facc0387556aa8a2956ef682d49fc3eae56d30a +md5=b9eda7cd7d1582e269bd8eb7ffc4fcad +cksum=1563594607 +upstream_url=https://pypi.io/packages/py3/c/chardet/chardet-VERSION-py3-none-any.whl diff --git a/build/pkgs/chardet/dependencies b/build/pkgs/chardet/dependencies new file mode 100644 index 00000000000..0738c2d7777 --- /dev/null +++ b/build/pkgs/chardet/dependencies @@ -0,0 +1,4 @@ +$(PYTHON) | $(PYTHON_TOOLCHAIN) + +---------- +All lines of this file are ignored except the first. diff --git a/build/pkgs/chardet/install-requires.txt b/build/pkgs/chardet/install-requires.txt new file mode 100644 index 00000000000..79236f25cda --- /dev/null +++ b/build/pkgs/chardet/install-requires.txt @@ -0,0 +1 @@ +chardet diff --git a/build/pkgs/chardet/package-version.txt b/build/pkgs/chardet/package-version.txt new file mode 100644 index 00000000000..91ff57278e3 --- /dev/null +++ b/build/pkgs/chardet/package-version.txt @@ -0,0 +1 @@ +5.2.0 diff --git a/build/pkgs/chardet/type b/build/pkgs/chardet/type new file mode 100644 index 00000000000..a6a7b9cd726 --- /dev/null +++ b/build/pkgs/chardet/type @@ -0,0 +1 @@ +standard diff --git a/build/pkgs/colorama/SPKG.rst b/build/pkgs/colorama/SPKG.rst new file mode 100644 index 00000000000..3335092e4c7 --- /dev/null +++ b/build/pkgs/colorama/SPKG.rst @@ -0,0 +1,16 @@ +colorama: Cross-platform colored terminal text. +=============================================== + +Description +----------- + +Cross-platform colored terminal text. + +License +------- + +Upstream Contact +---------------- + +https://pypi.org/project/colorama/ + diff --git a/build/pkgs/colorama/checksums.ini b/build/pkgs/colorama/checksums.ini new file mode 100644 index 00000000000..e625d548a68 --- /dev/null +++ b/build/pkgs/colorama/checksums.ini @@ -0,0 +1,5 @@ +tarball=colorama-VERSION-py2.py3-none-any.whl +sha1=d6ab1608850fecfc0e1cf50bf93d743695c04027 +md5=3fc7a89530d68d7ea231ebe779c0db9c +cksum=3297334831 +upstream_url=https://pypi.io/packages/py2.py3/c/colorama/colorama-VERSION-py2.py3-none-any.whl diff --git a/build/pkgs/colorama/dependencies b/build/pkgs/colorama/dependencies new file mode 100644 index 00000000000..0738c2d7777 --- /dev/null +++ b/build/pkgs/colorama/dependencies @@ -0,0 +1,4 @@ +$(PYTHON) | $(PYTHON_TOOLCHAIN) + +---------- +All lines of this file are ignored except the first. diff --git a/build/pkgs/colorama/install-requires.txt b/build/pkgs/colorama/install-requires.txt new file mode 100644 index 00000000000..3fcfb51b2ad --- /dev/null +++ b/build/pkgs/colorama/install-requires.txt @@ -0,0 +1 @@ +colorama diff --git a/build/pkgs/colorama/package-version.txt b/build/pkgs/colorama/package-version.txt new file mode 100644 index 00000000000..ef52a648073 --- /dev/null +++ b/build/pkgs/colorama/package-version.txt @@ -0,0 +1 @@ +0.4.6 diff --git a/build/pkgs/colorama/type b/build/pkgs/colorama/type new file mode 100644 index 00000000000..a6a7b9cd726 --- /dev/null +++ b/build/pkgs/colorama/type @@ -0,0 +1 @@ +standard diff --git a/build/pkgs/distlib/checksums.ini b/build/pkgs/distlib/checksums.ini index 1d749b2f9a7..be255ceca11 100644 --- a/build/pkgs/distlib/checksums.ini +++ b/build/pkgs/distlib/checksums.ini @@ -1,5 +1,5 @@ tarball=distlib-VERSION.tar.gz -sha1=3a86d49dc17320325004564d0dc86afa808624bc -md5=f60ba4e3f8e76c214d3d00b2227a16f7 -cksum=1543870863 +sha1=5c99f8bd1cc58c387a8d22afa632f81c6fec9993 +md5=44e4357e35bbd77fdf1b81e174e34f20 +cksum=3690000669 upstream_url=https://pypi.io/packages/source/d/distlib/distlib-VERSION.tar.gz diff --git a/build/pkgs/distlib/package-version.txt b/build/pkgs/distlib/package-version.txt index 449d7e73a96..0f82685331e 100644 --- a/build/pkgs/distlib/package-version.txt +++ b/build/pkgs/distlib/package-version.txt @@ -1 +1 @@ -0.3.6 +0.3.7 diff --git a/build/pkgs/editables/checksums.ini b/build/pkgs/editables/checksums.ini index 6a0618183b7..52c7fa0b03b 100644 --- a/build/pkgs/editables/checksums.ini +++ b/build/pkgs/editables/checksums.ini @@ -1,5 +1,5 @@ tarball=editables-VERSION.tar.gz -sha1=a99e0ba3d75e4f439b9742e65cbff24e0b8ce80e -md5=e91709fbb0ef586cb7b785042068ab67 -cksum=2338248945 +sha1=90efed858e78bf6276d1a5959ec6692e11a6bce9 +md5=520de8c3a9dc5dfb2b365d104541c9de +cksum=3074203672 upstream_url=https://pypi.io/packages/source/e/editables/editables-VERSION.tar.gz diff --git a/build/pkgs/editables/package-version.txt b/build/pkgs/editables/package-version.txt index be586341736..2eb3c4fe4ee 100644 --- a/build/pkgs/editables/package-version.txt +++ b/build/pkgs/editables/package-version.txt @@ -1 +1 @@ -0.3 +0.5 diff --git a/build/pkgs/filelock/SPKG.rst b/build/pkgs/filelock/SPKG.rst index d39b439be2e..448c283aa3d 100644 --- a/build/pkgs/filelock/SPKG.rst +++ b/build/pkgs/filelock/SPKG.rst @@ -1,5 +1,5 @@ -filelock: A platform independent file lock -========================================== +filelock: A platform independent file lock. +=========================================== Description ----------- @@ -9,8 +9,6 @@ A platform independent file lock. License ------- -Public Domain - Upstream Contact ---------------- diff --git a/build/pkgs/filelock/checksums.ini b/build/pkgs/filelock/checksums.ini index 48a18055930..0d412bb2ca3 100644 --- a/build/pkgs/filelock/checksums.ini +++ b/build/pkgs/filelock/checksums.ini @@ -1,5 +1,5 @@ -tarball=filelock-VERSION.tar.gz -sha1=1de304add05b7e3e8874aa9f86202204f8042e30 -md5=9bd8d33d5d7dc95012981ccbfb2d2a0f -cksum=2335245752 -upstream_url=https://pypi.io/packages/source/f/filelock/filelock-VERSION.tar.gz +tarball=filelock-VERSION-py3-none-any.whl +sha1=74f5368865bf05ddc5b69949e4547ad25c078fc1 +md5=63b0f117cb65ef531ffafb566170661e +cksum=1046951951 +upstream_url=https://pypi.io/packages/py3/f/filelock/filelock-VERSION-py3-none-any.whl diff --git a/build/pkgs/filelock/package-version.txt b/build/pkgs/filelock/package-version.txt index 19811903a7f..871f80a34be 100644 --- a/build/pkgs/filelock/package-version.txt +++ b/build/pkgs/filelock/package-version.txt @@ -1 +1 @@ -3.8.0 +3.12.3 diff --git a/build/pkgs/filelock/spkg-install.in b/build/pkgs/filelock/spkg-install.in deleted file mode 100644 index 37ac1a53437..00000000000 --- a/build/pkgs/filelock/spkg-install.in +++ /dev/null @@ -1,2 +0,0 @@ -cd src -sdh_pip_install . diff --git a/build/pkgs/packaging/checksums.ini b/build/pkgs/packaging/checksums.ini index c8c315c78c8..83ab122e324 100644 --- a/build/pkgs/packaging/checksums.ini +++ b/build/pkgs/packaging/checksums.ini @@ -1,5 +1,5 @@ tarball=packaging-VERSION.tar.gz -sha1=b8caff3bec760723db6af4092c68075e22bdb769 -md5=e713c1939f294fd729af4a7be40dd141 -cksum=2539089468 +sha1=1245c28c10ae6cb80164f081daece224b6fa89bc +md5=f7d5c39c6f92cc2dfa1293ba8f6c097c +cksum=11867377 upstream_url=https://pypi.io/packages/source/p/packaging/packaging-VERSION.tar.gz diff --git a/build/pkgs/packaging/package-version.txt b/build/pkgs/packaging/package-version.txt index 8e5954eb6f3..a12b18e4372 100644 --- a/build/pkgs/packaging/package-version.txt +++ b/build/pkgs/packaging/package-version.txt @@ -1 +1 @@ -21.3 +23.1 diff --git a/build/pkgs/platformdirs/checksums.ini b/build/pkgs/platformdirs/checksums.ini index 604aa7f6c99..288483e8fc2 100644 --- a/build/pkgs/platformdirs/checksums.ini +++ b/build/pkgs/platformdirs/checksums.ini @@ -1,5 +1,5 @@ tarball=platformdirs-VERSION.tar.gz -sha1=082974f7d3ea03adfa147f4ab5be76079c2a116f -md5=f449b7f3767577fa2a57465a4523e92e -cksum=2966639810 +sha1=c4e0f8486e67a97affbc1b6b267a1f196c4177fa +md5=1c1c8c05e9bc370b78e0a95103523b75 +cksum=4231977838 upstream_url=https://pypi.io/packages/source/p/platformdirs/platformdirs-VERSION.tar.gz diff --git a/build/pkgs/platformdirs/package-version.txt b/build/pkgs/platformdirs/package-version.txt index fe16b348d97..30291cba223 100644 --- a/build/pkgs/platformdirs/package-version.txt +++ b/build/pkgs/platformdirs/package-version.txt @@ -1 +1 @@ -2.5.4 +3.10.0 diff --git a/build/pkgs/pluggy/SPKG.rst b/build/pkgs/pluggy/SPKG.rst index b15967007ed..33cce4d8843 100644 --- a/build/pkgs/pluggy/SPKG.rst +++ b/build/pkgs/pluggy/SPKG.rst @@ -9,7 +9,7 @@ plugin and hook calling mechanisms for python License ------- -MIT license +MIT Upstream Contact ---------------- diff --git a/build/pkgs/pluggy/checksums.ini b/build/pkgs/pluggy/checksums.ini index 087f36ad1a6..02c89db5e83 100644 --- a/build/pkgs/pluggy/checksums.ini +++ b/build/pkgs/pluggy/checksums.ini @@ -1,5 +1,5 @@ -tarball=pluggy-VERSION.tar.gz -sha1=0486bc511fc3415bb84252339b63b9d9e6d0734a -md5=daa6fddfb6cd364f3c82e52098911e4b -cksum=996010694 -upstream_url=https://pypi.io/packages/source/p/pluggy/pluggy-VERSION.tar.gz +tarball=pluggy-VERSION-py3-none-any.whl +sha1=25492905db99a151fc86368f0cca518a5ee5a832 +md5=9d0a58f023a0642eebae7c19f2729b72 +cksum=273236458 +upstream_url=https://pypi.io/packages/py3/p/pluggy/pluggy-VERSION-py3-none-any.whl diff --git a/build/pkgs/pluggy/package-version.txt b/build/pkgs/pluggy/package-version.txt index 3eefcb9dd5b..f0bb29e7638 100644 --- a/build/pkgs/pluggy/package-version.txt +++ b/build/pkgs/pluggy/package-version.txt @@ -1 +1 @@ -1.0.0 +1.3.0 diff --git a/build/pkgs/pluggy/spkg-install.in b/build/pkgs/pluggy/spkg-install.in deleted file mode 100644 index 37ac1a53437..00000000000 --- a/build/pkgs/pluggy/spkg-install.in +++ /dev/null @@ -1,2 +0,0 @@ -cd src -sdh_pip_install . diff --git a/build/pkgs/pyproject_api/SPKG.rst b/build/pkgs/pyproject_api/SPKG.rst new file mode 100644 index 00000000000..521b15e35d6 --- /dev/null +++ b/build/pkgs/pyproject_api/SPKG.rst @@ -0,0 +1,16 @@ +pyproject_api: API to interact with the python pyproject.toml based projects +============================================================================ + +Description +----------- + +API to interact with the python pyproject.toml based projects + +License +------- + +Upstream Contact +---------------- + +https://pypi.org/project/pyproject-api/ + diff --git a/build/pkgs/pyproject_api/checksums.ini b/build/pkgs/pyproject_api/checksums.ini new file mode 100644 index 00000000000..9fc8e383a7c --- /dev/null +++ b/build/pkgs/pyproject_api/checksums.ini @@ -0,0 +1,5 @@ +tarball=pyproject_api-VERSION-py3-none-any.whl +sha1=5ea24c784a68fd0ef0228c332dc078ce64387eb8 +md5=8941280ffec3eb79a8cd6e380774980f +cksum=913049079 +upstream_url=https://pypi.io/packages/py3/p/pyproject_api/pyproject_api-VERSION-py3-none-any.whl diff --git a/build/pkgs/pyproject_api/dependencies b/build/pkgs/pyproject_api/dependencies new file mode 100644 index 00000000000..0738c2d7777 --- /dev/null +++ b/build/pkgs/pyproject_api/dependencies @@ -0,0 +1,4 @@ +$(PYTHON) | $(PYTHON_TOOLCHAIN) + +---------- +All lines of this file are ignored except the first. diff --git a/build/pkgs/pyproject_api/install-requires.txt b/build/pkgs/pyproject_api/install-requires.txt new file mode 100644 index 00000000000..3f2ab4cb2a0 --- /dev/null +++ b/build/pkgs/pyproject_api/install-requires.txt @@ -0,0 +1 @@ +pyproject-api diff --git a/build/pkgs/pyproject_api/package-version.txt b/build/pkgs/pyproject_api/package-version.txt new file mode 100644 index 00000000000..9c6d6293b1a --- /dev/null +++ b/build/pkgs/pyproject_api/package-version.txt @@ -0,0 +1 @@ +1.6.1 diff --git a/build/pkgs/pyproject_api/type b/build/pkgs/pyproject_api/type new file mode 100644 index 00000000000..a6a7b9cd726 --- /dev/null +++ b/build/pkgs/pyproject_api/type @@ -0,0 +1 @@ +standard diff --git a/build/pkgs/toml/SPKG.rst b/build/pkgs/toml/SPKG.rst deleted file mode 100644 index e1b53b8f79e..00000000000 --- a/build/pkgs/toml/SPKG.rst +++ /dev/null @@ -1,18 +0,0 @@ -toml: Python Library for Tom's Obvious, Minimal Language -======================================================== - -Description ------------ - -Python Library for Tom's Obvious, Minimal Language - -License -------- - -MIT - -Upstream Contact ----------------- - -https://pypi.org/project/toml/ - diff --git a/build/pkgs/toml/checksums.ini b/build/pkgs/toml/checksums.ini deleted file mode 100644 index 27467959676..00000000000 --- a/build/pkgs/toml/checksums.ini +++ /dev/null @@ -1,5 +0,0 @@ -tarball=toml-VERSION.tar.gz -sha1=00137fc72f31100edd1c03670081b03053b6c836 -md5=59bce5d8d67e858735ec3f399ec90253 -cksum=3015531877 -upstream_url=https://pypi.io/packages/source/t/toml/toml-VERSION.tar.gz diff --git a/build/pkgs/toml/distros/conda.txt b/build/pkgs/toml/distros/conda.txt deleted file mode 100644 index bd79a658fe7..00000000000 --- a/build/pkgs/toml/distros/conda.txt +++ /dev/null @@ -1 +0,0 @@ -toml diff --git a/build/pkgs/toml/distros/void.txt b/build/pkgs/toml/distros/void.txt deleted file mode 100644 index 543e89d2a6f..00000000000 --- a/build/pkgs/toml/distros/void.txt +++ /dev/null @@ -1 +0,0 @@ -python3-toml diff --git a/build/pkgs/toml/install-requires.txt b/build/pkgs/toml/install-requires.txt deleted file mode 100644 index bd79a658fe7..00000000000 --- a/build/pkgs/toml/install-requires.txt +++ /dev/null @@ -1 +0,0 @@ -toml diff --git a/build/pkgs/toml/package-version.txt b/build/pkgs/toml/package-version.txt deleted file mode 100644 index 5eef0f10e8c..00000000000 --- a/build/pkgs/toml/package-version.txt +++ /dev/null @@ -1 +0,0 @@ -0.10.2 diff --git a/build/pkgs/toml/spkg-configure.m4 b/build/pkgs/toml/spkg-configure.m4 deleted file mode 100644 index 0dbc722cde5..00000000000 --- a/build/pkgs/toml/spkg-configure.m4 +++ /dev/null @@ -1,7 +0,0 @@ -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/toml/spkg-install.in b/build/pkgs/toml/spkg-install.in deleted file mode 100644 index 37ac1a53437..00000000000 --- a/build/pkgs/toml/spkg-install.in +++ /dev/null @@ -1,2 +0,0 @@ -cd src -sdh_pip_install . diff --git a/build/pkgs/tox/SPKG.rst b/build/pkgs/tox/SPKG.rst index 442f4e85756..ef20bba52b6 100644 --- a/build/pkgs/tox/SPKG.rst +++ b/build/pkgs/tox/SPKG.rst @@ -9,8 +9,6 @@ tox is a generic virtualenv management and test command line tool License ------- -MIT - Upstream Contact ---------------- diff --git a/build/pkgs/tox/checksums.ini b/build/pkgs/tox/checksums.ini index 19a159a8e4a..caf44efe123 100644 --- a/build/pkgs/tox/checksums.ini +++ b/build/pkgs/tox/checksums.ini @@ -1,5 +1,5 @@ -tarball=tox-VERSION.tar.gz -sha1=4a17b94eea345a2fb1a76106fb4d01ac9aca3569 -md5=ed4a11d13cd6a206b516c84750109602 -cksum=3144404727 -upstream_url=https://pypi.io/packages/source/t/tox/tox-VERSION.tar.gz +tarball=tox-VERSION-py3-none-any.whl +sha1=d3312285c4988d3307d3b000a8a18cfcb16aea29 +md5=127a9d3fae61a0967f14ab6d59fd118f +cksum=4147794288 +upstream_url=https://pypi.io/packages/py3/t/tox/tox-VERSION-py3-none-any.whl diff --git a/build/pkgs/tox/dependencies b/build/pkgs/tox/dependencies index 5a00a282b7d..06576118876 100644 --- a/build/pkgs/tox/dependencies +++ b/build/pkgs/tox/dependencies @@ -1,4 +1,4 @@ -$(PYTHON) packaging six filelock pluggy py toml virtualenv importlib_metadata | $(PYTHON_TOOLCHAIN) +cachetools chardet colorama filelock packaging platformdirs pluggy pyproject_api virtualenv | $(PYTHON_TOOLCHAIN) $(PYTHON) ---------- All lines of this file are ignored except the first. diff --git a/build/pkgs/tox/install-requires.txt b/build/pkgs/tox/install-requires.txt index ffbf4099ae8..053148f8486 100644 --- a/build/pkgs/tox/install-requires.txt +++ b/build/pkgs/tox/install-requires.txt @@ -1 +1 @@ -tox >= 3.21.4 +tox diff --git a/build/pkgs/tox/package-version.txt b/build/pkgs/tox/package-version.txt index 8c53120442c..d782fca8f64 100644 --- a/build/pkgs/tox/package-version.txt +++ b/build/pkgs/tox/package-version.txt @@ -1 +1 @@ -3.27.0 +4.11.1 diff --git a/build/pkgs/tox/spkg-install.in b/build/pkgs/tox/spkg-install.in deleted file mode 100644 index 37ac1a53437..00000000000 --- a/build/pkgs/tox/spkg-install.in +++ /dev/null @@ -1,2 +0,0 @@ -cd src -sdh_pip_install . diff --git a/build/pkgs/virtualenv/SPKG.rst b/build/pkgs/virtualenv/SPKG.rst index 9b869626ce4..feaa8aed78e 100644 --- a/build/pkgs/virtualenv/SPKG.rst +++ b/build/pkgs/virtualenv/SPKG.rst @@ -9,8 +9,6 @@ Virtual Python Environment builder License ------- -MIT - Upstream Contact ---------------- diff --git a/build/pkgs/virtualenv/checksums.ini b/build/pkgs/virtualenv/checksums.ini index e324ed781ee..b7def1fa7e0 100644 --- a/build/pkgs/virtualenv/checksums.ini +++ b/build/pkgs/virtualenv/checksums.ini @@ -1,5 +1,5 @@ -tarball=virtualenv-VERSION.tar.gz -sha1=8371dccb9866b40c3fdc5c0aa9c8f034cc0b174b -md5=b2d60f3c431f370b5fed5169b94f4798 -cksum=3124829245 -upstream_url=https://pypi.io/packages/source/v/virtualenv/virtualenv-VERSION.tar.gz +tarball=virtualenv-VERSION-py3-none-any.whl +sha1=a17fc6409d29b7e7b1427f37496bfc0fa399f9bf +md5=6374ee91c1ed02956a334aa01d9414ed +cksum=31593789 +upstream_url=https://pypi.io/packages/py3/v/virtualenv/virtualenv-VERSION-py3-none-any.whl diff --git a/build/pkgs/virtualenv/dependencies b/build/pkgs/virtualenv/dependencies index a8b8def7051..94381671d3e 100644 --- a/build/pkgs/virtualenv/dependencies +++ b/build/pkgs/virtualenv/dependencies @@ -1,4 +1,4 @@ -$(PYTHON) appdirs distlib filelock six importlib_metadata importlib_resources platformdirs | $(PYTHON_TOOLCHAIN) +distlib filelock | $(PYTHON_TOOLCHAIN) $(PYTHON) ---------- All lines of this file are ignored except the first. diff --git a/build/pkgs/virtualenv/package-version.txt b/build/pkgs/virtualenv/package-version.txt index d1df974a56b..b744a5a46cb 100644 --- a/build/pkgs/virtualenv/package-version.txt +++ b/build/pkgs/virtualenv/package-version.txt @@ -1 +1 @@ -20.16.6 +20.24.4 diff --git a/build/pkgs/virtualenv/spkg-install.in b/build/pkgs/virtualenv/spkg-install.in deleted file mode 100644 index 37ac1a53437..00000000000 --- a/build/pkgs/virtualenv/spkg-install.in +++ /dev/null @@ -1,2 +0,0 @@ -cd src -sdh_pip_install . From 9b2a43706a3fec2322730b3410580a2a3b22e4ac Mon Sep 17 00:00:00 2001 From: Matthias Koeppe Date: Sat, 2 Sep 2023 10:41:41 -0700 Subject: [PATCH 02/11] build/pkgs/tox/dependencies: Add tomli --- build/pkgs/tox/dependencies | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/pkgs/tox/dependencies b/build/pkgs/tox/dependencies index 06576118876..ebec555b1e0 100644 --- a/build/pkgs/tox/dependencies +++ b/build/pkgs/tox/dependencies @@ -1,4 +1,4 @@ -cachetools chardet colorama filelock packaging platformdirs pluggy pyproject_api virtualenv | $(PYTHON_TOOLCHAIN) $(PYTHON) +cachetools chardet colorama filelock packaging platformdirs pluggy pyproject_api tomli virtualenv | $(PYTHON_TOOLCHAIN) $(PYTHON) ---------- All lines of this file are ignored except the first. From a2c8322c2348808c49a6947dc8dee741a28b0e87 Mon Sep 17 00:00:00 2001 From: Matthias Koeppe Date: Sat, 2 Sep 2023 11:52:45 -0700 Subject: [PATCH 03/11] build/pkgs/{cachetools,chardet,colorama}: Do not require when system tox is used --- build/pkgs/cachetools/spkg-configure.m4 | 7 +++++++ build/pkgs/chardet/spkg-configure.m4 | 7 +++++++ build/pkgs/colorama/spkg-configure.m4 | 7 +++++++ 3 files changed, 21 insertions(+) create mode 100644 build/pkgs/cachetools/spkg-configure.m4 create mode 100644 build/pkgs/chardet/spkg-configure.m4 create mode 100644 build/pkgs/colorama/spkg-configure.m4 diff --git a/build/pkgs/cachetools/spkg-configure.m4 b/build/pkgs/cachetools/spkg-configure.m4 new file mode 100644 index 00000000000..1e6c1fb453a --- /dev/null +++ b/build/pkgs/cachetools/spkg-configure.m4 @@ -0,0 +1,7 @@ +SAGE_SPKG_CONFIGURE([cachetools], [ + sage_spkg_install_cachetools=yes + ], [dnl REQUIRED-CHECK + AC_REQUIRE([SAGE_SPKG_CONFIGURE_TOX]) + dnl cachetools is only needed when we cannot use system tox. + AS_VAR_SET([SPKG_REQUIRE], [$sage_spkg_install_tox]) + ]) diff --git a/build/pkgs/chardet/spkg-configure.m4 b/build/pkgs/chardet/spkg-configure.m4 new file mode 100644 index 00000000000..2dba4eef338 --- /dev/null +++ b/build/pkgs/chardet/spkg-configure.m4 @@ -0,0 +1,7 @@ +SAGE_SPKG_CONFIGURE([chardet], [ + sage_spkg_install_chardet=yes + ], [dnl REQUIRED-CHECK + AC_REQUIRE([SAGE_SPKG_CONFIGURE_TOX]) + dnl chardet is only needed when we cannot use system tox. + AS_VAR_SET([SPKG_REQUIRE], [$sage_spkg_install_tox]) + ]) diff --git a/build/pkgs/colorama/spkg-configure.m4 b/build/pkgs/colorama/spkg-configure.m4 new file mode 100644 index 00000000000..65c88b05ec8 --- /dev/null +++ b/build/pkgs/colorama/spkg-configure.m4 @@ -0,0 +1,7 @@ +SAGE_SPKG_CONFIGURE([colorama], [ + sage_spkg_install_colorama=yes + ], [dnl REQUIRED-CHECK + AC_REQUIRE([SAGE_SPKG_CONFIGURE_TOX]) + dnl colorama is only needed when we cannot use system tox. + AS_VAR_SET([SPKG_REQUIRE], [$sage_spkg_install_tox]) + ]) From 76340edc4078d6fa1a5f53556ddc68e9526462f7 Mon Sep 17 00:00:00 2001 From: Matthias Koeppe Date: Sat, 2 Sep 2023 11:55:06 -0700 Subject: [PATCH 04/11] build/pkgs/{filelock,pluggy}: Restore edited versions --- build/pkgs/filelock/SPKG.rst | 6 ++++-- build/pkgs/pluggy/SPKG.rst | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/build/pkgs/filelock/SPKG.rst b/build/pkgs/filelock/SPKG.rst index 448c283aa3d..d39b439be2e 100644 --- a/build/pkgs/filelock/SPKG.rst +++ b/build/pkgs/filelock/SPKG.rst @@ -1,5 +1,5 @@ -filelock: A platform independent file lock. -=========================================== +filelock: A platform independent file lock +========================================== Description ----------- @@ -9,6 +9,8 @@ A platform independent file lock. License ------- +Public Domain + Upstream Contact ---------------- diff --git a/build/pkgs/pluggy/SPKG.rst b/build/pkgs/pluggy/SPKG.rst index 33cce4d8843..b15967007ed 100644 --- a/build/pkgs/pluggy/SPKG.rst +++ b/build/pkgs/pluggy/SPKG.rst @@ -9,7 +9,7 @@ plugin and hook calling mechanisms for python License ------- -MIT +MIT license Upstream Contact ---------------- From 4fdb0173dd82215459fb35528766d2d30171faed Mon Sep 17 00:00:00 2001 From: Matthias Koeppe Date: Sat, 2 Sep 2023 11:57:21 -0700 Subject: [PATCH 05/11] build/pkgs/{chardet,colorama,pyproject_api}: Make python order-only dependency as in #36141 --- build/pkgs/chardet/dependencies | 2 +- build/pkgs/colorama/dependencies | 2 +- build/pkgs/pyproject_api/dependencies | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build/pkgs/chardet/dependencies b/build/pkgs/chardet/dependencies index 0738c2d7777..47296a7bace 100644 --- a/build/pkgs/chardet/dependencies +++ b/build/pkgs/chardet/dependencies @@ -1,4 +1,4 @@ -$(PYTHON) | $(PYTHON_TOOLCHAIN) + | $(PYTHON_TOOLCHAIN) $(PYTHON) ---------- All lines of this file are ignored except the first. diff --git a/build/pkgs/colorama/dependencies b/build/pkgs/colorama/dependencies index 0738c2d7777..47296a7bace 100644 --- a/build/pkgs/colorama/dependencies +++ b/build/pkgs/colorama/dependencies @@ -1,4 +1,4 @@ -$(PYTHON) | $(PYTHON_TOOLCHAIN) + | $(PYTHON_TOOLCHAIN) $(PYTHON) ---------- All lines of this file are ignored except the first. diff --git a/build/pkgs/pyproject_api/dependencies b/build/pkgs/pyproject_api/dependencies index 0738c2d7777..47296a7bace 100644 --- a/build/pkgs/pyproject_api/dependencies +++ b/build/pkgs/pyproject_api/dependencies @@ -1,4 +1,4 @@ -$(PYTHON) | $(PYTHON_TOOLCHAIN) + | $(PYTHON_TOOLCHAIN) $(PYTHON) ---------- All lines of this file are ignored except the first. From 7bcef0cde9ed0b94acba2eb8a34feba777e66318 Mon Sep 17 00:00:00 2001 From: Matthias Koeppe Date: Sat, 2 Sep 2023 11:58:32 -0700 Subject: [PATCH 06/11] sage --package create --pypi: Make python order-only dependency as in #36141 --- build/sage_bootstrap/creator.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/sage_bootstrap/creator.py b/build/sage_bootstrap/creator.py index f7a6ab203dc..c52090e5fa3 100644 --- a/build/sage_bootstrap/creator.py +++ b/build/sage_bootstrap/creator.py @@ -94,7 +94,7 @@ def set_python_data_and_scripts(self, pypi_package_name=None, source='normal'): if pypi_package_name is None: pypi_package_name = self.package_name with open(os.path.join(self.path, 'dependencies'), 'w+') as f: - f.write('$(PYTHON) | $(PYTHON_TOOLCHAIN)\n\n') + f.write(' | $(PYTHON_TOOLCHAIN) $(PYTHON)\n\n') f.write('----------\nAll lines of this file are ignored except the first.\n') if source == 'normal': with open(os.path.join(self.path, 'spkg-install.in'), 'w+') as f: From edd8e24d075c6e490c24e3fd8ccb8a0ae289d2a9 Mon Sep 17 00:00:00 2001 From: Matthias Koeppe Date: Sat, 2 Sep 2023 12:12:58 -0700 Subject: [PATCH 07/11] build/pkgs/tox: Reject tox 3, require tox >= 4.2.7 --- build/pkgs/tox/install-requires.txt | 3 ++- build/pkgs/tox/spkg-configure.m4 | 24 +++++++----------------- 2 files changed, 9 insertions(+), 18 deletions(-) diff --git a/build/pkgs/tox/install-requires.txt b/build/pkgs/tox/install-requires.txt index 053148f8486..41bd756ea6b 100644 --- a/build/pkgs/tox/install-requires.txt +++ b/build/pkgs/tox/install-requires.txt @@ -1 +1,2 @@ -tox +# see spkg-configure.m4 +tox >= 4.2.7 diff --git a/build/pkgs/tox/spkg-configure.m4 b/build/pkgs/tox/spkg-configure.m4 index 5a260439cdd..ab69f673b5a 100644 --- a/build/pkgs/tox/spkg-configure.m4 +++ b/build/pkgs/tox/spkg-configure.m4 @@ -1,28 +1,18 @@ SAGE_SPKG_CONFIGURE([tox], [ - dnl Use non-ancient tox with full support for PEP 517. - m4_pushdef([TOX3_MIN_VERSION], [3.21.4]) dnl Early 4.0.x versions have bugs regarding complex factor conditions - m4_pushdef([TOX4_MIN_VERSION], [4.0.15]) - AC_CACHE_CHECK([for tox 3 >= ]TOX3_MIN_VERSION[ or tox 4 >= ]TOX4_MIN_VERSION, [ac_cv_path_TOX], [ + dnl [pkgenv] added in 4.2 - https://tox.wiki/en/latest/upgrading.html#packaging-configuration-and-inheritance + dnl 4.2.7 for repaired numerical factors + m4_pushdef([TOX4_MIN_VERSION], [4.2.7]) + AC_CACHE_CHECK([for tox >= ]TOX4_MIN_VERSION, [ac_cv_path_TOX], [ AC_PATH_PROGS_FEATURE_CHECK([TOX], [tox], [ tox_version=$($ac_path_TOX --version 2> /dev/null | tail -n 1) - AS_IF([test -n "$tox_version"], [ - AX_COMPARE_VERSION([$tox_version], [lt], [4], [ - AX_COMPARE_VERSION([$tox_version], [ge], TOX3_MIN_VERSION, [ - ac_cv_path_TOX="$ac_path_TOX" - ac_path_TOX_found=: - ]) - ], [ - AX_COMPARE_VERSION([$tox_version], [ge], TOX4_MIN_VERSION, [ - ac_cv_path_TOX="$ac_path_TOX" - ac_path_TOX_found=: - ]) - ]) + AX_COMPARE_VERSION([$tox_version], [ge], TOX4_MIN_VERSION, [ + ac_cv_path_TOX="$ac_path_TOX" + ac_path_TOX_found=: ]) ]) ]) AS_IF([test -z "$ac_cv_path_TOX"], [sage_spkg_install_tox=yes]) m4_popdef([TOX4_MIN_VERSION]) - m4_popdef([TOX3_MIN_VERSION]) ]) From 7e2dcd09427c0d3e5aa391303672e6e7f5a71374 Mon Sep 17 00:00:00 2001 From: Matthias Koeppe Date: Sat, 2 Sep 2023 12:28:28 -0700 Subject: [PATCH 08/11] build/pkgs/virtualenv/dependencies: Re-add platformdirs --- build/pkgs/virtualenv/dependencies | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/pkgs/virtualenv/dependencies b/build/pkgs/virtualenv/dependencies index 94381671d3e..b0e964bba0c 100644 --- a/build/pkgs/virtualenv/dependencies +++ b/build/pkgs/virtualenv/dependencies @@ -1,4 +1,4 @@ -distlib filelock | $(PYTHON_TOOLCHAIN) $(PYTHON) +distlib filelock platformdirs | $(PYTHON_TOOLCHAIN) $(PYTHON) ---------- All lines of this file are ignored except the first. From db9c39224718fe6b1ab0fc780fc8f70d00fb92a4 Mon Sep 17 00:00:00 2001 From: Matthias Koeppe Date: Wed, 6 Sep 2023 23:19:13 -0700 Subject: [PATCH 09/11] build/pkgs/{tox,virtualenv}/SPKG.rst: Restore manually added license info --- build/pkgs/tox/SPKG.rst | 2 ++ build/pkgs/virtualenv/SPKG.rst | 2 ++ 2 files changed, 4 insertions(+) diff --git a/build/pkgs/tox/SPKG.rst b/build/pkgs/tox/SPKG.rst index ef20bba52b6..442f4e85756 100644 --- a/build/pkgs/tox/SPKG.rst +++ b/build/pkgs/tox/SPKG.rst @@ -9,6 +9,8 @@ tox is a generic virtualenv management and test command line tool License ------- +MIT + Upstream Contact ---------------- diff --git a/build/pkgs/virtualenv/SPKG.rst b/build/pkgs/virtualenv/SPKG.rst index feaa8aed78e..9b869626ce4 100644 --- a/build/pkgs/virtualenv/SPKG.rst +++ b/build/pkgs/virtualenv/SPKG.rst @@ -9,6 +9,8 @@ Virtual Python Environment builder License ------- +MIT + Upstream Contact ---------------- From 12f6ef88f3567ff07c96ac904f9bfe8807485da4 Mon Sep 17 00:00:00 2001 From: Matthias Koeppe Date: Sun, 10 Sep 2023 17:41:17 -0700 Subject: [PATCH 10/11] bootstrap: Use 'ENABLE_SYSTEM_SITE_PACKAGES=yes sage-get-system-packages install-requires' --- bootstrap | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/bootstrap b/bootstrap index 5156f369c38..aa5755cfc63 100755 --- a/bootstrap +++ b/bootstrap @@ -98,8 +98,8 @@ SAGE_SPKG_CONFIGURE_$(echo ${pkgname} | tr '[a-z]' '[A-Z]')" if test -f "$DIR/requirements.txt" -o -f "$DIR/install-requires.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 - echo "define(>>>SPKG_INSTALL_REQUIRES_${pkgname}<<<, >>>$(echo $(sage-get-system-packages install-requires-toml ${pkgname}))<<<)dnl" >> m4/sage_spkg_versions_toml.m4 + echo "define(>>>SPKG_INSTALL_REQUIRES_${pkgname}<<<, >>>$(echo $(ENABLE_SYSTEM_SITE_PACKAGES=yes sage-get-system-packages install-requires ${pkgname}))<<<)dnl" >> m4/sage_spkg_versions.m4 + echo "define(>>>SPKG_INSTALL_REQUIRES_${pkgname}<<<, >>>$(echo $(ENABLE_SYSTEM_SITE_PACKAGES=yes sage-get-system-packages install-requires-toml ${pkgname}))<<<)dnl" >> m4/sage_spkg_versions_toml.m4 fi fi spkg_configures="$spkg_configures From 0785206ee752d10d1e4774d7e5feb04d84624aca Mon Sep 17 00:00:00 2001 From: Matthias Koeppe Date: Wed, 13 Sep 2023 11:56:15 -0700 Subject: [PATCH 11/11] Update pyproject.toml files to use version info from build/pkgs/setuptools_wheel, not the ancient build/pkgs/setuptools --- build/pkgs/setuptools_wheel/install-requires.txt | 2 +- pkgs/sagemath-bliss/pyproject.toml.m4 | 2 +- pkgs/sagemath-categories/pyproject.toml.m4 | 2 +- pkgs/sagemath-coxeter3/pyproject.toml.m4 | 2 +- pkgs/sagemath-environment/pyproject.toml.m4 | 2 +- pkgs/sagemath-mcqd/pyproject.toml.m4 | 2 +- pkgs/sagemath-meataxe/pyproject.toml.m4 | 2 +- pkgs/sagemath-objects/pyproject.toml.m4 | 2 +- pkgs/sagemath-repl/pyproject.toml.m4 | 2 +- pkgs/sagemath-sirocco/pyproject.toml.m4 | 2 +- pkgs/sagemath-tdlib/pyproject.toml.m4 | 2 +- src/pyproject.toml.m4 | 2 +- 12 files changed, 12 insertions(+), 12 deletions(-) diff --git a/build/pkgs/setuptools_wheel/install-requires.txt b/build/pkgs/setuptools_wheel/install-requires.txt index d1dc532ceab..d3767a68c8f 100644 --- a/build/pkgs/setuptools_wheel/install-requires.txt +++ b/build/pkgs/setuptools_wheel/install-requires.txt @@ -1 +1 @@ -# We use this file to mark the package as a Python package +setuptools >= 65.6 diff --git a/pkgs/sagemath-bliss/pyproject.toml.m4 b/pkgs/sagemath-bliss/pyproject.toml.m4 index 439482ad26b..1cbcdf7e162 100644 --- a/pkgs/sagemath-bliss/pyproject.toml.m4 +++ b/pkgs/sagemath-bliss/pyproject.toml.m4 @@ -2,7 +2,7 @@ include(`sage_spkg_versions_toml.m4')dnl' -*- conf-toml -*- [build-system] # Minimum requirements for the build system to execute. requires = [ - SPKG_INSTALL_REQUIRES_setuptools + SPKG_INSTALL_REQUIRES_setuptools_wheel SPKG_INSTALL_REQUIRES_sage_conf SPKG_INSTALL_REQUIRES_sage_setup SPKG_INSTALL_REQUIRES_sagemath_environment diff --git a/pkgs/sagemath-categories/pyproject.toml.m4 b/pkgs/sagemath-categories/pyproject.toml.m4 index 6ce29ddcb71..cf4c97f1fd1 100644 --- a/pkgs/sagemath-categories/pyproject.toml.m4 +++ b/pkgs/sagemath-categories/pyproject.toml.m4 @@ -2,7 +2,7 @@ include(`sage_spkg_versions_toml.m4')dnl' -*- conf-toml -*- [build-system] # Minimum requirements for the build system to execute. requires = [ - SPKG_INSTALL_REQUIRES_setuptools + SPKG_INSTALL_REQUIRES_setuptools_wheel SPKG_INSTALL_REQUIRES_wheel SPKG_INSTALL_REQUIRES_sage_setup SPKG_INSTALL_REQUIRES_sagemath_environment diff --git a/pkgs/sagemath-coxeter3/pyproject.toml.m4 b/pkgs/sagemath-coxeter3/pyproject.toml.m4 index e5b939e414d..a7d65382b21 100644 --- a/pkgs/sagemath-coxeter3/pyproject.toml.m4 +++ b/pkgs/sagemath-coxeter3/pyproject.toml.m4 @@ -2,7 +2,7 @@ include(`sage_spkg_versions_toml.m4')dnl' -*- conf-toml -*- [build-system] # Minimum requirements for the build system to execute. requires = [ - SPKG_INSTALL_REQUIRES_setuptools + SPKG_INSTALL_REQUIRES_setuptools_wheel SPKG_INSTALL_REQUIRES_sage_setup SPKG_INSTALL_REQUIRES_sagemath_environment SPKG_INSTALL_REQUIRES_cython diff --git a/pkgs/sagemath-environment/pyproject.toml.m4 b/pkgs/sagemath-environment/pyproject.toml.m4 index 7f62a86cd69..fb2db955ed5 100644 --- a/pkgs/sagemath-environment/pyproject.toml.m4 +++ b/pkgs/sagemath-environment/pyproject.toml.m4 @@ -2,7 +2,7 @@ include(`sage_spkg_versions_toml.m4')dnl' -*- conf-toml -*- [build-system] # Minimum requirements for the build system to execute. requires = [ - SPKG_INSTALL_REQUIRES_setuptools + SPKG_INSTALL_REQUIRES_setuptools_wheel SPKG_INSTALL_REQUIRES_wheel ] build-backend = "setuptools.build_meta" diff --git a/pkgs/sagemath-mcqd/pyproject.toml.m4 b/pkgs/sagemath-mcqd/pyproject.toml.m4 index d28ff179a00..7e651119193 100644 --- a/pkgs/sagemath-mcqd/pyproject.toml.m4 +++ b/pkgs/sagemath-mcqd/pyproject.toml.m4 @@ -2,7 +2,7 @@ include(`sage_spkg_versions_toml.m4')dnl' -*- conf-toml -*- [build-system] # Minimum requirements for the build system to execute. requires = [ - SPKG_INSTALL_REQUIRES_setuptools + SPKG_INSTALL_REQUIRES_setuptools_wheel SPKG_INSTALL_REQUIRES_sage_setup SPKG_INSTALL_REQUIRES_sagemath_environment SPKG_INSTALL_REQUIRES_cython diff --git a/pkgs/sagemath-meataxe/pyproject.toml.m4 b/pkgs/sagemath-meataxe/pyproject.toml.m4 index e5b939e414d..a7d65382b21 100644 --- a/pkgs/sagemath-meataxe/pyproject.toml.m4 +++ b/pkgs/sagemath-meataxe/pyproject.toml.m4 @@ -2,7 +2,7 @@ include(`sage_spkg_versions_toml.m4')dnl' -*- conf-toml -*- [build-system] # Minimum requirements for the build system to execute. requires = [ - SPKG_INSTALL_REQUIRES_setuptools + SPKG_INSTALL_REQUIRES_setuptools_wheel SPKG_INSTALL_REQUIRES_sage_setup SPKG_INSTALL_REQUIRES_sagemath_environment SPKG_INSTALL_REQUIRES_cython diff --git a/pkgs/sagemath-objects/pyproject.toml.m4 b/pkgs/sagemath-objects/pyproject.toml.m4 index 0c5558f3412..d8fda57a8f8 100644 --- a/pkgs/sagemath-objects/pyproject.toml.m4 +++ b/pkgs/sagemath-objects/pyproject.toml.m4 @@ -2,7 +2,7 @@ include(`sage_spkg_versions_toml.m4')dnl' -*- conf-toml -*- [build-system] # Minimum requirements for the build system to execute. requires = [ - SPKG_INSTALL_REQUIRES_setuptools + SPKG_INSTALL_REQUIRES_setuptools_wheel SPKG_INSTALL_REQUIRES_wheel SPKG_INSTALL_REQUIRES_sage_setup SPKG_INSTALL_REQUIRES_sagemath_environment diff --git a/pkgs/sagemath-repl/pyproject.toml.m4 b/pkgs/sagemath-repl/pyproject.toml.m4 index 7f62a86cd69..fb2db955ed5 100644 --- a/pkgs/sagemath-repl/pyproject.toml.m4 +++ b/pkgs/sagemath-repl/pyproject.toml.m4 @@ -2,7 +2,7 @@ include(`sage_spkg_versions_toml.m4')dnl' -*- conf-toml -*- [build-system] # Minimum requirements for the build system to execute. requires = [ - SPKG_INSTALL_REQUIRES_setuptools + SPKG_INSTALL_REQUIRES_setuptools_wheel SPKG_INSTALL_REQUIRES_wheel ] build-backend = "setuptools.build_meta" diff --git a/pkgs/sagemath-sirocco/pyproject.toml.m4 b/pkgs/sagemath-sirocco/pyproject.toml.m4 index 1b000bd5c3b..99894dd5e5e 100644 --- a/pkgs/sagemath-sirocco/pyproject.toml.m4 +++ b/pkgs/sagemath-sirocco/pyproject.toml.m4 @@ -2,7 +2,7 @@ include(`sage_spkg_versions_toml.m4')dnl' -*- conf-toml -*- [build-system] # Minimum requirements for the build system to execute. requires = [ - SPKG_INSTALL_REQUIRES_setuptools + SPKG_INSTALL_REQUIRES_setuptools_wheel SPKG_INSTALL_REQUIRES_sage_setup SPKG_INSTALL_REQUIRES_sagemath_environment SPKG_INSTALL_REQUIRES_cython diff --git a/pkgs/sagemath-tdlib/pyproject.toml.m4 b/pkgs/sagemath-tdlib/pyproject.toml.m4 index e5b939e414d..a7d65382b21 100644 --- a/pkgs/sagemath-tdlib/pyproject.toml.m4 +++ b/pkgs/sagemath-tdlib/pyproject.toml.m4 @@ -2,7 +2,7 @@ include(`sage_spkg_versions_toml.m4')dnl' -*- conf-toml -*- [build-system] # Minimum requirements for the build system to execute. requires = [ - SPKG_INSTALL_REQUIRES_setuptools + SPKG_INSTALL_REQUIRES_setuptools_wheel SPKG_INSTALL_REQUIRES_sage_setup SPKG_INSTALL_REQUIRES_sagemath_environment SPKG_INSTALL_REQUIRES_cython diff --git a/src/pyproject.toml.m4 b/src/pyproject.toml.m4 index 56f1b2b03ab..f707b6f890e 100644 --- a/src/pyproject.toml.m4 +++ b/src/pyproject.toml.m4 @@ -6,7 +6,7 @@ requires = [ # https://github.com/pypa/pip/issues/6144 esyscmd(`sage-get-system-packages install-requires-toml \ sage_conf \ - setuptools \ + setuptools_wheel \ wheel \ sage_setup \ cypari \