summary refs log tree commit diff
diff options
context:
space:
mode:
authorDavid Robertson <davidr@element.io>2022-03-03 17:14:09 +0000
committerGitHub <noreply@github.com>2022-03-03 17:14:09 +0000
commit9297d040a72b70c7cc0ec15319afdd99b01ba885 (patch)
treeaa69f6cc26a7b3c4ddf600a4631765256c9f7b5c
parentAdd type hints to `tests/rest` (#12146) (diff)
downloadsynapse-9297d040a72b70c7cc0ec15319afdd99b01ba885.tar.xz
Detox, part 2 of N (#12152)
I've argued in #11537 that poetry and tox don't cooperate well at the
moment. (See also #12119.) Therefore I'm pruning away bits of tox to make the transition to poetry easier. This change removes the commands for coverage.

We don't use coverage in anger at the moment. It shouldn't be too hard to add coverage as a dev-dependency and reintroduce this if we really want it.
-rw-r--r--changelog.d/12152.misc1
-rw-r--r--tox.ini26
2 files changed, 1 insertions, 26 deletions
diff --git a/changelog.d/12152.misc b/changelog.d/12152.misc
new file mode 100644
index 0000000000..b9877eaccb
--- /dev/null
+++ b/changelog.d/12152.misc
@@ -0,0 +1 @@
+Prune unused jobs from `tox` config.
\ No newline at end of file
diff --git a/tox.ini b/tox.ini
index f4829200cc..04d282a705 100644
--- a/tox.ini
+++ b/tox.ini
@@ -158,32 +158,6 @@ commands =
 extras = lint
 commands = isort -c --df {[base]lint_targets}
 
-[testenv:combine]
-skip_install = true
-usedevelop = false
-deps =
-    coverage
-    pip>=10
-commands=
-    coverage combine
-    coverage report
-
-[testenv:cov-erase]
-skip_install = true
-usedevelop = false
-deps =
-    coverage
-commands=
-    coverage erase
-
-[testenv:cov-html]
-skip_install = true
-usedevelop = false
-deps =
-    coverage
-commands=
-    coverage html
-
 [testenv:mypy]
 deps =
     {[base]deps}