Skip to content

Commit 274b9b3

Browse files
committed
Merge remote-tracking branch 'origin/develop' into enh/parachute-inflation-modeling
2 parents 18a5ef5 + 857c4f4 commit 274b9b3

File tree

88 files changed

+2128
-809
lines changed

Some content is hidden

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

88 files changed

+2128
-809
lines changed

.github/workflows/linters.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616
runs-on: ubuntu-latest
1717
strategy:
1818
matrix:
19-
python-version: ["3.9"]
19+
python-version: ["3.10"]
2020
steps:
2121
- uses: actions/checkout@main
2222
- name: Set up Python ${{ matrix.python-version }}

.github/workflows/publish-to-pypi.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ jobs:
1919
- name: Set up Python
2020
uses: actions/setup-python@main
2121
with:
22-
python-version: "3.9"
22+
python-version: "3.10"
2323
- name: Install dependencies
2424
run: |
2525
python -m pip install --upgrade pip

.github/workflows/test-pytest-slow.yaml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ on:
55
- cron: "0 17 * * 5" # at 05:00 PM, only on Friday
66
push:
77
branches:
8-
- main
8+
- master
99
paths:
1010
- "**.py"
1111
- ".github/**"
@@ -21,9 +21,10 @@ jobs:
2121
runs-on: ubuntu-latest
2222
strategy:
2323
matrix:
24-
python-version: [3.9, 3.13]
24+
python-version: ["3.10", "3.14"]
2525
env:
2626
PYTHON: ${{ matrix.python-version }}
27+
MPLBACKEND: Agg
2728
steps:
2829
- uses: actions/checkout@main
2930
- name: Set up Python

.github/workflows/test_pytest.yaml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,11 @@ jobs:
1919
strategy:
2020
matrix:
2121
os: [ubuntu-latest, macos-latest, windows-latest]
22-
python-version: [3.9, 3.13]
22+
python-version: ["3.10", "3.14"]
2323
env:
2424
OS: ${{ matrix.os }}
2525
PYTHON: ${{ matrix.python-version }}
26+
MPLBACKEND: Agg
2627
steps:
2728
- uses: actions/checkout@main
2829
- name: Set up Python

.pylintrc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ persistent=yes
8888

8989
# Minimum Python version to use for version dependent checks. Will default to
9090
# the version used to run pylint.
91-
py-version=3.9
91+
py-version=3.10
9292

9393
# Discover python modules and packages in the file system subtree.
9494
recursive=no

CHANGELOG.md

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

3333
### Added
3434

