Skip to content

Commit 4a26c64

Browse files
committed
pin black req
CI: skip lint on Py3.6, black 23.1 doesn't support it anymore
1 parent ff50ffb commit 4a26c64

File tree

6 files changed

+9
-6
lines changed

6 files changed

+9
-6
lines changed

.github/workflows/ci-tests.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,9 @@ jobs:
2626
- py-ver-major: 3
2727
py-ver-minor: 6
2828
step: mypy
29+
- py-ver-major: 3
30+
py-ver-minor: 6
31+
step: lint
2932

3033
env:
3134
py-semver: ${{ format('{0}.{1}', matrix.py-ver-major, matrix.py-ver-minor) }}

Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,8 @@ EXTRAS=
2929
PYSOURCES=$(filter-out $(MODULE)/parser/cwl_v%,$(shell find $(MODULE) -name "*.py")) \
3030
$(wildcard tests/*.py) create_cwl_from_objects.py load_cwl_by_path.py \
3131
setup.py ${MODULE}/parser/cwl_v1_?_utils.py docs/conf.py
32-
DEVPKGS=diff_cover black pylint pep257 pydocstyle flake8 tox tox-pyenv \
33-
isort wheel autoflake flake8-bugbear pyupgrade bandit \
32+
DEVPKGS=diff_cover pylint pep257 pydocstyle flake8 tox tox-pyenv \
33+
isort wheel autoflake pyupgrade bandit -lint-requirements.txt \
3434
-rtest-requirements.txt -rmypy-requirements.txt
3535
DEBDEVPKGS=pep8 python-autopep8 pylint python-coverage pydocstyle sloccount \
3636
python-flake8 python-mock shellcheck

cwl_utils/sandboxjs.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -164,7 +164,6 @@ def exec_js_process(
164164
force_docker_pull: bool = False,
165165
container_engine: str = "docker",
166166
) -> Tuple[int, str, str]:
167-
168167
if not hasattr(self.localdata, "procs"):
169168
self.localdata.procs = {}
170169

cwl_utils/schemadef.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -145,7 +145,6 @@ def _inline_type(
145145
_inline_type_name_uniq_id += 1
146146

147147
if isinstance(v, str):
148-
149148
# Handle syntactic sugar
150149
if v.endswith("[]"):
151150
return {

lint-requirements.txt

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
flake8-bugbear
2+
black ~= 23.1
3+
codespell

tox.ini

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,7 @@ passenv =
3636
deps =
3737
py{36,37,38,39,310,311}-{unit,mypy}: -rrequirements.txt
3838
py{36,37,38,39,310,311}-{unit,mypy}: -rtest-requirements.txt
39-
py{36,37,38,39,310,311}-lint: flake8-bugbear
40-
py{36,37,38,39,310,311}-lint: black
39+
py{36,37,38,39,310,311}-lint: -rlint-requirements.txt
4140
py{36,37,38,39,310,311}-bandit: bandit
4241
py{36,37}-bandit: importlib-metadata<5 # work around https://github.com/PyCQA/bandit/issues/956
4342
py{37,38,39,310,311}-mypy: -rmypy-requirements.txt

0 commit comments

Comments
 (0)