Skip to content

fix(conda): read conda-forge's CFEP-27 Windows layout in the smoke check (#2126) - #2127

Merged
JarryShaw merged 1 commit into
mainfrom
fix/2126-cfep27-windows-layout
Oct 24, 2026
Merged

JarryShaw merged 1 commit into
mainfrom
fix/2126-cfep27-windows-layout

Conversation

@JarryShaw

Copy link
Copy Markdown
Owner

What is the purpose of your pull request?

  • fix — corrects a defect

Description of your pull request and other information

Closes #2126.

  • Cause: conda-forge's CPython 3.15 on Windows uses CFEP-27's lib/python/site-packages. conda-build 26.9.1 sets SP_DIR from the python package's python_site_packages_path. built_for only knew Lib/site-packages, so it returned python and failed the win-64 3.15 smoke in run 40034513322.
  • Fix: built_for recognises both Windows layouts (WINDOWS_SITES) and reads the version from the pyXY build string for either.
  • Package: unaffected. conda-build's test: imports: pcapkit passed in a fresh 3.15.1 env.
  • Tests: TestTheWindowsLayout covers the CFEP-27 path in built_for and end to end through smoke(). Both new tests fail without the fix. The module gives 22 passed.
  • Still to verify: the rest of the smoke (foreign() and the probe) has not run on real Windows 3.15. A build-only Conda Update run on this commit plus fix(release): read the environment without os.environb where Windows lacks it (#2120) #2122 and ci(conda): build the macos-26-intel legs again (#2123) #2124 will show it.

…eck (#2126)

- util/conda_vendor.py: built_for recognises lib/python/site-packages, the
  layout conda-forge's CPython 3.15 uses on Windows (CFEP-27), beside
  Lib/site-packages, and reads the version from the pyXY build string for
  either. It returned the bare `python` before, failing the win-64 3.15 smoke.
- tests/project/test_conda_windows_leg_2060.py: TestTheWindowsLayout covers
  the CFEP-27 path for built_for and end to end through smoke().

tests/project/test_conda_windows_leg_2060.py: 22 passed; the 2 new tests fail
without the fix.
@JarryShaw JarryShaw added bug Issues reporting a defect (set by the bug report template; a default, not an assessment) ci Pull requests that change CI or workflow configuration (ci: subject prefix) review: running A cross-review is in flight against the current head - no verdict yet labels Oct 24, 2026
@JarryShaw JarryShaw added ci Pull requests that change CI or workflow configuration (ci: subject prefix) review: running A cross-review is in flight against the current head - no verdict yet labels Oct 24, 2026
@JarryShaw JarryShaw moved this to In review in PyPCAPKit Oct 24, 2026
@JarryShaw

Copy link
Copy Markdown
Owner Author

GOOD TO GO at 0be0ba004 (Sonnet review).

@JarryShaw JarryShaw added review: good-to-go Cross-review at the current head says ready; CI state is separate and removed review: running A cross-review is in flight against the current head - no verdict yet labels Oct 24, 2026
@github-actions

Copy link
Copy Markdown
Contributor

Coverage: 91.54% (unit tier, Python 3.15, 0be0ba004, Unit Tests run success)

Package Statements Missed Branches Partial Cover
pcapkit (top level) 104 4 20 2 95.16%
pcapkit/const 19599 880 2618 866 92.12%
pcapkit/corekit 2580 75 814 37 96.46%
pcapkit/dumpkit 282 3 102 3 98.44%
pcapkit/foundation 2944 23 1028 25 98.79%
pcapkit/interface 138 4 52 3 96.32%
pcapkit/protocols 17414 219 4574 185 98.14%
pcapkit/toolkit 869 36 298 10 95.20%
pcapkit/utilities 473 7 136 5 98.03%
pcapkit/vendor 4432 1988 1018 167 51.87%

Per-file detail: the coverage-html artifact of this run.

@JarryShaw
JarryShaw merged commit 23a815b into main Oct 24, 2026
69 checks passed
@github-project-automation github-project-automation Bot moved this from In review to Done in PyPCAPKit Oct 24, 2026
@JarryShaw
JarryShaw deleted the fix/2126-cfep27-windows-layout branch October 24, 2026 00:38
@JarryShaw JarryShaw removed the review: good-to-go Cross-review at the current head says ready; CI state is separate label Oct 24, 2026
@JarryShaw JarryShaw added this to the PyPCAPKit v1.5 milestone Oct 26, 2026
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

bug Issues reporting a defect (set by the bug report template; a default, not an assessment) ci Pull requests that change CI or workflow configuration (ci: subject prefix)

Projects

Status: Done

Development

Successfully merging this pull request may close these issues.

fix(conda): the smoke check misreads conda-forge's CFEP-27 Windows layout for Python 3.15

1 participant