Merge branch 'ci-xdist' into 'develop'

use pytest-xdist in tests

See merge request psyplot/psy-simple!37

Author: Chilipp

.gitlab-ci.yml

@@ -36,12 +36,14 @@ test:
     # container runs as root
     # https://doc.qt.io/qt-5/qtwebengine-platform-notes.html#sandboxing-support
     QTWEBENGINE_DISABLE_SANDBOX: "true"
+  tags:
+    - performance
   script:
     # install necessary libraries for pyqt
     - apt-get install -y xvfb python3-pyqt5.qtwebengine
     - pip install pipenv
     - pipenv install
-    - xvfb-run make pipenv-test
+    - NPROCS=auto xvfb-run make pipenv-test
   parallel:
     matrix:
       - SCENARIO:

Makefile

@@ -27,6 +27,8 @@ export PRINT_HELP_PYSCRIPT
 
 BROWSER := python -c "$$BROWSER_PYSCRIPT"
 
+NPROCS ?= 1
+
 help:
 	@python -c "$$PRINT_HELP_PYSCRIPT" < $(MAKEFILE_LIST)
 
@@ -79,7 +81,7 @@ pipenv-test: ## run tox
 	pipenv run black --line-length 79 --check psy_simple
 	pipenv run flake8 psy_simple
 	pipenv run pytest -v --cov=psy_simple -x --ref
-	pipenv run pytest -v --cov=psy_simple -x --cov-append
+	pipenv run pytest -v --cov=psy_simple -x --cov-append -n $(NPROCS)
 	pipenv run reuse lint
 	pipenv run cffconvert --validate
 

psy_simple/plotters.py

@@ -2977,7 +2977,8 @@ def array(self):
         xcoord = self.transpose.get_x(self.data)
         func = "get_x" if not self.transpose.value else "get_y"
         data = next(self.iter_data)
-        if xcoord.name == getattr(self.decoder, func)(data).name:
+        decoder_coord = getattr(self.decoder, func)(data)
+        if decoder_coord is not None and xcoord.name == decoder_coord.name:
             bounds = self.decoder.get_cell_node_coord(
                 data, axis="x", coords=data.coords
             )
@@ -2996,7 +2997,8 @@ def array(self):
         ycoord = self.transpose.get_y(self.data)
         func = "get_x" if self.transpose.value else "get_y"
         data = next(self.iter_data)
-        if ycoord.name == getattr(self.decoder, func)(data).name:
+        decoder_coord = getattr(self.decoder, func)(data)
+        if decoder_coord is not None and ycoord.name == decoder_coord.name:
             bounds = self.decoder.get_cell_node_coord(
                 data, axis="y", coords=data.coords
             )
@@ -4757,9 +4759,11 @@ def update_axis(self, value):
         label_positions = dict(
             zip(
                 map("label{}".format, posnames),
-                [True, False]
-                if self.position in ["t", "ft", "l", "fl"]
-                else [False, True],
+                (
+                    [True, False]
+                    if self.position in ["t", "ft", "l", "fl"]
+                    else [False, True]
+                ),
             )
         )
         label_positions.update(**value)
@@ -5883,7 +5887,7 @@ class PointDensity(Formatoption):
 
     References
     ----------
-    .. [statsmodels] http://statsmodels.sourceforge.net/
+    .. [statsmodels] https://www.statsmodels.org
     """
 
     priority = START

pyproject.toml

@@ -75,6 +75,7 @@ testsite = [
     "pytest-cov",
     "reuse",
     "cffconvert",
+    "pytest-xdist",
     "dask",
     "netCDF4",
     "seaborn",