Skip to content

Commit 61a21d2

Browse files
authored
Merge pull request #323 from RocketPy-Team/develop
REL: Welcome to v0.13.0
2 parents 37d147c + 7c33fbf commit 61a21d2

29 files changed

+56823
-3414
lines changed

.github/workflows/test_pytest.yaml

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,11 +22,12 @@ jobs:
2222
- name: Install dependencies
2323
run: |
2424
python -m pip install --upgrade pip
25-
pip install -r requirements.txt
2625
pip install -r requirements_test.txt
2726
- name: Build RocketPy
2827
run: |
29-
python setup.py install
28+
pip install -e .
3029
- name: Test with pytest
3130
run: |
32-
pytest
31+
pytest
32+
cd rocketpy
33+
pytest --doctest-modules
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.1"
27+
release = "0.13.0"
2828

2929

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

docs/notebooks/environment_analysis_EuroC_example.ipynb

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

docs/notebooks/environment_analysis_class_usage.ipynb

Lines changed: 15 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -143,14 +143,15 @@
143143
]
144144
},
145145
{
146+
"attachments": {},
146147
"cell_type": "markdown",
147148
"metadata": {
148149
"slideshow": {
149150
"slide_type": "slide"
150151
}
151152
},
152153
"source": [
153-
"# Surface level Analysis"
154+
"## Surface level Analysis"
154155
]
155156
},
156157
{
@@ -166,14 +167,15 @@
166167
]
167168
},
168169
{
170+
"attachments": {},
169171
"cell_type": "markdown",
170172
"metadata": {
171173
"slideshow": {
172174
"slide_type": "slide"
173175
}
174176
},
175177
"source": [
176-
"## Average and record values"
178+
"### Average and record values"
177179
]
178180
},
179181
{
@@ -12598,14 +12600,15 @@
1259812600
]
1259912601
},
1260012602
{
12603+
"attachments": {},
1260112604
"cell_type": "markdown",
1260212605
"metadata": {
1260312606
"slideshow": {
1260412607
"slide_type": "slide"
1260512608
}
1260612609
},
1260712610
"source": [
12608-
"## Wind Roses"
12611+
"### Wind Roses"
1260912612
]
1261012613
},
1261112614
{
@@ -12703,14 +12706,15 @@
1270312706
]
1270412707
},
1270512708
{
12709+
"attachments": {},
1270612710
"cell_type": "markdown",
1270712711
"metadata": {
1270812712
"slideshow": {
1270912713
"slide_type": "slide"
1271012714
}
1271112715
},
1271212716
"source": [
12713-
"# Pressure Level Analysis"
12717+
"## Pressure Level Analysis"
1271412718
]
1271512719
},
1271612720
{
@@ -12726,14 +12730,15 @@
1272612730
]
1272712731
},
1272812732
{
12733+
"attachments": {},
1272912734
"cell_type": "markdown",
1273012735
"metadata": {
1273112736
"slideshow": {
1273212737
"slide_type": "slide"
1273312738
}
1273412739
},
1273512740
"source": [
12736-
"## Average wind profiles"
12741+
"### Average wind profiles"
1273712742
]
1273812743
},
1273912744
{
@@ -29669,10 +29674,11 @@
2966929674
]
2967029675
},
2967129676
{
29677+
"attachments": {},
2967229678
"cell_type": "markdown",
2967329679
"metadata": {},
2967429680
"source": [
29675-
"# Going further with your analysis"
29681+
"## Going further with your analysis"
2967629682
]
2967729683
},
2967829684
{
@@ -29798,7 +29804,7 @@
2979829804
"metadata": {
2979929805
"celltoolbar": "Slideshow",
2980029806
"kernelspec": {
29801-
"display_name": "Python 3.10.0 ('rocketpy_dev')",
29807+
"display_name": "rocketpy_dev",
2980229808
"language": "python",
2980329809
"name": "python3"
2980429810
},
@@ -29812,11 +29818,11 @@
2981229818
"name": "python",
2981329819
"nbconvert_exporter": "python",
2981429820
"pygments_lexer": "ipython3",
29815-
"version": "3.10.0"
29821+
"version": "3.10.0 | packaged by conda-forge | (default, Nov 10 2021, 13:20:59) [MSC v.1916 64 bit (AMD64)]"
2981629822
},
2981729823
"vscode": {
2981829824
"interpreter": {
29819-
"hash": "18e93d5347af13ace37d47ea4e2a2ad720f0331bd9cb28f9983f5585f4dfaa5c"
29825+
"hash": "59ee05f09b472313b636ec8ef2b98477e505db7da462e17a2a6c52426ac2f597"
2982029826
}
2982129827
}
2982229828
},

docs/notebooks/environment_class_usage.ipynb

Lines changed: 1014 additions & 1947 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",

0 commit comments

Comments
 (0)