Skip to content

Commit 5a4ae16

Browse files
committed
Add auxilliary licenses appended on to the main LICENSE file for inclusion in the wheel
1 parent 8f83f8a commit 5a4ae16

File tree

9 files changed

+696
-2900
lines changed

9 files changed

+696
-2900
lines changed

.github/workflows/wheels.yml

Lines changed: 5 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -67,13 +67,6 @@ jobs:
6767
with:
6868
python-version: '3.11'
6969

70-
# Something changed somewhere that prevents the downloaded-at-build-time
71-
# licenses from being included in built wheels, so pre-download them so
72-
# that they exist before the build and are included.
73-
- name: Pre-download bundled licenses
74-
run: |
75-
mkdir -p LICENSE
76-
curl -Lo LICENSE/LICENSE_QHULL https://github.com/qhull/qhull/raw/2020.2/COPYING.txt
7770

7871
- name: Install dependencies
7972
run: python -m pip install build twine
@@ -101,10 +94,12 @@ jobs:
10194
runs-on: ${{ matrix.os }}
10295
env:
10396
CIBW_BEFORE_BUILD: >-
104-
rm -rf {package}/build
97+
rm -rf {package}/build &&
98+
cat {package}/../tools/wheel/LICENSE_binary.txt >> {package}/LICENSE/LICENSE
10599
CIBW_BEFORE_BUILD_WINDOWS: >-
106100
pip install delvewheel &&
107-
rm -rf {package}/build
101+
rm -rf {package}/build &&
102+
cat {package}/../tools/wheel/LICENSE_binary.txt >> {package}/LICENSE/LICENSE
108103
CIBW_REPAIR_WHEEL_COMMAND_WINDOWS: >-
109104
delvewheel repair -w {dest_dir} {wheel}
110105
# On Windows, we explicitly request MSVC compilers (as GitHub Action runners have
@@ -121,7 +116,7 @@ jobs:
121116
CIBW_TEST_COMMAND: >-
122117
python -m pip install build twine &&
123118
twine check {wheel} &&
124-
python {package}/ci/check_wheel_licenses.py {wheel} &&
119+
# python {package}/ci/check_wheel_licenses.py {wheel} && # Disabled because we concatenate into one file here
125120
python {package}/ci/check_version_number.py
126121
MACOSX_DEPLOYMENT_TARGET: "10.12"
127122
strategy:

tools/wheels/LICENSE_binary.txt

Lines changed: 691 additions & 0 deletions
Large diffs are not rendered by default.

tools/wheels/LICENSE_linux.txt

Lines changed: 0 additions & 904 deletions
This file was deleted.

tools/wheels/LICENSE_osx.txt

Lines changed: 0 additions & 904 deletions
This file was deleted.

tools/wheels/LICENSE_win32.txt

Lines changed: 0 additions & 882 deletions
This file was deleted.

tools/wheels/check_license.py

Lines changed: 0 additions & 59 deletions
This file was deleted.

tools/wheels/cibw_before_build.sh

Lines changed: 0 additions & 76 deletions
This file was deleted.

tools/wheels/cibw_test_command.sh

Lines changed: 0 additions & 25 deletions
This file was deleted.

tools/wheels/repair_windows.sh

Lines changed: 0 additions & 40 deletions
This file was deleted.

0 commit comments

Comments
 (0)