feat(curations): Improve various Python packages

tsteenbe · tsteenbe · commit 6ee52da61389 · 2023-08-25T17:54:12.000+02:00
Align older curations with new way of doing declared
license curations.

Improvements include:
- More elaborate proof for curations
- No URLs pointing to main or master branches

Signed-off-by: Thomas Steenbergen &lt;opensource@steenbe.nl&gt;
diff --git a/curations/PyPI/_/asgiref.yml b/curations/PyPI/_/asgiref.yml
@@ -1,7 +1,8 @@
 - id: "PyPI::asgiref:(,4.0.0["
   curations:
     comment: |
-      The library is licensed under BSD-3-Clause, see:
-      https://github.com/django/asgiref/blob/main/LICENSE
+      Mapping declared license based on
+      https://github.com/django/asgiref/blob/3.6.0/LICENSE and
+      https://github.com/django/asgiref/blob/3.6.0/setup.cfg#L14.
     declared_license_mapping:
       "BSD License": "BSD-3-Clause"
diff --git a/curations/PyPI/_/astroid.yml b/curations/PyPI/_/astroid.yml
@@ -1,7 +1,9 @@
-- id: "PyPI::astroid:(,3.0.0["
+- id: "PyPI::astroid:"
   curations:
     comment: |
-      The library is licensed under LGPL-2.1-or-later, see:
-      https://github.com/PyCQA/astroid/blob/main/LICENSE
+      Mapping declared license based on
+      https://github.com/pylint-dev/astroid/blob/v2.8.1/LICENSE,
+      https://github.com/pylint-dev/astroid/blob/v2.8.1/setup.cfg#L10 and
+      https://github.com/pylint-dev/astroid/blob/v2.8.1/setup.cfg#L16.
     declared_license_mapping:
       "GNU Lesser General Public License v2 (LGPLv2)": "LGPL-2.1-or-later"
diff --git a/curations/PyPI/_/click.yml b/curations/PyPI/_/click.yml
@@ -1,7 +1,8 @@
-- id: "PyPI::click:(,9.0.0["
+- id: "PyPI::click:"
   curations:
     comment: |
-      The library is licensed under BSD-3-Clause, see:
-      https://github.com/pallets/click/blob/main/LICENSE.rst
+      Mapping declared license based on
+      https://github.com/pallets/click/blob/6.4/LICENSE and
+      https://github.com/pallets/click/blob/6.4/setup.py#L24.
     declared_license_mapping:
       "BSD License": "BSD-3-Clause"
diff --git a/curations/PyPI/_/fakeredis.yml b/curations/PyPI/_/fakeredis.yml
@@ -1,7 +1,10 @@
 - id: "PyPI::fakeredis:(,2.0.0["
   curations:
     comment: |
-      The library is licensed under BSD-3-Clause, see:
-      https://github.com/jamesls/fakeredis/blob/master/COPYING
+      Mapping declared license based on
+      https://github.com/jamesls/fakeredis/blob/v0.4.1/COPYING,
+      https://github.com/jamesls/fakeredis/blob/v0.4.1/setup.py#L12 and
+      https://github.com/jamesls/fakeredis/blob/v0.4.1/setup.py#L21.
     declared_license_mapping:
+      "BSD": "BSD-3-Clause"
       "BSD License": "BSD-3-Clause"
diff --git a/curations/PyPI/_/idna.yml b/curations/PyPI/_/idna.yml
@@ -1,7 +1,9 @@
-- id: "PyPI::idna:(,4.0["
+- id: "PyPI::idna:"
   curations:
     comment: |
-      The library is licensed under BSD-3-Clause, see:
-      https://github.com/kjd/idna/blob/master/LICENSE.md
+      Mapping declared license based on
+      https://github.com/kjd/idna/blob/v3.2/LICENSE.md,
+      https://github.com/kjd/idna/blob/v3.2/setup.py#L32 and
+      https://github.com/kjd/idna/blob/v3.2/setup.py#L38.
     declared_license_mapping:
       "BSD License": "BSD-3-Clause"
