Skip to content

Commit 0d6caf2

Browse files
Merge pull request #684 from RocketPy-Team/develop
DEV: Updates master to prepare v1.5.0
2 parents df968af + dca3a84 commit 0d6caf2

File tree

144 files changed

+79408
-5095
lines changed

Some content is hidden

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

144 files changed

+79408
-5095
lines changed

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ name: Scheduled Tests
22

33
on:
44
schedule:
5-
- cron: "0 17 */14 * 5" # every 2 weeks, always on a Friday at 17:00
5+
- cron: "0 17 * * 5" # at 05:00 PM, only on Friday
66
timezone: "America/Sao_Paulo"
77

88
defaults:
@@ -11,7 +11,6 @@ defaults:
1111

1212
jobs:
1313
pytest:
14-
if: github.ref == "refs/heads/master" || github.ref == "refs/heads/develop"
1514
runs-on: ubuntu-latest
1615
strategy:
1716
matrix:

.github/workflows/test_pytest.yaml

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -18,20 +18,20 @@ jobs:
1818
runs-on: ${{ matrix.os }}
1919
strategy:
2020
matrix:
21-
os: [ubuntu-latest, macos-latest, windows-latest]
21+
os: [ubuntu-latest, macos-latest]
2222
python-version: [3.9, 3.12]
2323
env:
2424
OS: ${{ matrix.os }}
2525
PYTHON: ${{ matrix.python-version }}
2626
steps:
2727
- uses: actions/checkout@v4
2828
- name: Set up Python
29-
uses: actions/setup-python@v2
29+
uses: actions/setup-python@v4
3030
with:
3131
python-version: ${{ matrix.python-version }}
3232

3333
- name: Cache Python dependencies
34-
uses: actions/cache@v2
34+
uses: actions/cache@v3
3535
with:
3636
path: ~/.cache/pip
3737
key: ${{ runner.os }}-pip-${{ hashFiles('**/requirements-tests.txt') }}
@@ -53,7 +53,9 @@ jobs:
5353
run: pytest tests/unit --cov=rocketpy
5454

5555
- name: Run Documentation Tests
56-
run: pytest rocketpy --doctest-modules --cov=rocketpy --cov-append
56+
run: |
57+
pip install numpy --upgrade
58+
pytest rocketpy --doctest-modules --cov=rocketpy --cov-append
5759
5860
- name: Run Integration Tests
5961
run: pytest tests/integration --cov=rocketpy --cov-append
@@ -62,7 +64,7 @@ jobs:
6264
run: pytest tests/acceptance --cov=rocketpy --cov-append --cov-report=xml
6365

6466
- name: Upload coverage to artifacts
65-
uses: actions/upload-artifact@v2
67+
uses: actions/upload-artifact@v3
6668
with:
6769
name: coverage
6870
path: coverage.xml
@@ -73,9 +75,9 @@ jobs:
7375
steps:
7476
- uses: actions/checkout@v4
7577
- name: Download all coverage reports
76-
uses: actions/download-artifact@v2
78+
uses: actions/download-artifact@v3
7779
- name: Upload to Codecov
78-
uses: codecov/codecov-action@v2
80+
uses: codecov/codecov-action@v4
7981
with:
8082
token: ${{ secrets.CODECOV_TOKEN }}
8183
files: |

.pylintrc

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -225,8 +225,7 @@ good-names=FlightPhases,
225225
motor_I_11_derivative_at_t,
226226
M3_forcing,
227227
M3_damping,
228-
CM_to_CDM,
229-
CM_to_CPM,
228+
CDM_to_CPM,
230229
center_of_mass_without_motor_to_CDM,
231230
motor_center_of_dry_mass_to_CDM,
232231
generic_motor_cesaroni_M1520,

.vscode/settings.json

