| FazBrowse GitHub Viewer | Trending | | Home |
| Tools: [Download Repo ZIP] [Original HTTPS Page] |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -0,0 +1,2 @@ | |||
| 1 | + Installing with ``py install 3[.x]-dev`` will now select final versions as | ||
| 2 | + well as prereleases. | ||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -80,7 +80,9 @@ def calculate_install_json(ns, *, for_embed=False, for_test=False): | |||
| 80 | 80 | ||
| 81 | 81 | # Tag used in runtime ID (for side-by-side install/updates) | |
| 82 | 82 | ID_TAG = XY_ARCH_TAG | |
| 83 | - # Tag shown in 'py list' output | ||
| 83 | + # Tag shown in 'py list' output. | ||
| 84 | + # gh-139810: We only include '-dev' here for prereleases, even though it | ||
| 85 | + # works for final releases too. | ||
| 84 | 86 | DISPLAY_TAG = f"{XY_TAG}-dev{TAG_ARCH}" if VER_SUFFIX else XY_ARCH_TAG | |
| 85 | 87 | # Tag used for PEP 514 registration | |
| 86 | 88 | SYS_WINVER = XY_TAG + (TAG_ARCH if TAG_ARCH != '-64' else '') | |
@@ -102,9 +104,10 @@ def calculate_install_json(ns, *, for_embed=False, for_test=False): | |||
| 102 | 104 | FULL_ARCH_TAG, | |
| 103 | 105 | XY_ARCH_TAG, | |
| 104 | 106 | X_ARCH_TAG, | |
| 105 | - # X_TAG and XY_TAG doesn't include VER_SUFFIX, so create -dev versions | ||
| 106 | - f"{XY_TAG}-dev{TAG_ARCH}" if XY_TAG and VER_SUFFIX else "", | ||
| 107 | - f"{X_TAG}-dev{TAG_ARCH}" if X_TAG and VER_SUFFIX else "", | ||
| 107 | + # gh-139810: The -dev tags are always included so that the latest | ||
| 108 | + # release is chosen, no matter whether it's prerelease or final. | ||
| 109 | + f"{XY_TAG}-dev{TAG_ARCH}" if XY_TAG else "", | ||
| 110 | + f"{X_TAG}-dev{TAG_ARCH}" if X_TAG else "", | ||
| 108 | 111 | ] | |
| 109 | 112 | ||
| 110 | 113 | # Generate run-for entries for each target. | |
@@ -115,16 +118,15 @@ def calculate_install_json(ns, *, for_embed=False, for_test=False): | |||
| 115 | 118 | ]: | |
| 116 | 119 | if not base["target"]: | |
| 117 | 120 | continue | |
| 118 | - STD_RUN_FOR.append({**base, "tag": FULL_ARCH_TAG}) | ||
| 121 | + STD_RUN_FOR.extend([ | ||
| 122 | + {**base, "tag": FULL_ARCH_TAG}, | ||
| 123 | + {**base, "tag": f"{XY_TAG}-dev{TAG_ARCH}" if XY_TAG else ""}, | ||
| 124 | + {**base, "tag": f"{X_TAG}-dev{TAG_ARCH}" if X_TAG else ""}, | ||
| 125 | + ]) | ||
| 119 | 126 | if XY_TAG: | |
| 120 | 127 | STD_RUN_FOR.append({**base, "tag": XY_ARCH_TAG}) | |
| 121 | 128 | if X_TAG: | |
| 122 | 129 | STD_RUN_FOR.append({**base, "tag": X_ARCH_TAG}) | |
| 123 | - if VER_SUFFIX: | ||
| 124 | - STD_RUN_FOR.extend([ | ||
| 125 | - {**base, "tag": f"{XY_TAG}-dev{TAG_ARCH}" if XY_TAG else ""}, | ||
| 126 | - {**base, "tag": f"{X_TAG}-dev{TAG_ARCH}" if X_TAG else ""}, | ||
| 127 | - ]) | ||
| 128 | 130 | ||
| 129 | 131 | # Generate alias entries for each target. We need both arch and non-arch | |
| 130 | 132 | # versions as well as windowed/non-windowed versions to make sure that all | |
| Back | FazBrowse Home | New Git URL |
0 commit comments