Skip to content

Commit

Permalink
Merge branch 'develop' into enh/initial-solution-from-flights-gets-pr…
Browse files Browse the repository at this point in the history
…evious-results
  • Loading branch information
Gui-FernandesBR committed May 5, 2024
2 parents 7edb39b + dc99084 commit 8a3a2b9
Show file tree
Hide file tree
Showing 36 changed files with 2,180 additions and 1,900 deletions.
5 changes: 0 additions & 5 deletions .flake8

This file was deleted.

7 changes: 6 additions & 1 deletion .github/workflows/test_pytest.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,8 @@ on:
paths:
- "**.py"
- ".github/**"
- "pyproject.toml"
- "requirements*"

defaults:
run:
Expand All @@ -16,8 +18,11 @@ jobs:
runs-on: ${{ matrix.os }}
strategy:
matrix:
os: [ubuntu-latest, macos-latest, windows-latest]
os: [ubuntu-latest, windows-latest]
python-version: [3.8, 3.12]
include:
- os: macos-latest
python-version: 3.12
env:
OS: ${{ matrix.os }}
PYTHON: ${{ matrix.python-version }}
Expand Down
19 changes: 19 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -32,17 +32,36 @@ and this project adheres to [Semantic Versioning](http://semver.org/).

### Added

- ENH: Exponential backoff decorator (fix #449) [#588](https://github.com/RocketPy-Team/RocketPy/pull/588)
- ENH: Function Validation Rework & Swap `np.searchsorted` to `bisect_left` [#582](https://github.com/RocketPy-Team/RocketPy/pull/582)
- ENH: Add new stability margin properties to Flight class [#572](https://github.com/RocketPy-Team/RocketPy/pull/572)
- ENH: adds `Function.remove_outliers` method [#554](https://github.com/RocketPy-Team/RocketPy/pull/554)

### Changed

- BLD: Change setup.py to pyproject.toml [#589](https://github.com/RocketPy-Team/RocketPy/pull/589)
- DEP: delete deprecated rocketpy.tools.cached_property [#587](https://github.com/RocketPy-Team/RocketPy/pull/587)
- ENH: Flight simulation speed up [#581] (https://github.com/RocketPy-Team/RocketPy/pull/581)
- MNT: Modularize Rocket Draw [#580](https://github.com/RocketPy-Team/RocketPy/pull/580)
- ENH: Initial solution from flights gets previous results [#568](https://github.com/RocketPy-Team/RocketPy/pull/568)
- DOC: Improvements of Environment docstring phrasing [#565](https://github.com/RocketPy-Team/RocketPy/pull/565)
- MNT: Refactor flight prints module [#579](https://github.com/RocketPy-Team/RocketPy/pull/579)
- DOC: Convert CompareFlights example notebooks to .rst files [#576](https://github.com/RocketPy-Team/RocketPy/pull/576)
- MNT: Refactor inertia calculations using parallel axis theorem [#573] (https://github.com/RocketPy-Team/RocketPy/pull/573)
- ENH: Optional argument to show the plot in Function.compare_plots [#563](https://github.com/RocketPy-Team/RocketPy/pull/563)

### Fixed

- BUG: Optional Dependencies Naming in pyproject.toml. [#592](https://github.com/RocketPy-Team/RocketPy/pull/592)
- BUG: Swap rocket.total_mass.differentiate for motor.total_mass_flow rate [#585](https://github.com/RocketPy-Team/RocketPy/pull/585)
- BUG: export_eng 'Motor' method would not work for liquid motors. [#559](https://github.com/RocketPy-Team/RocketPy/pull/559)

## [v1.2.2] - 2024-03-22

You can install this version by running `pip install rocketpy==1.2.2`

- BUG: wrong rocket mass in parachute u dot method [#569](https://github.com/RocketPy-Team/RocketPy/pull/569)

## [v1.2.1] - 2024-02-22

You can install this version by running `pip install rocketpy==1.2.1`
Expand Down
2 changes: 1 addition & 1 deletion docs/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
author = "RocketPy Team"

# The full version, including alpha/beta/rc tags
release = "1.2.1"
release = "1.2.2"


# -- General configuration ---------------------------------------------------
Expand Down
6 changes: 3 additions & 3 deletions docs/user/installation.rst
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ If you want to choose a specific version to guarantee compatibility, you may ins

.. code-block:: shell
pip install rocketpy==1.2.1
pip install rocketpy==1.2.2
Optional Installation Method: ``conda``
Expand Down Expand Up @@ -49,7 +49,7 @@ Once you are done downloading/cloning RocketPy's repository, you can install it

.. code-block:: shell
python setup.py install
python -m pip install .
Development version
Expand All @@ -76,7 +76,7 @@ Alternatively, you can clone RocketPy's repository, check out the branch named `

.. code-block:: shell
python setup.py install
python -m pip install -e .
Requirements
Expand Down
74 changes: 74 additions & 0 deletions pyproject.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,74 @@
[project]
name = "rocketpy"
version = "1.2.2"
description="Advanced 6-DOF trajectory simulation for High-Power Rocketry."
dynamic = ["dependencies"]
readme = "README.md"
requires-python = ">=3.8"
authors = [
{name = "Giovani Hidalgo Ceotto", email = "[email protected]"}
]
classifiers = [
"Programming Language :: Python :: 3",
"License :: OSI Approved :: MIT License",
"Operating System :: OS Independent",
"Topic :: Rocket Flight Simulation :: Libraries :: Python Modules",
]

[project.urls]
homepage = "https://rocketpy.org/"
documentation = "https://docs.rocketpy.org/"
repository = "https://github.com/RocketPy-Team/RocketPy"

[build-system]
requires = ["setuptools"]
build-backend = "setuptools.build_meta"

[tool.setuptools]
py-modules = ['rocketpy']

[tool.setuptools.dynamic]
dependencies = { file = ["requirements.txt"] }

[project.optional-dependencies]
tests = [
"pytest",
"pytest-coverage",
"black[jupyter]",
"flake8-black",
"flake8-pyproject",
"pandas",
"numericalunits==1.25",
"pylint",
"isort"
]

env-analysis = [
"windrose>=1.6.8",
"timezonefinder",
"jsonpickle",
"ipython",
"ipywidgets>=7.6.3"
]

all = ["rocketpy[env-analysis]"]

[tool.black]
line-length = 88
include = '\.py$|\.ipynb$'
skip-string-normalization = true

[tool.coverage.report]
# Regexes for lines to exclude from consideration
exclude_also = [
#Don't complain about exceptions or warnings not being covered by tests
"warnings.warn*"
]

[tool.flake8]
max-line-length = 88
max-module-lines = 3000
ignore = ['E203', 'W503']
exclude = [
'.git,__pycache__',
]
3 changes: 2 additions & 1 deletion requirements-tests.txt
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,8 @@ pytest
pytest-coverage
black[jupyter]
flake8-black
flake8-pyproject
pandas
numericalunits==1.25
pylint
isort
isort
Loading

0 comments on commit 8a3a2b9

Please sign in to comment.