Skip to content

Commit

Permalink
gh-38226: build/pkgs/setuptools_scm: Upgrade to 8.1.0, fix dependen…
Browse files Browse the repository at this point in the history
…cy typing_extensions, change some packages to `wheel`

    
<!-- ^ Please provide a concise and informative title. -->
<!-- ^ Don't put issue numbers in the title, do this in the PR
description below. -->
<!-- ^ For example, instead of "Fixes #12345" use "Introduce new method
to calculate 1 + 2". -->
<!-- v Describe your changes below in detail. -->
<!-- v Why is this change required? What problem does it solve? -->
<!-- v If this PR resolves an open issue, please link to it here. For
example, "Fixes #12345". -->

Currently several packages show a (non-fatal) build error like this:
```
[asttokens-2.4.1] [spkg-install] < INFO: pip is looking at multiple
versions of setuptools-scm to determine
[asttokens-2.4.1] [spkg-install]   which version is compatible with
other requirements. This could take a
[asttokens-2.4.1] [spkg-install]   while.
[asttokens-2.4.1] [spkg-install] < ERROR: Could not find a version that
satisfies the requirement typing-
[asttokens-2.4.1] [spkg-install]   extensions (from setuptools-scm)
(from versions: none)
[asttokens-2.4.1] [spkg-install] < ERROR: No matching distribution found
for typing-extensions
```

The reason: `setuptools_scm` 8.0.4 (our current version) has an
unconditional dependency on `typing_extensions`, but our `spkg-
configure.m4` marks that as "not required" when using Python >= 3.11.

In this PR:
- We reduce several of these packages to (platform-independent) wheel
packages (and incidental updates) -- so that there is no build
dependency any more
- Two packages (`hatch_*`) that were build dependencies only are deleted
- We upgrade `setuptools_scm` to 8.1.0, which conditionalizes the
dependency on `typing_extensions` on `python_version < "3.10"`
https://github.com/pypa/setuptools_scm/blob/v8.1.0/pyproject.toml#L46




### 📝 Checklist

<!-- Put an `x` in all the boxes that apply. -->

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

### ⌛ Dependencies

<!-- List all open PRs that this PR logically depends on. For example,
-->
<!-- - #12345: short description why this is a dependency -->
<!-- - #34567: ... -->
    
URL: #38226
Reported by: Matthias Köppe
Reviewer(s): Kwankyu Lee
  • Loading branch information
Release Manager committed Jul 9, 2024
2 parents fc3a044 + a8d254d commit a13ffad
Show file tree
Hide file tree
Showing 62 changed files with 49 additions and 158 deletions.
8 changes: 4 additions & 4 deletions build/pkgs/asttokens/checksums.ini
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
tarball=asttokens-VERSION.tar.gz
sha1=d522a139240293953c99d32ca62c41542babb963
sha256=b03869718ba9a6eb027e134bfdf69f38a236d681c83c160d510768af11254ba0
upstream_url=https://pypi.io/packages/source/a/asttokens/asttokens-VERSION.tar.gz
tarball=asttokens-VERSION-py2.py3-none-any.whl
sha1=69a9448cd7fad3007a66f464f9daa35dd28183a6
sha256=051ed49c3dcae8913ea7cd08e46a606dba30b79993209636c4875bc1d637bc24
upstream_url=https://pypi.io/packages/py2.py3/a/asttokens/asttokens-VERSION-py2.py3-none-any.whl
2 changes: 1 addition & 1 deletion build/pkgs/asttokens/dependencies
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
| $(PYTHON_TOOLCHAIN) $(PYTHON)
six | pip $(PYTHON)

----------
All lines of this file are ignored except the first.
2 changes: 0 additions & 2 deletions build/pkgs/asttokens/spkg-install.in

This file was deleted.

8 changes: 4 additions & 4 deletions build/pkgs/cppy/checksums.ini
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
tarball=cppy-VERSION.tar.gz
sha1=c82ee7a4f38e302bfe4de2a695d2bdfefb69951f
sha256=83b43bf17b1085ac15c5debdb42154f138b928234b21447358981f69d0d6fe1b
upstream_url=https://files.pythonhosted.org/packages/source/c/cppy/cppy-VERSION.tar.gz
tarball=cppy-VERSION-py3-none-any.whl
sha1=57304a8ceaaf7cb34e4315aa9b8084b17fc0332c
sha256=c5b5eac3d3f42593a07d35275b0bc27f447b76b9ad8f27c62e3cfa286dc1988a
upstream_url=https://pypi.io/packages/py3/c/cppy/cppy-VERSION-py3-none-any.whl
2 changes: 1 addition & 1 deletion build/pkgs/cppy/dependencies
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
| $(PYTHON_TOOLCHAIN) $(PYTHON)
| pip $(PYTHON)

