Skip to content

Commit 2eede5b

Browse files
authored
Merge pull request #80 from KotlinIsland/fix/deps
add dependency on typing_extensions, add ruff, update deps
2 parents 1943f5d + c868a76 commit 2eede5b

30 files changed

+362
-533
lines changed

.flake8

Lines changed: 0 additions & 21 deletions
This file was deleted.

.github/workflows/check.yaml

Lines changed: 14 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,24 @@ name: check
33
on: push
44

55
env:
6-
POETRY_VERSION: "1.2.2"
6+
POETRY_VERSION: "1.6.1"
77

88
jobs:
99
check:
1010
runs-on: ubuntu-latest
1111
strategy:
1212
matrix:
13-
python-version: ["3.8", "3.9", "3.10", "3.11"]
13+
include:
14+
- python-version: "3.8"
15+
usable-python-version: "3.8"
16+
- python-version: "3.9"
17+
usable-python-version: "3.9"
18+
- python-version: "3.10"
19+
usable-python-version: "3.10"
20+
- python-version: "3.11"
21+
usable-python-version: "3.11"
22+
- python-version: "3.12-dev"
23+
usable-python-version: "3.12"
1424

1525
steps:
1626
- uses: actions/checkout@v2
@@ -32,7 +42,7 @@ jobs:
3242
if: steps.cache.outputs.cache-hit == 'true'
3343
run: timeout 10s poetry run pip --version || rm -rf .venv
3444
- run: poetry install
35-
- run: poetry run mypy -p basedtyping -p tests --python-version ${{ matrix.python-version }}
45+
- run: poetry run mypy -p basedtyping -p tests --python-version ${{ matrix.usable-python-version }}
3646
- run: poetry run pytest tests/
3747

3848
lint:
@@ -58,5 +68,4 @@ jobs:
5868
run: timeout 10s poetry run pip --version || rm -rf .venv
5969
- run: poetry install
6070
- run: poetry run black --check --diff .
61-
- run: poetry run isort --check --diff .
62-
- run: poetry run flake8 .
71+
- run: poetry run ruff .

.idea/git_toolbox_prj.xml

Lines changed: 5 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/watcherTasks.xml

Lines changed: 0 additions & 20 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.vscode/extensions.json

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,8 @@
22
"recommendations": [
33
"ms-python.python",
44
"ms-python.vscode-pylance",
5-
"ms-python.pylint",
65
"ms-python.black-formatter",
7-
"ms-python.isort",
6+
"charliermarsh.ruff",
87
"eamodio.gitlens",
98
"mhutchie.git-graph",
109
"ninoseki.vscode-pylens",

.vscode/settings.json

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -24,20 +24,9 @@
2424
"source.fixAll": true,
2525
"source.organizeImports": true
2626
},
27-
"python.linting.flake8CategorySeverity.W": "Error",
2827
"files.eol": "\n",
2928
"python.testing.pytestEnabled": true,
3029
"python.analysis.typeCheckingMode": "off",
31-
"python.linting.flake8Enabled": true,
32-
"pylint.severity": {
33-
"convention": "Warning",
34-
"error": "Error",
35-
"fatal": "Error",
36-
"refactor": "Warning",
37-
"warning": "Warning",
38-
"info": "Warning"
39-
},
40-
"pylint.importStrategy": "fromEnvironment",
4130
"yaml.schemas": {
4231
"https://raw.githubusercontent.com/SchemaStore/schemastore/master/src/schemas/json/github-workflow.json": ".github/workflows/*.yaml"
4332
},

.vscode/tasks.json

Lines changed: 7 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -44,40 +44,29 @@
4444
"problemMatcher": []
4545
},
4646
{
47-
"label": "flake8 - all files",
48-
"type": "shell",
49-
"command": "${command:python.interpreterPath}",
50-
"args": ["-m", "flake8"],
51-
"presentation": {
52-
"clear": true
53-
},
54-
"problemMatcher": []
55-
},
56-
{
57-
"label": "pylint - all files",
47+
"label": "black - all files",
5848
"type": "shell",
5949
"command": "${command:python.interpreterPath}",
60-
"args": ["-m", "pylint", "basedtyping", "tests"],
50+
"args": ["-m", "black", "--color", "."],
6151
"presentation": {
6252
"clear": true
6353
},
6454
"problemMatcher": []
65-
},
66-
{
67-
"label": "isort - all files",
55+
}, {
56+
"label": "ruff - all files",
6857
"type": "shell",
6958
"command": "${command:python.interpreterPath}",
70-
"args": ["-m", "isort", "--diff", "--color", "."],
59+
"args": ["-m", "ruff", "."],
7160
"presentation": {
7261
"clear": true
7362
},
7463
"problemMatcher": []
7564
},
7665
{
77-
"label": "black - all files",
66+
"label": "ruff fix - all files",
7867
"type": "shell",
7968
"command": "${command:python.interpreterPath}",
80-
"args": ["-m", "black", "--color", "."],
69+
"args": ["-m", "ruff", "--fix", "."],
8170
"presentation": {
8271
"clear": true
8372
},

0 commit comments

Comments
 (0)