35-
- EHN: Addition of ensemble variable to ECMWF dictionaries [#842] (https://github.com/RocketPy-Team/RocketPy/pull/842)
35+
- ENH: Tank Fluids with Variable Density from Temperature and Pressure [#852](https://github.com/RocketPy-Team/RocketPy/pull/852)
36+
- ENH: Controller (AirBrakes) and Sensors Encoding [#849](https://github.com/RocketPy-Team/RocketPy/pull/849)
37+
- EHN: Addition of ensemble variable to ECMWF dictionaries [#842](https://github.com/RocketPy-Team/RocketPy/pull/842)
3638
- ENH: Added Crop and Clip Methods to Function Class [#817](https://github.com/RocketPy-Team/RocketPy/pull/817)
3739
- DOC: Add Flight class usage documentation and update index [#841](https://github.com/RocketPy-Team/RocketPy/pull/841)
38-
- ENH: Discretized and No-Pickle Encoding Options [#827] (https://github.com/RocketPy-Team/RocketPy/pull/827)
40+
- ENH: Discretized and No-Pickle Encoding Options [#827](https://github.com/RocketPy-Team/RocketPy/pull/827)
3941
- ENH: Add the Coriolis Force to the Flight class [#799](https://github.com/RocketPy-Team/RocketPy/pull/799)
4042
- ENH: Improve parachute geometric parametrization [#835](https://github.com/RocketPy-Team/RocketPy/pull/835)
43+
- ENH: Changing ellipses plot axis label [#855](https://github.com/RocketPy-Team/RocketPy/pull/855)
4144

4245
### Changed
4346

47+
- MNT: allow for exporting of non apogee flights. [#863](https://github.com/RocketPy-Team/RocketPy/pull/863)
48+
- TST: remove remaining files after test session. [#862](https://github.com/RocketPy-Team/RocketPy/pull/862)
49+
- MNT: bumps min python version to 3.10 [#857](https://github.com/RocketPy-Team/RocketPy/pull/857)
50+
- DOC: Update docs dependencies and sub dependencies [#851](https://github.com/RocketPy-Team/RocketPy/pull/851)
51+
- MNT: extract flight data exporters [#845](https://github.com/RocketPy-Team/RocketPy/pull/845)
4452
- ENH: _MotorPrints inheritance - issue #460 [#828](https://github.com/RocketPy-Team/RocketPy/pull/828)
4553
- MNT: fix deprecations and warnings [#829](https://github.com/RocketPy-Team/RocketPy/pull/829)
4654

4755
### Fixed
4856

57+
- BUG: correct encoding for trapezoidal sweep length and angle. [#861](https://github.com/RocketPy-Team/RocketPy/pull/861)
4958
- BUG: Fix no time initialization when passing initial_solution as array to Flight object [#844](https://github.com/RocketPy-Team/RocketPy/pull/844)
5059

5160

README.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -262,8 +262,8 @@ main = calisto.add_parachute(
262262
sampling_rate=105,
263263
lag=1.5,
264264
noise=(0, 8.3, 0.5),
265-
parachute_radius=1.5,
266-
parachute_height=1.5,
265+
radius=1.5,
266+
height=1.5,
267267
porosity=0.0432,
268268
)
269269

@@ -274,8 +274,8 @@ drogue = calisto.add_parachute(
274274
sampling_rate=105,
275275
lag=1.5,
276276
noise=(0, 8.3, 0.5),
277-
parachute_radius=1.5,
278-
parachute_height=1.5,
277+
radius=1.5,
278+
height=1.5,
279279
porosity=0.0432,
280280
)
281281
```
Lines changed: 101 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,101 @@
1+
Temperature (K),Pressure (Pa),Density (kg/m³)
2+
193.150000,101325.000000,2.839688
3+
205.372222,101325.000000,2.659196
4+
217.594444,101325.000000,2.501930
5+
229.816667,101325.000000,2.363172
6+
242.038889,101325.000000,2.239591
7+
254.261111,101325.000000,2.128693
8+
266.483333,101325.000000,2.028539
9+
278.705556,101325.000000,1.937588
10+
290.927778,101325.000000,1.854594
11+
303.150000,101325.000000,1.778532
12+
193.150000,990733.333333,1206.532256
13+
205.372222,990733.333333,1168.931406
14+
217.594444,990733.333333,1129.335464
15+
229.816667,990733.333333,1087.042281
16+
242.038889,990733.333333,24.480299
17+
254.261111,990733.333333,22.807515
18+
266.483333,990733.333333,21.414919
19+
278.705556,990733.333333,20.221402
20+
290.927778,990733.333333,19.178742
21+
303.150000,990733.333333,18.255258
22+
193.150000,1880141.666667,1207.901606
23+
205.372222,1880141.666667,1170.560205
24+
217.594444,1880141.666667,1131.305292
25+
229.816667,1880141.666667,1089.479276
26+
242.038889,1880141.666667,1044.107836
27+
254.261111,1880141.666667,993.574261
28+
266.483333,1880141.666667,44.818526
29+
278.705556,1880141.666667,41.521255
30+
290.927778,1880141.666667,38.847302
31+
303.150000,1880141.666667,36.598433
32+
193.150000,2769550.000000,1209.256890
33+
205.372222,2769550.000000,1172.168610
34+
217.594444,2769550.000000,1133.244437
35+
229.816667,2769550.000000,1091.867709
36+
242.038889,2769550.000000,1047.140735
37+
254.261111,2769550.000000,997.611513
38+
266.483333,2769550.000000,940.542069
39+
278.705556,2769550.000000,67.699444
40+
290.927778,2769550.000000,61.910544
41+
303.150000,2769550.000000,57.447399
42+
193.150000,3658958.333333,1210.598454
43+
205.372222,3658958.333333,1173.757228
44+
217.594444,3658958.333333,1135.154031
45+
229.816667,3658958.333333,1094.209859
46+
242.038889,3658958.333333,1050.096018
47+
254.261111,3658958.333333,1001.503955
48+
266.483333,3658958.333333,946.059899
49+
278.705556,3658958.333333,878.329006
50+
290.927778,3658958.333333,90.504952
51+
303.150000,3658958.333333,81.893190
52+
193.150000,4548366.666667,1211.926631
53+
205.372222,4548366.666667,1175.326641
54+
217.594444,4548366.666667,1137.035143
55+
229.816667,4548366.666667,1096.507838
56+
242.038889,4548366.666667,1052.978332
57+
254.261111,4548366.666667,1005.263627
58+
266.483333,4548366.666667,951.292446
59+
278.705556,4548366.666667,886.629576
60+
290.927778,4548366.666667,130.554270
61+
303.150000,4548366.666667,112.079628
62+
193.150000,5437775.000000,1213.241741
63+
205.372222,5437775.000000,1176.877402
64+
217.594444,5437775.000000,1138.888779
65+
229.816667,5437775.000000,1098.763608
66+
242.038889,5437775.000000,1055.791888
67+
254.261111,5437775.000000,1008.901026
68+
266.483333,5437775.000000,956.273388
69+
278.705556,5437775.000000,894.237174
70+
290.927778,5437775.000000,812.409895
71+
303.150000,5437775.000000,153.463224
72+
193.150000,6327183.333333,1214.544092
73+
205.372222,6327183.333333,1178.410038
74+
217.594444,6327183.333333,1140.715888
75+
229.816667,6327183.333333,1100.978992
76+
242.038889,6327183.333333,1058.540519
77+
254.261111,6327183.333333,1012.425369
78+
266.483333,6327183.333333,961.030387
79+
278.705556,6327183.333333,901.279439
80+
290.927778,6327183.333333,825.421408
81+
303.150000,6327183.333333,689.418589
82+
193.150000,7216591.666667,1215.833981
83+
205.372222,7216591.666667,1179.925053
84+
217.594444,7216591.666667,1142.517369
85+
229.816667,7216591.666667,1103.155693
86+
242.038889,7216591.666667,1061.227727
87+
254.261111,7216591.666667,1015.844801
88+
266.483333,7216591.666667,965.586483
89+
278.705556,7216591.666667,907.849718
90+
290.927778,7216591.666667,836.658448
91+
303.150000,7216591.666667,729.094125
92+
193.150000,8106000.000000,1217.111692
93+
205.372222,8106000.000000,1181.422931
94+
217.594444,8106000.000000,1144.294074
95+
229.816667,8106000.000000,1105.295297
96+
242.038889,8106000.000000,1063.856717
97+
254.261111,8106000.000000,1019.166555
98+
266.483333,8106000.000000,969.961109
99+
278.705556,8106000.000000,914.018666
100+
290.927778,8106000.000000,846.619843
101+
303.150000,8106000.000000,753.272731

docs/requirements.in

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1-
nbsphinx==0.9.4
2-
pydata-sphinx-theme==0.15.2
1+
nbsphinx==0.9.7
2+
pydata-sphinx-theme==0.16.1
33
jupyter-sphinx==0.5.3
4-
sphinx_design==0.5.0
5-
ipykernel==6.29.4
6-
pandas==2.2.2
7-
lxml_html_clean==0.1.1
4+
sphinx_design==0.6.1
5+
ipykernel==6.30.1
6+
pandas==2.3.2
7+
lxml_html_clean==0.4.2
88
sphinx-copybutton==0.5.2
99
sphinx-tabs==3.4.7
10-
plotly>=5
10+
plotly==6.3.0

0 commit comments

Comments
 (0)