Skip to content

Commit

Permalink
fix actions: allow make in tox and bump styling to 3.7
Browse files Browse the repository at this point in the history
  • Loading branch information
fopina committed Jan 31, 2023
1 parent 8f82d0f commit 55ebe7c
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 6 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,10 @@ jobs:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- name: Set up Python 3.6
- name: Set up Python 3.7
uses: actions/setup-python@v2
with:
python-version: 3.6
python-version: 3.7
- name: Install tox
run: pip install tox
- name: Style check
Expand Down
4 changes: 2 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
.PHONY: style
style:
black --target-version=py36 \
black --target-version=py37 \
--line-length=120 \
--skip-string-normalization \
notifications testapp setup.py

.PHONY: style_check
style_check:
black --target-version=py36 \
black --target-version=py37 \
--line-length=120 \
--skip-string-normalization \
--check \
Expand Down
4 changes: 2 additions & 2 deletions tox.ini
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ envlist =
py{39}-dj{22,30,32}

[testenv]
allowlist_externals = make
deps =
dj22: Django==2.2.*
dj30: Django==3.0.*
Expand All @@ -14,7 +15,6 @@ extras =
setenv =
PYTHONPATH = {toxinidir}
DJANGO_SETTINGS_MODULE = testapp.settings
whitelist_externals = make
pip_pre = True
commands = make coverage TEST_ARGS='{posargs:tests}'

Expand All @@ -28,6 +28,6 @@ skip_install = true
basepython = python3
commands = make style_check
deps =
black>=19.10b0
black==22.12.0
flake8
skip_install = true

0 comments on commit 55ebe7c

Please sign in to comment.