Lines changed: 111 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,12 +14,14 @@
1414
"cSpell.language": "en-US",
1515
"cSpell.words": [
1616
"Abdulklech",
17+
"addsurface",
1718
"adjugate",
1819
"akima",
1920
"allclose",
2021
"altitudemode",
2122
"Alves",
2223
"amax",
24+
"angularpos",
2325
"arange",
2426
"arccos",
2527
"arcsin",
@@ -34,11 +36,20 @@
3436
"autopep",
3537
"autouse",
3638
"axhline",
39+
"axisymmetric",
3740
"axup",
3841
"axvline",
42+
"axvspan",
43+
"Barrowman",
44+
"Baruh",
3945
"behaviour",
46+
"Bigl",
47+
"Bigr",
4048
"bijective",
49+
"bmatrix",
50+
"boldsymbol",
4151
"brentq",
52+
"bysource",
4253
"Calebe",
4354
"calisto",
4455
"Calisto",
@@ -52,29 +63,42 @@
5263
"cftime",
5364
"changealphaint",
5465
"Chassikos",
66+
"chisquare",
5567
"clabel",
5668
"clalpha",
5769
"cmap",
5870
"cmcens",
5971
"coeff",
6072
"coeffs",
73+
"Colab",
6174
"colorbar",
6275
"colormaps",
6376
"contourf",
6477
"conusnest",
78+
"copybutton",
6579
"cstride",
6680
"csys",
81+
"cumsum",
6782
"datapoints",
83+
"datetime",
84+
"dcsys",
6885
"ddot",
86+
"deepcopy",
6987
"deletechars",
7088
"dimgrey",
7189
"discretizes",
7290
"disp",
91+
"displaystyle",
92+
"docstrings",
93+
"Doretto",
7394
"dtype",
95+
"dunder",
96+
"Dyllon",
7497
"ECMWF",
7598
"edgecolor",
7699
"epsabs",
77100
"epsrel",
101+
"eqsv",
78102
"errstate",
79103
"evals",
80104
"exponentiated",
@@ -85,59 +109,103 @@
85109
"fftfreq",
86110
"figsize",
87111
"filt",
112+
"firstsimulation",
113+
"flightcsys",
114+
"Fluxogram",
88115
"fmax",
89116
"fmin",
117+
"fontawesome",
90118
"fontsize",
91119
"freestream",
92120
"funcified",
93121
"funcify",
122+
"functionusage",
94123
"GEFS",
95124
"genfromtxt",
96125
"geopotential",
97126
"geopotentials",
127+
"Geospatial",
98128
"getdata",
99129
"getfixturevalue",
100130
"Giorgio",
101131
"Giovani",
102132
"github",
103133
"Glauert",
104134
"gmaps",
135+
"Gnss",
105136
"Gomes",
137+
"Gonçalvez",
106138
"grav",
139+
"Guilherme",
140+
"Haim",
141+
"headlength",
142+
"headwidth",
107143
"hemis",
108144
"hgtprs",
109145
"hgtsfc",
110146
"HIRESW",
147+
"HRES",
111148
"hspace",
149+
"htmlhelp",
150+
"hybridmotor",
112151
"ICONEU",
113152
"idxmax",
153+
"IGRA",
154+
"Ilya",
114155
"imageio",
115156
"imread",
157+
"imshow",
116158
"intc",
117159
"interp",
118160
"Interquartile",
119161
"intp",
162+
"ipynb",
163+
"ipython",
120164
"ipywidgets",
121165
"isbijective",
122166
"isin",
167+
"isort",
168+
"ivar",
123169
"jsonpickle",
170+
"Junqueira",
124171
"jupyter",
172+
"Kaleb",
125173
"Karman",
174+
"labelrotation",
175+
"Krasser",
126176
"linalg",
127177
"linestyle",
128178
"linewidth",
179+
"linspace",
180+
"liquidmotor",
129181
"loadtxt",
182+
"lognormal",
130183
"LSODA",
131184
"lvhaack",
132185
"Mandioca",
186+
"Marte",
187+
"Masatoshi",
188+
"Mateus",
189+
"mathbf",
190+
"Matheus",
191+
"mathjax",
192+
"mathrm",
133193
"mathutils",
194+
"matplotlib",
134195
"maxdepth",
135196
"mbar",
136197
"meshgrid",
198+
"Mesoscale",
199+
"Meteo",
200+
"Meteomatics",
137201
"Metrum",
202+
"modindex",
138203
"mult",
139204
"Mumma",
140205
"NASADEM",
206+
"nbformat",
207+
"nbsphinx",
208+
"NCEP",
141209
"NDAP",
142210
"ndarray",
143211
"NDRT",
@@ -146,58 +214,99 @@
146214
"newmultigeometry",
147215
"newpolygon",
148216
"nfev",
217+
"Niskanen",
149218
"NOAA",
150219
"NOAA's",
151220
"noaaruc",
221+
"noaarucsounding",
152222
"num2pydate",
223+
"numericalunits",
224+
"numfig",
225+
"numpy",
226+
"numref",
153227
"outerboundaryis",
228+
"overshootable",
154229
"planform",
155230
"polystyle",
156231
"powerseries",
232+
"Prandtl",
233+
"prettytable",
157234
"Projeto",
158235
"prometheus",
236+
"pydata",
237+
"pylint",
238+
"PYPI",
239+
"pyplot",
240+
"pyproject",
241+
"pytest",
159242
"pytz",
243+
"quantile",
160244
"Rdot",
161245
"referece",
162246
"relativetoground",
247+
"repr",
248+
"reversesort",
163249
"reynolds",
250+
"rightarrow",
251+
"rmul",
164252
"ROABs",
165253
"rocketpy",
254+
"rocketusage",
166255
"rstride",
167256
"rtol",
257+
"rtype",
168258
"rucsoundings",
169259
"rwork",
170260
"savetxt",
171261
"savgol",
262+
"SBMT",
172263
"scilimits",
173264
"searchsorted",
174265
"seealso",
266+
"setrail",
175267
"simplekml",
176268
"SIRGAS",
269+
"Sobol",
270+
"solidmotor",
177271
"somgl",
178272
"Somigliana",
273+
"Sorban",
274+
"sqrd",
179275
"SRTM",
180276
"SRTMGL",
277+
"Stano",
278+
"statsmodels",
279+
"STFT",
181280
"subintervals",
281+
"suptitle",
282+
"supxlabel",
283+
"supylabel",
182284
"ticklabel",
285+
"timedelta",
183286
"timezonefinder",
184287
"tmpprs",
185288
"toctree",
186289
"trapz",
187290
"TRHEDDS",
291+
"triggerdetails",
188292
"triggerfunc",
189293
"twinx",
294+
"typehints",
190295
"udot",
191296
"ufunc",
192297
"ugrdprs",
298+
"Unidimensional",
193299
"USGS",
194300
"uwyo",
301+
"valetudo",
195302
"vectorize",
196303
"vgrdprs",
304+
"viewcode",
197305
"viridis",
198306
"vmax",
199307
"vmin",
200308
"vonkarman",
309+
"Wanderley",
201310
"Weibull",
202311
"windrose",
203312
"wireframe",
@@ -209,6 +318,7 @@
209318
"ylim",
210319
"zdir",
211320
"zlabel",
212-
"zlim"
321+
"zlim",
322+
"zorder"
213323
]
214324
}

0 commit comments

Comments
 (0)