Skip to content

Commit

Permalink
Merge pull request #109 from robamu-org/prep_v6.0.0
Browse files Browse the repository at this point in the history
prep v6.0.0
  • Loading branch information
robamu authored Sep 14, 2023
2 parents b8c7ec8 + 8b26a62 commit e2efd90
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 16 deletions.
5 changes: 4 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
17 changes: 3 additions & 14 deletions NOTICE
Original file line number Diff line number Diff line change
@@ -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 is licensed under a MIT/Apache-2.0 dual license and you can chose which license to
apply for your project.
2 changes: 1 addition & 1 deletion pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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 = [
Expand Down

0 comments on commit e2efd90

Please sign in to comment.