Skip to content

Commit

Permalink
Update PBS GitHub repo URLs. (#2633)
Browse files Browse the repository at this point in the history
This tracks the ownership transfer from indygreg to astral-sh.
  • Loading branch information
jsirois authored Dec 18, 2024
1 parent adf9ba6 commit ed02078
Show file tree
Hide file tree
Showing 7 changed files with 12 additions and 12 deletions.
2 changes: 1 addition & 1 deletion CHANGES.md
Original file line number Diff line number Diff line change
Expand Up @@ -453,7 +453,7 @@ platform the PEX supports). These PEX scies are single file
executables that look and behave like traditional PEXes, but unlike
PEXes they can run on a machine with no Python interpreter available.

[PBS]: https://github.com/indygreg/python-build-standalone
[PBS]: https://github.com/astral-sh/python-build-standalone
[scie]: https://github.com/a-scie

* Add `--scie` option to produce native PEX exes. (#2466)
Expand Down
8 changes: 4 additions & 4 deletions docs/scie.md
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ system as well.
When you add the `--scie eager` option to your `pex` command line, Pex uses the [science](
https://science.scie.app/) [projects](https://github.com/a-scie/) to produce what is known as a
`scie` (pronounced like "ski") binary powered by the [Python Standalone Builds](
https://github.com/indygreg/python-build-standalone) CPython distributions or the distributions
https://github.com/astral-sh/python-build-standalone) CPython distributions or the distributions
released by [PyPy](https://pypy.org/download.html) depending on which interpreter your PEX targets.
The end product looks and behaves like a traditional PEX except in two aspects:
+ The PEX scie file is larger than the equivalent PEX file since it contains a Python distribution.
Expand Down Expand Up @@ -190,7 +190,7 @@ content hash does not match, the PEX scie will fail to boot. For example:
@@ -1,5 +1,5 @@
{
"ptex": {
- "cpython-3.11.9+20240726-x86_64-unknown-linux-gnu-install_only.tar.gz": "https://github.com/indygreg/python-build-standalone/releases/download/20240726/cpython-3.11.9%2B20240726-x86_64-unknown-linux-gnu-install_only.tar.gz"
- "cpython-3.11.9+20240726-x86_64-unknown-linux-gnu-install_only.tar.gz": "https://github.com/astral-sh/python-build-standalone/releases/download/20240726/cpython-3.11.9%2B20240726-x86_64-unknown-linux-gnu-install_only.tar.gz"
+ "cpython-3.11.9+20240726-x86_64-unknown-linux-gnu-install_only.tar.gz": "file:///etc/hosts"
}
}
Expand All @@ -208,7 +208,7 @@ size 410 had unexpected hash: 16183c427758316754b82e4d48d63c265ee46ec5ae96a40d90
can correct this by re-pointing to a valid file:
```sh
# Download the expected dstribution:
:; curl -fL https://github.com/indygreg/python-build-standalone/releases/download/20240726/cpython-3.11.9%2B20240726-x86_64-unknown-linux-gnu-install_only.tar.gz > /tmp/example
:; curl -fL https://github.com/astral-sh/python-build-standalone/releases/download/20240726/cpython-3.11.9%2B20240726-x86_64-unknown-linux-gnu-install_only.tar.gz > /tmp/example

# Re-point to the now valid copy of the expected Python distribution:
:; jq 'first(.ptex | .[]) = "file:///tmp/example"' starter.json > pythons.json
Expand All @@ -218,7 +218,7 @@ can correct this by re-pointing to a valid file:
@@ -1,5 +1,5 @@
{
"ptex": {
- "cpython-3.11.9+20240726-x86_64-unknown-linux-gnu-install_only.tar.gz": "https://github.com/indygreg/python-build-standalone/releases/download/20240726/cpython-3.11.9%2B20240726-x86_64-unknown-linux-gnu-install_only.tar.gz"
- "cpython-3.11.9+20240726-x86_64-unknown-linux-gnu-install_only.tar.gz": "https://github.com/astral-sh/python-build-standalone/releases/download/20240726/cpython-3.11.9%2B20240726-x86_64-unknown-linux-gnu-install_only.tar.gz"
+ "cpython-3.11.9+20240726-x86_64-unknown-linux-gnu-install_only.tar.gz": "file:///tmp/example"
}
}
Expand Down
2 changes: 1 addition & 1 deletion pex/fetcher.py
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@ def create_ssl_context(self):
# [^3]: https://github.com/openssl/openssl/blob/c3cc0f1386b0544383a61244a4beeb762b67498f/crypto/objects/obj_dat.c#L326-L340
# [^4]: https://github.com/openssl/openssl/blob/c3cc0f1386b0544383a61244a4beeb762b67498f/ssl/ssl_lib.c#L3194-L3212
# [^5]: https://github.com/openssl/openssl/blob/c3cc0f1386b0544383a61244a4beeb762b67498f/ssl/ssl_init.c#L86-L116
# [^6]: https://github.com/indygreg/python-build-standalone/releases/tag/20240107
# [^6]: https://github.com/astral-sh/python-build-standalone/releases/tag/20240107
# [^7]: https://gitlab.com/redhat-crypto/fedora-crypto-policies/-/merge_requests/110/diffs#269a48e71ac25ad1d07ff00db2390834c8ba7596_11_16
production_assert(
in_main_thread(),
Expand Down
6 changes: 3 additions & 3 deletions pex/scie/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -187,7 +187,7 @@ def register_options(parser):
"The Python Standalone Builds release to use when a CPython interpreter distribution "
"is needed for the PEX scie. Currently, releases are dates of the form YYYYMMDD, "
"e.g.: '20240713'. See their GitHub releases page at"
"https://github.com/indygreg/python-build-standalone/releases to discover available "
"https://github.com/astral-sh/python-build-standalone/releases to discover available "
"releases. If left unspecified the latest release is used. N.B.: The latest lookup is "
"cached for 5 days. To force a fresh lookup you can remove the cache at "
"<USER CACHE DIR>/science/downloads."
Expand Down Expand Up @@ -219,7 +219,7 @@ def register_options(parser):
"If you don't specify this option, Pex will do its best to guess appropriate portable "
"CPython versions. N.B.: Python Standalone Builds does not provide all patch versions; "
"so you should check their releases at "
"https://github.com/indygreg/python-build-standalone/releases if you wish to pin down "
"https://github.com/astral-sh/python-build-standalone/releases if you wish to pin down "
"to the patch level."
),
)
Expand Down Expand Up @@ -365,7 +365,7 @@ def extract_options(options):
"Invalid Python version: '{python_version}'.\n"
"Scies are built using Python Standalone Builds which only supports Python >=3.8.\n"
"To find supported Python versions, you can browse the releases here:\n"
" https://github.com/indygreg/python-build-standalone/releases".format(
" https://github.com/astral-sh/python-build-standalone/releases".format(
python_version=options.scie_python_version
)
)
Expand Down
2 changes: 1 addition & 1 deletion tests/integration/scie/test_pex_scie.py
Original file line number Diff line number Diff line change
Expand Up @@ -380,7 +380,7 @@ def make_20221002_3_10_7_file(platform):
def make_20240415_3_10_14_url(platform):
# type: (str) -> str
return (
"https://github.com/indygreg/python-build-standalone/releases/download/20240415/"
"https://github.com/astral-sh/python-build-standalone/releases/download/20240415/"
"cpython-3.10.14+20240415-{platform}-install_only.tar.gz".format(platform=platform)
)

Expand Down
2 changes: 1 addition & 1 deletion tests/integration/test_issue_2017.py
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ def musl_libc_capable_pip_versions():
def statically_linked_musl_libc_cpython(shared_integration_test_tmpdir):
# type: (str) -> str
pbs_distribution_url = (
"https://github.com/indygreg/python-build-standalone/releases/download/20221220/"
"https://github.com/astral-sh/python-build-standalone/releases/download/20221220/"
"cpython-3.10.9+20221220-x86_64_v3-unknown-linux-musl-install_only.tar.gz"
)
tarball_name = os.path.basename(urlparse.urlparse(pbs_distribution_url).path)
Expand Down
2 changes: 1 addition & 1 deletion tests/integration/test_issue_2355.py
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ def test_ssl_context(
)
)

pbs_release = "https://github.com/indygreg/python-build-standalone/releases/download/20240107"
pbs_release = "https://github.com/astral-sh/python-build-standalone/releases/download/20240107"
pbs_archive = "cpython-3.9.18+20240107-{arch}-unknown-linux-gnu-install_only.tar.gz".format(
arch="x86_64" if IS_X86_64 else "aarch64"
)
Expand Down

0 comments on commit ed02078

Please sign in to comment.