Skip to content

Commit

Permalink
Merge branch 'develop' into enh/air-brakes
Browse files Browse the repository at this point in the history
  • Loading branch information
MateusStano committed Nov 21, 2023
2 parents b22f4e7 + 3d3d982 commit 480258f
Show file tree
Hide file tree
Showing 63 changed files with 25,557 additions and 83,124 deletions.
46 changes: 46 additions & 0 deletions .dockerignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,46 @@
# Python files
__pycache__/
*.pyc
*.pyo
*.pyd
.Python
db.sqlite3
/db.sqlite3
pip-log.txt
pip-delete-this-directory.txt
.pytest_cache/

# Documentation and Tests
docs/
.coverage
readthedocs.yml
.travis.yml
Makefile

# Binary and Package files
*.egg-info/
*.egg
dist/
build/

# VCS
.git/
.gitignore
.gitattributes
.github/

# IDEs and Editors
.vscode

# Virtual environments
.venv
venv
ENV/
env/

# Others
*.log

# Docker
Dockerfile
.dockerignore
5 changes: 5 additions & 0 deletions .flake8
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
[flake8]
max-line-length = 88
max-module-lines= 3000
exclude = .git,__pycache__
ignore = E203, W503
7 changes: 5 additions & 2 deletions .github/pull_request_template.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,18 +3,21 @@
<!-- You may use this template to describe your Pull Request. But if you believe there is a better way to express yourself, don't hesitate! -->

## Pull request type
<!-- Remove unchecked box items. -->

- [ ] Code changes (bugfix, features)
- [ ] Code maintenance (refactoring, formatting, tests)
- [ ] ReadMe, Docs and GitHub updates
- [ ] Other (please describe):

## Checklist
<!-- Remove irrelevant items to this PR. -->

- [ ] Tests for the changes have been added (if needed)
- [ ] Docs have been reviewed and added / updated
- [ ] Lint (`black rocketpy/ tests/`) has passed locally
- [ ] All tests (`pytest --runslow`) have passed locally
- [ ] `CHANGELOG.md` has been updated (if relevant)

## Current behavior
<!-- Describe current behavior or link to an issue. -->
Expand All @@ -27,12 +30,12 @@ Enter text here...
Enter text here...

## Breaking change
<!-- If this introduces a breaking change, please describe the impact and migration path for existing applications below. -->
<!-- If this introduces a breaking change, please describe the impact and migration path for existing applications below. Remove the unchecked box item. -->

- [ ] Yes
- [ ] No

## Additional information
<!-- Include any relevant details or screenshots. -->
<!-- Include any relevant details or screenshots. If none, remove this section. -->

Enter text here...
25 changes: 20 additions & 5 deletions .github/workflows/test_pytest.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,15 +5,16 @@ on:
types: [opened, synchronize, reopened, ready_for_review]
paths:
- "**.py"
- ".github/**"

jobs:
fail_if_pull_request_is_draft:
fail_if_pr_is_draft:
if: github.event.pull_request.draft == true
runs-on: ubuntu-18.04
steps:
- name: Fails in order to indicate that pull request needs to be marked as ready to review and unit tests workflow needs to pass.
run: exit 1
run_pytest_and_doctest:
pytest_and_doctest:
runs-on: ${{ matrix.os }}
strategy:
matrix:
Expand All @@ -23,7 +24,10 @@ jobs:
- windows-latest
python-version:
- 3.8
- 3.11
- 3.12
env:
OS: ${{ matrix.os }}
PYTHON: ${{ matrix.python-version }}
steps:
- uses: actions/checkout@v2
- name: Set up Python ${{ matrix.python-version }}
Expand All @@ -44,6 +48,17 @@ jobs:
pip install -r requirements-tests.txt
- name: Test with pytest
run: |
pytest
pytest --cov=rocketpy --cov-report=xml
cd rocketpy
pytest --doctest-modules
pytest --doctest-modules --cov=rocketpy --cov-report=xml
- name: Upload coverage report to Codecov
uses: codecov/codecov-action@v3
with:
token: ${{ secrets.CODECOV_TOKEN }}
directory: ./coverage/reports/
env_vars: OS,PYTHON
fail_ci_if_error: true
files: ./coverage.xml, ./rocketpy/coverage.xml
flags: unittests
name: codecov-umbrella
verbose: true
Loading

0 comments on commit 480258f

Please sign in to comment.