Skip to content

Commit b19bc1d

Browse files
committed
Update makefile for test, format and lint
1 parent ef47f29 commit b19bc1d

File tree

2 files changed

+7
-8
lines changed

2 files changed

+7
-8
lines changed

.github/workflows/pytest.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@ jobs:
2020
- name: Install dependencies
2121
run: |
2222
make setup-dev
23-
pipenv shell
2423
- name: Locally install branch's mapillary
2524
run: |
2625
make build && make local-install

Makefile

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -59,18 +59,18 @@ style: format lint
5959

6060
# # # Formatting
6161
format:
62-
@ black src/mapillary
63-
@ black tests/
62+
@ pipenv run black src/mapillary
63+
@ pipenv run black tests/
6464

6565
# # # Linting
6666
lint:
6767
@ # stop the build if there are python3 syntax errors or undefined names
68-
@ flake8 src/mapillary --count --select=E9,F63,F7,F82 --show-source --statistics
69-
@ flake8 tests/ --count --select=E9,F63,F7,F82 --show-source --statistics
68+
@ pipenv run flake8 src/mapillary --count --select=E9,F63,F7,F82 --show-source --statistics
69+
@ pipenv run flake8 tests/ --count --select=E9,F63,F7,F82 --show-source --statistics
7070

7171
@ # exit-zero treats all errors as warnings. The GitHub editor is 127 chars wide
72-
@ flake8 src/mapillary --count --exit-zero --max-complexity=10 --max-line-length=127 --statistics
73-
@ flake8 tests/ --count --select=E9,F63,F7,F82 --show-source --statistics
72+
@ pipenv run flake8 src/mapillary --count --exit-zero --max-complexity=10 --max-line-length=127 --statistics
73+
@ pipenv run flake8 tests/ --count --select=E9,F63,F7,F82 --show-source --statistics
7474

7575
# DOCUMENTATION
7676

@@ -132,7 +132,7 @@ dump-clean:
132132

133133
# # Execute pytest on tests/
134134
test:
135-
@ pytest --log-cli-level=20
135+
@pipenv run pytest --log-cli-level=20
136136

137137
test-no-warn:
138138
@ pytest --log-cli-level=20 --disable-warnings

0 commit comments

Comments
 (0)