Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Upgrade to 3.13.0a4. #2376

Merged
merged 2 commits into from
Feb 22, 2024
Merged

Upgrade to 3.13.0a4. #2376

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c4da9ba
Upgrade to 3.13.0a4.
jsirois Feb 22, 2024
141d507
Skip test_wheel_file_url_dep for exactly 3.13.0a4.
jsirois Feb 22, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 10 additions & 2 deletions docker/base/install_pythons.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,16 @@

set -xeuo pipefail

# TODO(John Sirois): Delete this definition when we upgarde past 3.13.0a4. Pyenv needed to revert
# 3.13.0a4 due to Mac build issues which don't affect us.
# See:
# + https://github.com/pyenv/pyenv/pull/2903
# + https://github.com/pyenv/pyenv/commit/f9a2bb81b69bc2fc45753f7da5d246bc2706f01d
PYENV_SHA=932dc464f5550e3c6af7f705891c1797c4ab004d

export PYENV_ROOT=/pyenv


# N.B.: The 1st listed version will supply the default `python` on the PATH; otherwise order does
# not matter.
PYENV_VERSIONS=(
Expand All @@ -16,7 +24,7 @@ PYENV_VERSIONS=(
3.9.18
3.10.13
3.12.2
3.13.0a3
3.13.0a4
pypy2.7-7.3.15
pypy3.5-7.0.0
pypy3.6-7.3.3
Expand All @@ -27,7 +35,7 @@ PYENV_VERSIONS=(
)

git clone https://github.com/pyenv/pyenv.git "${PYENV_ROOT}" && (
cd "${PYENV_ROOT}" && src/configure && make -C src
cd "${PYENV_ROOT}" && git checkout "${PYENV_SHA:-HEAD}" && src/configure && make -C src
)
PATH="${PATH}:${PYENV_ROOT}/bin"

Expand Down
5 changes: 2 additions & 3 deletions pex/interpreter_constraints.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -317,12 +317,11 @@ def iter_compatible_versions(
PythonVersion(Lifecycle.EOL, 3, 5, 10),
PythonVersion(Lifecycle.EOL, 3, 6, 15),
PythonVersion(Lifecycle.EOL, 3, 7, 17),
# ^-- EOL --^
PythonVersion(Lifecycle.STABLE, 3, 8, 18),
PythonVersion(Lifecycle.STABLE, 3, 9, 18),
PythonVersion(Lifecycle.STABLE, 3, 10, 13),
PythonVersion(Lifecycle.STABLE, 3, 11, 7),
PythonVersion(Lifecycle.STABLE, 3, 12, 1),
PythonVersion(Lifecycle.STABLE, 3, 11, 8),
PythonVersion(Lifecycle.STABLE, 3, 12, 2),
Comment on lines +323 to +324
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm assuming this is tangentially-related general bumping because these have also been recently released?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes. I should have done it in #2360.

PythonVersion(Lifecycle.DEV, 3, 13, 0),
)

Expand Down
10 changes: 8 additions & 2 deletions tests/integration/test_issue_2038.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,14 @@


@pytest.mark.skipif(
sys.version_info[:2] < (3, 7),
reason="This test needs to run Poetry which requires at least Python 3.7",
sys.version_info[:2] < (3, 7) or sys.version_info == (3, 13, 0, "alpha", 4),
reason=(
"This test needs to run Poetry which requires at least Python 3.7. "
"Poetry also indirectly depends on msgpack (1.0.7 currently), which uses the "
Copy link
Member Author

@jsirois jsirois Feb 22, 2024 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Pyenv needed to revert 3.13.0a4 due to Mac build issues which don't affect us.

This is probably why they needed to revert: M1 not generally available for CI -> No arm wheels published -> sdist needs to be built -> this API is used. Most projects have a pre-built wheel for Linux.

"_PyCFunctionFastWithKeywords ~private CPython API which was mistakenly yanked (typo) by "
"https://github.com/python/cpython/pull/114627 just before the 3.13.0a4 release and "
"restored by https://github.com/python/cpython/pull/115561 just after."
),
)
def test_wheel_file_url_dep(tmpdir):
# type: (Any) -> None
Expand Down