Skip to content

Commit 78e394a

Browse files
committed
Do not fail Python prerelease completion on PyPI's stable-default selection
1 parent d26d9bf commit 78e394a

2 files changed

Lines changed: 48 additions & 6 deletions

File tree

‎scripts/check_api_reference_install.py‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -239,15 +239,15 @@ def run_clean_install(
239239
install_attempts: int = 6,
240240
install_retry_sleep: float = 20,
241241
) -> None:
242-
"""Exercise the documented range and independently require the exact release."""
242+
"""Require the exact release before exercising the documented range."""
243243
_run_clean_requirement(
244-
requirement,
244+
identity.exact_requirement,
245245
expected_version=identity.registry_version,
246246
install_attempts=install_attempts,
247247
install_retry_sleep=install_retry_sleep,
248248
)
249249
_run_clean_requirement(
250-
identity.exact_requirement,
250+
requirement,
251251
expected_version=identity.registry_version,
252252
install_attempts=install_attempts,
253253
install_retry_sleep=install_retry_sleep,

‎tests/test_api_reference_install.py‎

Lines changed: 45 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -159,7 +159,7 @@ def unavailable(
159159
)
160160

161161

162-
def test_clean_install_qualifies_the_documented_range_before_the_exact_release(
162+
def test_clean_install_probes_the_exact_release_before_the_documented_range(
163163
monkeypatch: pytest.MonkeyPatch,
164164
) -> None:
165165
identity = load_release_identity(REPO_ROOT)
@@ -181,15 +181,16 @@ def run_requirement(
181181
run_clean_install(identity.requirement, identity, install_attempts=1, install_retry_sleep=0)
182182

183183
assert calls == [
184-
("durable-workflow~=2.0.0rc0", identity.registry_version),
185184
(f"durable-workflow=={identity.registry_version}", identity.registry_version),
185+
("durable-workflow~=2.0.0rc0", identity.registry_version),
186186
]
187187

188188

189-
def test_unpublished_exact_release_uses_the_existing_deferral_signal(
189+
def test_public_rc24_does_not_mask_an_unpublished_exact_rc25(
190190
monkeypatch: pytest.MonkeyPatch,
191191
) -> None:
192192
identity = load_release_identity(REPO_ROOT)
193+
calls: list[str] = []
193194

194195
def run_requirement(
195196
requirement: str,
@@ -199,14 +200,55 @@ def run_requirement(
199200
install_retry_sleep: float,
200201
) -> None:
201202
del expected_version, install_attempts, install_retry_sleep
203+
calls.append(requirement)
202204
if requirement == identity.exact_requirement:
203205
raise PublicRequirementUnavailable(1, ["pip", "install", requirement])
206+
raise subprocess.CalledProcessError(
207+
1,
208+
["python", "-c", "installed durable-workflow 2.0.0rc24, expected 2.0.0rc25"],
209+
)
204210

205211
monkeypatch.setattr("scripts.check_api_reference_install._run_clean_requirement", run_requirement)
206212

207213
with pytest.raises(PublicRequirementUnavailable):
208214
run_clean_install(identity.requirement, identity, install_attempts=1, install_retry_sleep=0)
209215

216+
assert identity.registry_version == "2.0.0rc25"
217+
assert calls == [identity.exact_requirement]
218+
219+
220+
def test_stale_documented_range_is_a_hard_failure_after_exact_rc25_exists(
221+
monkeypatch: pytest.MonkeyPatch,
222+
) -> None:
223+
identity = load_release_identity(REPO_ROOT)
224+
calls: list[str] = []
225+
stale_range = subprocess.CalledProcessError(
226+
1,
227+
["python", "-c", "installed durable-workflow 2.0.0rc24, expected 2.0.0rc25"],
228+
)
229+
230+
def run_requirement(
231+
requirement: str,
232+
*,
233+
expected_version: str | None,
234+
install_attempts: int,
235+
install_retry_sleep: float,
236+
) -> None:
237+
assert expected_version == identity.registry_version
238+
assert install_attempts == 1
239+
assert install_retry_sleep == 0
240+
calls.append(requirement)
241+
if requirement == identity.requirement:
242+
raise stale_range
243+
244+
monkeypatch.setattr("scripts.check_api_reference_install._run_clean_requirement", run_requirement)
245+
246+
with pytest.raises(subprocess.CalledProcessError) as failure:
247+
run_clean_install(identity.requirement, identity, install_attempts=1, install_retry_sleep=0)
248+
249+
assert failure.value is stale_range
250+
assert calls == [identity.exact_requirement, identity.requirement]
251+
210252

211253
def test_public_release_evidence_derives_from_manifest(tmp_path: Path) -> None:
212254
identity = load_release_identity(REPO_ROOT)

0 commit comments

Comments
 (0)