Merge pull request #1128 from girder/fix-typo

Fix a typo in some docs.
girder · Apr 20, 2023 · ffbf0c8 · ffbf0c8
2 parents 5382afc + f3f587b
commit ffbf0c8
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 4 deletions.
diff --git a/large_image/tilesource/base.py b/large_image/tilesource/base.py
@@ -2511,7 +2511,7 @@ def tileIterator(self, format=(TILE_FORMAT_NUMPY, ), resample=True,
             pixels or mm are used for inits.  It applies to output if
             neither output maxWidth nor maxHeight is specified.
 
-            :magnification: the magnification ratio.  Only used is maxWidth and
+            :magnification: the magnification ratio.  Only used if maxWidth and
                 maxHeight are not specified or None.
             :mm_x: the horizontal size of a pixel in millimeters.
             :mm_y: the vertical size of a pixel in millimeters.

diff --git a/tox.ini b/tox.ini
@@ -28,6 +28,7 @@ deps =
   pytest-cov>=2.6
   pytest-custom-exit-code
   pytest-girder>=3.0.4
+  pytest-rerunfailures
   pytest-xdist
 allowlist_externals =
   rm
@@ -36,7 +37,7 @@ allowlist_externals =
 commands =
   rm -rf build/test/coverage/web_temp
   girder build --dev
-  pytest -m 'singular' --cov-config tox.ini --suppress-no-test-exit-code {posargs}
+  pytest --numprocesses 1 -m 'singular' --cov-config tox.ini --suppress-no-test-exit-code {posargs}
   pytest --numprocesses logical -m 'not singular' --cov-config tox.ini --cov-append --suppress-no-test-exit-code {posargs}
   - npx nyc report --temp-dir build/test/coverage/web_temp --report-dir build/test/coverage --reporter cobertura --reporter text-summary
 # Reduce npm chatter
@@ -70,6 +71,7 @@ deps =
   pytest-cov>=2.6
   pytest-custom-exit-code
   pytest-girder>=3.0.4
+  pytest-rerunfailures
   pytest-xdist
 allowlist_externals = {[testenv:test]allowlist_externals}
 commands = {[testenv:test]commands}
@@ -79,7 +81,7 @@ setenv = {[testenv:test]setenv}
 description = Run all tests except Girder client
 deps = {[testenv:test]deps}
 commands =
-  pytest -m 'singular and not girder_client' --cov-config tox.ini --suppress-no-test-exit-code {posargs}
+  pytest --numprocesses 1 -m 'singular and not girder_client' --cov-config tox.ini --suppress-no-test-exit-code {posargs}
   pytest --numprocesses logical -m 'not singular and not girder_client' --cov-config tox.ini --cov-append --suppress-no-test-exit-code {posargs}
 
 [testenv:server-py{36,37,38,39,310,311}]
@@ -98,9 +100,10 @@ deps =
   pytest>=3.6
   pytest-cov>=2.6
   pytest-custom-exit-code
+  pytest-rerunfailures
   pytest-xdist
 commands =
-  pytest -m 'singular and not girder' --cov-config tox.ini --suppress-no-test-exit-code {posargs}
+  pytest --numprocesses 1 -m 'singular and not girder' --cov-config tox.ini --suppress-no-test-exit-code {posargs}
   pytest --numprocesses logical -m 'not singular and not girder' --cov-config tox.ini --cov-append --suppress-no-test-exit-code {posargs}
 
 [testenv:core-py{36,37,38,39,310,311}]