Skip to content

Commit 2b3a15c

Browse files
authored
Merge branch 'develop' into enh/enable-only-radial-burning
2 parents c941070 + 8c82c3a commit 2b3a15c

27 files changed

Lines changed: 577 additions & 152 deletions

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

Lines changed: 2 additions & 1 deletion
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/**"
@@ -24,6 +24,7 @@ jobs:
2424
python-version: [3.9, 3.13]
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: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ jobs:
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

CHANGELOG.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,18 +32,24 @@ Attention: The newest changes should be on top -->
3232

3333
### Added
3434
- ENH: Enable only radial burning [#815](https://github.com/RocketPy-Team/RocketPy/pull/815)
35+
- ENH: Controller (AirBrakes) and Sensors Encoding [#849] (https://github.com/RocketPy-Team/RocketPy/pull/849)
36+
- EHN: Addition of ensemble variable to ECMWF dictionaries [#842] (https://github.com/RocketPy-Team/RocketPy/pull/842)
3537
- ENH: Added Crop and Clip Methods to Function Class [#817](https://github.com/RocketPy-Team/RocketPy/pull/817)
3638
- DOC: Add Flight class usage documentation and update index [#841](https://github.com/RocketPy-Team/RocketPy/pull/841)
3739
- ENH: Discretized and No-Pickle Encoding Options [#827] (https://github.com/RocketPy-Team/RocketPy/pull/827)
3840
- ENH: Add the Coriolis Force to the Flight class [#799](https://github.com/RocketPy-Team/RocketPy/pull/799)
41+
- ENH: Improve parachute geometric parametrization [#835](https://github.com/RocketPy-Team/RocketPy/pull/835)
3942

4043
### Changed
4144

45+
- DOC: Update docs dependencies and sub dependencies [#851](https://github.com/RocketPy-Team/RocketPy/pull/851)
4246
- ENH: _MotorPrints inheritance - issue #460 [#828](https://github.com/RocketPy-Team/RocketPy/pull/828)
4347
- MNT: fix deprecations and warnings [#829](https://github.com/RocketPy-Team/RocketPy/pull/829)
4448

4549
### Fixed
4650

51+
- BUG: Fix no time initialization when passing initial_solution as array to Flight object [#844](https://github.com/RocketPy-Team/RocketPy/pull/844)
52+
4753

4854
## [v1.10.0] - 2025-05-16
4955

README.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -262,6 +262,9 @@ main = calisto.add_parachute(
262262
sampling_rate=105,
263263
lag=1.5,
264264
noise=(0, 8.3, 0.5),
265+
radius=1.5,
266+
height=1.5,
267+
porosity=0.0432,
265268
)
266269

267270
drogue = calisto.add_parachute(
@@ -271,6 +274,9 @@ drogue = calisto.add_parachute(
271274
sampling_rate=105,
272275
lag=1.5,
273276
noise=(0, 8.3, 0.5),
277+
radius=1.5,
278+
height=1.5,
279+
porosity=0.0432,
274280
)
275281
```
276282

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)