Skip to content

Commit

Permalink
Merge pull request #684 from RocketPy-Team/develop
Browse files Browse the repository at this point in the history
DEV: Updates master to prepare v1.5.0
  • Loading branch information
Gui-FernandesBR authored Sep 14, 2024
2 parents df968af + dca3a84 commit 0d6caf2
Show file tree
Hide file tree
Showing 144 changed files with 79,408 additions and 5,095 deletions.
3 changes: 1 addition & 2 deletions .github/workflows/test-pytest-slow.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ name: Scheduled Tests

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

defaults:
Expand All @@ -11,7 +11,6 @@ defaults:

jobs:
pytest:
if: github.ref == "refs/heads/master" || github.ref == "refs/heads/develop"
runs-on: ubuntu-latest
strategy:
matrix:
Expand Down
16 changes: 9 additions & 7 deletions .github/workflows/test_pytest.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -18,20 +18,20 @@ jobs:
runs-on: ${{ matrix.os }}
strategy:
matrix:
os: [ubuntu-latest, macos-latest, windows-latest]
os: [ubuntu-latest, macos-latest]
python-version: [3.9, 3.12]
env:
OS: ${{ matrix.os }}
PYTHON: ${{ matrix.python-version }}
steps:
- uses: actions/checkout@v4
- name: Set up Python
uses: actions/setup-python@v2
uses: actions/setup-python@v4
with:
python-version: ${{ matrix.python-version }}

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

- name: Run Documentation Tests
run: pytest rocketpy --doctest-modules --cov=rocketpy --cov-append
run: |
pip install numpy --upgrade
pytest rocketpy --doctest-modules --cov=rocketpy --cov-append
- name: Run Integration Tests
run: pytest tests/integration --cov=rocketpy --cov-append
Expand All @@ -62,7 +64,7 @@ jobs:
run: pytest tests/acceptance --cov=rocketpy --cov-append --cov-report=xml

