Drop unneeded test dependency on diff-cover
This commit is contained in:
parent
9c36dcf721
commit
6338097dbb
2 changed files with 13 additions and 13 deletions
|
|
@ -1,29 +1,29 @@
|
|||
From af734d392fa9fbb6fca3ea7c9fdbeff0297e89df Mon Sep 17 00:00:00 2001
|
||||
From 2c5dce5c027de2662d81944f1ba129d8a860b0a7 Mon Sep 17 00:00:00 2001
|
||||
From: Lumir Balhar <lbalhar@redhat.com>
|
||||
Date: Tue, 10 Jan 2023 08:34:25 +0100
|
||||
Subject: [PATCH] fix tests
|
||||
|
||||
---
|
||||
pyproject.toml | 7 -------
|
||||
pyproject.toml | 8 --------
|
||||
src/tox/pytest.py | 16 +++-------------
|
||||
tests/test_provision.py | 18 ++----------------
|
||||
3 files changed, 5 insertions(+), 36 deletions(-)
|
||||
3 files changed, 5 insertions(+), 37 deletions(-)
|
||||
|
||||
diff --git a/pyproject.toml b/pyproject.toml
|
||||
index 4f9836d..bae6776 100644
|
||||
index 50142c5..66f8b5a 100644
|
||||
--- a/pyproject.toml
|
||||
+++ b/pyproject.toml
|
||||
@@ -74,9 +74,6 @@ optional-dependencies.docs = [
|
||||
@@ -74,17 +74,12 @@ optional-dependencies.docs = [
|
||||
]
|
||||
optional-dependencies.testing = [
|
||||
"build[virtualenv]>=1.2.2",
|
||||
- "covdefaults>=2.3",
|
||||
- "detect-test-pollution>=1.2",
|
||||
- "devpi-process>=1.0.2",
|
||||
"diff-cover>=9.2",
|
||||
- "diff-cover>=9.2",
|
||||
"distlib>=0.3.8",
|
||||
"flaky>=3.8.1",
|
||||
@@ -84,7 +81,6 @@ optional-dependencies.testing = [
|
||||
"hatch-vcs>=0.4",
|
||||
"hatchling>=1.25",
|
||||
"psutil>=6",
|
||||
"pytest>=8.3.3",
|
||||
|
|
@ -31,7 +31,7 @@ index 4f9836d..bae6776 100644
|
|||
"pytest-mock>=3.14",
|
||||
"pytest-xdist>=3.6.1",
|
||||
"re-assert>=1.1",
|
||||
@@ -192,9 +188,6 @@ report.omit = [
|
||||
@@ -192,9 +187,6 @@ report.omit = [
|
||||
"tests/type_check/*",
|
||||
]
|
||||
run.parallel = true
|
||||
|
|
@ -42,7 +42,7 @@ index 4f9836d..bae6776 100644
|
|||
[tool.towncrier]
|
||||
name = "tox"
|
||||
diff --git a/src/tox/pytest.py b/src/tox/pytest.py
|
||||
index 54503e3..e676ac1 100644
|
||||
index 13072fd..80bf266 100644
|
||||
--- a/src/tox/pytest.py
|
||||
+++ b/src/tox/pytest.py
|
||||
@@ -17,7 +17,6 @@ from typing import TYPE_CHECKING, Any, Callable, Iterator, Protocol, Sequence, c
|
||||
|
|
@ -53,7 +53,7 @@ index 54503e3..e676ac1 100644
|
|||
from virtualenv.info import fs_supports_symlink
|
||||
|
||||
import tox.run
|
||||
@@ -277,9 +276,9 @@ class ToxProject:
|
||||
@@ -280,9 +279,9 @@ class ToxProject:
|
||||
m.setattr(sys, "argv", [sys.executable, "-m", "tox", *list(args)])
|
||||
m.setenv("VIRTUALENV_SYMLINK_APP_DATA", "1")
|
||||
m.setenv("VIRTUALENV_SYMLINKS", "1")
|
||||
|
|
@ -66,7 +66,7 @@ index 54503e3..e676ac1 100644
|
|||
try:
|
||||
tox_run(args)
|
||||
except SystemExit as exception:
|
||||
@@ -472,15 +471,6 @@ def enable_pypi_server(monkeypatch: pytest.MonkeyPatch, url: str | None) -> None
|
||||
@@ -475,15 +474,6 @@ def enable_pypi_server(monkeypatch: pytest.MonkeyPatch, url: str | None) -> None
|
||||
monkeypatch.setenv("PIP_TIMEOUT", str(2))
|
||||
|
||||
|
||||
|
|
@ -120,5 +120,5 @@ index 5b2b652..7657c2e 100644
|
|||
ini = "[tox]\nrequires=demo-pkg-inline\n[testenv]\npackage=skip\n[testenv:.tox]\nplatform=wrong_platform"
|
||||
proj = tox_project({"tox.ini": ini})
|
||||
--
|
||||
2.46.0
|
||||
2.46.2
|
||||
|
||||
|
|
|
|||
|
|
@ -98,7 +98,7 @@ Recommends: python3-devel
|
|||
|
||||
# Upstream updates dependencies too aggressively
|
||||
# see https://github.com/tox-dev/tox/pull/2843#discussion_r1065028356
|
||||
sed -ri -e 's/"(packaging|filelock|platformdirs|psutil|diff-cover|pyproject-api|pytest|pytest-mock|pytest-xdist|wheel|pluggy|distlib|cachetools|build\[virtualenv\]|setuptools|flaky)>=.*/"\1",/g' \
|
||||
sed -ri -e 's/"(packaging|filelock|platformdirs|psutil|pyproject-api|pytest|pytest-mock|pytest-xdist|wheel|pluggy|distlib|cachetools|build\[virtualenv\]|setuptools|flaky)>=.*/"\1",/g' \
|
||||
-e 's/"(time-machine)>=[^;"]+/"\1/' \
|
||||
-e 's/"(virtualenv)>=.*/"\1>=20",/g' \
|
||||
-e 's/"(hatchling)>=.*/"\1>=1.13",/g' \
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue