Skip to content

Commit 50cc2e7

Browse files
committed
BLD: Implement PEP639 licensing
1 parent 3c7bc45 commit 50cc2e7

File tree

4 files changed

+12
-15
lines changed

4 files changed

+12
-15
lines changed

.github/workflows/cibuildwheel.yml

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -48,14 +48,6 @@ jobs:
4848
with:
4949
python-version: '3.10'
5050

51-
# Something changed somewhere that prevents the downloaded-at-build-time
52-
# licenses from being included in built wheels, so pre-download them so
53-
# that they exist before the build and are included.
54-
- name: Pre-download bundled licenses
55-
run: >
56-
curl -Lo LICENSE/LICENSE_QHULL
57-
https://github.com/qhull/qhull/raw/2020.2/COPYING.txt
58-
5951
- name: Install dependencies
6052
run: python -m pip install build twine
6153

.github/workflows/tests.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -261,7 +261,8 @@ jobs:
261261
python -m pip install --upgrade $PRE \
262262
'contourpy>=1.0.1' cycler fonttools kiwisolver importlib_resources \
263263
packaging pillow 'pyparsing!=3.1.0' python-dateutil setuptools-scm \
264-
'meson-python>=0.13.1' 'pybind11>=2.6' \
264+
'git+https://github.com/dnicolodi/meson-python@pep639' 'pybind11>=2.6' \
265+
'meson>=1.6.0rc2' 'pyproject-metadata>=0.9.0b7' \
265266
-r requirements/testing/all.txt \
266267
${{ matrix.extra-requirements }}
267268

pyproject.toml

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,14 +6,12 @@ authors = [
66
]
77
description = "Python plotting package"
88
readme = "README.md"
9-
license = { file = "LICENSE/LICENSE" }
10-
dynamic = ["version"]
9+
dynamic = ["version", "license", "license-files"]
1110
classifiers=[
1211
"Development Status :: 5 - Production/Stable",
1312
"Framework :: Matplotlib",
1413
"Intended Audience :: Science/Research",
1514
"Intended Audience :: Education",
16-
"License :: OSI Approved :: Python Software Foundation License",
1715
"Programming Language :: Python",
1816
"Programming Language :: Python :: 3",
1917
"Programming Language :: Python :: 3.10",
@@ -46,7 +44,9 @@ requires-python = ">=3.10"
4644
[project.optional-dependencies]
4745
# Should be a copy of the build dependencies below.
4846
dev = [
49-
"meson-python>=0.13.1",
47+
"meson-python @ git+https://github.com/dnicolodi/meson-python@pep639",
48+
"meson>=1.6.0rc2",
49+
"pyproject-metadata>=0.9.0b7",
5050
"pybind11>=2.6,!=2.13.3",
5151
"setuptools_scm>=7",
5252
# Not required by us but setuptools_scm without a version, cso _if_
@@ -70,7 +70,9 @@ dev = [
7070
build-backend = "mesonpy"
7171
# Also keep in sync with optional dependencies above.
7272
requires = [
73-
"meson-python>=0.13.1",
73+
"meson-python @ git+https://github.com/dnicolodi/meson-python@pep639",
74+
"meson>=1.6.0rc2",
75+
"pyproject-metadata>=0.9.0b7",
7476
"pybind11>=2.6,!=2.13.3",
7577
"setuptools_scm>=7",
7678
]
Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
11
pybind11!=2.13.3
2-
meson-python
2+
git+https://github.com/dnicolodi/meson-python@pep639
3+
meson>=1.6.0rc2
4+
pyproject-metadata>=0.9.0b7
35
setuptools-scm

0 commit comments

Comments
 (0)