Skip to content

Commit 2a530ef

Browse files
authored
Merge pull request #51 from dbatten5/linting
Linting
2 parents 2c8abf4 + 5eaa3c7 commit 2a530ef

File tree

4 files changed

+12
-22
lines changed

4 files changed

+12
-22
lines changed

.github/workflows/constraints.txt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
pip==22.1.2
2-
nox==2022.1.7
3-
nox-poetry==1.0.0
1+
pip==23.0.1
2+
nox==2022.11.21
3+
nox-poetry==1.0.2
44
poetry==1.4.2
55
virtualenv==20.14.1

.pre-commit-config.yaml

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -39,13 +39,7 @@ repos:
3939
language: system
4040
types: [python]
4141
require_serial: true
42-
- id: isort
43-
name: isort
44-
entry: isort
45-
require_serial: true
46-
language: system
47-
types_or: [cython, pyi, python]
48-
args: ["--filter-files"]
42+
args: ["--fix"]
4943
- id: pyupgrade
5044
name: pyupgrade
5145
description: Automatically upgrade syntax for newer versions.

noxfile.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -123,7 +123,6 @@ def precommit(session: Session) -> None:
123123
"black",
124124
"darglint",
125125
"ruff",
126-
"isort",
127126
"pep8-naming",
128127
"pre-commit",
129128
"pre-commit-hooks",

pyproject.toml

Lines changed: 8 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,9 @@ typing-extensions = "^4.5.0"
2525
[tool.poetry.group.test.dependencies]
2626
pytest = "^6.2.4"
2727
coverage = {extras = ["toml"], version = "^6.1"}
28+
xdoctest = {extras = ["colors"], version = "*"}
2829

2930
[tool.poetry.group.dev.dependencies]
30-
xdoctest = {extras = ["colors"], version = "*"}
3131
typeguard = "*"
3232
safety = "^2.2.0"
3333
mypy = "*"
@@ -39,18 +39,14 @@ reorder-python-imports = "*"
3939
pre-commit-hooks = "^4.0.1"
4040
Pygments = "^2.9.0"
4141
ruff = "*"
42-
isort = "*"
43-
pydocstyle = "*"
4442
pyupgrade = ">=2.29.1"
45-
myst-parser = {version = ">=0.16.1"}
4643

4744
[tool.poetry.group.docs.dependencies]
48-
49-
[tool.poetry.dev-dependencies]
5045
furo = ">=2021.11.12"
5146
sphinx = ">=4.3.2"
5247
sphinx-autobuild = ">=2021.3.14"
5348
sphinx-click = ">=3.0.2"
49+
myst-parser = {version = ">=0.16.1"}
5450

5551
[tool.poetry.scripts]
5652
arraytex = "arraytex.__main__:main"
@@ -67,11 +63,6 @@ source = ["arraytex", "tests"]
6763
show_missing = true
6864
fail_under = 100
6965

70-
[tool.isort]
71-
profile = "black"
72-
force_single_line = true
73-
lines_after_imports = 2
74-
7566
[tool.mypy]
7667
strict = true
7768
warn_unreachable = true
@@ -87,6 +78,7 @@ module = [
8778
ignore_missing_imports = true
8879

8980
[tool.ruff]
81+
src = ["src", "tests"]
9082
ignore = [
9183
'B019',
9284
'D203',
@@ -112,6 +104,7 @@ select = [
112104
'N',
113105
'S',
114106
'W',
107+
'I001'
115108
]
116109

117110
[tool.ruff.mccabe]
@@ -120,6 +113,10 @@ max-complexity = 10
120113
[tool.ruff.pydocstyle]
121114
convention = 'google'
122115

116+
[tool.ruff.isort]
117+
force-single-line = true
118+
lines-after-imports = 2
119+
123120
[tool.ruff.per-file-ignores]
124121
"__init__.py" = ['F401']
125122
"tests/*" = [

0 commit comments

Comments
 (0)