diff --git a/README.md b/README.md index 00a6c74b..7e8229b5 100644 --- a/README.md +++ b/README.md @@ -18,4 +18,4 @@ Links: Licences: -Caldav is dual-licensed under the [GNU GENERAL PUBLIC LICENSE Version 3](COPYING.GPL) and the [Apache License 2.0](COPYING.APACHE). +Caldav is dual-licensed under the [GNU GENERAL PUBLIC LICENSE Version 3](COPYING.GPL) or the [Apache License 2.0](COPYING.APACHE). diff --git a/docs/source/about.rst b/docs/source/about.rst index 6fe335ad..138fdcc0 100644 --- a/docs/source/about.rst +++ b/docs/source/about.rst @@ -285,4 +285,4 @@ While I hope we never will need to refer to it, the `Contributor Covenant =1.27.0", "hatch-vcs"] build-backend = "hatchling.build" [tool.hatch.version] @@ -11,15 +11,14 @@ version-file = "caldav/_version.py" [project] name = "caldav" authors = [{ name = "Cyril Robert", email = "cyril@hippie.io" }, { name = "Tobias Brox", email = "caldav@plann.no" }] -license = { text = "GPL" } +license = "GPL-3.0-or-later OR Apache-2.0" +license-files = ["COPYING.*"] description = "CalDAV (RFC4791) client library" keywords = [] readme = "README.md" classifiers = [ "Development Status :: 4 - Beta", "Intended Audience :: Developers", - "License :: OSI Approved :: GNU General Public License (GPL)", - "License :: OSI Approved :: Apache Software License", "Operating System :: OS Independent", "Programming Language :: Python", "Programming Language :: Python :: 3.9",