Skip to content

Commit 88da9fc

Browse files
cdce8ptobixen
authored andcommitted
Use PEP 639 license expression
#538
1 parent 4dd5df2 commit 88da9fc

3 files changed

Lines changed: 5 additions & 6 deletions

File tree

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,4 +18,4 @@ Links:
1818

1919
Licences:
2020

21-
Caldav is dual-licensed under the [GNU GENERAL PUBLIC LICENSE Version 3](COPYING.GPL) and the [Apache License 2.0](COPYING.APACHE).
21+
Caldav is dual-licensed under the [GNU GENERAL PUBLIC LICENSE Version 3](COPYING.GPL) or the [Apache License 2.0](COPYING.APACHE).

docs/source/about.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -285,4 +285,4 @@ While I hope we never will need to refer to it, the `Contributor Covenant <https
285285
License
286286
=======
287287

288-
Caldav is dual-licensed under the GNU GENERAL PUBLIC LICENSE Version 3 and the Apache License 2.0.
288+
Caldav is dual-licensed under the GNU GENERAL PUBLIC LICENSE Version 3 or the Apache License 2.0.

pyproject.toml

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
[build-system]
2-
requires = ["hatchling", "hatch-vcs"]
2+
requires = ["hatchling>=1.27.0", "hatch-vcs"]
33
build-backend = "hatchling.build"
44

55
[tool.hatch.version]
@@ -11,15 +11,14 @@ version-file = "caldav/_version.py"
1111
[project]
1212
name = "caldav"
1313
authors = [{ name = "Cyril Robert", email = "cyril@hippie.io" }, { name = "Tobias Brox", email = "caldav@plann.no" }]
14-
license = { text = "GPL" }
14+
license = "GPL-3.0-or-later OR Apache-2.0"
15+
license-files = ["COPYING.*"]
1516
description = "CalDAV (RFC4791) client library"
1617
keywords = []
1718
readme = "README.md"
1819
classifiers = [
1920
"Development Status :: 4 - Beta",
2021
"Intended Audience :: Developers",
21-
"License :: OSI Approved :: GNU General Public License (GPL)",
22-
"License :: OSI Approved :: Apache Software License",
2322
"Operating System :: OS Independent",
2423
"Programming Language :: Python",
2524
"Programming Language :: Python :: 3.9",

0 commit comments

Comments
 (0)