Skip to content
This repository has been archived by the owner on Feb 15, 2023. It is now read-only.

MAINT, CI: check _distributor_init.py contents #151

Merged
merged 4 commits into from
Nov 28, 2021
Merged

MAINT, CI: check _distributor_init.py contents #151

merged 4 commits into from
Nov 28, 2021

Commits on Nov 28, 2021

  1. MAINT, CI: check _distributor_init.py contents 

    * following on from continued problems reported here:
scipy/scipy#15050

* draft in code to check that MacOS wheels get
the same `_distributor_init.py` as the one present
in the wheels repo, rather than the generic nearly-empty
copy actually present in the `1.7.3` release

* we've had two pull requests about this and it slipped through into
a release despite 3 sets of eyes so need to be careful here;
I'd like to the test script added here failing for MacOS in CI
like it does locally, before attempting a fix

* this is likely still wip, since relative paths/directories
can be confusing to predict in the wheels/multibuild control
flow, which also flushes in and out of containers I think, etc.
(this probably contributed to the original problem)

* the script did seem to work in a quick local check though, complaining
about our new MacOS file inclusion, but happy with the long-standing
windows wheel inclusion for dirs containing wheels for each OS type:

`python verify_init.py /Users/treddy/rough_work/scipy/release_173/release/installers/windows`
`python verify_init.py /Users/treddy/rough_work/scipy/release_173/release/installers/linux`
`python verify_init.py /Users/treddy/rough_work/scipy/release_173/release/installers/mac`

```
Traceback (most recent call last):
  File "verify_init.py", line 40, in <module>
    check_for_dist_init(input_dir=input_dir)
  File "verify_init.py", line 34, in check_for_dist_init
    raise ValueError(f"Contents of _distributor_init.py incorrect for
{wheel_file}")
ValueError: Contents of _distributor_init.py incorrect for
/Users/treddy/rough_work/scipy/release_173/release/installers/mac/scipy-1.7.3-cp39-cp39-macosx_10_9_x86_64.whl
```
    @tylerjereddy
    tylerjereddy committed Nov 28, 2021
    Configuration menu
    Copy the full SHA
    dbb2bb9 View commit details
    Browse the repository at this point in the history

  2. MAINT: PR 151 revisions 

    * try to fix up appveyor paths for init
file verification
    @tylerjereddy
    tylerjereddy committed Nov 28, 2021
    Configuration menu
    Copy the full SHA
    765cfc7 View commit details
    Browse the repository at this point in the history

  3. BUG: fix inclusion of _distributor_init.py on macOS. 

    Follow-up to MacPythongh-145
    @rgommers
    rgommers committed Nov 28, 2021
    Configuration menu
    Copy the full SHA
    7470cdb View commit details
    Browse the repository at this point in the history

  4. MAINT: PR 151 revisions 

    * adjust appveyor control flow to use a `cp` instead
of `mv` for placing `_distributor_init.py` in the wheel
so that we retain the ability to verify the correct
packaging later on
    @tylerjereddy
    tylerjereddy committed Nov 28, 2021
    Configuration menu
    Copy the full SHA
    cc17ad7 View commit details
    Browse the repository at this point in the history