Skip to content

Commit 2caf08f

Browse files
Merge pull request #696 from RocketPy-Team/develop
DEV: Prepare Master for v1.6
2 parents 9f2efa0 + 94e2958 commit 2caf08f

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

49 files changed

+3149
-417
lines changed

.pylintrc

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -359,6 +359,9 @@ max-statements=25
359359
# Minimum number of public methods for a class (see R0903).
360360
min-public-methods=0
361361

362+
# Maximum number of positional arguments (see R0917).
363+
max-positional-arguments = 25
364+
362365

363366
[EXCEPTIONS]
364367

CHANGELOG.md

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,11 +32,13 @@ Attention: The newest changes should be on top -->
3232

3333
### Added
3434

35-
-
35+
- ENH: Generic Surfaces and Generic Linear Surfaces [#680](https://github.com/RocketPy-Team/RocketPy/pull/680)
36+
- ENH: Free-Form Fins [#694](https://github.com/RocketPy-Team/RocketPy/pull/694)
37+
- ENH: Expand Polation Options for ND Functions. [#691](https://github.com/RocketPy-Team/RocketPy/pull/691)
3638

3739
### Changed
3840

39-
-
41+
-
4042

4143
### Fixed
4244

README.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -329,6 +329,9 @@ RocketPy extends its gratitude to the following institutions for their support a
329329
<a href="https://github.com/Space-Enterprise-at-Berkeley">
330330
<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">
331331
</a>
332+
<a href="https://www.instagram.com/faradayupv">
333+
<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">
334+
</a>
332335
</div>
333336

334337
## Individual Contributors
Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
Generic Surface Class
2+
---------------------
3+
4+
.. autoclass:: rocketpy.GenericSurface
5+
:members:
Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
Linear Generic Surface Class
2+
----------------------------
3+
4+
.. autoclass:: rocketpy.LinearGenericSurface
5+
:members:

docs/reference/classes/aero_surfaces/index.rst

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,3 +13,5 @@ AeroSurface Classes
1313
EllipticalFins
1414
RailButtons
1515
AirBrakes
16+
GenericSurface
17+
LinearGenericSurface
27.6 KB
Loading

docs/static/rocket/aeroframe.png

40 KB
Loading

0 commit comments

Comments
 (0)