Skip to content

Commit fa94784

Browse files
Merge branch 'develop' into mnt/deprecated-decorator
2 parents efc0c81 + 780f724 commit fa94784

File tree

6 files changed

+14
-16
lines changed

6 files changed

+14
-16
lines changed

.github/workflows/test_pytest.yaml

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -29,14 +29,11 @@ jobs:
2929
uses: actions/setup-python@main
3030
with:
3131
python-version: ${{ matrix.python-version }}
32-
33-
- name: Cache Python dependencies
34-
uses: actions/cache@main
35-
with:
36-
path: ~/.cache/pip
37-
key: ${{ runner.os }}-pip-${{ hashFiles('**/requirements-tests.txt') }}
38-
restore-keys: |
39-
${{ runner.os }}-pip-
32+
cache: 'pip'
33+
cache-dependency-path: |
34+
requirements.txt
35+
requirements-tests.txt
36+
requirements-optional.txt
4037
4138
- name: Install rocketpy
4239
run: pip install .

CHANGELOG.md

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,9 @@ Attention: The newest changes should be on top -->
3535

3636
### Changed
3737

38+
- ENH: _MotorPrints inheritance - issue #460 [#828](https://github.com/RocketPy-Team/RocketPy/pull/828)
39+
40+
- MNT: fix deprecations and warnings [#829](https://github.com/RocketPy-Team/RocketPy/pull/829)
3841

3942
### Fixed
4043

@@ -44,7 +47,7 @@ Attention: The newest changes should be on top -->
4447
### Added
4548
- ENH: Support for ND arithmetic in Function class. [#810] (https://github.com/RocketPy-Team/RocketPy/pull/810)
4649
- ENH: allow users to provide custom samplers [#803](https://github.com/RocketPy-Team/RocketPy/pull/803)
47-
- ENH: Implement Multivariate Rejection Sampling (MRS) [#738] (https://github.com/RocketPy-Team/RocketPy/pull/738)
50+
- ENH: Implement Multivariate Rejection Sampling (MRS) [#738] (https://github.com/RocketPy-Team/RocketPy/pull/738)
4851
- ENH: Create a rocketpy file to store flight simulations [#800](https://github.com/RocketPy-Team/RocketPy/pull/800)
4952
- ENH: Support for the RSE file format has been added to the library [#798](https://github.com/RocketPy-Team/RocketPy/pull/798)
5053
- ENH: Introduce Net Thrust with pressure corrections [#789](https://github.com/RocketPy-Team/RocketPy/pull/789)

requirements.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
numpy>=1.13
22
scipy>=1.0
3-
matplotlib>=3.0
3+
matplotlib>=3.9.0 # Released May 15th 2024
44
netCDF4>=1.6.4
55
requests
66
pytz

rocketpy/environment/environment.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,14 +27,14 @@
2727
find_latitude_index,
2828
find_longitude_index,
2929
find_time_index,
30+
geodesic_to_utm,
3031
get_elevation_data_from_dataset,
3132
get_final_date_from_time_array,
3233
get_initial_date_from_time_array,
3334
get_interval_date_from_time_array,
3435
get_pressure_levels_from_file,
3536
mask_and_clean_dataset,
3637
)
37-
from rocketpy.environment.tools import geodesic_to_utm as geodesic_to_utm_tools
3838
from rocketpy.environment.weather_model_mapping import WeatherModelMapping
3939
from rocketpy.mathutils.function import NUMERICAL_TYPES, Function, funcify_method
4040
from rocketpy.plots.environment_plots import _EnvironmentPlots
@@ -450,7 +450,7 @@ def __initialize_utm_coordinates(self):
450450
self.initial_utm_letter,
451451
self.initial_hemisphere,
452452
self.initial_ew,
453-
) = geodesic_to_utm_tools(
453+
) = geodesic_to_utm(
454454
lat=self.latitude,
455455
lon=self.longitude,
456456
flattening=self.ellipsoid.flattening,

rocketpy/plots/monte_carlo_plots.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -183,7 +183,8 @@ def all(self, keys=None):
183183
ax2 = fig.add_subplot(gs[1])
184184

185185
# Plot boxplot
186-
ax1.boxplot(self.monte_carlo.results[key], orientation="horizontal")
186+
# TODO: changes vert to orientation="horizontal" when support for Py3.9 ends
187+
ax1.boxplot(self.monte_carlo.results[key], vert=False)
187188
ax1.set_title(f"Box Plot of {key}")
188189
ax1.set_yticks([])
189190

rocketpy/simulation/flight.py

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -155,8 +155,6 @@ class Flight:
155155
Current integration time.
156156
Flight.y : list
157157
Current integration state vector u.
158-
Flight.post_processed : bool
159-
Defines if solution data has been post processed.
160158
Flight.initial_solution : list
161159
List defines initial condition - [tInit, x_init,
162160
y_init, z_init, vx_init, vy_init, vz_init, e0_init, e1_init,
@@ -1102,7 +1100,6 @@ def __init_solution_monitors(self):
11021100
self.impact_velocity = 0
11031101
self.impact_state = np.array([0])
11041102
self.parachute_events = []
1105-
self.post_processed = False
11061103
self.__post_processed_variables = []
11071104

11081105
def __init_flight_state(self):

0 commit comments

Comments
 (0)