Merge pull request #2882 from abravalheri/fix-2880

jaraco · web-flow · commit 77cc5312f1ff · 2021-11-14T15:04:34.000-05:00
Fix 2880, 2881 - Avoid depdencies with URLs in setup.cfg
diff --git a/changelog.d/2880.misc.rst b/changelog.d/2880.misc.rst
@@ -0,0 +1,3 @@
+Removed URL requirement for ``pytest-virtualenv`` in ``setup.cfg``.
+PyPI rejects packages with dependencies external to itself.
+Instead the test dependency was overwritten via ``tox.ini``
diff --git a/setup.cfg b/setup.cfg
@@ -55,7 +55,7 @@ testing =
 	mock
 	flake8-2020
 	virtualenv>=13.0.0
-	pytest-virtualenv @ git+https://github.com/jaraco/pytest-plugins@distutils-deprecated#subdirectory=pytest-virtualenv
+	pytest-virtualenv>=1.2.7  # TODO: Update once man-group/pytest-plugins#188 is solved
 	wheel
 	paver
 	pip>=19.1 # For proper file:// URLs support.
diff --git a/tox.ini b/tox.ini
@@ -10,6 +10,8 @@ deps =
 	# workaround for sphinx-doc/sphinx#9562
 	# TODO: remove after Sphinx>4.1.2 is available.
 	sphinx@git+https://github.com/sphinx-doc/sphinx; python_version>="3.10"
+	# TODO: remove after man-group/pytest-plugins#188 is solved
+	pytest-virtualenv @ git+https://github.com/jaraco/pytest-plugins@distutils-deprecated#subdirectory=pytest-virtualenv
 commands =
 	pytest {posargs}
 usedevelop = True

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	+Removed URL requirement for ``pytest-virtualenv`` in ``setup.cfg``.
	`2`	`+PyPI rejects packages with dependencies external to itself.`
	`3`	+Instead the test dependency was overwritten via ``tox.ini``