Skip to content

Commit ebf8457

Browse files
MNT: updates Makefile scripts, adds isort to requirements-tests.txt
1 parent 821518a commit ebf8457

File tree

4 files changed

+30
-23
lines changed

4 files changed

+30
-23
lines changed

.github/pull_request_template.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
- [ ] Tests for the changes have been added (if needed)
1717
- [ ] Docs have been reviewed and added / updated
1818
- [ ] Lint (`black rocketpy/ tests/`) has passed locally
19-
- [ ] All tests (`pytest --runslow`) have passed locally
19+
- [ ] All tests (`python3 -m pytest tests -m slow --runslow`) have passed locally
2020
- [ ] `CHANGELOG.md` has been updated (if relevant)
2121

2222
## Current behavior

.gitignore

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ MANIFEST
3636
pip-log.txt
3737
pip-delete-this-directory.txt
3838

39-
# Unit test / coverage reports
39+
# Unit test / coverage reports / lints reports
4040
htmlcov/
4141
.tox/
4242
.nox/
@@ -50,6 +50,7 @@ coverage.xml
5050
.hypothesis/
5151
.pytest_cache/
5252
cover/
53+
.pylint-report.txt
5354

5455
# Translations
5556
*.mo

Makefile

Lines changed: 24 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,32 @@
1-
test:
2-
python -m pytest tests -vv
1+
pytest:
2+
python3 -m pytest tests
33

4-
testfile:
5-
python -m pytest tests/$(file) -vv
4+
pytest-slow:
5+
python3 -m pytest tests -vv -m slow --runslow
66

7-
tests:
8-
test
9-
10-
coverage:
11-
python -m pytest --cov=rocketpy tests -vv
7+
coverage:
8+
python3 -m pytest --cov=rocketpy tests
129

1310
coverage-report:
14-
python -m pytest --cov=rocketpy tests -vv --cov-report html
11+
python3 -m pytest --cov=rocketpy tests --cov-report html
1512

16-
install:
17-
python -m pip install --upgrade pip
13+
install:
14+
python3 -m pip install --upgrade pip
1815
pip install -r requirements.txt
19-
python setup.py install
16+
pip install -r requirements-optional.txt
17+
pip install -e .
18+
19+
isort:
20+
isort --profile black rocketpy/ tests/ docs/
2021

21-
verify-lint:
22-
flake8 --select BLK rocketpy
23-
flake8 --select BLK test
22+
black:
23+
black rocketpy/ tests/ docs/
24+
25+
pylint:
26+
-pylint rocketpy tests --output=.pylint-report.txt
2427

25-
lint:
26-
black rocketpy
27-
black tests
28+
biuld-docs:
29+
cd docs
30+
python3 -m pip install -r requirements.txt
31+
make html
32+
cd ..

requirements-tests.txt

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
pytest==6.2.4
22
pytest-coverage
3-
black
3+
black[jupyter]
44
flake8-black
55
pandas
66
numericalunits==1.25
7-
pylint
7+
pylint
8+
isort

0 commit comments

Comments
 (0)