Merge remote-tracking branch 'origin/master' into develop

RocketPy-Team · Oct 1, 2024 · 1b0020b · 1b0020b
2 parents ffcb1ef + 054f893
commit 1b0020b
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 6 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -32,9 +32,7 @@ Attention: The newest changes should be on top -->
 
 ### Added
 
-- ENH: Generic Surfaces and Generic Linear Surfaces [#680](https://github.com/RocketPy-Team/RocketPy/pull/680)
-- ENH: Free-Form Fins [#694](https://github.com/RocketPy-Team/RocketPy/pull/694)
-- ENH: Expand Polation Options for ND Functions. [#691](https://github.com/RocketPy-Team/RocketPy/pull/691)
+- 
 
 ### Changed
 
@@ -44,6 +42,14 @@ Attention: The newest changes should be on top -->
 
 - 
 
+## [v1.6.0] - 2024-09-29
+
+### Added
+
+- ENH: Generic Surfaces and Generic Linear Surfaces [#680](https://github.com/RocketPy-Team/RocketPy/pull/680)
+- ENH: Free-Form Fins [#694](https://github.com/RocketPy-Team/RocketPy/pull/694)
+- ENH: Expand Polation Options for ND Functions. [#691](https://github.com/RocketPy-Team/RocketPy/pull/691)
+
 ## [v1.5.0] - 2024-09-15
 
 ### Added

diff --git a/docs/conf.py b/docs/conf.py
@@ -27,7 +27,7 @@
 author = "RocketPy Team"
 
 # The full version, including alpha/beta/rc tags
-release = "1.5.0"
+release = "1.6.0"
 
 
 # -- General configuration ---------------------------------------------------

diff --git a/docs/user/installation.rst b/docs/user/installation.rst
@@ -19,7 +19,7 @@ If you want to choose a specific version to guarantee compatibility, you may ins
 
 .. code-block:: shell
 
- pip install rocketpy==1.5.0
+ pip install rocketpy==1.6.0
 
 
 Optional Installation Method: ``conda``

diff --git a/pyproject.toml b/pyproject.toml
@@ -1,6 +1,6 @@
 [project]
 name = "rocketpy"
-version = "1.5.0"
+version = "1.6.0"
 description="Advanced 6-DOF trajectory simulation for High-Power Rocketry."
 dynamic = ["dependencies"]
 readme = "README.md"