Merge pull request #1702 from girder/tox-adjustment

Adjust tox to make some tests somewhat faster
girder · Oct 25, 2024 · 99405bb · 99405bb
2 parents c8fda2d + cff31ec
commit 99405bb
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 5 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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