- name: Upload coverage to artifacts
uses: actions/upload-artifact@v2
uses: actions/upload-artifact@v3
with:
name: coverage
path: coverage.xml
Expand All @@ -73,9 +75,9 @@ jobs:
steps:
- uses: actions/checkout@v4
- name: Download all coverage reports
uses: actions/download-artifact@v2
uses: actions/download-artifact@v3
- name: Upload to Codecov
uses: codecov/codecov-action@v2
uses: codecov/codecov-action@v4
with:
token: ${{ secrets.CODECOV_TOKEN }}
files: |
Expand Down
3 changes: 1 addition & 2 deletions .pylintrc
Original file line number Diff line number Diff line change
Expand Up @@ -225,8 +225,7 @@ good-names=FlightPhases,
motor_I_11_derivative_at_t,
M3_forcing,
M3_damping,
CM_to_CDM,
CM_to_CPM,
CDM_to_CPM,
center_of_mass_without_motor_to_CDM,
motor_center_of_dry_mass_to_CDM,
generic_motor_cesaroni_M1520,
Expand Down
112 changes: 111 additions & 1 deletion .vscode/settings.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,12 +14,14 @@
"cSpell.language": "en-US",
"cSpell.words": [
"Abdulklech",
"addsurface",
"adjugate",
"akima",
"allclose",
"altitudemode",
"Alves",
"amax",
"angularpos",
"arange",
"arccos",
"arcsin",
Expand All @@ -34,11 +36,20 @@
"autopep",
"autouse",
"axhline",
"axisymmetric",
"axup",
"axvline",
"axvspan",
"Barrowman",
"Baruh",
"behaviour",
"Bigl",
"Bigr",
"bijective",
"bmatrix",
"boldsymbol",
"brentq",
"bysource",
"Calebe",
"calisto",
"Calisto",
Expand All @@ -52,29 +63,42 @@
"cftime",
"changealphaint",
"Chassikos",
"chisquare",
"clabel",
"clalpha",
"cmap",
"cmcens",
"coeff",
"coeffs",
"Colab",
"colorbar",
"colormaps",
"contourf",
"conusnest",
"copybutton",
"cstride",
"csys",
"cumsum",
"datapoints",
"datetime",
"dcsys",
"ddot",
"deepcopy",
"deletechars",
"dimgrey",
"discretizes",
"disp",
"displaystyle",
"docstrings",
"Doretto",
"dtype",
"dunder",
"Dyllon",
"ECMWF",
"edgecolor",
"epsabs",
"epsrel",
"eqsv",
"errstate",
"evals",
"exponentiated",
Expand All @@ -85,59 +109,103 @@
"fftfreq",
"figsize",
"filt",
"firstsimulation",
"flightcsys",
"Fluxogram",
"fmax",
"fmin",
"fontawesome",
"fontsize",
"freestream",
"funcified",
"funcify",
"functionusage",
"GEFS",
"genfromtxt",
"geopotential",
"geopotentials",
"Geospatial",
"getdata",
"getfixturevalue",
"Giorgio",
"Giovani",
"github",
"Glauert",
"gmaps",
"Gnss",
"Gomes",
"Gonçalvez",
"grav",
"Guilherme",
"Haim",
"headlength",
"headwidth",
"hemis",
"hgtprs",
"hgtsfc",
"HIRESW",
"HRES",
"hspace",
"htmlhelp",
"hybridmotor",
"ICONEU",
"idxmax",
"IGRA",
"Ilya",
"imageio",
"imread",
"imshow",
"intc",
"interp",
"Interquartile",
"intp",
"ipynb",
"ipython",
"ipywidgets",
"isbijective",
"isin",
"isort",
"ivar",
"jsonpickle",
"Junqueira",
"jupyter",
"Kaleb",
"Karman",
"labelrotation",
"Krasser",
"linalg",
"linestyle",
"linewidth",
"linspace",
"liquidmotor",
"loadtxt",
"lognormal",
"LSODA",
"lvhaack",
"Mandioca",
"Marte",
"Masatoshi",
"Mateus",
"mathbf",
"Matheus",
"mathjax",
"mathrm",
"mathutils",
"matplotlib",
"maxdepth",
"mbar",
"meshgrid",
"Mesoscale",
"Meteo",
"Meteomatics",
"Metrum",
"modindex",
"mult",
"Mumma",
"NASADEM",
"nbformat",
"nbsphinx",
"NCEP",
"NDAP",
"ndarray",
"NDRT",
Expand All @@ -146,58 +214,99 @@
"newmultigeometry",
"newpolygon",
"nfev",
"Niskanen",
"NOAA",
"NOAA's",
"noaaruc",
"noaarucsounding",
"num2pydate",
"numericalunits",
"numfig",
"numpy",
"numref",
"outerboundaryis",
"overshootable",
"planform",
"polystyle",
"powerseries",
"Prandtl",
"prettytable",
"Projeto",
"prometheus",
"pydata",
"pylint",
"PYPI",
"pyplot",
"pyproject",
"pytest",
"pytz",
"quantile",
"Rdot",
"referece",
"relativetoground",
"repr",
"reversesort",
"reynolds",
"rightarrow",
"rmul",
"ROABs",
"rocketpy",
"rocketusage",
"rstride",
"rtol",
"rtype",
"rucsoundings",
"rwork",
"savetxt",
"savgol",
"SBMT",
"scilimits",
"searchsorted",
"seealso",
"setrail",
"simplekml",
"SIRGAS",
"Sobol",
"solidmotor",
"somgl",
"Somigliana",
"Sorban",
"sqrd",
"SRTM",
"SRTMGL",
"Stano",
"statsmodels",
"STFT",
"subintervals",
"suptitle",
"supxlabel",
"supylabel",
"ticklabel",
"timedelta",
"timezonefinder",
"tmpprs",
"toctree",
"trapz",
"TRHEDDS",
"triggerdetails",
"triggerfunc",
"twinx",
"typehints",
"udot",
"ufunc",
"ugrdprs",
"Unidimensional",
"USGS",
"uwyo",
"valetudo",
"vectorize",
"vgrdprs",
"viewcode",
"viridis",
"vmax",
"vmin",
"vonkarman",
"Wanderley",
"Weibull",
"windrose",
"wireframe",
Expand All @@ -209,6 +318,7 @@
"ylim",
"zdir",
"zlabel",
"zlim"
"zlim",
"zorder"
]
}
Loading

0 comments on commit 0d6caf2

Please sign in to comment.