Skip to content

Commit

Permalink
Merge branch 'develop' into enh/parallel_montecarlo
Browse files Browse the repository at this point in the history
  • Loading branch information
Gui-FernandesBR committed Feb 10, 2025
2 parents 0009c24 + 7864590 commit 4e0ef92
Show file tree
Hide file tree
Showing 64 changed files with 4,286 additions and 525 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/auto-assign.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ jobs:
run:
runs-on: ubuntu-latest
steps:
- uses: bubkoo/auto-assign@v1
- uses: bubkoo/auto-assign@master
with:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
CONFIG_FILE: .github/auto-assign.yml
8 changes: 4 additions & 4 deletions .github/workflows/codecov.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,20 +14,20 @@ coverage:
branches:
- master
- develop
if_ci_failed: error #success, failure, error, ignore
if_ci_failed: error # success, failure, error, ignore
informational: false
only_pulls: false
patch:
patch: # Computes only the changes introduced in the PR
default:
# basic
target: auto
threshold: 1%
threshold: 5%
base: auto
# advanced
branches:
- master
- develop
if_ci_failed: error #success, failure, error, ignore
if_ci_failed: error # success, failure, error, ignore
only_pulls: false
flags:
- "unit"
Expand Down
8 changes: 3 additions & 5 deletions .github/workflows/linters.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,26 +18,24 @@ jobs:
matrix:
python-version: ["3.9"]
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@main
- name: Set up Python ${{ matrix.python-version }}
uses: actions/setup-python@v3
uses: actions/setup-python@main
with:
python-version: ${{ matrix.python-version }}
- name: Install dependencies
run: |
python -m pip install --upgrade pip
pip install .[all]
pip install .[tests]
pip install pylint isort flake8 black
pip install pylint isort black
- name: Run isort
run: isort --check-only rocketpy/ tests/ docs/ --profile black
- name: Run black
uses: psf/black@stable
with:
options: "--check rocketpy/ tests/ docs/"
jupyter: true
- name: Run flake8
run: flake8 rocketpy/ tests/
- name: Run pylint
run: |
pylint rocketpy/ tests/
6 changes: 3 additions & 3 deletions .github/workflows/publish-to-pypi.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,9 @@ jobs:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@main
- name: Set up Python
uses: actions/setup-python@v3
uses: actions/setup-python@main
with:
python-version: "3.9"
- name: Install dependencies
Expand All @@ -27,7 +27,7 @@ jobs:
- name: Build package
run: python -m build
- name: Publish package
uses: pypa/gh-action-pypi-publish@27b31702a0e7fc50959f5ad993c78deac1bdfc29
uses: pypa/gh-action-pypi-publish@master
with:
user: __token__
password: ${{ secrets.PYPI_API_TOKEN }}
8 changes: 2 additions & 6 deletions .github/workflows/test-pytest-slow.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ name: Scheduled Tests
on:
schedule:
- cron: "0 17 * * 5" # at 05:00 PM, only on Friday
timezone: "America/Sao_Paulo"
push:
branches:
- main
Expand All @@ -22,16 +21,13 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
fail-fast: false
python-version: [3.9, 3.13]

env:
OS: ${{ matrix.os }}
PYTHON: ${{ matrix.python-version }}
steps:
- uses: actions/checkout@v4
- uses: actions/checkout@main
- name: Set up Python
uses: actions/setup-python@v2
uses: actions/setup-python@main
with:
python-version: ${{ matrix.python-version }}

Expand Down
18 changes: 10 additions & 8 deletions .github/workflows/test_pytest.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -24,14 +24,14 @@ jobs:
OS: ${{ matrix.os }}
PYTHON: ${{ matrix.python-version }}
steps:
- uses: actions/checkout@v4
- uses: actions/checkout@main
- name: Set up Python
uses: actions/setup-python@v4
uses: actions/setup-python@main
with:
python-version: ${{ matrix.python-version }}

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

- name: Upload coverage to artifacts
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@main
with:
name: coverage
path: coverage.xml
overwrite: true
if-no-files-found: error

CodecovUpload:
needs: Pytest
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- name: Download all coverage reports
uses: actions/download-artifact@v3
- uses: actions/checkout@main
- name: Download latest coverage report
uses: actions/download-artifact@main
- name: Upload to Codecov
uses: codecov/codecov-action@v4
uses: codecov/codecov-action@main
with:
token: ${{ secrets.CODECOV_TOKEN }}
files: |
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/upload-to-codecov.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Upload coverage report to Codecov
uses: codecov/codecov-action@v3
uses: codecov/codecov-action@main
with:
token: ${{ inputs.codecov_token }}
directory: ./coverage/reports/
Expand Down
3 changes: 3 additions & 0 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
Expand Up @@ -92,6 +92,7 @@
"disp",
"displaystyle",
"docstrings",
"doctest",
"Doretto",
"dtype",
"dunder",
Expand Down Expand Up @@ -241,6 +242,7 @@
"prometheus",
"pydata",
"pylint",
"pylintrc",
"PYPI",
"pyplot",
"pyproject",
Expand All @@ -263,6 +265,7 @@
"rtol",
"rtype",
"rucsoundings",
"runslow",
"rwork",
"savetxt",
"savgol",
Expand Down
21 changes: 21 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,27 @@ Attention: The newest changes should be on top -->

-

## [v1.8.0] - 2025-01-20

To install this version, run `pip install rocketpy==1.8.0`

### Added

- DOC: EREBUS Flight Example [#757](https://github.com/RocketPy-Team/RocketPy/pull/757))
- DOC: Lince Flight Example [#752](https://github.com/RocketPy-Team/RocketPy/pull/752)
- DOC: Andromeda Flight Example [#754](https://github.com/RocketPy-Team/RocketPy/pull/754)
- ENH: create a dataset of pre-registered motors. See #664 [#744](https://github.com/RocketPy-Team/RocketPy/pull/744)
- DOC: add Defiance flight example [#742](https://github.com/RocketPy-Team/RocketPy/pull/742)
- ENH: Allow for Alternative and Custom ODE Solvers. [#748](https://github.com/RocketPy-Team/RocketPy/pull/748)
- ENH: Expansion of Encoders Implementation for Full Flights. [#679](https://github.com/RocketPy-Team/RocketPy/pull/679)

### Changed

- REL: bumps up rocketpy version to 1.8.0 [#762](https://github.com/RocketPy-Team/RocketPy/pull/762)
- ENH: Display more information in MonteCarlo prints and plots [#760](https://github.com/RocketPy-Team/RocketPy/pull/760)
- MNT: move piecewise functions to separate file [#746](https://github.com/RocketPy-Team/RocketPy/pull/746)
- DOC: flight comparison improvements [#755](https://github.com/RocketPy-Team/RocketPy/pull/755)

## [v1.7.1] - 2024-12-07


Expand Down
File renamed without changes.
2 changes: 1 addition & 1 deletion docs/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
author = "RocketPy Team"

# The full version, including alpha/beta/rc tags
release = "1.7.1"
release = "1.8.0"


# -- General configuration ---------------------------------------------------
Expand Down

Large diffs are not rendered by default.

Loading

0 comments on commit 4e0ef92

Please sign in to comment.