Skip to content

Commit 4e0ef92

Browse files
Gui-FernandesBRGui-FernandesBR
committed
Merge branch 'develop' into enh/parallel_montecarlo
2 parents 0009c24 + 7864590 commit 4e0ef92

Some content is hidden

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

64 files changed

+4286
-525
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: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -18,26 +18,24 @@ 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
31+
pip install pylint isort black
3232
- name: Run isort
3333
run: isort --check-only rocketpy/ tests/ docs/ --profile black
3434
- name: Run black
3535
uses: psf/black@stable
3636
with:
3737
options: "--check rocketpy/ tests/ docs/"
3838
jupyter: true
39-
- name: Run flake8
40-
run: flake8 rocketpy/ tests/
4139
- name: Run pylint
4240
run: |
4341
pylint rocketpy/ tests/

‎.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/

‎.vscode/settings.json

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -92,6 +92,7 @@
9292
"disp",
9393
"displaystyle",
9494
"docstrings",
95+
"doctest",
9596
"Doretto",
9697
"dtype",
9798
"dunder",
@@ -241,6 +242,7 @@
241242
"prometheus",
242243
"pydata",
243244
"pylint",
245+
"pylintrc",
244246
"PYPI",
245247
"pyplot",
246248
"pyproject",
@@ -263,6 +265,7 @@
263265
"rtol",
264266
"rtype",
265267
"rucsoundings",
268+
"runslow",
266269
"rwork",
267270
"savetxt",
268271
"savgol",

‎CHANGELOG.md

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,27 @@ Attention: The newest changes should be on top -->
4949

5050
-
5151

52+
## [v1.8.0] - 2025-01-20
53+
54+
To install this version, run `pip install rocketpy==1.8.0`
55+
56+
### Added
57+
58+
- DOC: EREBUS Flight Example [#757](https://github.com/RocketPy-Team/RocketPy/pull/757))
59+
- DOC: Lince Flight Example [#752](https://github.com/RocketPy-Team/RocketPy/pull/752)
60+
- DOC: Andromeda Flight Example [#754](https://github.com/RocketPy-Team/RocketPy/pull/754)
61+
- ENH: create a dataset of pre-registered motors. See #664 [#744](https://github.com/RocketPy-Team/RocketPy/pull/744)
62+
- DOC: add Defiance flight example [#742](https://github.com/RocketPy-Team/RocketPy/pull/742)
63+
- ENH: Allow for Alternative and Custom ODE Solvers. [#748](https://github.com/RocketPy-Team/RocketPy/pull/748)
64+
- ENH: Expansion of Encoders Implementation for Full Flights. [#679](https://github.com/RocketPy-Team/RocketPy/pull/679)
65+
66+
### Changed
67+
68+
- REL: bumps up rocketpy version to 1.8.0 [#762](https://github.com/RocketPy-Team/RocketPy/pull/762)
69+
- ENH: Display more information in MonteCarlo prints and plots [#760](https://github.com/RocketPy-Team/RocketPy/pull/760)
70+
- MNT: move piecewise functions to separate file [#746](https://github.com/RocketPy-Team/RocketPy/pull/746)
71+
- DOC: flight comparison improvements [#755](https://github.com/RocketPy-Team/RocketPy/pull/755)
72+
5273
## [v1.7.1] - 2024-12-07
5374

5475

‎.github/CITATION.cff renamed to ‎CITATION.cff

File renamed without changes.

‎docs/conf.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
author = "RocketPy Team"
2828

2929
# The full version, including alpha/beta/rc tags
30-
release = "1.7.1"
30+
release = "1.8.0"
3131

3232

3333
# -- General configuration ---------------------------------------------------

‎docs/notebooks/monte_carlo_analysis/monte_carlo_analysis_outputs/monte_carlo_class_example.inputs.txt

Lines changed: 1000 additions & 100 deletions
Large diffs are not rendered by default.

0 commit comments

Comments
 (0)