Skip to content

Commit c544b11

Browse files
authored
Merge pull request #128 from ivankorobkov/prepare-for-bigger-formatters-n-linters
Prepare for bigger formatters-n-linters
2 parents 0e37674 + 41f2ea6 commit c544b11

17 files changed

+221
-151
lines changed

.github/workflows/tests.yaml

Lines changed: 20 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -7,26 +7,27 @@ name: tests
77

88
jobs:
99

10-
# misc:
10+
misc:
1111
# name: "Linting configs and git"
12-
# runs-on: ubuntu-latest
13-
# steps:
14-
# - uses: actions/checkout@v4
15-
# with:
16-
# fetch-depth: 12
17-
#
18-
# - uses: docker://docker.io/tamasfe/taplo:latest
19-
# name: "Lint TOMLs"
20-
# with:
21-
# args: fmt --check --diff
22-
#
23-
# - uses: actions/setup-python@v5
24-
# - name: "Install tox"
25-
# run: |
26-
# pip install tox
27-
# - name: "Lint YAMLs"
28-
# run: |
29-
# tox -e lint-yaml
12+
name: "Linting configs"
13+
runs-on: ubuntu-latest
14+
steps:
15+
- uses: actions/checkout@v4
16+
with:
17+
fetch-depth: 12
18+
19+
- uses: docker://docker.io/tamasfe/taplo:latest
20+
name: "Lint TOMLs"
21+
with:
22+
args: fmt --check --diff
23+
24+
- uses: actions/setup-python@v5
25+
- name: "Install tox"
26+
run: |
27+
pip install tox
28+
- name: "Lint YAMLs"
29+
run: |
30+
tox -e lint-yaml
3031
# - name: "Lint git"
3132
# run: |
3233
# tox -e lint-git

.taplo.toml

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
exclude = [
2+
"**/.venv/**/*.toml",
3+
"**/.tox/**/*.toml",
4+
]
5+
6+
[formatting]
7+
column_width = 88
8+
array_auto_collapse = false

.travis.yml

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,15 @@
1+
---
12
dist: xenial
23
language: python
34
matrix:
45
include:
5-
- python: '3.6'
6-
- python: '3.7'
6+
- python: "3.6"
7+
- python: "3.7"
78
env: TOXENV=py37
8-
- python: '3.8'
9+
- python: "3.8"
910
env: TOXENV=py37
1011
install:
1112
- python -m pip install --upgrade --editable=./
12-
script:
13+
script:
1314
- nosetests test $EXTRA_ARGS
1415
- if [ "$TOXENV" = "py37" ]; then nosetests test37; fi

.yamllint.yaml

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
---
2+
extends: default
3+
4+
ignore:
5+
- "**/.venv/*"
6+
- "**/.tox/*"
7+
8+
rules:
9+
comments:
10+
require-starting-space: true
11+
min-spaces-from-content: 1
12+
comments-indentation: disable
13+
quoted-strings:
14+
quote-type: double
15+
required: false
16+
check-keys: true
17+
line-length:
18+
max: 88

makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,8 @@ clean:
2626

2727
pytest:
2828
if ! command -v pytest &>/dev/null; then python3 -m pip install --upgrade pytest; fi
29-
pytest test
29+
pytest tests
3030

3131
test:
3232
if ! command -v nosetests &>/dev/null; then python3 -m pip install --upgrade nose; fi
33-
nosetests test
33+
nosetests tests

0 commit comments

Comments
 (0)