Merge pull request #141 from patrikspiess/main

Release 1.0.0
migros · Aug 3, 2023 · 822339a · 822339a
2 parents d3031eb + dcffcff
commit 822339a
Show file tree

Hide file tree

Showing 6 changed files with 29 additions and 23 deletions.
diff --git a/.make_release.sh b/.make_release.sh
@@ -47,13 +47,14 @@ sed -i -e '/./,$!d' -e :a -e '/^\n*$/{$d;N;ba' -e '}' WHATSNEW.md
 VERSION="## [$new_version] - $(date +%Y-%m-%d)"
 WHATSNEW="$(<WHATSNEW.md)"
 sed -i "1s/^/\n$VERSION\n\n/" WHATSNEW.md
-echo "" >> WHATSNEW.md
+echo "" > WHATSNEW.md
 sed -i '/# \[Released\]/r WHATSNEW.md' CHANGELOG.md
 
 
 git add pyproject.toml
 git add fotoobo/__init__.py
 git add CHANGELOG.md
+git add WHATSNEW.md
 
 echo 'Committing version bump...'
 git commit -m ":bookmark: Commit version v$new_version"

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -10,6 +10,30 @@ For unreleased changes see [WHATSNEW.md](WHATSNEW.md)
 
 # [Released]
 
+## [1.0.0] - 2023-08-03
+
+### Added
+
+- First version of architecture documentation (according to Arc42)
+- Inventory getter now supports wildcard * syntax
+- Parallel processing bulk queries to FortiGates. This includes the following commands:
+  `fgt backup` `fgt get version` `fgt monitor hamaster`
+- Introduce `fgt config get` command to (bulk) print parts of saved configuration
+- Command `fgt hamaster` now supports Jinja2 templating
+
+### Changed
+
+- Much better session key handling for FortiManager and FortiAnalyzer
+- FortiManager and FortiAnalyzer session key can now be saved into a file
+- Improved CHANGELOG and WHATSNEW handling for new releases
+- `fgt monitor hamaster` now uses the API to query FortiGate instead of SNMP
+- Migrate `fgt config`, `fgt get` and `fmg get` commands to use the Result class
+
+### Removed
+
+- Module pysnmp is not used anymore as we use API for all use cases now
+
+
 ## [0.10.0] - 2023-06-15
 
 ### Added

diff --git a/WHATSNEW.md b/WHATSNEW.md
@@ -1,19 +0,0 @@
-### Added
-
-- Inventory getter now supports wildcard * syntax
-- Parallel processing bulk queries to FortiGates. This includes the following commands:
-  `fgt backup` `fgt get version` `fgt monitor hamaster`
-- Introduce `fgt config get` command to (bulk) print parts of saved configuration
-- Command `fgt hamaster` now supports Jinja2 templating
-
-### Changed
-
-- Much better session key handling for FortiManager and FortiAnalyzer
-- FortiManager and FortiAnalyzer session key can now be saved into a file
-- Improved CHANGELOG and WHATSNEW handling for new releases
-- `fgt monitor hamaster` now uses the API to query FortiGate instead of SNMP
-- Migrate `fgt config`, `fgt get` and `fmg get` commands to use the Result class
-
-### Removed
-
-- Module pysnmp is not used anymore as we use API for all use cases now

diff --git a/docs/source/developer/how_to/how_to_release.rst b/docs/source/developer/how_to/how_to_release.rst
@@ -14,7 +14,7 @@ some scripts and workflows which do some checks and automation.
 Here are the steps you need to perform to make a release.
 
 #. Make sure all tests pass
-#. Update the changelog
+#. Update the WHATSNEW file
 #. Execute the ``.make_release.sh`` script giving the type of release (major/minor/patch)
 #. Make a pull request
 #. Switch to the main repository (migros/fotoobo)

diff --git a/fotoobo/__init__.py b/fotoobo/__init__.py
@@ -8,4 +8,4 @@
 from .fortinet import FortiAnalyzer, FortiClientEMS, FortiGate, FortiManager
 
 __all__ = ["FortiAnalyzer", "FortiClientEMS", "FortiGate", "FortiManager"]
-__version__: str = "0.10.0"
+__version__: str = "1.0.0"
diff --git a/pyproject.toml b/pyproject.toml
@@ -4,7 +4,7 @@ build-backend = "poetry.core.masonry.api"
 
 [tool.poetry]
 name = "fotoobo"
-version = "0.10.0"
+version = "1.0.0"
 description = "The awesome Fortinet Toolbox"
 authors = ["Patrik Spiess <patrik.spiess@mgb.ch>", "Lukas Murer-Jäckle <lukas.murer@mgb.ch>"]
 readme = "README.md"