Merge pull request #696 from RocketPy-Team/develop

DEV: Prepare Master for v1.6
RocketPy-Team · Sep 28, 2024 · 2caf08f · 2caf08f
2 parents 9f2efa0 + 94e2958
commit 2caf08f
Show file tree

Hide file tree

Showing 49 changed files with 3,149 additions and 417 deletions.
diff --git a/.pylintrc b/.pylintrc
@@ -359,6 +359,9 @@ max-statements=25
 # Minimum number of public methods for a class (see R0903).
 min-public-methods=0
 
+# Maximum number of positional arguments (see R0917).
+max-positional-arguments = 25
+
 
 [EXCEPTIONS]
 

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -32,11 +32,13 @@ 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
 
-- 
+-
 
 ### Fixed
 

diff --git a/README.md b/README.md
@@ -329,6 +329,9 @@ RocketPy extends its gratitude to the following institutions for their support a
     <a href="https://github.com/Space-Enterprise-at-Berkeley">
         <img align=top alt="Space Enterprise at Berkeley Logo" src="https://raw.githubusercontent.com/RocketPy-Team/RocketPy/master/docs/static/institutional/space_enterprise_at_berkeley.jpeg" height="150px">
     </a>
+    <a href="https://www.instagram.com/faradayupv">
+        <img align=top alt="Faraday Rocketry UPV Logo" src="https://raw.githubusercontent.com/RocketPy-Team/RocketPy/master/docs/static/institutional/faraday_team_logo.jpg" height="150px">
+    </a>
 </div>
 
 ## Individual Contributors

diff --git a/docs/reference/classes/aero_surfaces/GenericSurface.rst b/docs/reference/classes/aero_surfaces/GenericSurface.rst
@@ -0,0 +1,5 @@
+Generic Surface Class
+---------------------
+
+.. autoclass:: rocketpy.GenericSurface
+   :members:
diff --git a/docs/reference/classes/aero_surfaces/LinearGenericSurface.rst b/docs/reference/classes/aero_surfaces/LinearGenericSurface.rst
@@ -0,0 +1,5 @@
+Linear Generic Surface Class
+----------------------------
+
+.. autoclass:: rocketpy.LinearGenericSurface
+   :members:
diff --git a/docs/reference/classes/aero_surfaces/index.rst b/docs/reference/classes/aero_surfaces/index.rst
@@ -13,3 +13,5 @@ AeroSurface Classes
    EllipticalFins
    RailButtons
    AirBrakes
+   GenericSurface
+   LinearGenericSurface
diff --git a/docs/static/institutional/faraday_team_logo.jpg b/docs/static/institutional/faraday_team_logo.jpg
diff --git a/docs/static/rocket/aeroframe.png b/docs/static/rocket/aeroframe.png