Skip to content

Commit

Permalink
sagemathgh-36176: build/pkgs/tox: Update, require tox >= 4.2.7, updat…
Browse files Browse the repository at this point in the history
…e dependencies

    
<!-- ^^^^^
Please provide a concise, informative and self-explanatory title.
Don't put issue numbers in there, do this in the PR body below.
For example, instead of "Fixes sagemath#1234" use "Introduce new method to
calculate 1+1"
-->
<!-- Describe your changes here in detail -->

<!-- Why is this change required? What problem does it solve? -->
<!-- If this PR resolves an open issue, please link to it here. For
example "Fixes sagemath#12345". -->
- Fixes sagemath#34840
- Fixes sagemath#36175
<!-- If your change requires a documentation PR, please link it
appropriately. -->

### 📝 Checklist

<!-- Put an `x` in all the boxes that apply. -->
<!-- If your change requires a documentation PR, please link it
appropriately -->
<!-- If you're unsure about any of these, don't hesitate to ask. We're
here to help! -->
<!-- Feel free to remove irrelevant items. -->

- [x] The title is concise, informative, and self-explanatory.
- [ ] The description explains in detail what this PR is about.
- [x] I have linked a relevant issue or discussion.
- [ ] I have created tests covering the changes.
- [ ] I have updated the documentation accordingly.

### ⌛ Dependencies

<!-- List all open PRs that this PR logically depends on
- sagemath#12345: short description why this is a dependency
- sagemath#34567: ...
-->
- Depends on sagemath#36240 (merged here)
- Depends on sagemath#36263 (merged here)

<!-- If you're unsure about any of these, don't hesitate to ask. We're
here to help! -->
    
URL: sagemath#36176
Reported by: Matthias Köppe
Reviewer(s): github-actions[bot], Kwankyu Lee
  • Loading branch information
Release Manager committed Sep 15, 2023
2 parents 9dd8a77 + d4bd789 commit 5b2f125
Show file tree
Hide file tree
Showing 59 changed files with 180 additions and 101 deletions.
18 changes: 18 additions & 0 deletions build/pkgs/cachetools/SPKG.rst
Original file line number Diff line number Diff line change
@@ -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/

5 changes: 5 additions & 0 deletions build/pkgs/cachetools/checksums.ini
Original file line number Diff line number Diff line change
@@ -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
File renamed without changes.
1 change: 1 addition & 0 deletions build/pkgs/cachetools/install-requires.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
cachetools
1 change: 1 addition & 0 deletions build/pkgs/cachetools/package-version.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
5.3.1
7 changes: 7 additions & 0 deletions build/pkgs/cachetools/spkg-configure.m4
Original file line number Diff line number Diff line change
@@ -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])
])
File renamed without changes.
18 changes: 18 additions & 0 deletions build/pkgs/chardet/SPKG.rst
Original file line number Diff line number Diff line change
@@ -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/

5 changes: 5 additions & 0 deletions build/pkgs/chardet/checksums.ini
Original file line number Diff line number Diff line change
@@ -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
4 changes: 4 additions & 0 deletions build/pkgs/chardet/dependencies
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
| $(PYTHON_TOOLCHAIN) $(PYTHON)

----------
All lines of this file are ignored except the first.
1 change: 1 addition & 0 deletions build/pkgs/chardet/install-requires.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
chardet
1 change: 1 addition & 0 deletions build/pkgs/chardet/package-version.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
5.2.0
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
SAGE_SPKG_CONFIGURE([toml], [
sage_spkg_install_toml=yes
SAGE_SPKG_CONFIGURE([chardet], [
sage_spkg_install_chardet=yes
], [dnl REQUIRED-CHECK
AC_REQUIRE([SAGE_SPKG_CONFIGURE_TOX])
dnl toml is only needed when we cannot use system tox.
dnl chardet is only needed when we cannot use system tox.
AS_VAR_SET([SPKG_REQUIRE], [$sage_spkg_install_tox])
])
1 change: 1 addition & 0 deletions build/pkgs/chardet/type
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
standard
16 changes: 16 additions & 0 deletions build/pkgs/colorama/SPKG.rst
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
colorama: Cross-platform colored terminal text.
===============================================

Description
-----------

Cross-platform colored terminal text.

License
-------

Upstream Contact
----------------

https://pypi.org/project/colorama/

5 changes: 5 additions & 0 deletions build/pkgs/colorama/checksums.ini
Original file line number Diff line number Diff line change
@@ -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
4 changes: 4 additions & 0 deletions build/pkgs/colorama/dependencies
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
| $(PYTHON_TOOLCHAIN) $(PYTHON)

----------
All lines of this file are ignored except the first.
1 change: 1 addition & 0 deletions build/pkgs/colorama/install-requires.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
colorama
1 change: 1 addition & 0 deletions build/pkgs/colorama/package-version.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
0.4.6
7 changes: 7 additions & 0 deletions build/pkgs/colorama/spkg-configure.m4
Original file line number Diff line number Diff line change
@@ -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])
])
1 change: 1 addition & 0 deletions build/pkgs/colorama/type
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
standard
6 changes: 3 additions & 3 deletions build/pkgs/distlib/checksums.ini
Original file line number Diff line number Diff line change
@@ -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
2 changes: 1 addition & 1 deletion build/pkgs/distlib/package-version.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
0.3.6
0.3.7
6 changes: 3 additions & 3 deletions build/pkgs/editables/checksums.ini
Original file line number Diff line number Diff line change
@@ -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
2 changes: 1 addition & 1 deletion build/pkgs/editables/package-version.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
0.3
0.5
10 changes: 5 additions & 5 deletions build/pkgs/filelock/checksums.ini
Original file line number Diff line number Diff line change
@@ -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
2 changes: 1 addition & 1 deletion build/pkgs/filelock/package-version.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
3.8.0
3.12.3
2 changes: 0 additions & 2 deletions build/pkgs/filelock/spkg-install.in

