From b98c80ca3991a493eb50f6a7b9b130c54449b1f8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaspar=20L=C3=B6chte?= Date: Mon, 8 Feb 2021 09:10:09 +0100 Subject: [PATCH 1/2] Change Versioning to Calendar Versioning --- CHANGELOG.md | 6 +++--- RELEASE.md | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 8a2e19e8..b8975f77 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,17 +3,17 @@ All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), -and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). +and this project adheres to [Calendar Versioning](https://calver.org). ## [Unreleased] ### Added - New command called `pontos-update-header` to update years in copyright headers [#58](https://github.com/greenbone/pontos/pull/58) -- Tests for `pontos-update-header` added. [#59](https://github.com/greenbone/pontos/pull/59) +- Tests for `pontos-update-header` added. [#59](https://github.com/greenbone/pontos/pull/59)[#60](https://github.com/greenbone/pontos/pull/60) ### Changed - Renamed `pontos-copyright` to `pontos-update-header`. This tool now adds copyright header to files, if missing. [#59](https://github.com/greenbone/pontos/pull/59) - +- Change versioning to [Calendar Versioning](https://calver.org)[#61](https://github.com/greenbone/pontos/pull/61) ### Deprecated ### Removed ### Fixed diff --git a/RELEASE.md b/RELEASE.md index 9286d202..44a9e6f3 100644 --- a/RELEASE.md +++ b/RELEASE.md @@ -1,7 +1,7 @@ # Release instructions Before creating a new release please do a careful consideration about the -version number for the new release. We are following [Semantic Versioning](https://semver.org/) +version number for the new release. We are following [Calendar Versioning](https://calver.org) and [PEP440](https://www.python.org/dev/peps/pep-0440/). ## Preparing the Required Python Packages From 22fecc07469f42c6848a8a5a6b107ac230954967 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Ricks?= Date: Mon, 8 Feb 2021 09:28:29 +0100 Subject: [PATCH 2/2] Update CHANGELOG.md --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index b8975f77..0d8b1a06 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -14,6 +14,7 @@ and this project adheres to [Calendar Versioning](https://calver.org). ### Changed - Renamed `pontos-copyright` to `pontos-update-header`. This tool now adds copyright header to files, if missing. [#59](https://github.com/greenbone/pontos/pull/59) - Change versioning to [Calendar Versioning](https://calver.org)[#61](https://github.com/greenbone/pontos/pull/61) + ### Deprecated ### Removed ### Fixed