Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
Installing with ``py install 3[.x]-dev`` will now select final versions as
well as prereleases.
22 changes: 12 additions & 10 deletions PC/layout/support/pymanager.py
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,9 @@ def calculate_install_json(ns, *, for_embed=False, for_test=False):

# Tag used in runtime ID (for side-by-side install/updates)
ID_TAG = XY_ARCH_TAG
# Tag shown in 'py list' output
# Tag shown in 'py list' output.
# gh-139810: We only include '-dev' here for prereleases, even though it
# works for final releases too.
DISPLAY_TAG = f"{XY_TAG}-dev{TAG_ARCH}" if VER_SUFFIX else XY_ARCH_TAG
# Tag used for PEP 514 registration
SYS_WINVER = XY_TAG + (TAG_ARCH if TAG_ARCH != '-64' else '')
Expand All @@ -102,9 +104,10 @@ def calculate_install_json(ns, *, for_embed=False, for_test=False):
FULL_ARCH_TAG,
XY_ARCH_TAG,
X_ARCH_TAG,
# X_TAG and XY_TAG doesn't include VER_SUFFIX, so create -dev versions
f"{XY_TAG}-dev{TAG_ARCH}" if XY_TAG and VER_SUFFIX else "",
f"{X_TAG}-dev{TAG_ARCH}" if X_TAG and VER_SUFFIX else "",
# gh-139810: The -dev tags are always included so that the latest
# release is chosen, no matter whether it's prerelease or final.
f"{XY_TAG}-dev{TAG_ARCH}" if XY_TAG else "",
f"{X_TAG}-dev{TAG_ARCH}" if X_TAG else "",
]

# Generate run-for entries for each target.
Expand All @@ -115,16 +118,15 @@ def calculate_install_json(ns, *, for_embed=False, for_test=False):
]:
if not base["target"]:
continue
STD_RUN_FOR.append({**base, "tag": FULL_ARCH_TAG})
STD_RUN_FOR.extend([
{**base, "tag": FULL_ARCH_TAG},
{**base, "tag": f"{XY_TAG}-dev{TAG_ARCH}" if XY_TAG else ""},
{**base, "tag": f"{X_TAG}-dev{TAG_ARCH}" if X_TAG else ""},
])
if XY_TAG:
STD_RUN_FOR.append({**base, "tag": XY_ARCH_TAG})
if X_TAG:
STD_RUN_FOR.append({**base, "tag": X_ARCH_TAG})
if VER_SUFFIX:
STD_RUN_FOR.extend([
{**base, "tag": f"{XY_TAG}-dev{TAG_ARCH}" if XY_TAG else ""},
{**base, "tag": f"{X_TAG}-dev{TAG_ARCH}" if X_TAG else ""},
])

# Generate alias entries for each target. We need both arch and non-arch
# versions as well as windowed/non-windowed versions to make sure that all
Expand Down
Loading