This file was deleted.

6 changes: 3 additions & 3 deletions build/pkgs/packaging/checksums.ini
Original file line number Diff line number Diff line change
@@ -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
2 changes: 1 addition & 1 deletion build/pkgs/packaging/package-version.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
21.3
23.1
6 changes: 3 additions & 3 deletions build/pkgs/platformdirs/checksums.ini
Original file line number Diff line number Diff line change
@@ -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
2 changes: 1 addition & 1 deletion build/pkgs/platformdirs/package-version.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
2.5.4
3.10.0
10 changes: 5 additions & 5 deletions build/pkgs/pluggy/checksums.ini
Original file line number Diff line number Diff line change
@@ -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
2 changes: 1 addition & 1 deletion build/pkgs/pluggy/package-version.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
1.0.0
1.3.0
2 changes: 0 additions & 2 deletions build/pkgs/pluggy/spkg-install.in

This file was deleted.

16 changes: 16 additions & 0 deletions build/pkgs/pyproject_api/SPKG.rst
Original file line number Diff line number Diff line change
@@ -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/

5 changes: 5 additions & 0 deletions build/pkgs/pyproject_api/checksums.ini
Original file line number Diff line number Diff line change
@@ -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
4 changes: 4 additions & 0 deletions build/pkgs/pyproject_api/dependencies
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
| $(PYTHON_TOOLCHAIN) $(PYTHON)

----------
All lines of this file are ignored except the first.
1 change: 1 addition & 0 deletions build/pkgs/pyproject_api/install-requires.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
pyproject-api
1 change: 1 addition & 0 deletions build/pkgs/pyproject_api/package-version.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
1.6.1
1 change: 1 addition & 0 deletions build/pkgs/pyproject_api/type
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
standard
18 changes: 0 additions & 18 deletions build/pkgs/toml/SPKG.rst

This file was deleted.

5 changes: 0 additions & 5 deletions build/pkgs/toml/checksums.ini

This file was deleted.

1 change: 0 additions & 1 deletion build/pkgs/toml/distros/conda.txt

This file was deleted.

1 change: 0 additions & 1 deletion build/pkgs/toml/distros/void.txt

This file was deleted.

1 change: 0 additions & 1 deletion build/pkgs/toml/install-requires.txt

This file was deleted.

1 change: 0 additions & 1 deletion build/pkgs/toml/package-version.txt

This file was deleted.

2 changes: 0 additions & 2 deletions build/pkgs/toml/spkg-install.in

This file was deleted.

10 changes: 5 additions & 5 deletions build/pkgs/tox/checksums.ini
Original file line number Diff line number Diff line change
@@ -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
2 changes: 1 addition & 1 deletion build/pkgs/tox/dependencies
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
packaging six filelock pluggy py toml virtualenv importlib_metadata | $(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.
3 changes: 2 additions & 1 deletion build/pkgs/tox/install-requires.txt
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
tox >= 3.21.4
# see spkg-configure.m4
tox >= 4.2.7
2 changes: 1 addition & 1 deletion build/pkgs/tox/package-version.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
3.27.0
4.11.1
24 changes: 7 additions & 17 deletions build/pkgs/tox/spkg-configure.m4
Original file line number Diff line number Diff line change
@@ -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])
])
2 changes: 0 additions & 2 deletions build/pkgs/tox/spkg-install.in

This file was deleted.

10 changes: 5 additions & 5 deletions build/pkgs/virtualenv/checksums.ini
Original file line number Diff line number Diff line change
@@ -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
2 changes: 1 addition & 1 deletion build/pkgs/virtualenv/dependencies
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
appdirs distlib filelock six importlib_metadata importlib_resources platformdirs | $(PYTHON_TOOLCHAIN) $(PYTHON)
distlib filelock platformdirs | $(PYTHON_TOOLCHAIN) $(PYTHON)

----------
All lines of this file are ignored except the first.
2 changes: 1 addition & 1 deletion build/pkgs/virtualenv/package-version.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
20.16.6
20.24.4
2 changes: 0 additions & 2 deletions build/pkgs/virtualenv/spkg-install.in

This file was deleted.

2 changes: 1 addition & 1 deletion build/sage_bootstrap/creator.py
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down

0 comments on commit 5b2f125

Please sign in to comment.