Skip to content

Commit a4e639e

Browse files
committed
Fix release pipeline
1 parent a572440 commit a4e639e

Some content is hidden

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

56 files changed

+565
-374
lines changed

.github/workflows/release.yml

+6-3
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,14 @@ jobs:
1313
runs-on: ubuntu-latest
1414
steps:
1515
- uses: actions/checkout@v2
16+
- name: Install
17+
id: install
18+
run: make install
1619
- name: Lint
1720
id: lint
1821
run: |
19-
make pylint
20-
make mypy
22+
make format
23+
make lint
2124
- name: Test
2225
id: test
2326
run: make test
@@ -45,4 +48,4 @@ jobs:
4548
- uses: act10ns/slack@v1
4649
with:
4750
status: ${{ job.status }}
48-
steps: ${{ toJson(steps) }}
51+
steps: ${{ toJson(steps) }}

.pre-commit-config.yaml

+4-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@ repos:
1717
- id: debug-statements
1818
- id: double-quote-string-fixer
1919
- id: end-of-file-fixer
20-
- id: flake8
2120
- id: fix-encoding-pragma
2221
args: ['--remove']
2322
- id: pretty-format-json
@@ -26,6 +25,10 @@ repos:
2625
args: ['--django']
2726
- id: requirements-txt-fixer
2827
- id: trailing-whitespace
28+
- repo: https://gitlab.com/pycqa/flake8
29+
rev: 3.9.2
30+
hooks:
31+
- id: flake8
2932
- repo: https://github.com/asottile/pyupgrade
3033
rev: v1.27.0
3134
hooks:

Makefile

+9-5
Original file line numberDiff line numberDiff line change
@@ -32,22 +32,22 @@ $(PIP):
3232
python3 -m venv $(VENV)
3333

3434
$(PYLINT): $(PIP)
35-
$(PIP) install pylint
35+
$(PIP) install pylint==2.11.1
3636

3737
$(MYPY): $(PIP)
38-
$(PIP) install mypy
38+
$(PIP) install mypy==0.812
3939

4040
$(BLACK): $(PIP)
41-
$(PIP) install black
41+
$(PIP) install black==21.11b1
4242

4343
$(TOX): $(PIP)
4444
$(PIP) install tox
4545

4646
$(PYTEST): $(PIP)
47-
$(PIP) install pytest
47+
$(PIP) install pytest==6.2.5 pytest-cov==3.0.0
4848

4949
$(PRE_COMMIT): $(PIP)
50-
$(PIP) install pre-commit
50+
$(PIP) install pre-commit==2.15.0
5151

5252
$(WHEEL): $(PIP)
5353
$(PIP) install wheel
@@ -59,6 +59,10 @@ ifdef TOXENV
5959
toxparams?=-e $(TOXENV)
6060
endif
6161

62+
## install - Install dependencies.
63+
install: $(PIP)
64+
$(PIP) install -r requirements.txt
65+
6266
## format - Code formatter.
6367
format: $(BLACK)
6468
$(BLACK) -l120 -S -v $(PROJECT)

alertaclient/__init__.py

+2-1
Original file line numberDiff line numberDiff line change
@@ -23,4 +23,5 @@
2323
2424
https://github.com/alerta/alerta/wiki/Python-3
2525
26-
""")
26+
"""
27+
)

0 commit comments

Comments
 (0)