From 86535a9db326c1152f9dbba6ca9d20b10cf2e1ab Mon Sep 17 00:00:00 2001
From: Hugo Osvaldo Barrera <hugo@barrera.io>
Date: Sat, 12 Jun 2021 15:08:17 +0200
Subject: [PATCH] Merge test dependencies into dev dependencies

---
 .builds/tests-minimal.yaml | 2 +-
 .builds/tests-release.yaml | 2 +-
 Makefile                   | 5 +----
 docs/contributing.rst      | 4 ++--
 docs/packaging.rst         | 4 ++--
 5 files changed, 7 insertions(+), 10 deletions(-)

diff --git a/.builds/tests-minimal.yaml b/.builds/tests-minimal.yaml
index dec4ba0..afeba0b 100644
--- a/.builds/tests-minimal.yaml
+++ b/.builds/tests-minimal.yaml
@@ -21,7 +21,7 @@ tasks:
   - setup: |
       sudo systemctl start docker
       cd vdirsyncer
-      make -e install-test
+      make -e install-dev
   - test: |
       cd vdirsyncer
       # Non-system python is used for packages:
diff --git a/.builds/tests-release.yaml b/.builds/tests-release.yaml
index 05d838a..9766b50 100644
--- a/.builds/tests-release.yaml
+++ b/.builds/tests-release.yaml
@@ -18,7 +18,7 @@ tasks:
   - setup: |
       sudo systemctl start docker
       cd vdirsyncer
-      make -e install-test -e install-style
+      make -e install-dev -e install-style
   - test: |
       cd vdirsyncer
       # Non-system python is used for packages:
diff --git a/Makefile b/Makefile
index 0104ff1..cf708f4 100644
--- a/Makefile
+++ b/Makefile
@@ -60,10 +60,6 @@ ci-test-storage:
 test:
 	$(PYTEST)
 
-install-test: install-dev
-	pip install -Ur test-requirements.txt
-	[ -z "$(TEST_EXTRA_PACKAGES)" ] || pip install $(TEST_EXTRA_PACKAGES)
-
 install-style: install-docs install-dev
 	pip install pre-commit
 
@@ -92,6 +88,7 @@ release-deb:
 install-dev:
 	pip install -U pip setuptools wheel
 	pip install -e .
+	pip install -Ur test-requirements.txt $(TEST_EXTRA_PACKAGES)
 	[ "$(ETESYNC_TESTS)" = "false" ] || pip install -Ue .[etesync]
 	set -xe && if [ "$(REQUIREMENTS)" = "minimal" ]; then \
 		pip install -U --force-reinstall $$(python setup.py --quiet minimal_requirements); \
diff --git a/docs/contributing.rst b/docs/contributing.rst
index 73175c7..3bb6068 100644
--- a/docs/contributing.rst
+++ b/docs/contributing.rst
@@ -87,8 +87,8 @@ virtualenv_ and run this inside of it::
     # Install git commit hook for some extra linting and checking
     pre-commit install
 
-    # install test dependencies
-    make install-test
+    # Install development dependencies
+    make install-dev
 
 Then you can run::
 
diff --git a/docs/packaging.rst b/docs/packaging.rst
index d4a81bb..8923f33 100644
--- a/docs/packaging.rst
+++ b/docs/packaging.rst
@@ -41,9 +41,9 @@ repository or PyPI package. Trying to e.g. run ``pytest`` directly will
 require a lot of environment variables to be set (for configuration) and you
 probably don't want to deal with that.
 
-You can install the testing dependencies with::
+You can install the all development dependencies with::
 
-    make install-test
+    make install-dev
 
 You probably don't want this since it will use pip to download the
 dependencies. Alternatively you can find the testing dependencies in