Skip to content

Commit b85978a

Browse files
committed
lint-and-test: WIP4.
1 parent a3bc098 commit b85978a

File tree

1 file changed

+20
-16
lines changed

1 file changed

+20
-16
lines changed

.github/workflows/lint-and-test.yml

Lines changed: 20 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -32,10 +32,11 @@ jobs:
3232
python-version: ${{ env.LINTING_PYTHON_VERSION }}
3333
cache: 'pip'
3434
cache-dependency-path: 'pyproject.toml'
35-
- name: Install with type-checking tools, stubs & minimal test libraries
36-
run: pip install .[typing,testing_minimal]
37-
- name: Run mypy
38-
run: ./tools/run-mypy
35+
- name: Lint
36+
run: |
37+
make
38+
. zt_venv/bin/activate
39+
./tools/run-mypy
3940
4041
ruff:
4142
runs-on: ubuntu-latest
@@ -49,10 +50,11 @@ jobs:
4950
python-version: ${{ env.LINTING_PYTHON_VERSION }}
5051
cache: 'pip'
5152
cache-dependency-path: 'pyproject.toml'
52-
- name: Install with linting tools
53-
run: pip install .[linting]
54-
- name: Run ruff
55-
run: ruff zulipterminal/ tests/ `tools/python_tools.py`
53+
- name: Lint
54+
run: |
55+
make
56+
. zt_venv/bin/activate
57+
ruff zulipterminal/ tests/ `tools/python_tools.py`
5658
5759
isort:
5860
runs-on: ubuntu-latest
@@ -66,11 +68,12 @@ jobs:
6668
python-version: ${{ env.LINTING_PYTHON_VERSION }}
6769
cache: 'pip'
6870
cache-dependency-path: 'pyproject.toml'
69-
- name: Install with linting tools & minimal test libraries
7071
# NOTE: Install pytest so that isort recognizes it as a known library
71-
run: pip install .[linting,minimal_testing]
72-
- name: Run isort
73-
run: ./tools/run-isort-check
72+
- name: Lint
73+
run: |
74+
make
75+
. zt_venv/bin/activate
76+
./tools/run-isort-check
7477
7578
black:
7679
runs-on: ubuntu-latest
@@ -84,10 +87,11 @@ jobs:
8487
python-version: ${{ env.LINTING_PYTHON_VERSION }}
8588
cache: 'pip'
8689
cache-dependency-path: 'pyproject.toml'
87-
- name: Install with linting tools
88-
run: pip install .[linting]
89-
- name: Check code & tests meet black standards
90-
run: black --check zulipterminal/ tests/ `tools/python_tools.py`
90+
- name: Lint
91+
run: |
92+
make
93+
. zt_venv/bin/activate
94+
black --check zulipterminal/ tests/ `tools/python_tools.py`
9195
9296
spellcheck:
9397
runs-on: ubuntu-latest

0 commit comments

Comments
 (0)