----------
All lines of this file are ignored except the first.
1 change: 0 additions & 1 deletion build/pkgs/cppy/spkg-install.in

This file was deleted.

8 changes: 4 additions & 4 deletions build/pkgs/dateutil/checksums.ini
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
tarball=python-dateutil-VERSION.tar.gz
sha1=c2ba10c775b7a52a4b57cac4d4110a0c0f812a82
sha256=0123cacc1627ae19ddf3c27a5de5bd67ee4586fbdd6440d9748f8abb483d3e86
upstream_url=https://files.pythonhosted.org/packages/source/p/python-dateutil/python-dateutil-VERSION.tar.gz
tarball=python_dateutil-VERSION-py2.py3-none-any.whl
sha1=323a8e8de7e00a254fadae9c77b1264d56525178
sha256=a8b2bc7bffae282281c8140a97d3aa9c14da0b136dfe83f850eea9a5f7470427
upstream_url=https://pypi.io/packages/py2.py3/p/python_dateutil/python_dateutil-VERSION-py2.py3-none-any.whl
2 changes: 1 addition & 1 deletion build/pkgs/dateutil/dependencies
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
six | $(PYTHON_TOOLCHAIN) $(PYTHON)
six | pip $(PYTHON)

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

This file was deleted.

8 changes: 4 additions & 4 deletions build/pkgs/executing/checksums.ini
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
tarball=executing-VERSION.tar.gz
sha1=ac9b0cbedd1166bce7a3b9f8542f8d1fafdd8c73
sha256=19da64c18d2d851112f09c287f8d3dbbdf725ab0e569077efb6cdcbd3497c107
upstream_url=https://pypi.io/packages/source/e/executing/executing-VERSION.tar.gz
tarball=executing-VERSION-py2.py3-none-any.whl
sha1=c32699ff6868bf3613d56795016880fdadde4fc6
sha256=eac49ca94516ccc753f9fb5ce82603156e590b27525a8bc32cce8ae302eb61bc
upstream_url=https://pypi.io/packages/py2.py3/e/executing/executing-VERSION-py2.py3-none-any.whl
2 changes: 1 addition & 1 deletion build/pkgs/executing/dependencies
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
| $(PYTHON_TOOLCHAIN) $(PYTHON)
| pip $(PYTHON)

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

This file was deleted.

18 changes: 0 additions & 18 deletions build/pkgs/hatch_fancy_pypi_readme/SPKG.rst

This file was deleted.

4 changes: 0 additions & 4 deletions build/pkgs/hatch_fancy_pypi_readme/checksums.ini

This file was deleted.

4 changes: 0 additions & 4 deletions build/pkgs/hatch_fancy_pypi_readme/dependencies

This file was deleted.

1 change: 0 additions & 1 deletion build/pkgs/hatch_fancy_pypi_readme/distros/alpine.txt

This file was deleted.

1 change: 0 additions & 1 deletion build/pkgs/hatch_fancy_pypi_readme/distros/arch.txt

This file was deleted.

1 change: 0 additions & 1 deletion build/pkgs/hatch_fancy_pypi_readme/distros/debian.txt

This file was deleted.

1 change: 0 additions & 1 deletion build/pkgs/hatch_fancy_pypi_readme/distros/fedora.txt

This file was deleted.

1 change: 0 additions & 1 deletion build/pkgs/hatch_fancy_pypi_readme/distros/freebsd.txt

This file was deleted.

1 change: 0 additions & 1 deletion build/pkgs/hatch_fancy_pypi_readme/distros/gentoo.txt

This file was deleted.

1 change: 0 additions & 1 deletion build/pkgs/hatch_fancy_pypi_readme/distros/macports.txt

This file was deleted.

1 change: 0 additions & 1 deletion build/pkgs/hatch_fancy_pypi_readme/distros/opensuse.txt

This file was deleted.

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

This file was deleted.

3 changes: 0 additions & 3 deletions build/pkgs/hatch_fancy_pypi_readme/spkg-configure.m4

This file was deleted.

1 change: 0 additions & 1 deletion build/pkgs/hatch_fancy_pypi_readme/type

This file was deleted.