diff --git a/curations/PyPI/_/j1939.yml b/curations/PyPI/_/j1939.yml
@@ -1,10 +1,11 @@
 - id: "PyPI::j1939:"
   curations:
-    comment: The correct VCS URL was found via https://pypi.org/project/j1939/.
+    comment: |
+      Code repository location missing in package metadata.
     vcs:
       url: "https://github.com/benkfra/j1939.git"
 - id: "PyPI::j1939:0.1.0.dev1"
   curations:
-    comment: Due to a change in delimiters the revision cannot be guessed.
+    comment: Due to a change in version delimiters the revision cannot be guessed.
     vcs:
       revision: "v0.1.0-dev1"
diff --git a/curations/PyPI/_/lazy-object-proxy.yml b/curations/PyPI/_/lazy-object-proxy.yml
@@ -1,7 +1,9 @@
-- id: "PyPI::lazy-object-proxy:(,2.0.0["
+- id: "PyPI::lazy-object-proxy:"
   curations:
     comment: |
-      The library is licensed under BSD-2-Clause, see:
-      https://github.com/ionelmc/python-lazy-object-proxy/blob/master/LICENSE
+      Mapping declared license based on
+      https://github.com/ionelmc/python-lazy-object-proxy/blob/v1.9.0/LICENSE,
+      https://github.com/ionelmc/python-lazy-object-proxy/blob/v1.9.0/setup.py#L79 and
+      https://github.com/ionelmc/python-lazy-object-proxy/blob/v1.9.0/setup.py#L97
     declared_license_mapping:
       "BSD License": "BSD-2-Clause"
diff --git a/curations/PyPI/_/ndg-httpsclient.yml b/curations/PyPI/_/ndg-httpsclient.yml
@@ -1,10 +1,10 @@
-- id: "PyPi::ndg-httpsclient:"
+- id: "PyPI::ndg-httpsclient:"
   curations:
     comment: |
       Mapping declared license based on
       https://github.com/cedadev/ndg_httpsclient/blob/v0.4.0/LICENSE,
       https://github.com/cedadev/ndg_httpsclient/blob/v0.4.0/setup.py#L112 and
       https://github.com/cedadev/ndg_httpsclient/blob/v0.4.0/setup.py#L134.
     declared_license_mapping:
-      "BSD": "BSD - See LICENCE file for details"
+      "BSD - See LICENCE file for details": "BSD-3-Clause"
       "BSD License": "BSD-3-Clause"
diff --git a/curations/PyPI/_/packaging.yml b/curations/PyPI/_/packaging.yml
@@ -1,7 +1,11 @@
-- id: "PyPI::packaging:(,22.0["
+- id: "PyPI::packaging:"
   curations:
     comment: |
-      The library is licensed under BSD-2-Clause, see:
-      https://github.com/pypa/packaging/blob/main/LICENSE.BSD
+      Mapping declared license based on
+      https://github.com/pypa/packaging/blob/20.9/LICENSE,
+      https://github.com/pypa/packaging/blob/20.9/LICENSE.BSD,
+      https://github.com/pypa/packaging/blob/20.9/LICENSE.APACHE and
+      https://github.com/pypa/packaging/blob/20.9/setup.py#L56-L57.
     declared_license_mapping:
-      "BSD License": "BSD-2-Clause"
+      Apache Software License: "Apache-2.0 OR BSD-2-Clause"
+      BSD License: "Apache-2.0 OR BSD-2-Clause"
diff --git a/curations/PyPI/_/pycparser.yml b/curations/PyPI/_/pycparser.yml
@@ -1,7 +1,10 @@
-- id: "PyPI::pycparser:(,3.0["
+- id: "PyPI::pycparser:"
   curations:
     comment: |
