From f9e279df7d75f2bfcba92c3393c4c64e25e6dcb7 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Mon, 20 Jan 2020 11:31:23 -0500
Subject: Move test dependencies into the package, removing 'tests' directory
 which masks the error reported in #1896.

---
 setuptools/tests/requirements.txt | 12 ++++++++++++
 tests/requirements.txt            | 12 ------------
 tox.ini                           |  2 +-
 3 files changed, 13 insertions(+), 13 deletions(-)
 create mode 100644 setuptools/tests/requirements.txt
 delete mode 100644 tests/requirements.txt

diff --git a/setuptools/tests/requirements.txt b/setuptools/tests/requirements.txt
new file mode 100644
index 00000000..cb3e6726
--- /dev/null
+++ b/setuptools/tests/requirements.txt
@@ -0,0 +1,12 @@
+mock
+pytest-flake8; python_version!="3.4"
+pytest-flake8<=1.0.0; python_version=="3.4"
+virtualenv>=13.0.0
+pytest-virtualenv>=1.2.7
+pytest>=3.7
+wheel
+coverage>=4.5.1
+pytest-cov>=2.5.1
+paver; python_version>="3.6"
+futures; python_version=="2.7"
+pip==18.1  # Temporary workaround for #1644.
diff --git a/tests/requirements.txt b/tests/requirements.txt
deleted file mode 100644
index cb3e6726..00000000
--- a/tests/requirements.txt
+++ /dev/null
@@ -1,12 +0,0 @@
-mock
-pytest-flake8; python_version!="3.4"
-pytest-flake8<=1.0.0; python_version=="3.4"
-virtualenv>=13.0.0
-pytest-virtualenv>=1.2.7
-pytest>=3.7
-wheel
-coverage>=4.5.1
-pytest-cov>=2.5.1
-paver; python_version>="3.6"
-futures; python_version=="2.7"
-pip==18.1  # Temporary workaround for #1644.
diff --git a/tox.ini b/tox.ini
index e0eef95a..048e6ea2 100644
--- a/tox.ini
+++ b/tox.ini
@@ -8,7 +8,7 @@
 envlist=python
 
 [testenv]
-deps=-rtests/requirements.txt
+deps=-rsetuptools/tests/requirements.txt
 # Changed from default (`python -m pip ...`)
 # to prevent the current working directory
 # from being added to `sys.path`.
-- 
cgit v1.2.1