From cff31ec55f444e23535f3577a25ecaffab78ec3b Mon Sep 17 00:00:00 2001
From: David Manthey <david.manthey@kitware.com>
Date: Fri, 25 Oct 2024 10:32:05 -0400
Subject: [PATCH] Adjust tox to make some tests somewhat faster

---
 requirements-dev-osx.txt   | 4 +++-
 requirements-dev.txt       | 3 ++-
 requirements-test-core.txt | 3 ++-
 requirements-test.txt      | 3 ++-
 tox.ini                    | 5 ++++-
 5 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/requirements-dev-osx.txt b/requirements-dev-osx.txt
index 3e219eb0f..72e4b2b92 100644
--- a/requirements-dev-osx.txt
+++ b/requirements-dev-osx.txt
@@ -13,9 +13,11 @@ girder-jobs>=3.0.3
 -e girder/.
 -e girder_annotation/.
 -e sources/zarr
+
 # Extras from main setup.py
-pylibmc>=1.5.1
 matplotlib
+pylibmc>=1.5.1
+redis
 simplejpeg
 
 # External dependencies
diff --git a/requirements-dev.txt b/requirements-dev.txt
index ec4de8471..92382985f 100644
--- a/requirements-dev.txt
+++ b/requirements-dev.txt
@@ -29,8 +29,9 @@ girder-jobs>=3.0.3
 -e girder_annotation/.[compute]
 
 # Extras from main setup.py
-pylibmc>=1.5.1
 matplotlib
+pylibmc>=1.5.1
+redis
 simplejpeg
 
 # External dependencies
diff --git a/requirements-test-core.txt b/requirements-test-core.txt
index 67ef51093..fe57fe069 100644
--- a/requirements-test-core.txt
+++ b/requirements-test-core.txt
@@ -23,8 +23,9 @@ sources/mapnik
 utilities/converter[stats]
 
 # Extras from main setup.py
-pylibmc>=1.5.1
 matplotlib
+pylibmc>=1.5.1
+redis
 simplejpeg
 
 # External dependencies
diff --git a/requirements-test.txt b/requirements-test.txt
index 71dedb92f..5bacf78da 100644
--- a/requirements-test.txt
+++ b/requirements-test.txt
@@ -29,8 +29,9 @@ girder/.
 girder_annotation/.
 
 # Extras from main setup.py
-pylibmc>=1.5.1
 matplotlib
+pylibmc>=1.5.1
+redis
 simplejpeg
 
 # External dependencies
diff --git a/tox.ini b/tox.ini
index 192af5c7d..177bc29c9 100644
--- a/tox.ini
+++ b/tox.ini
@@ -10,7 +10,7 @@ skip_missing_interpreters = true
 toxworkdir = {toxinidir}/build/tox
 
 [testenv]
-passenv = PYTEST_*,COVERAGE_*,DICOMWEB_TEST_URL,DICOMWEB_TEST_TOKEN,GIRDER_BUILD_OPTIONS,PIP_*,CFLAGS
+passenv = PYTEST_*,COVERAGE_*,DICOMWEB_TEST_*,REDIS_TEST_*,GIRDER_BUILD_OPTIONS,PIP_*,CFLAGS
 extras =
   memcached
   redis
@@ -61,7 +61,10 @@ setenv =
 # Versions that do have all tile sources.  Using the requirements-dev.txt file
 # installs in editable mode, which then includes results in coverage.
 [testenv:test-py{38,39,310,311,312,313}]
+# Don't package for tests where we use editable modes
+package=skip
 passenv = {[testenv:test]passenv}
+extras = {[testenv:test]extras}
 deps =
   -rrequirements-dev.txt
   coverage