Skip to content

Commit 76fb5ef

Browse files
Merge pull request #793 from RocketPy-Team/develop
DEV: Master to v1.9.0
2 parents a4b42c3 + 4a41f7a commit 76fb5ef

File tree

96 files changed

+26105
-23721
lines changed

Some content is hidden

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

96 files changed

+26105
-23721
lines changed

.github/workflows/auto-assign.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ jobs:
66
run:
77
runs-on: ubuntu-latest
88
steps:
9-
- uses: bubkoo/auto-assign@v1
9+
- uses: bubkoo/auto-assign@master
1010
with:
1111
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
1212
CONFIG_FILE: .github/auto-assign.yml

.github/workflows/codecov.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,20 +14,20 @@ coverage:
1414
branches:
1515
- master
1616
- develop
17-
if_ci_failed: error #success, failure, error, ignore
17+
if_ci_failed: error # success, failure, error, ignore
1818
informational: false
1919
only_pulls: false
20-
patch:
20+
patch: # Computes only the changes introduced in the PR
2121
default:
2222
# basic
2323
target: auto
24-
threshold: 1%
24+
threshold: 5%
2525
base: auto
2626
# advanced
2727
branches:
2828
- master
2929
- develop
30-
if_ci_failed: error #success, failure, error, ignore
30+
if_ci_failed: error # success, failure, error, ignore
3131
only_pulls: false
3232
flags:
3333
- "unit"

.github/workflows/linters.yml

Lines changed: 9 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -18,26 +18,21 @@ jobs:
1818
matrix:
1919
python-version: ["3.9"]
2020
steps:
21-
- uses: actions/checkout@v3
21+
- uses: actions/checkout@main
2222
- name: Set up Python ${{ matrix.python-version }}
23-
uses: actions/setup-python@v3
23+
uses: actions/setup-python@main
2424
with:
2525
python-version: ${{ matrix.python-version }}
2626
- name: Install dependencies
2727
run: |
2828
python -m pip install --upgrade pip
2929
pip install .[all]
3030
pip install .[tests]
31-
pip install pylint isort flake8 black
32-
- name: Run isort
33-
run: isort --check-only rocketpy/ tests/ docs/ --profile black
34-
- name: Run black
35-
uses: psf/black@stable
36-
with:
37-
options: "--check rocketpy/ tests/ docs/"
38-
jupyter: true
39-
- name: Run flake8
40-
run: flake8 rocketpy/ tests/
41-
- name: Run pylint
31+
pip install pylint ruff
32+
- name: Ruff (lint)
33+
run: ruff check --output-format=github .
34+
- name: Ruff (format)
35+
run: ruff format --check .
36+
- name: Pylint
4237
run: |
43-
pylint rocketpy/ tests/
38+
pylint rocketpy/ tests/ docs/

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,9 @@ jobs:
1515
runs-on: ubuntu-latest
1616

1717
steps:
18-
- uses: actions/checkout@v3
18+
- uses: actions/checkout@main
1919
- name: Set up Python
20-
uses: actions/setup-python@v3
20+
uses: actions/setup-python@main
2121
with:
2222
python-version: "3.9"
2323
- name: Install dependencies
@@ -27,7 +27,7 @@ jobs:
2727
- name: Build package
2828
run: python -m build
2929
- name: Publish package
30-
uses: pypa/gh-action-pypi-publish@27b31702a0e7fc50959f5ad993c78deac1bdfc29
30+
uses: pypa/gh-action-pypi-publish@master
3131
with:
3232
user: __token__
3333
password: ${{ secrets.PYPI_API_TOKEN }}

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

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ name: Scheduled Tests
33
on:
44
schedule:
55
- cron: "0 17 * * 5" # at 05:00 PM, only on Friday
6-
timezone: "America/Sao_Paulo"
76
push:
87
branches:
98
- main
@@ -22,16 +21,13 @@ jobs:
2221
runs-on: ubuntu-latest
2322
strategy:
2423
matrix:
25-
fail-fast: false
2624
python-version: [3.9, 3.13]
27-
2825
env:
29-
OS: ${{ matrix.os }}
3026
PYTHON: ${{ matrix.python-version }}
3127
steps:
32-
- uses: actions/checkout@v4
28+
- uses: actions/checkout@main
3329
- name: Set up Python
34-
uses: actions/setup-python@v2
30+
uses: actions/setup-python@main
3531
with:
3632
python-version: ${{ matrix.python-version }}
3733

.github/workflows/test_pytest.yaml

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -24,14 +24,14 @@ jobs:
2424
OS: ${{ matrix.os }}
2525
PYTHON: ${{ matrix.python-version }}
2626
steps:
27-
- uses: actions/checkout@v4
27+
- uses: actions/checkout@main
2828
- name: Set up Python
29-
uses: actions/setup-python@v4
29+
uses: actions/setup-python@main
3030
with:
3131
python-version: ${{ matrix.python-version }}
3232

3333
- name: Cache Python dependencies
34-
uses: actions/cache@v3
34+
uses: actions/cache@main
3535
with:
3636
path: ~/.cache/pip
3737
key: ${{ runner.os }}-pip-${{ hashFiles('**/requirements-tests.txt') }}
@@ -64,20 +64,22 @@ jobs:
6464
run: pytest tests/acceptance --cov=rocketpy --cov-append --cov-report=xml
6565

