Skip to content

Commit e3f7b5c

Browse files
Merge pull request #629 from RocketPy-Team/develop
MNT: Updates master for release 1.4.0
2 parents 54c69a3 + 23fa110 commit e3f7b5c

Some content is hidden

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

69 files changed

+3624
-2727
lines changed

.github/workflows/lint_black.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616
- name: Set up Python
1717
uses: actions/setup-python@v1
1818
with:
19-
python-version: 3.8
19+
python-version: 3.9
2020

2121
- name: Install Python dependencies
2222
run: pip install black[jupyter]

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ jobs:
1919
- name: Set up Python
2020
uses: actions/setup-python@v3
2121
with:
22-
python-version: "3.8"
22+
python-version: "3.9"
2323
- name: Install dependencies
2424
run: |
2525
python -m pip install --upgrade pip

.github/workflows/test_pytest.yaml

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -18,11 +18,8 @@ jobs:
1818
runs-on: ${{ matrix.os }}
1919
strategy:
2020
matrix:
21-
os: [ubuntu-latest, windows-latest]
22-
python-version: [3.8, 3.12]
23-
include:
24-
- os: macos-latest
25-
python-version: 3.12
21+
os: [ubuntu-latest, macos-latest, windows-latest]
22+
python-version: [3.9, 3.12]
2623
env:
2724
OS: ${{ matrix.os }}
2825
PYTHON: ${{ matrix.python-version }}
@@ -53,12 +50,12 @@ jobs:
5350
- name: Run Unit Tests
5451
run: pytest tests/unit --cov=rocketpy
5552

56-
- name: Run Integration Tests
57-
run: pytest $(find tests -maxdepth 1 -name "*.py") --cov=rocketpy --cov-append
58-
5953
- name: Run Documentation Tests
6054
run: pytest rocketpy --doctest-modules --cov=rocketpy --cov-append
6155

56+
- name: Run Integration Tests
57+
run: pytest tests/integration --cov=rocketpy --cov-append
58+
6259
- name: Run Acceptance Tests
6360
run: pytest tests/acceptance --cov=rocketpy --cov-append --cov-report=xml
6461

.gitignore

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -72,6 +72,9 @@ instance/
7272
# Sphinx documentation
7373
docs/_build/
7474

75+
# WebServer extension
76+
.iis
77+
7578
# PyBuilder
7679
.pybuilder/
7780
target/

.pylintrc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ persistent=yes
8888

8989
# Minimum Python version to use for version dependent checks. Will default to
9090
# the version used to run pylint.
91-
py-version=3.8
91+
py-version=3.9
9292

9393
# Discover python modules and packages in the file system subtree.
9494
recursive=no

CHANGELOG.md

Lines changed: 29 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,37 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
2727

2828
## [Unreleased] - yyyy-mm-dd
2929

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

33+
### Added
34+
35+
-
36+
37+
### Changed
38+
39+
-
40+
41+
### Fixed
42+
43+
-
44+
45+
## [1.4.0] - 2024-07-dd
46+
47+
### Added
48+
49+
- DOC: Adding testing guidelines for RocketPy. [#626](https://github.com/RocketPy-Team/RocketPy/pull/626)
50+
- ENH: CP and Thrust Eccentricity Effects Generate Roll Moment [#617](https://github.com/RocketPy-Team/RocketPy/pull/617)
51+
- ENH: Add Prandtl-Gauss transformation to NoseCone and Tail [#609](https://github.com/RocketPy-Team/RocketPy/pull/609)
52+
- ENH: Implement power series nose cones [#603](https://github.com/RocketPy-Team/RocketPy/pull/603)
53+
54+
### Changed
55+
56+
- ENH: Eliminating multiple plots for inertia components [#566](https://github.com/RocketPy-Team/RocketPy/pull/566)
57+
- MNT: Fix warnings in test suite and adds support for numpy 2.0 [#623](https://github.com/RocketPy-Team/RocketPy/pull/623)
58+
- MNT: bump minimum Python version to 3.9. [#624](https://github.com/RocketPy-Team/RocketPy/pull/624)
59+
- DOC: Change rocketpy Landing Page to Standard Code docs [#584](https://github.com/RocketPy-Team/RocketPy/pull/584)
60+
3361
## [1.3.0.post1] - 2024-06-02
3462

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

docker-compose.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
version: '3.8'
22

33
services:
4-
python38-linux:
5-
image: python:3.8
4+
python39-linux:
5+
image: python:3.9
66
volumes:
77
- .:/app
88
working_dir: /app

docs/conf.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,6 @@
4141
"sphinx_design",
4242
"jupyter_sphinx",
4343
"nbsphinx",
44-
"m2r2",
4544
]
4645

4746
# source_suffix = '.rst'
@@ -96,7 +95,7 @@
9695
# relative to this directory. They are copied after the builtin static files,
9796
# so a file named "default.css" will overwrite the builtin "default.css".
9897
html_static_path = ["static"]
99-
html_css_files = ["notebooks.css"]
98+
html_css_files = ["rocketpy.css"]
10099
html_favicon = "static/favicon.ico"
101100
html_theme_options = {
102101
"logo_link": "index",

docs/development/docker.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,7 @@ operational system.
108108
However, it is still useful to run the unit tests on different python versions.
109109

110110
Currently, the `docker-compose.yml` file is configured to run the unit tests
111-
on python 3.8 and 3.12.
111+
on python 3.9 and 3.12.
112112

113113
To run the unit tests on both python versions, run the following command
114114
**on your machine**:

docs/development/index.rst

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ Contributing to RocketPy
88
Running RocketPy as a Developer <rocketpy_as_developer.rst>
99
GitHub Workflow for RocketPy Hackathon 2022 <github_hackathon.rst>
1010
Style Guide <style_guide>
11+
Testing Guidelines <testing.rst>
1112
RocketPy with Docker <docker.rst>
1213
Building the Documentation <build_docs.rst>
1314

0 commit comments

Comments
 (0)