Skip to content

Commit 418ddfd

Browse files
authored
Merge branch 'enh/new_plots' into enh/flight_prints
2 parents 48b0fd3 + 7925d60 commit 418ddfd

26 files changed

+55661
-1113
lines changed

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

Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
1+
# This workflow will upload a Python Package using Twine when a release is created
2+
# For more information see: https://packaging.python.org/en/latest/guides/publishing-package-distribution-releases-using-github-actions-ci-cd-workflows/
3+
4+
name: Publish New Version to PyPI
5+
6+
on:
7+
release:
8+
types: [published]
9+
10+
permissions:
11+
contents: read
12+
13+
jobs:
14+
deploy:
15+
16+
runs-on: ubuntu-latest
17+
18+
steps:
19+
- uses: actions/checkout@v3
20+
- name: Set up Python
21+
uses: actions/setup-python@v3
22+
with:
23+
python-version: '3.7'
24+
- name: Install dependencies
25+
run: |
26+
python -m pip install --upgrade pip
27+
pip install build
28+
- name: Build package
29+
run: python -m build
30+
- name: Publish package
31+
uses: pypa/gh-action-pypi-publish@27b31702a0e7fc50959f5ad993c78deac1bdfc29
32+
with:
33+
user: __token__
34+
password: ${{ secrets.PYPI_API_TOKEN }}

.github/workflows/test_pytest.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ jobs:
1212
- macos-latest
1313
- windows-latest
1414
python-version:
15-
- 3.8
15+
- 3.7
1616
steps:
1717
- uses: actions/checkout@v2
1818
- name: Set up Python ${{ matrix.python-version }}
Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
attribute_class; parameter_name; mean_value; standard_deviation;
2+
environment; ensembleMember; [0, 1, 2, 3, 4, 5, 6, 7, 8, 9];;
3+
motor; impulse; 1415.15; 35.3;
4+
motor; burnOut; 5.274; 1;
5+
motor; nozzleRadius; 0.021642; 0.0005;
6+
motor; throatRadius; 0.008; 0.0005;
7+
motor; grainSeparation; 0.006; 0.001;
8+
motor; grainDensity; 1707; 50;
9+
motor; grainOuterRadius; 0.0214; 0.2;
10+
motor; grainInitialInnerRadius; .0097;0.000375;
11+
motor; grainInitialHeight; 0.12; 0.001
12+
rocket; rocketMass; 8.257; 0.001;
13+
rocket; inertiaI; 3.675; 0.03675;
14+
rocket; inertiaZ; 0.007; 0.00007;
15+
rocket; radius; 0.04045; 0.001;
16+
rocket; distanceRocketNozzle; -1.024; .001;
17+
rocket; distanceRocketPropellant; -0.51; 0.001;
18+
rocket; powerOffDrag; 0.864857143; 0.03;
19+
rocket; powerOnDrag; 0.864857143; 0.03;
20+
rocket; noseLength; 0.274; 0.001;
21+
rocket; noseDistanceToCM; 1.134; 0.001
22+
fins; finSpan; 0.077; 0.0005;
23+
fins; finRootChord; 0.058; 0.0005;
24+
fins; finTipChord; 0.018; 0.0005;
25+
fins; finDistanceToCM; -0.906; 0.001;
26+
parachute; CdSDrogue; 0.4537; 0.07;
27+
parachute; lag_rec; 1; 0.5;
28+
parachute; lag_se; 0.73; 0.16;
29+
flight; inclination; 84.7; 1;
30+
flight; heading; 53; 2;
31+
flight; railLength; 5.7; 0.0005;
Binary file not shown.
Binary file not shown.

docs/conf.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
author = "Giovani Hidalgo Ceotto"
2525

2626
# The full version, including alpha/beta/rc tags
27-
release = "0.12.0"
27+
release = "0.12.1"
2828

2929

3030
# -- General configuration ---------------------------------------------------

docs/notebooks/environment_analysis_EuroC_example.ipynb

Lines changed: 51355 additions & 0 deletions
Large diffs are not rendered by default.

docs/notebooks/getting_started.ipynb

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -337,8 +337,15 @@
337337
"source": [
338338
"NoseCone = Calisto.addNose(length=0.55829, kind=\"vonKarman\", distanceToCM=0.71971)\n",
339339
"\n",
340-
"FinSet = Calisto.addEllipticalFins(\n",
341-
" 4, span=0.100, rootChord=0.120, distanceToCM=-1.04956\n",
340+
"FinSet = Calisto.addTrapezoidalFins(\n",
341+
" n=4,\n",
342+
" rootChord=0.120,\n",
343+
" tipChord=0.040,\n",
344+
" span=0.100,\n",
345+
" distanceToCM=-1.04956,\n",
346+
" cantAngle=0,\n",
347+
" radius=None,\n",
348+
" airfoil=None,\n",
342349
")\n",
343350
"\n",
344351
"Tail = Calisto.addTail(\n",
11 Bytes
Binary file not shown.

docs/user/index.rst

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ Welcome to RocketPy's user documentation!
1010
../notebooks/getting_started.ipynb
1111
../notebooks/environment_class_usage.ipynb
1212
../notebooks/environment_analysis_class_usage.ipynb
13+
../notebooks/environment_analysis_EuroC_example.ipynb
1314
../notebooks/dispersion_analysis/dispersion_analysis.ipynb
1415
../notebooks/utilities_usage.ipynb
1516
../matlab/matlab.rst

docs/user/installation.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ If you want to choose a specific version to guarantee compatibility, you may ins
1919

2020
.. code-block:: shell
2121
22-
pip install rocketpy==0.12.0
22+
pip install rocketpy==0.12.1
2323
2424
2525
Optional Installation Method: ``conda``

docs/user/requirements.rst

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@ The following packages are needed in order to run RocketPy:
2727
- timezonefinder
2828
- simplekml
2929
- ipywidgets >= 7.6.3
30+
- jsonpickle
3031

3132

3233
All of these packages, with the exception of netCDF4, should be automatically installed when RocketPy is installed using either ``pip`` or ``conda``.
@@ -49,6 +50,7 @@ The packages needed can be installed via ``pip`` by running the following lines
4950
pip install pytz
5051
pip install timezonefinder
5152
pip install simplekml
53+
pip install jsonpickle
5254
5355
Installing Required Packages Using ``conda``
5456
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^

requirements.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,3 +8,4 @@ requests
88
pytz
99
timezonefinder
1010
simplekml
11+
jsonpickle

0 commit comments

Comments
 (0)