Skip to content

Commit 136743b

Browse files
committed
revert pyproject changes
1 parent 295befc commit 136743b

File tree

1 file changed

+11
-2
lines changed

1 file changed

+11
-2
lines changed

pyproject.toml

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,11 +50,15 @@ dynamic = ["version"]
5050

5151
[project.optional-dependencies]
5252
dev = ["flopy4[lint,test,build]"]
53+
<<<<<<< HEAD
5354
lint = ["ruff", "pre-commit>=4.0.1,<5"]
5455
build = [
5556
"build",
5657
"twine",
5758
]
59+
=======
60+
lint = ["ruff"]
61+
>>>>>>> 94bb1fd (revert pyproject changes)
5862
test = [
5963
"flopy4[lint]",
6064
"coverage",
@@ -69,6 +73,7 @@ test = [
6973
"pytest-dotenv",
7074
"pytest-xdist",
7175
]
76+
build = ["build", "twine"]
7277

7378
[tool.setuptools]
7479
include-package-data = true
@@ -132,8 +137,12 @@ test312 = { features = ["py312", "test"], solve-group = "py312" }
132137
test313 = { features = ["py313", "test"], solve-group = "py313" }
133138
dev = { features = ["py311", "test", "lint", "build"], solve-group = "py311" }
134139

135-
[tool.pixi.feature.dev.tasks]
140+
[tool.pixi.feature.build.tasks]
136141
build = { cmd = "python -m build" }
142+
143+
[tool.pixi.feature.test.tasks]
144+
test = { cmd = "pytest -v -n auto" }
145+
146+
[tool.pixi.feature.lint.tasks]
137147
lint = { cmd = "ruff check ." }
138148
install = { cmd = "pre-commit install --install-hooks" }
139-
test = { cmd = "pytest -v -n auto" }

0 commit comments

Comments
 (0)