Skip to content

Commit 24db532

Browse files
Fix Tox to use Poetry hermetically (#531)
1 parent 2bcb05a commit 24db532

File tree

2 files changed

+85
-32
lines changed

2 files changed

+85
-32
lines changed

poetry.lock

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

pyproject.toml

Lines changed: 21 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -24,22 +24,24 @@ typing-extensions = "^4.7.1"
2424
[tool.poetry.group.dev.dependencies]
2525
asv = "^0.4.2"
2626
bpython = "^0.19"
27-
grpcio-tools = "^1.54.2"
2827
jinja2 = ">=3.0.3"
2928
mypy = "^0.930"
29+
sphinx = "3.1.2"
30+
sphinx-rtd-theme = "0.5.0"
31+
pre-commit = "^2.17.0"
32+
grpcio-tools = "^1.54.2"
33+
tox = "^4.0.0"
34+
35+
[tool.poetry.group.test.dependencies]
3036
poethepoet = ">=0.9.0"
31-
protobuf = "^4.21.6"
3237
pytest = "^6.2.5"
3338
pytest-asyncio = "^0.12.0"
3439
pytest-cov = "^2.9.0"
3540
pytest-mock = "^3.1.1"
36-
sphinx = "3.1.2"
37-
sphinx-rtd-theme = "0.5.0"
38-
tomlkit = "^0.7.0"
39-
tox = "^3.15.1"
40-
pre-commit = "^2.17.0"
4141
pydantic = ">=1.8.0,<2"
42+
protobuf = "^4"
4243
cachelib = "^0.10.2"
44+
tomlkit = ">=0.7.0"
4345

4446
[tool.poetry.scripts]
4547
protoc-gen-python_betterproto = "betterproto.plugin:main"
@@ -135,14 +137,21 @@ omit = ["betterproto/tests/*"]
135137
[tool.tox]
136138
legacy_tox_ini = """
137139
[tox]
138-
isolated_build = true
139-
envlist = py37, py38, py310
140+
requires =
141+
tox>=4.2
142+
tox-poetry-installer[poetry]==1.0.0b1
143+
env_list =
144+
py311
145+
py38
146+
py37
140147
141148
[testenv]
142-
whitelist_externals = poetry
143149
commands =
144-
poetry install -v --extras compiler
145-
poetry run pytest --cov betterproto
150+
pytest {posargs: --cov betterproto}
151+
poetry_dep_groups =
152+
test
153+
require_locked_deps = true
154+
require_poetry = true
146155
"""
147156

148157
[build-system]

0 commit comments

Comments
 (0)