Merge pull request #759 from carmenbianca/cleanup-json

Some followup work on the `--json` PR

.github/workflows/test.yaml

@@ -20,12 +20,12 @@ jobs:
       # do not abort the whole test job if one combination in the matrix fails
       fail-fast: false
       matrix:
-        python-version: ["3.7", "3.8", "3.9", "3.10", "3.11"]
+        python-version: ["3.8", "3.9", "3.10", "3.11"]
         os: [ubuntu-20.04]
         include:
-          - python-version: "3.7"
+          - python-version: "3.8"
             os: macos-latest
-          - python-version: "3.7"
+          - python-version: "3.8"
             os: windows-latest
 
     steps:
@@ -52,7 +52,7 @@ jobs:
       - name: Set up Python
         uses: actions/setup-python@v2
         with:
-          python-version: 3.7
+          python-version: 3.8
       - name: Install dependencies
         run: |
           pip install poetry
@@ -68,7 +68,7 @@ jobs:
       - name: Set up Python
         uses: actions/setup-python@v2
         with:
-          python-version: 3.7
+          python-version: 3.8
       - name: Install dependencies
         run: |
           pip install poetry
@@ -93,7 +93,7 @@ jobs:
       - name: Set up Python
         uses: actions/setup-python@v2
         with:
-          python-version: 3.7
+          python-version: 3.8
       - name: Install dependencies
         run: |
           pip install poetry
@@ -109,7 +109,7 @@ jobs:
       - name: Set up Python
         uses: actions/setup-python@v2
         with:
-          python-version: 3.7
+          python-version: 3.8
       - name: Install dependencies
         run: |
           pip install poetry

.readthedocs.yaml

@@ -8,7 +8,7 @@ build:
   # This should mirror the configuration in ./.github/workflows/pythonpackage.yaml
   os: "ubuntu-20.04"
   tools:
-    python: "3.7"
+    python: "3.8"
 
 python:
   install:

CHANGELOG.md