This file was deleted.

18 changes: 0 additions & 18 deletions build/pkgs/hatch_vcs/SPKG.rst

This file was deleted.

4 changes: 0 additions & 4 deletions build/pkgs/hatch_vcs/checksums.ini

This file was deleted.

4 changes: 0 additions & 4 deletions build/pkgs/hatch_vcs/dependencies

This file was deleted.

1 change: 0 additions & 1 deletion build/pkgs/hatch_vcs/distros/alpine.txt

This file was deleted.

1 change: 0 additions & 1 deletion build/pkgs/hatch_vcs/distros/arch.txt

This file was deleted.

1 change: 0 additions & 1 deletion build/pkgs/hatch_vcs/distros/debian.txt

This file was deleted.

1 change: 0 additions & 1 deletion build/pkgs/hatch_vcs/distros/fedora.txt

This file was deleted.

1 change: 0 additions & 1 deletion build/pkgs/hatch_vcs/distros/freebsd.txt

This file was deleted.

1 change: 0 additions & 1 deletion build/pkgs/hatch_vcs/distros/gentoo.txt

This file was deleted.

1 change: 0 additions & 1 deletion build/pkgs/hatch_vcs/distros/macports.txt

This file was deleted.

1 change: 0 additions & 1 deletion build/pkgs/hatch_vcs/distros/opensuse.txt

This file was deleted.

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

This file was deleted.

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

This file was deleted.

3 changes: 0 additions & 3 deletions build/pkgs/hatch_vcs/spkg-configure.m4

This file was deleted.

1 change: 0 additions & 1 deletion build/pkgs/hatch_vcs/type

This file was deleted.

1 change: 0 additions & 1 deletion build/pkgs/hatch_vcs/version_requirements.txt

This file was deleted.

2 changes: 1 addition & 1 deletion build/pkgs/httpx/dependencies
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
httpcore | $(PYTHON_TOOLCHAIN) $(PYTHON)
httpcore anyio sniffio | $(PYTHON_TOOLCHAIN) $(PYTHON)

----------
All lines of this file are ignored except the first.
8 changes: 4 additions & 4 deletions build/pkgs/jsonschema/checksums.ini
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
tarball=jsonschema-VERSION.tar.gz
sha1=9f762c6c2b92defddf1c441cce8132d021252b2c
sha256=0f864437ab8b6076ba6707453ef8f98a6a0d512a80e93f8abdb676f737ecb60d
upstream_url=https://pypi.io/packages/source/j/jsonschema/jsonschema-VERSION.tar.gz
tarball=jsonschema-VERSION-py3-none-any.whl
sha1=189537b18c91e60be991a3dba704577d19f8e48d
sha256=a870ad254da1a8ca84b6a2905cac29d265f805acc57af304784962a2aa6508f6
upstream_url=https://pypi.io/packages/py3/j/jsonschema/jsonschema-VERSION-py3-none-any.whl
2 changes: 1 addition & 1 deletion build/pkgs/jsonschema/dependencies
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
jsonschema_specifications pyrsistent attrs importlib_metadata fqdn isoduration jsonpointer uri_template webcolors | $(PYTHON_TOOLCHAIN) hatchling hatch_vcs hatch_fancy_pypi_readme $(PYTHON)
jsonschema_specifications pyrsistent attrs fqdn isoduration jsonpointer uri_template webcolors | $(PYTHON_TOOLCHAIN) $(PYTHON)

----------
All lines of this file are ignored except the first.
14 changes: 0 additions & 14 deletions build/pkgs/jsonschema/spkg-install.in

This file was deleted.

8 changes: 4 additions & 4 deletions build/pkgs/pure_eval/checksums.ini
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
tarball=pure_eval-VERSION.tar.gz
sha1=45813e75b359573c2ef49430673812ea3f8f81f2
sha256=2b45320af6dfaa1750f543d714b6d1c520a1688dec6fd24d339063ce0aaa9ac3
upstream_url=https://pypi.io/packages/source/p/pure_eval/pure_eval-VERSION.tar.gz
tarball=pure_eval-VERSION-py3-none-any.whl
sha1=dbd5eaa9eb5a4910cff5ccd42b570f866f581da4
sha256=01eaab343580944bc56080ebe0a674b39ec44a945e6d09ba7db3cb8cec289350
upstream_url=https://pypi.io/packages/py3/p/pure_eval/pure_eval-VERSION-py3-none-any.whl
2 changes: 1 addition & 1 deletion build/pkgs/pure_eval/dependencies
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
| $(PYTHON_TOOLCHAIN) $(PYTHON)
| pip $(PYTHON)

