Skip to content

Commit 44eb8f2

Browse files
Merge 'develop' into tst/flight-class-protection
2 parents e1a60f3 + 46725b9 commit 44eb8f2

251 files changed

Lines changed: 144680 additions & 126950 deletions

File tree

Some content is hidden

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

.github/auto-assign.yml

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,16 +4,19 @@ addReviewers: true
44
# Set to 'author' to add PR's author as a assignee
55
addAssignees: author
66

7-
# A list of reviewers to be added to PRs (GitHub user name)
7+
# A list of reviewers to be added to PRs (GitHub user name)
88
reviewers:
99
- Gui-FernandesBR
1010
- giovaniceotto
1111
- MateusStano
12-
12+
- phmbressan
13+
1314
# A number of reviewers added to the PR
1415
# Set 0 to add all the reviewers (default: 0)
1516
numberOfReviewers: 0
1617

1718
# A list of keywords to be skipped the process if PR's title include it
1819
skipKeywords:
1920
- wip
21+
- work in progress
22+
- draft

.github/pull_request_template.md

Lines changed: 16 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -4,52 +4,35 @@
44

55
## Pull request type
66

7-
Please check the type of change your PR introduces:
8-
9-
- [ ] Code base additions (bugfix, features)
10-
- [ ] Code maintenance (refactoring, formatting, renaming, tests)
11-
- [ ] ReadMe, Docs and GitHub maintenance
7+
- [ ] Code changes (bugfix, features)
8+
- [ ] Code maintenance (refactoring, formatting, tests)
9+
- [ ] ReadMe, Docs and GitHub updates
1210
- [ ] Other (please describe):
1311

14-
## Pull request checklist
15-
16-
Please check if your PR fulfills the following requirements, depending on the type of PR:
17-
18-
- ReadMe, Docs and GitHub maintenance:
19-
20-
- [ ] Spelling has been verified
21-
- [ ] Code docs are working correctly
12+
## Checklist
2213

23-
- Code base maintenance (refactoring, formatting, renaming):
14+
- [ ] Tests for the changes have been added (if needed)
15+
- [ ] Docs have been reviewed and added / updated
16+
- [ ] Lint (`black rocketpy/ tests/`) has passed locally
17+
- [ ] All tests (`pytest --runslow`) have passed locally
2418

25-
- [ ] Docs have been reviewed and added / updated if needed
26-
- [ ] Lint (`black rocketpy`) has passed locally and any fixes were made
27-
- [ ] All tests (`pytest --runslow`) have passed locally
28-
29-
- Code base additions (for bug fixes / features):
30-
31-
- [ ] Tests for the changes have been added
32-
- [ ] Docs have been reviewed and added / updated if needed
33-
- [ ] Lint (`black rocketpy`) has passed locally and any fixes were made
34-
- [ ] All tests (`pytest --runslow`) have passed locally
35-
36-
## What is the current behavior?
37-
<!-- Please describe the current behavior that you are modifying, or link to a relevant issue. -->
19+
## Current behavior
20+
<!-- Describe current behavior or link to an issue. -->
3821

3922
Enter text here...
4023

41-
## What is the new behavior?
42-
<!-- Please describe the behavior or changes that are being added by this PR. -->
24+
## New behavior
25+
<!-- Describe changes introduced by this PR. -->
4326

4427
Enter text here...
4528

46-
## Does this introduce a breaking change?
29+
## Breaking change
4730
<!-- If this introduces a breaking change, please describe the impact and migration path for existing applications below. -->
4831

4932
- [ ] Yes
5033
- [ ] No
5134

52-
## Other information
53-
<!-- Any other information that is important to this PR such as screenshots of how the component looks before and after the change. -->
35+
## Additional information
36+
<!-- Include any relevant details or screenshots. -->
5437

55-
Enter text here...
38+
Enter text here...

.github/workflows/auto-assign-projects

Lines changed: 0 additions & 21 deletions
This file was deleted.

.github/workflows/auto-assign.yml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
1-
name: Auto Assign Issues and PRs once opened
1+
name: Auto Assign PRs once opened
22
on:
3-
issues:
4-
types: [opened]
53
pull_request:
64
types: [opened]
75
jobs:

.github/workflows/test_pytest.yaml

Lines changed: 20 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,19 @@
11
name: PyTest
22

3-
on: [pull_request]
3+
on:
4+
pull_request:
5+
types: [opened, synchronize, reopened, ready_for_review]
6+
paths:
7+
- "**.py"
48

59
jobs:
6-
build:
10+
fail_if_pull_request_is_draft:
11+
if: github.event.pull_request.draft == true
12+
runs-on: ubuntu-18.04
13+
steps:
14+
- name: Fails in order to indicate that pull request needs to be marked as ready to review and unit tests workflow needs to pass.
15+
run: exit 1
16+
run_pytest_and_doctest:
717
runs-on: ${{ matrix.os }}
818
strategy:
919
matrix:
@@ -23,10 +33,15 @@ jobs:
2333
- name: Install dependencies
2434
run: |
2535
python -m pip install --upgrade pip
26-
pip install -r requirements-tests.txt
27-
- name: Build RocketPy
36+
- name: Build RocketPy (without optional dependencies)
37+
run: |
38+
pip install .
39+
- name: Import rocketpy in python and test if it works
2840
run: |
29-
pip install -e.[all]
41+
python -c "import sys, rocketpy; print(f'{rocketpy.__name__} running on Python {sys.version}')"
42+
- name: Install optional dependencies
43+
run: |
44+
pip install -r requirements-tests.txt
3045
- name: Test with pytest
3146
run: |
3247
pytest

.readthedocs.yaml

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,14 @@ build:
1313

1414
# Build documentation in the docs/ directory with Sphinx
1515
sphinx:
16-
configuration: docs/conf.py
16+
configuration: docs/conf.py
1717

1818
# Optionally declare the Python requirements required to build your docs
1919
python:
20-
install:
21-
- requirements: docs/requirements.txt
22-
- requirements: requirements.txt
20+
install:
21+
- requirements: docs/requirements.txt
22+
- requirements: requirements.txt
23+
- method: pip
24+
path: .
25+
extra_requirements:
26+
- all

0 commit comments

Comments
 (0)