From 2c456babeab9511f859b63be9dfe2b55dc2599f0 Mon Sep 17 00:00:00 2001 From: Robin Mueller Date: Thu, 14 Sep 2023 11:08:02 +0200 Subject: [PATCH 1/3] prep v6.0.0 --- CHANGELOG.md | 5 ++++- pyproject.toml | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index cd058997..4672b83e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -9,7 +9,10 @@ Starting from v4.0.0, this project adheres to [Semantic Versioning](http://semve # [unreleased] -Changed package license from Apache-2.0 to dual Apache-2.0 or MIT. +# [v6.0.0] 2023-09-14 + +- Changed package license from Apache-2.0 to dual Apache-2.0 or MIT. +- spacepackets version v18.0.0 ## Fixed diff --git a/pyproject.toml b/pyproject.toml index f4171bba..03d90015 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -6,7 +6,7 @@ build-backend = "setuptools.build_meta" name = "tmtccmd" description = "TMTC Commander Core" readme = "README.md" -version = "6.0.0rc0" +version = "6.0.0" requires-python = ">=3.8" license = {text = "Apache-2.0 or MIT" } authors = [ From cdad851df0737531dfbc20ad61bbfda69c6b7525 Mon Sep 17 00:00:00 2001 From: Robin Mueller Date: Thu, 14 Sep 2023 11:20:32 +0200 Subject: [PATCH 2/3] adapt NOTICE file --- NOTICE | 17 +++-------------- 1 file changed, 3 insertions(+), 14 deletions(-) diff --git a/NOTICE b/NOTICE index 157c8fce..29c9fed8 100644 --- a/NOTICE +++ b/NOTICE @@ -1,15 +1,4 @@ -## License +Copyright 2019-2023 Robin Mueller, KSat e.V. Stuttgart. -Copyright 2019-2021 Robin Mueller, KSat e.V. Stuttgart - -Licensed under the Apache License, Version 2.0 (the "License"); -you may not use this file except in compliance with the License. -You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, software -distributed under the License is distributed on an "AS IS" BASIS, -WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -See the License for the specific language governing permissions and -limitations under the License. +This project has a MIT/Apache-2.0 dual license and you can chose which license +to apply for your project. From 8b26a6265afe595b1d925ec514d4ea4be34570cf Mon Sep 17 00:00:00 2001 From: Robin Mueller Date: Thu, 14 Sep 2023 11:23:09 +0200 Subject: [PATCH 3/3] sounds better --- NOTICE | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/NOTICE b/NOTICE index 29c9fed8..c5b8adfb 100644 --- a/NOTICE +++ b/NOTICE @@ -1,4 +1,4 @@ Copyright 2019-2023 Robin Mueller, KSat e.V. Stuttgart. -This project has a MIT/Apache-2.0 dual license and you can chose which license -to apply for your project. +This project is licensed under a MIT/Apache-2.0 dual license and you can chose which license to +apply for your project.