----------
All lines of this file are ignored except the first.
2 changes: 0 additions & 2 deletions build/pkgs/pure_eval/spkg-install.in

This file was deleted.

8 changes: 4 additions & 4 deletions build/pkgs/py/checksums.ini
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
tarball=py-VERSION.tar.gz
sha1=bb8aa4f56e3ced1cd61906495150e7ca2dacc10b
sha256=51c75c4126074b472f746a24399ad32f6053d1b34b68d2fa41e558e6f4a98719
upstream_url=https://pypi.io/packages/source/p/py/py-VERSION.tar.gz
tarball=py-VERSION-py2.py3-none-any.whl
sha1=44002baec8d2184d218bd2fa6049967cd9b4dbb5
sha256=607c53218732647dff4acdfcd50cb62615cedf612e72d1724fb1a0cc6405b378
upstream_url=https://pypi.io/packages/py2.py3/p/py/py-VERSION-py2.py3-none-any.whl
2 changes: 1 addition & 1 deletion build/pkgs/py/dependencies
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
| $(PYTHON_TOOLCHAIN) setuptools_scm $(PYTHON)
| pip $(PYTHON)

----------
All lines of this file are ignored except the first.
2 changes: 0 additions & 2 deletions build/pkgs/py/spkg-install.in

This file was deleted.

4 changes: 2 additions & 2 deletions build/pkgs/setuptools_scm/checksums.ini
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
tarball=setuptools_scm-VERSION-py3-none-any.whl
sha1=cfde7254fe351b69cd4bf02e1b57e0b3c59aa9a6
sha256=b47844cd2a84b83b3187a5782c71128c28b4c94cad8bfb871da2784a5cb54c4f
sha1=be606b6acb67714b96e9e1e9a9944feaca504e44
sha256=897a3226a6fd4a6eb2f068745e49733261a21f70b1bb28fce0339feb978d9af3
upstream_url=https://pypi.io/packages/py3/s/setuptools_scm/setuptools_scm-VERSION-py3-none-any.whl
2 changes: 1 addition & 1 deletion build/pkgs/setuptools_scm/package-version.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
8.0.4
8.1.0
8 changes: 4 additions & 4 deletions build/pkgs/stack_data/checksums.ini
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
tarball=stack_data-VERSION.tar.gz
sha1=7f7627afc47570ffb06924c1b2fbb48e21bac724
sha256=836a778de4fec4dcd1dcd89ed8abff8a221f58308462e1c4aa2a3cf30148f0b9
upstream_url=https://pypi.io/packages/source/s/stack_data/stack_data-VERSION.tar.gz
tarball=stack_data-VERSION-py3-none-any.whl
sha1=96814b10bdc464e8ef00f4a07c60dd17a3dc9668
sha256=d5558e0c25a4cb0853cddad3d77da9891a08cb85dd9f9f91b9f8cd66e511e695
upstream_url=https://pypi.io/packages/py3/s/stack_data/stack_data-VERSION-py3-none-any.whl
2 changes: 1 addition & 1 deletion build/pkgs/stack_data/dependencies
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
executing asttokens pure_eval | $(PYTHON_TOOLCHAIN) $(PYTHON)
executing asttokens pure_eval | pip $(PYTHON)

----------
All lines of this file are ignored except the first.
2 changes: 0 additions & 2 deletions build/pkgs/stack_data/spkg-install.in

This file was deleted.

4 changes: 2 additions & 2 deletions build/pkgs/types_python_dateutil/checksums.ini
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
tarball=types_python_dateutil-VERSION-py3-none-any.whl
sha1=c039b93ad4b5f3ea1c6aac3d08386995e8c7b19e
sha256=f977b8de27787639986b4e28963263fd0e5158942b3ecef91b9335c130cb1ce9
sha1=fc0a6cbd54667dd8dadb95c448014efe66c9ae0a
sha256=6b8cb66d960771ce5ff974e9dd45e38facb81718cc1e208b10b1baccbfdbee3b
upstream_url=https://pypi.io/packages/py3/t/types_python_dateutil/types_python_dateutil-VERSION-py3-none-any.whl
2 changes: 1 addition & 1 deletion build/pkgs/types_python_dateutil/package-version.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
2.8.19.14
2.9.0.20240316

0 comments on commit a13ffad

Please sign in to comment.