From abe3877e8fa5140980e5a621c518928dea1990f8 Mon Sep 17 00:00:00 2001 From: linozen Date: Tue, 18 Jul 2023 10:23:33 +0200 Subject: [PATCH 1/5] fix: sort imports --- docs/conf.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/docs/conf.py b/docs/conf.py index f22cd82de..45f511a65 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -20,7 +20,8 @@ # import os import sys -from importlib.metadata import PackageNotFoundError, version as get_version +from importlib.metadata import PackageNotFoundError +from importlib.metadata import version as get_version from shutil import copyfile sys.path.insert(0, os.path.abspath("../src/")) From c6e5a4cf38eeb630ade89af47dd5fe30f9bef56b Mon Sep 17 00:00:00 2001 From: linozen Date: Tue, 18 Jul 2023 10:23:37 +0200 Subject: [PATCH 2/5] =?UTF-8?q?Bump=20version:=202.0.0=20=E2=86=92=202.1.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .bumpversion.cfg | 2 +- README.md | 2 +- docs/conf.py | 2 +- pyproject.toml | 2 +- src/reuse/__init__.py | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.bumpversion.cfg b/.bumpversion.cfg index 7866081ae..36fc49ecf 100644 --- a/.bumpversion.cfg +++ b/.bumpversion.cfg @@ -1,5 +1,5 @@ [bumpversion] -current_version = 2.0.0 +current_version = 2.1.0 commit = True tag = False parse = (?P\d+)\.(?P\d+)\.(?P\d+)(?P(a|b|rc)?)(?P\d*) diff --git a/README.md b/README.md index 970ac7d89..4190e8cb2 100644 --- a/README.md +++ b/README.md @@ -243,7 +243,7 @@ Git. This uses [pre-commit](https://pre-commit.com/). Once you ```yaml repos: - repo: https://github.com/fsfe/reuse-tool - rev: v2.0.0 + rev: v2.1.0 hooks: - id: reuse ``` diff --git a/docs/conf.py b/docs/conf.py index 45f511a65..42bca8878 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -76,7 +76,7 @@ # The full version, including alpha/beta/rc tags. release = get_version("reuse") except PackageNotFoundError: - release = "2.0.0" + release = "2.1.0" # The short X.Y.Z version. version = ".".join(release.split(".")[:3]) diff --git a/pyproject.toml b/pyproject.toml index 4b1deaa33..4c638a158 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -7,7 +7,7 @@ [tool.poetry] name = "reuse" -version = "2.0.0" +version = "2.1.0" description = "reuse is a tool for compliance with the REUSE recommendations." authors = [ "Free Software Foundation Europe ", diff --git a/src/reuse/__init__.py b/src/reuse/__init__.py index 1fe5e688b..fcc8cb374 100644 --- a/src/reuse/__init__.py +++ b/src/reuse/__init__.py @@ -31,7 +31,7 @@ __version__ = version("reuse") except PackageNotFoundError: # package is not installed - __version__ = "2.0.0" + __version__ = "2.1.0" __author__ = "Carmen Bianca Bakker" __email__ = "carmenbianca@fsfe.org" From 17dfd8873ba1e2a7e8d58fc43a09a44bca0d9cae Mon Sep 17 00:00:00 2001 From: linozen Date: Tue, 18 Jul 2023 10:34:17 +0200 Subject: [PATCH 3/5] chore: alter changelog --- CHANGELOG.md | 42 +++++++++++++++++++++++++++++++++++++++++- 1 file changed, 41 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 0b4673b1d..9db54c8b0 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -42,6 +42,47 @@ CLI command and its behaviour. There are no guarantees of stability for the ### Added +### Changed + +### Deprecated + +### Removed + +### Fixed + +### Security + +## 2.1.0 - 2023-07-18 + +After the yanked 2.0.0 release, we're excited to announce our latest major +version packed with new features and improvements! We've expanded our file type +recognition, now including Fennel, CommonJS, Qt .pro, .pri, .qrc, .qss, .ui, +Textile, Visual Studio Code workspace, Application Resource Bundle, Svelte +components, AES encrypted files, Jakarta Server Page, Clang format, Browserslist +config, Prettier config and ignored files, Flutter pubspec.lock, .metadata, +Terraform and HCL, Typst and more. + +We've also added the ability to detect SPDX snippet tags in files and introduced +additional license metadata for the Python package. A new `--json` flag has been +added to the `lint` command, marking the first step towards better integration +of REUSE output with other tools. + +Notably, `reuse.ReuseInfo` has been enhanced with `copy` and `union` methods and +now stores information about the source from which the information was gathered. + +On the changes front, we've bumped the SPDX license list to v3.21 and made +significant updates to our Sphinx documentation. Please note that Python 3.6 and +3.7 support has been dropped in this release. + +We've fixed several issues including automatic generation of Sphinx +documentation via readthedocs.io and a compatibility issue where reuse could not +be installed if gettext is not installed. + +This update is all about making your experience better. Enjoy adding copyright +and licensing information to your code! + +### Added + - Detect SPDX snippet tags in files. (#699) - More file types are recognised: - Fennel (`.fnl`) (#638) @@ -90,7 +131,6 @@ CLI command and its behaviour. There are no guarantees of stability for the - Removed dependency on setuptools' `pkg_resources` to determine the installed version of reuse. (#724) - Bumped SPDX license list to v3.21. (#763) -- Bumped REUSE Spec version to 3.1. (#768) - `Project.reuse_info_of` now returns a list of `ReuseInfo` objects instead of a single one. This is because the source information is now stored alongside the REUSE information. (#787) From 1efca6eba06af69055b30965504e34647ba866f9 Mon Sep 17 00:00:00 2001 From: linozen Date: Tue, 18 Jul 2023 10:34:38 +0200 Subject: [PATCH 4/5] fix: update reuse spec version to 3.0 --- src/reuse/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/reuse/__init__.py b/src/reuse/__init__.py index fcc8cb374..1c567da92 100644 --- a/src/reuse/__init__.py +++ b/src/reuse/__init__.py @@ -36,7 +36,7 @@ __author__ = "Carmen Bianca Bakker" __email__ = "carmenbianca@fsfe.org" __license__ = "Apache-2.0 AND CC0-1.0 AND CC-BY-SA-4.0 AND GPL-3.0-or-later" -__REUSE_version__ = "3.1" +__REUSE_version__ = "3.0" _LOGGER = logging.getLogger(__name__) From 8bd182bc1f66113e228914241ff8cd16cbc67272 Mon Sep 17 00:00:00 2001 From: linozen Date: Tue, 18 Jul 2023 10:47:06 +0200 Subject: [PATCH 5/5] fix: remove changelog comment because we don't guarantee API stability. --- CHANGELOG.md | 3 --- 1 file changed, 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 9db54c8b0..b8d4b26a1 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -67,9 +67,6 @@ additional license metadata for the Python package. A new `--json` flag has been added to the `lint` command, marking the first step towards better integration of REUSE output with other tools. -Notably, `reuse.ReuseInfo` has been enhanced with `copy` and `union` methods and -now stores information about the source from which the information was gathered. - On the changes front, we've bumped the SPDX license list to v3.21 and made significant updates to our Sphinx documentation. Please note that Python 3.6 and 3.7 support has been dropped in this release.