Skip to content

Commit bf08cab

Browse files
committed
sdist: include data_dir again, license dir fix
The data dir was accidentally removed from the sdist in 053abcd. Our Maturin version is currently incorrectly packaging the license files under `.dist-info/license_files`, when it should be (according to PEP 639) in `.dist-info/licenses`. This has been fixed in newer versions of Maturin. Update the CI test to check in both places so that it won't break when we update Maturin. Signed-off-by: Tom Jakubowski <[email protected]>
1 parent 126a6a1 commit bf08cab

File tree

2 files changed

+7
-4
lines changed

2 files changed

+7
-4
lines changed

.github/workflows/build.yaml

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -716,9 +716,12 @@ jobs:
716716
- name: Verify licenses are installed
717717
shell: bash
718718
run: |
719-
pip show -f perspective-python > wheel_installed_files.txt
720-
grep licenses/LICENSE.md wheel_installed_files.txt
721-
grep licenses/LICENSE_THIRDPARTY_cargo.yml wheel_installed_files.txt
719+
pip show -f perspective-python | tee wheel_installed_files.txt
720+
# Maturin got this wrong: the packages should be in .dist-info/licenses/
721+
# Newer versions of Maturin will fix it, so search for either location.
722+
# https://github.com/PyO3/maturin/pull/862 https://github.com/PyO3/maturin/pull/2181
723+
grep '.dist-info/(license|license_files)/LICENSE.md' wheel_installed_files.txt
724+
grep '.dist-info/(license|license_files)/LICENSE_THIRDPARTY_cargo.yml' wheel_installed_files.txt
722725
723726
- name: Verify labextension
724727
shell: bash

rust/perspective-python/build.mjs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -152,7 +152,7 @@ if (build_sdist) {
152152
prefix: `perspective_python-${version}`,
153153
strict: true,
154154
},
155-
crate_files.concat(["PKG-INFO"])
155+
crate_files.concat(["PKG-INFO", data_dir])
156156
);
157157
}
158158

0 commit comments

Comments
 (0)