6666
- name: Upload coverage to artifacts
67-
uses: actions/upload-artifact@v3
67+
uses: actions/upload-artifact@main
6868
with:
6969
name: coverage
7070
path: coverage.xml
71+
overwrite: true
72+
if-no-files-found: error
7173

7274
CodecovUpload:
7375
needs: Pytest
7476
runs-on: ubuntu-latest
7577
steps:
76-
- uses: actions/checkout@v4
77-
- name: Download all coverage reports
78-
uses: actions/download-artifact@v3
78+
- uses: actions/checkout@main
79+
- name: Download latest coverage report
80+
uses: actions/download-artifact@main
7981
- name: Upload to Codecov
80-
uses: codecov/codecov-action@v4
82+
uses: codecov/codecov-action@main
8183
with:
8284
token: ${{ secrets.CODECOV_TOKEN }}
8385
files: |

.github/workflows/upload-to-codecov.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ jobs:
1818
runs-on: ubuntu-latest
1919
steps:
2020
- name: Upload coverage report to Codecov
21-
uses: codecov/codecov-action@v3
21+
uses: codecov/codecov-action@main
2222
with:
2323
token: ${{ inputs.codecov_token }}
2424
directory: ./coverage/reports/

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,7 @@ coverage.xml
5151
.pytest_cache/
5252
cover/
5353
.pylint-report.txt
54+
.ruff-report.txt
5455

5556
# Translations
5657
*.mo

.pylintrc

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ fail-under=10
4646
#from-stdin=
4747

4848
# Files or directories to be skipped. They should be base names, not paths.
49-
ignore=CVS, docs, data,
49+
ignore=CVS, docs, data,
5050

5151
# Add files or directories matching the regular expressions patterns to the
5252
# ignore-list. The regex matches against paths and can be in Posix or Windows
@@ -214,7 +214,7 @@ good-names=FlightPhases,
214214
HIRESW_dictionary,
215215
prop_I_11,
216216
Kt, # transformation matrix transposed
217-
clalpha2D,
217+
clalpha2D,
218218
clalpha2D_incompressible,
219219
r_NOZ, # Nozzle position vector
220220
rocket_dry_I_33,
@@ -475,7 +475,7 @@ disable=raw-checker-failed,
475475
file-ignored,
476476
suppressed-message,
477477
useless-suppression,
478-
deprecated-pragma, # because we have some peniding deprecations in the code.
478+
deprecated-pragma, # because we have some pending deprecations in the code.
479479
use-symbolic-message-instead,
480480
use-implicit-booleaness-not-comparison-to-string,
481481
use-implicit-booleaness-not-comparison-to-zero,
@@ -492,13 +492,14 @@ disable=raw-checker-failed,
492492
too-many-function-args, # gives false positives for Function calls
493493
method-hidden, # avoids some errors in tank_geometry and flight classes
494494
missing-timeout, # not a problem to use requests without timeout
495-
protected-access, # we use private attriubutes out of the class (maybe we should fix this)
495+
protected-access, # we use private attributes out of the class (maybe we should fix this)
496496
duplicate-code, # repeating code is a bad thing, but should we really care about it?
497497
line-too-long, # black already takes care of this
498498
missing-function-docstring, # this is too verbose.
499499
redefined-outer-name, # too verbose, and doesn't add much value
500500
method-cache-max-size-none,
501501
no-else-raise, # pointless
502+
unnecessary-lambda-assignment, # ruff already checks this
502503

503504

504505

.vscode/settings.json

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,7 @@
5151
"bmatrix",
5252
"boldsymbol",
5353
"brentq",
54+
"Bressan",
5455
"bysource",
5556
"Calebe",
5657
"calisto",
@@ -92,6 +93,7 @@
9293
"disp",
9394
"displaystyle",
9495
"docstrings",
96+
"doctest",
9597
"Doretto",
9698
"dtype",
9799
"dunder",
@@ -144,6 +146,7 @@
144146
"headlength",
145147
"headwidth",
146148
"hemis",
149+
"Henrique",
147150
"hgtprs",
148151
"hgtsfc",
149152
"HIRESW",
@@ -187,6 +190,7 @@
187190
"LSODA",
188191
"lvhaack",
189192
"Mandioca",
193+
"Marinho",
190194
"Marte",
191195
"Masatoshi",
192196
"Mateus",
@@ -205,6 +209,7 @@
205209
"Metrum",
206210
"modindex",
207211
"mult",
212+
"multiprocess",
208213
"Mumma",
209214
"NASADEM",
210215
"nbformat",
@@ -238,8 +243,11 @@
238243
"prettytable",
239244
"Projeto",
240245
"prometheus",
246+
"pycodestyle",
241247
"pydata",
248+
"pydocstyle",
242249
"pylint",
250+
"pylintrc",
243251
"PYPI",
244252
"pyplot",
245253
"pyproject",
@@ -272,6 +280,7 @@
272280
"seblm",
273281
"seealso",
274282
"setrail",
283+
"setuptools",
275284
"simplekml",
276285
"SIRGAS",
277286
"Sobol",

0 commit comments

Comments
 (0)