Skip to content

Commit

Permalink
Merge pull request #618 from RocketPy-Team/master
Browse files Browse the repository at this point in the history
DEV: update develop branch with master
  • Loading branch information
Gui-FernandesBR authored Jun 9, 2024
2 parents 6deec5f + 54c69a3 commit 365037d
Show file tree
Hide file tree
Showing 5 changed files with 21 additions and 9 deletions.
16 changes: 15 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,19 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
## [Unreleased] - yyyy-mm-dd

<!-- These are the changes that were not release yet, please add them correctly.
Attention: The newest changes should be on top -->
Attention: The newest changes should be on top -->

## [1.3.0.post1] - 2024-06-02

You can install this version by running `pip install rocketpy==1.3.0.post1`

### Fixed

- BUG: pyproject.toml Main Module Finding. [#616](https://github.com/RocketPy-Team/RocketPy/pull/616)

## [1.3.0] - 2024-06-01

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

### Added

Expand All @@ -42,6 +54,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/).

### Changed

- REL: Bump versioning to RocketPy v1.3.0 [#614](https://github.com/RocketPy-Team/RocketPy/pull/614)
- ENH: Adds StochasticModel.visualize_attributes() method [#612](https://github.com/RocketPy-Team/RocketPy/pull/612)
- DOC: Monte carlo documentation updates [#607](https://github.com/RocketPy-Team/RocketPy/pull/607)
- MNT: refactor u_dot parachute method [#596](https://github.com/RocketPy-Team/RocketPy/pull/596)
Expand All @@ -58,6 +71,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/).

### Fixed

- MNT: Alter PYPI classifier naming. [#615](https://github.com/RocketPy-Team/RocketPy/pull/615)
- DOC: Solve Dependencies Conflicts and pyproject build [#613](https://github.com/RocketPy-Team/RocketPy/pull/613)
- BUG: Fixes nose cone bluffness issue #610 [#611](https://github.com/RocketPy-Team/RocketPy/pull/611)
- BUG: plot drag curves when function source is callable [#599](https://github.com/RocketPy-Team/RocketPy/pull/599)
Expand Down
2 changes: 1 addition & 1 deletion docs/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
author = "RocketPy Team"

# The full version, including alpha/beta/rc tags
release = "1.2.2"
release = "1.3.0.post1"


# -- General configuration ---------------------------------------------------
Expand Down
3 changes: 1 addition & 2 deletions docs/examples/prometheus_2022_flight_sim.ipynb
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,6 @@
"env.set_atmospheric_model(\n",
" type=\"Reanalysis\",\n",
" file=\"../../data/weather/spaceport_america_pressure_levels_2023_hourly.nc\",\n",
"\n",
" dictionary=\"ECMWF\",\n",
")\n",
"\n",
Expand Down Expand Up @@ -259,7 +258,7 @@
" 0.05,\n",
" ),\n",
" power_off_drag=prometheus_cd_at_ma,\n",
" power_on_drag=lambda x: prometheus_cd_at_ma(x) * 1.02, # 5% increase in drag \n",
" power_on_drag=lambda x: prometheus_cd_at_ma(x) * 1.02, # 5% increase in drag\n",
" center_of_mass_without_motor=0.9549,\n",
" coordinate_system_orientation=\"tail_to_nose\",\n",
")\n",
Expand Down
2 changes: 1 addition & 1 deletion 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.2
pip install rocketpy==1.3.0.post1
Optional Installation Method: ``conda``
Expand Down
7 changes: 3 additions & 4 deletions pyproject.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[project]
name = "rocketpy"
version = "1.2.2"
version = "1.3.0.post1"
description="Advanced 6-DOF trajectory simulation for High-Power Rocketry."
dynamic = ["dependencies"]
readme = "README.md"
Expand All @@ -12,7 +12,6 @@ classifiers = [
"Programming Language :: Python :: 3",
"License :: OSI Approved :: MIT License",
"Operating System :: OS Independent",
"Topic :: Rocket Flight Simulation :: Libraries :: Python Modules",
]

[project.urls]
Expand All @@ -21,11 +20,11 @@ documentation = "https://docs.rocketpy.org/"
repository = "https://github.com/RocketPy-Team/RocketPy"

[build-system]
requires = ["setuptools"]
requires = ["setuptools>=42", "wheel"]
build-backend = "setuptools.build_meta"

[tool.setuptools]
py-modules = ['rocketpy']
packages = { find = { where = ["."], include = ["rocketpy*"] } }

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

0 comments on commit 365037d

Please sign in to comment.