Skip to content

Commit fefa805

Browse files
authored
Merge pull request #772 from rgommers/pep-639
MAINT: update handling of license files to use PEP 639
2 parents 6ddffce + 576a8f1 commit fefa805

File tree

7 files changed

+82
-17
lines changed

7 files changed

+82
-17
lines changed

LICENSE

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
Copyright (c) 2006-2012 Filip Wasilewski <http://en.ig.ma/>
2-
Copyright (c) 2012-2020 The PyWavelets Developers <https://github.com/PyWavelets/pywt>
2+
Copyright (c) 2012- The PyWavelets Developers <https://github.com/PyWavelets/pywt>
33

44
Permission is hereby granted, free of charge, to any person obtaining a copy of
55
this software and associated documentation files (the "Software"), to deal in

LICENSES_bundled.txt

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

licenses_bundled/LICENSE_numpy.txt

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
Copyright (c) 2005-2024, NumPy Developers.
2+
All rights reserved.
3+
4+
Redistribution and use in source and binary forms, with or without
5+
modification, are permitted provided that the following conditions are
6+
met:
7+
8+
* Redistributions of source code must retain the above copyright
9+
notice, this list of conditions and the following disclaimer.
10+
11+
* Redistributions in binary form must reproduce the above
12+
copyright notice, this list of conditions and the following
13+
disclaimer in the documentation and/or other materials provided
14+
with the distribution.
15+
16+
* Neither the name of the NumPy Developers nor the names of any
17+
contributors may be used to endorse or promote products derived
18+
from this software without specific prior written permission.
19+
20+
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
21+
"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
22+
LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
23+
A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
24+
OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
25+
SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
26+
LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
27+
DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
28+
THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
29+
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
30+
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

licenses_bundled/LICENSE_scipy.txt

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
Copyright (c) 2001-2002 Enthought, Inc. 2003-2024, SciPy Developers.
2+
All rights reserved.
3+
4+
Redistribution and use in source and binary forms, with or without
5+
modification, are permitted provided that the following conditions
6+
are met:
7+
8+
1. Redistributions of source code must retain the above copyright
9+
notice, this list of conditions and the following disclaimer.
10+
11+
2. Redistributions in binary form must reproduce the above
12+
copyright notice, this list of conditions and the following
13+
disclaimer in the documentation and/or other materials provided
14+
with the distribution.
15+
16+
3. Neither the name of the copyright holder nor the names of its
17+
contributors may be used to endorse or promote products derived
18+
from this software without specific prior written permission.
19+
20+
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
21+
"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
22+
LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
23+
A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
24+
OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
25+
SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
26+
LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
27+
DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
28+
THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
29+
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
30+
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

licenses_bundled/README.txt

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
The PyWavelets repository and source distributions bundle some code that is
2+
adapted from compatibly licensed projects. We list these here, together with
3+
the path to the files (relative to the root of the repository or sdist)
4+
identifying the vendored code that required including a license file.
5+
6+
Name: NumPy
7+
Files: pywt/_pytesttester.py
8+
License: BSD-3-Clause
9+
10+
Name: SciPy
11+
Files: meson.build, util/*
12+
License: BSD-3-Clause

pyproject.toml

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
[build-system]
88
build-backend = "mesonpy"
99
requires = [
10-
"meson-python>=0.16.0",
10+
"meson-python>=0.18.0",
1111
"Cython>=3.0.4",
1212

1313
# numpy requirement for wheel builds for distribution on PyPI - building
@@ -18,14 +18,17 @@ requires = [
1818
# disabling build isolation.
1919
"numpy>=2.0.0; python_version<'3.13'",
2020
"numpy>=2.1.0; python_version>='3.13'",
21+
"numpy>=2.3.2; python_version>='3.14'",
2122
]
2223

2324
[project]
2425
name = "PyWavelets"
2526
version = "1.9.0.dev0"
26-
# TODO: add `license-files` once PEP 639 is accepted (see meson-python#88)
27-
# at that point, no longer include them in `py3.install_sources()`
28-
license = {file = "LICENSE"}
27+
license = "MIT and BSD-3-Clause"
28+
license-files = [
29+
"LICENSE",
30+
"licenses_bundled/LICENSE_*",
31+
]
2932
maintainers = [
3033
{name = "The PyWavelets Developers", email = "pywavelets@googlegroups.com"}
3134
]
@@ -38,14 +41,14 @@ classifiers = [
3841
"Intended Audience :: Developers",
3942
"Intended Audience :: Education",
4043
"Intended Audience :: Science/Research",
41-
"License :: OSI Approved :: MIT License",
4244
"Operating System :: OS Independent",
4345
"Programming Language :: C",
4446
"Programming Language :: Python",
4547
"Programming Language :: Python :: 3",
4648
"Programming Language :: Python :: 3.11",
4749
"Programming Language :: Python :: 3.12",
4850
"Programming Language :: Python :: 3.13",
51+
"Programming Language :: Python :: 3.14",
4952
"Topic :: Software Development :: Libraries :: Python Modules"
5053
]
5154

pywt/__init__.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# flake8: noqa
22

33
# Copyright (c) 2006-2012 Filip Wasilewski <http://en.ig.ma/>
4-
# Copyright (c) 2012-2020 The PyWavelets Developers
4+
# Copyright (c) 2012- The PyWavelets Developers
55
# <https://github.com/PyWavelets/pywt>
66
# See LICENSE for more details.
77

0 commit comments

Comments
 (0)