-      The library is licensed under BSD-3-Clause, see:
-      https://github.com/eliben/pycparser/blob/master/LICENSE
+      Mapping declared license based on
+      https://github.com/eliben/pycparser/blob/release_v2.21/LICENSE,
+      https://github.com/eliben/pycparser/blob/release_v2.21/setup.py#L45 and
+      https://github.com/eliben/pycparser/blob/release_v2.21/setup.py#L54.
     declared_license_mapping:
+      "BSD": "BSD-3-Clause"
       "BSD License": "BSD-3-Clause"
diff --git a/curations/PyPI/_/pycryptodomex.yml b/curations/PyPI/_/pycryptodomex.yml
@@ -10,7 +10,7 @@
     vcs:
       type: "Git"
       url: "https://github.com/Legrandin/pycryptodome"
-- id: "PyPI::pycryptodome:"
+- id: "PyPI::pycryptodomex:"
   curations:
     comment: |
       Mapping declared license based on
@@ -22,7 +22,7 @@
       "BSD License": "Apache-2.0 AND BSD-2-Clause AND LicenseRef-scancode-public-domain"
       "BSD, Public Domain, Apache": "Apache-2.0 AND BSD-2-Clause AND LicenseRef-scancode-public-domain"
       "Public Domain": "Apache-2.0 AND BSD-2-Clause AND LicenseRef-scancode-public-domain"
-- id: "PyPI::pycryptodome:"
+- id: "PyPI::pycryptodomex:"
   curations:
     comment: |
       Package resides in its own directory within project's code repository.
diff --git a/curations/PyPI/_/starlette.yml b/curations/PyPI/_/starlette.yml
@@ -1,7 +1,9 @@
-- id: "PyPI::starlette:(,1.0.0["
+- id: "PyPI::starlette"
   curations:
     comment: |
-      The library is licensed under BSD-3-Clause, see:
-      https://github.com/encode/starlette/blob/master/LICENSE.md
+      Mapping declared license based on
+      https://github.com/encode/starlette/blob/0.31.0/LICENSE.md,
+      https://github.com/encode/starlette/blob/0.31.0/pyproject.toml#L10 and
+      https://github.com/encode/starlette/blob/0.31.0/pyproject.toml#L20.
     declared_license_mapping:
-      "BSD License": "BSD-3-Clause"
+      "BSD License": "BSD-2-Clause"
diff --git a/curations/PyPI/_/uvicorn.yml b/curations/PyPI/_/uvicorn.yml
@@ -1,7 +1,9 @@
-- id: "PyPI::uvicorn:(,1.0.0["
+- id: "PyPI::uvicorn:"
   curations:
     comment: |
-      The library is licensed under BSD-3-Clause, see:
-      https://github.com/encode/uvicorn/blob/master/LICENSE.md
+      Mapping declared license based on
+      https://github.com/encode/uvicorn/blob/0.23.2/LICENSE.md,
+      https://github.com/encode/uvicorn/blob/0.23.2/pyproject.toml#L10 and
+      https://github.com/encode/uvicorn/blob/0.23.2/pyproject.toml#L19.
     declared_license_mapping:
       "BSD License": "BSD-3-Clause"
diff --git a/curations/PyPI/_/wrapt.yml b/curations/PyPI/_/wrapt.yml
@@ -1,7 +1,10 @@
-- id: "PyPI::wrapt:(,2.0.0["
+- id: "PyPI::wrapt:"
   curations:
     comment: |
-      The library is licensed under BSD-2-Clause, see:
-      https://github.com/GrahamDumpleton/wrapt/blob/develop/LICENSE
+      Mapping declared license based on
+      https://github.com/GrahamDumpleton/wrapt/blob/1.15.0/LICENSE,
+      https://github.com/GrahamDumpleton/wrapt/blob/1.15.0/setup.cfg#L12 and
+      https://github.com/GrahamDumpleton/wrapt/blob/1.15.0/setup.cfg#L18.
     declared_license_mapping:
+      "BSD": "BSD-2-Clause"
       "BSD License": "BSD-2-Clause"