@@ -73,22 +73,23 @@ CLI command and its behaviour. There are no guarantees of stability for the
   `Apache-2.0 AND CC0-1.0 AND CC-BY-SA-4.0 AND GPL-3.0-or-later`. (#733)
 - Added `--contributor` option to `annotate`. (#669)
 - Added `--json` flag to `lint` command (#654).
+- `reuse.ReuseInfo` now has `copy` and `union` methods. (#759)
 
 ### Changed
 
 - Bumped SPDX license list to v3.20. (#692)
-- `reuse.SpdxInfo` is now a (frozen) dataclass instead of a namedtuple. This is
-  only relevant if you're using reuse as a library in Python. (#669)
+- `reuse.SpdxInfo` was renamed to `reuse.ReuseInfo`. It is now a (frozen)
+  dataclass instead of a namedtuple. This is only relevant if you're using reuse
+  as a library in Python. (#669)
 - Sphinx documentation: Switched from RTD theme to Furo. (#673, #716)
 - Removed dependency on setuptools' `pkg_resources` to determine the installed
-  version of reuse. For Python <3.8, a dependency on `importlib-metadata` is
-  added. (#724)
+  version of reuse. (#724)
 
 ### Deprecated
 
 ### Removed
 
-- Python 3.6 support has been dropped. (#673)
+- Python 3.6 and 3.7 support has been dropped. (#673, #759)
 - Removed runtime and build time dependency on `setuptools`. (#724)
 
 ### Fixed

README.md

@@ -20,7 +20,7 @@ recommendations.
 - Source code: <https://github.com/fsfe/reuse-tool>
 - PyPI: <https://pypi.python.org/pypi/reuse>
 - REUSE: 3.0
-- Python: 3.7+
+- Python: 3.8+
 
 ## Table of contents
 

docs/conf.py

@@ -20,13 +20,9 @@
 #
 import os
 import sys
+from importlib.metadata import PackageNotFoundError, version
 from shutil import copyfile
 
-try:
-    from importlib.metadata import PackageNotFoundError, version
-except ImportError:
-    from importlib_metadata import PackageNotFoundError, version
-
 sys.path.insert(0, os.path.abspath("../src/"))
 
 

docs/requirements.txt

@@ -1,72 +1,69 @@
-alabaster==0.7.13 ; python_full_version >= "3.7.2" and python_full_version < "4.0.0"
-astroid==2.15.2 ; python_full_version >= "3.7.2" and python_full_version < "4.0.0"
-attrs==22.2.0 ; python_full_version >= "3.7.2" and python_full_version < "4.0.0"
-babel==2.12.1 ; python_full_version >= "3.7.2" and python_full_version < "4.0.0"
-beautifulsoup4==4.12.0 ; python_full_version >= "3.7.2" and python_full_version < "4.0.0"
-binaryornot==0.4.4 ; python_full_version >= "3.7.2" and python_full_version < "4.0.0"
-black==23.3.0 ; python_full_version >= "3.7.2" and python_full_version < "4.0.0"
-boolean-py==4.0 ; python_full_version >= "3.7.2" and python_full_version < "4.0.0"
-bump2version==1.0.1 ; python_full_version >= "3.7.2" and python_full_version < "4.0.0"
-certifi==2022.12.7 ; python_full_version >= "3.7.2" and python_version < "4"
-cfgv==3.3.1 ; python_full_version >= "3.7.2" and python_full_version < "4.0.0"
-chardet==5.1.0 ; python_full_version >= "3.7.2" and python_full_version < "4.0.0"
-charset-normalizer==3.1.0 ; python_full_version >= "3.7.2" and python_version < "4"
-click==8.1.3 ; python_full_version >= "3.7.2" and python_full_version < "4.0.0"
-colorama==0.4.6 ; python_full_version >= "3.7.2" and python_full_version < "4.0.0" and sys_platform == "win32" or python_full_version >= "3.7.2" and python_full_version < "4.0.0" and platform_system == "Windows"
-commonmark==0.9.1 ; python_full_version >= "3.7.2" and python_full_version < "4.0.0"
-coverage[toml]==7.2.2 ; python_full_version >= "3.7.2" and python_full_version < "4.0.0"
-dill==0.3.6 ; python_full_version >= "3.7.2" and python_full_version < "4.0.0"
-distlib==0.3.6 ; python_full_version >= "3.7.2" and python_full_version < "4.0.0"
-docutils==0.19 ; python_full_version >= "3.7.2" and python_full_version < "4.0.0"
-exceptiongroup==1.1.1 ; python_full_version >= "3.7.2" and python_version < "3.11"
-filelock==3.10.7 ; python_full_version >= "3.7.2" and python_full_version < "4.0.0"
-furo==2023.3.27 ; python_full_version >= "3.7.2" and python_full_version < "4.0.0"
-identify==2.5.22 ; python_full_version >= "3.7.2" and python_full_version < "4.0.0"
-idna==3.4 ; python_full_version >= "3.7.2" and python_version < "4"
-imagesize==1.4.1 ; python_full_version >= "3.7.2" and python_full_version < "4.0.0"
-importlib-metadata==6.1.0 ; python_full_version >= "3.7.2" and python_version < "3.10"
-iniconfig==2.0.0 ; python_full_version >= "3.7.2" and python_full_version < "4.0.0"
-isort==5.11.5 ; python_full_version >= "3.7.2" and python_full_version < "4.0.0"
-jinja2==3.1.2 ; python_full_version >= "3.7.2" and python_full_version < "4.0.0"
-lazy-object-proxy==1.9.0 ; python_full_version >= "3.7.2" and python_full_version < "4.0.0"
-license-expression==30.1.0 ; python_full_version >= "3.7.2" and python_full_version < "4.0.0"
-markupsafe==2.1.2 ; python_full_version >= "3.7.2" and python_full_version < "4.0.0"
-mccabe==0.7.0 ; python_full_version >= "3.7.2" and python_full_version < "4.0.0"
-mypy-extensions==1.0.0 ; python_full_version >= "3.7.2" and python_full_version < "4.0.0"
-nodeenv==1.7.0 ; python_full_version >= "3.7.2" and python_full_version < "4.0.0"
-packaging==23.0 ; python_full_version >= "3.7.2" and python_full_version < "4.0.0"
-pathspec==0.11.1 ; python_full_version >= "3.7.2" and python_full_version < "4.0.0"
-pbr==5.11.1 ; python_full_version >= "3.7.2" and python_full_version < "4.0.0"
-platformdirs==3.2.0 ; python_full_version >= "3.7.2" and python_full_version < "4.0.0"
-pluggy==1.0.0 ; python_full_version >= "3.7.2" and python_full_version < "4.0.0"
-pre-commit==2.21.0 ; python_full_version >= "3.7.2" and python_full_version < "4.0.0"
-pygments==2.14.0 ; python_full_version >= "3.7.2" and python_full_version < "4.0.0"
-pylint==2.17.2 ; python_full_version >= "3.7.2" and python_full_version < "4.0.0"
-pytest-cov==4.0.0 ; python_full_version >= "3.7.2" and python_full_version < "4.0.0"
-pytest==7.2.2 ; python_full_version >= "3.7.2" and python_full_version < "4.0.0"
-python-debian==0.1.49 ; python_full_version >= "3.7.2" and python_full_version < "4.0.0"
-pytz==2023.3 ; python_full_version >= "3.7.2" and python_version < "3.9"
-pyyaml==6.0 ; python_full_version >= "3.7.2" and python_full_version < "4.0.0"
-recommonmark==0.7.1 ; python_full_version >= "3.7.2" and python_full_version < "4.0.0"
-requests==2.28.2 ; python_full_version >= "3.7.2" and python_version < "4"
-setuptools==67.6.1 ; python_full_version >= "3.7.2" and python_full_version < "4.0.0"
-snowballstemmer==2.2.0 ; python_full_version >= "3.7.2" and python_full_version < "4.0.0"
-soupsieve==2.4 ; python_full_version >= "3.7.2" and python_full_version < "4.0.0"
-sphinx-autodoc-typehints==1.22 ; python_full_version >= "3.7.2" and python_full_version < "4.0.0"
-sphinx-basic-ng==1.0.0b1 ; python_full_version >= "3.7.2" and python_full_version < "4.0.0"
-sphinx==5.3.0 ; python_full_version >= "3.7.2" and python_full_version < "4.0.0"
-sphinxcontrib-apidoc==0.3.0 ; python_full_version >= "3.7.2" and python_full_version < "4.0.0"
-sphinxcontrib-applehelp==1.0.2 ; python_full_version >= "3.7.2" and python_full_version < "4.0.0"
-sphinxcontrib-devhelp==1.0.2 ; python_full_version >= "3.7.2" and python_full_version < "4.0.0"
-sphinxcontrib-htmlhelp==2.0.0 ; python_full_version >= "3.7.2" and python_full_version < "4.0.0"
-sphinxcontrib-jsmath==1.0.1 ; python_full_version >= "3.7.2" and python_full_version < "4.0.0"
-sphinxcontrib-qthelp==1.0.3 ; python_full_version >= "3.7.2" and python_full_version < "4.0.0"
-sphinxcontrib-serializinghtml==1.1.5 ; python_full_version >= "3.7.2" and python_full_version < "4.0.0"
-tomli==2.0.1 ; python_full_version >= "3.7.2" and python_full_version <= "3.11.0a6"
-tomlkit==0.11.7 ; python_full_version >= "3.7.2" and python_full_version < "4.0.0"
-typed-ast==1.5.4 ; python_version < "3.8" and implementation_name == "cpython" and python_full_version >= "3.7.2"
-typing-extensions==4.5.0 ; python_full_version >= "3.7.2" and python_version < "3.11"
-urllib3==1.26.15 ; python_full_version >= "3.7.2" and python_version < "4"
-virtualenv==20.21.0 ; python_full_version >= "3.7.2" and python_full_version < "4.0.0"
-wrapt==1.15.0 ; python_full_version >= "3.7.2" and python_full_version < "4.0.0"
-zipp==3.15.0 ; python_full_version >= "3.7.2" and python_version < "3.10"
+alabaster==0.7.13; python_version >= "3.8"
+astroid==2.15.5; python_full_version >= "3.7.2"
+babel==2.12.1; python_version >= "3.8"
+beautifulsoup4==4.12.2; python_full_version >= "3.6.0" and python_version >= "3.7"
+binaryornot==0.4.4
+black==23.3.0; python_version >= "3.7"
+boolean.py==4.0
+bump2version==1.0.1; python_version >= "3.5"
+certifi==2023.5.7; python_version >= "3.8"
+cfgv==3.3.1; python_full_version >= "3.6.1" and python_version >= "3.7"
+chardet==5.1.0; python_version >= "3.7"
+charset-normalizer==3.1.0; python_full_version >= "3.7.0" and python_version >= "3.8"
+click==8.1.3; python_version >= "3.7"
+colorama==0.4.6; sys_platform == "win32" and python_version >= "3.8" and python_full_version >= "3.7.2" and (python_version >= "3.7" and python_full_version < "3.0.0" and sys_platform == "win32" or sys_platform == "win32" and python_version >= "3.7" and python_full_version >= "3.7.0") and (python_version >= "3.8" and python_full_version < "3.0.0" and sys_platform == "win32" or sys_platform == "win32" and python_version >= "3.8" and python_full_version >= "3.7.0") and (python_version >= "3.7" and python_full_version < "3.0.0" and platform_system == "Windows" or platform_system == "Windows" and python_version >= "3.7" and python_full_version >= "3.7.0")
+commonmark==0.9.1
+coverage==7.2.7; python_version >= "3.7"
+dill==0.3.6
+distlib==0.3.6; python_version >= "3.7"
+docutils==0.20.1; python_version >= "3.8"
+exceptiongroup==1.1.1; python_version < "3.11" and python_version >= "3.7"
+filelock==3.12.1; python_version >= "3.7"
+furo==2023.5.20; python_version >= "3.7"
+identify==2.5.24; python_version >= "3.7"
+idna==3.4; python_version >= "3.8"
+imagesize==1.4.1; python_version >= "3.8" and python_full_version < "3.0.0" or python_full_version >= "3.4.0" and python_version >= "3.8"
+importlib-metadata==6.6.0; python_version < "3.10" and python_version >= "3.8"
+iniconfig==2.0.0; python_version >= "3.7"
+isort==5.12.0; python_full_version >= "3.8.0"
+jinja2==3.1.2; python_version >= "3.7"
+lazy-object-proxy==1.9.0; python_version >= "3.7" and python_full_version >= "3.7.2"
+license-expression==30.1.1; python_version >= "3.7"
+markupsafe==2.1.3; python_version >= "3.8"
+mccabe==0.7.0; python_version >= "3.6" and python_full_version >= "3.7.2"
+mypy-extensions==1.0.0; python_version >= "3.7"
+nodeenv==1.8.0; python_version >= "3.7" and python_full_version < "3.0.0" or python_full_version >= "3.7.0" and python_version >= "3.7"
+packaging==23.1; python_version >= "3.8"
+pathspec==0.11.1; python_version >= "3.7"
+pbr==5.11.1; python_version >= "2.6"
+platformdirs==3.5.3; python_version >= "3.7" and python_full_version >= "3.7.2"
+pluggy==1.0.0; python_version >= "3.7"
+pre-commit==2.21.0; python_version >= "3.7"
+pygments==2.15.1; python_version >= "3.8"
+pylint==2.17.4; python_full_version >= "3.7.2"
+pytest-cov==4.1.0; python_version >= "3.7"
+pytest==7.3.1; python_version >= "3.7"
+python-debian==0.1.49; python_version >= "3.5"
+pytz==2023.3; python_version < "3.9" and python_version >= "3.8"
+pyyaml==6.0; python_version >= "3.7"
+recommonmark==0.7.1
+requests==2.31.0; python_version >= "3.8"
+snowballstemmer==2.2.0; python_version >= "3.8"
+soupsieve==2.4.1; python_full_version >= "3.6.0" and python_version >= "3.7"
+sphinx-autodoc-typehints==1.23.4; python_version >= "3.7"
+sphinx-basic-ng==1.0.0b1; python_version >= "3.7"
+sphinx==7.0.1; python_version >= "3.8"
+sphinxcontrib-apidoc==0.3.0
+sphinxcontrib-applehelp==1.0.4; python_version >= "3.8"
+sphinxcontrib-devhelp==1.0.2; python_version >= "3.8"
+sphinxcontrib-htmlhelp==2.0.1; python_version >= "3.8"
+sphinxcontrib-jsmath==1.0.1; python_version >= "3.8"
+sphinxcontrib-qthelp==1.0.3; python_version >= "3.8"
+sphinxcontrib-serializinghtml==1.1.5; python_version >= "3.8"
+tomli==2.0.1; python_version < "3.11" and python_version >= "3.7" and python_full_version >= "3.7.2" and python_full_version <= "3.11.0a6"
+tomlkit==0.11.8; python_version >= "3.7" and python_full_version >= "3.7.2"
+typing-extensions==4.6.3; python_version < "3.10" and python_version >= "3.7" and python_full_version >= "3.7.2"
+urllib3==2.0.3; python_version >= "3.8"
+virtualenv==20.23.0; python_version >= "3.7"
+wrapt==1.15.0
+zipp==3.15.0; python_version < "3.10" and python_version >= "3.8"