Skip to content

Commit

Permalink
Merge pull request #994 from carmenbianca/release-3.1.0a1
Browse files Browse the repository at this point in the history
Release 3.1.0a1
  • Loading branch information
carmenbianca authored May 28, 2024
2 parents ca82db2 + 6afda74 commit 3831234
Show file tree
Hide file tree
Showing 8 changed files with 1,109 additions and 759 deletions.
28 changes: 0 additions & 28 deletions .bumpversion.cfg

This file was deleted.

8 changes: 3 additions & 5 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ CLI command and its behaviour. There are no guarantees of stability for the
### Security
-->

## Unreleased - YYYY-MM-DD
## 3.1.0a1 - 2024-05-28

### Added

Expand All @@ -65,6 +65,8 @@ CLI command and its behaviour. There are no guarantees of stability for the

### Changed

- Updated SPDX resources to 3.24.0. (#994)
- Updated REUSE specification version to 3.2. (#994)
- `.s` files now use the Python comment style as per GNU Assembler (gas). (#928)
- Previously, any file that begins with `COPYING` or `LICENSE` was ignored. This
has been changed. Now, files like `COPYING_README` are no longer ignored, but
Expand All @@ -79,8 +81,6 @@ CLI command and its behaviour. There are no guarantees of stability for the
- `.reuse/dep5` is marked deprecated. `reuse convert-dep5` will help you switch
to `REUSE.toml`. (#863)

### Removed

### Fixed

- Clearer instructions for `--suppress-deprecation` in deprecation warning.
Expand All @@ -92,8 +92,6 @@ CLI command and its behaviour. There are no guarantees of stability for the
- Support annotating a file that contains only a shebang. (#965)
- Add `CONTRIBUTING.md` to the sdist. (#987)

### Security

## 3.0.2 - 2024-04-08

### Fixed
Expand Down
2 changes: 1 addition & 1 deletion CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ possible, run `poetry lock --no-update`.

- Verify changelog
- Create branch release-x.y.z
- `bumpversion --new-version x.y.z minor`
- `bumpver update --set-version vx.y.z`
- `make update-resources`
- Alter changelog
- Do some final tweaks/bugfixes (and alter changelog)
Expand Down
64 changes: 55 additions & 9 deletions poetry.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

25 changes: 23 additions & 2 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@

[tool.poetry]
name = "reuse"
version = "3.0.2"
version = "3.1.0a1"
description = "reuse is a tool for compliance with the REUSE recommendations."
authors = [
"Free Software Foundation Europe <contact@fsfe.org>",
Expand Down Expand Up @@ -76,7 +76,7 @@ furo = ">=2023.3.27"
black = ">=20"
isort = ">=5.6.0"
pre-commit = ">=2.9.0"
bump2version = ">=1.0.0"
bumpver = ">=2023.1129"
pylint = ">=2.12.2"
mypy = ">=1.0"
GitPython = ">=3.0"
Expand All @@ -101,6 +101,27 @@ script = "_build.py"
requires = ["poetry-core>=1.1.0"]
build-backend = "poetry.core.masonry.api"

[bumpver]
current_version = "v3.1.0a1"
version_pattern = "vMAJOR.MINOR.PATCH[PYTAGNUM]"
commit_message = "Bump version: {old_version} → {new_version}"
tag_message = "{new_version}"
tag_scope = "default"
pre_commit_hook = ""
post_commit_hook = ""
commit = true
tag = false
push = false

[bumpver.file_patterns]
"pyproject.toml" = [
'^version = "{pep440_version}"$',
'^current_version = "{version}"$',
]
"src/reuse/__init__.py" = [
'__version__ = "{pep440_version}"$',
]

[tool.black]
line-length = 80

Expand Down
4 changes: 2 additions & 2 deletions src/reuse/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -31,12 +31,12 @@
__version__ = version("reuse")
except PackageNotFoundError:
# package is not installed
__version__ = "3.0.2"
__version__ = "3.1.0a1"

__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.0"
__REUSE_version__ = "3.2"

_LOGGER = logging.getLogger(__name__)

Expand Down
Loading

0 comments on commit 3831234

Please sign in to comment.