Merge pull request #39 from astrofrog/update-infrastructure

Update CI infrastructure
astrofrog · Jul 4, 2023 · a890fa4 · a890fa4
2 parents 2a5551f + 5d8381b
commit a890fa4
Show file tree

Hide file tree

Showing 48 changed files with 59 additions and 48 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -0,0 +1,44 @@
+name: CI
+
+on:
+  push:
+  pull_request:
+
+jobs:
+
+  tests:
+    uses: OpenAstronomy/github-actions-workflows/.github/workflows/tox.yml@v1
+    with:
+      coverage: codecov
+      runs-on: |
+        linux: ubuntu-latest
+      envs: |
+        # Code style
+        - linux: codestyle
+
+        # Linux builds - test on all supported Matplotlib versions
+        - linux: py38-test-mpl33
+        - linux: py39-test-mpl34
+        - linux: py39-test-mpl35
+        - linux: py310-test-mpl36
+        - linux: py310-test-mpl37
+        - linux: py311-test-mpldev
+
+        # MacOS X and Windows builds - alternative Matplotlib versions
+        - windows: py38-test-mpl33
+        - macos: py39-test-mpl34
+        - windows: py39-test-mpl35
+        - macos: py310-test-mpl36
+        - windows: py310-test-mpl37
+        - windows: py311-test-mpldev
+
+        # Image tests
+        - linux: py311-test-mpl38-image
+
+  publish:
+    uses: OpenAstronomy/github-actions-workflows/.github/workflows/publish_pure_python.yml@v1
+    with:
+      test_extras: test
+      test_command: pytest --pyargs mpl_scatter_density
+    secrets:
+      pypi_token: ${{ secrets.pypi_token }}
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
diff --git a/mpl_scatter_density/tests/__init__.py b/mpl_scatter_density/tests/__init__.py
@@ -8,8 +8,8 @@
 
 baseline_root = 'baseline'
 
-if MPL_VERSION >= LooseVersion('2'):  # pragma: nocover
-    baseline_subdir = '2.0.x'
+if MPL_VERSION >= LooseVersion('3'):  # pragma: nocover
+    baseline_subdir = '3.0.x'
 else:  # pragma: nocover
     raise ValueError('Matplotlib {0} is not supported'.format(matplotlib.__version__))
 

diff --git a/mpl_scatter_density/tests/baseline/2.0.x/test_axes_basic.png b/mpl_scatter_density/tests/baseline/2.0.x/test_axes_basic.png
diff --git a/mpl_scatter_density/tests/baseline/2.0.x/test_axes_projection.png b/mpl_scatter_density/tests/baseline/2.0.x/test_axes_projection.png
diff --git a/mpl_scatter_density/tests/baseline/2.0.x/test_color.png b/mpl_scatter_density/tests/baseline/2.0.x/test_color.png
diff --git a/mpl_scatter_density/tests/baseline/2.0.x/test_colorcode.png b/mpl_scatter_density/tests/baseline/2.0.x/test_colorcode.png
diff --git a/mpl_scatter_density/tests/baseline/2.0.x/test_colorcode_downres.png b/mpl_scatter_density/tests/baseline/2.0.x/test_colorcode_downres.png
diff --git a/mpl_scatter_density/tests/baseline/2.0.x/test_default.png b/mpl_scatter_density/tests/baseline/2.0.x/test_default.png
diff --git a/mpl_scatter_density/tests/baseline/2.0.x/test_downres_False.png b/mpl_scatter_density/tests/baseline/2.0.x/test_downres_False.png
diff --git a/mpl_scatter_density/tests/baseline/2.0.x/test_downres_True.png b/mpl_scatter_density/tests/baseline/2.0.x/test_downres_True.png
diff --git a/mpl_scatter_density/tests/baseline/2.0.x/test_flipping_False-False.png b/mpl_scatter_density/tests/baseline/2.0.x/test_flipping_False-False.png
diff --git a/mpl_scatter_density/tests/baseline/2.0.x/test_flipping_False-True.png b/mpl_scatter_density/tests/baseline/2.0.x/test_flipping_False-True.png
diff --git a/mpl_scatter_density/tests/baseline/2.0.x/test_flipping_True-False.png b/mpl_scatter_density/tests/baseline/2.0.x/test_flipping_True-False.png
diff --git a/mpl_scatter_density/tests/baseline/2.0.x/test_flipping_True-True.png b/mpl_scatter_density/tests/baseline/2.0.x/test_flipping_True-True.png
diff --git a/mpl_scatter_density/tests/baseline/2.0.x/test_image_settings.png b/mpl_scatter_density/tests/baseline/2.0.x/test_image_settings.png
diff --git a/mpl_scatter_density/tests/baseline/2.0.x/test_manual_limits.png b/mpl_scatter_density/tests/baseline/2.0.x/test_manual_limits.png
diff --git a/mpl_scatter_density/tests/baseline/2.0.x/test_multi_scatter.png b/mpl_scatter_density/tests/baseline/2.0.x/test_multi_scatter.png
diff --git a/mpl_scatter_density/tests/baseline/2.0.x/test_origin.png b/mpl_scatter_density/tests/baseline/2.0.x/test_origin.png
diff --git a/mpl_scatter_density/tests/baseline/2.0.x/test_remove.png b/mpl_scatter_density/tests/baseline/2.0.x/test_remove.png
diff --git a/mpl_scatter_density/tests/baseline/2.0.x/test_scales_linear-linear.png b/mpl_scatter_density/tests/baseline/2.0.x/test_scales_linear-linear.png
diff --git a/mpl_scatter_density/tests/baseline/2.0.x/test_scales_linear-log.png b/mpl_scatter_density/tests/baseline/2.0.x/test_scales_linear-log.png
diff --git a/mpl_scatter_density/tests/baseline/2.0.x/test_scales_log-linear.png b/mpl_scatter_density/tests/baseline/2.0.x/test_scales_log-linear.png
diff --git a/mpl_scatter_density/tests/baseline/2.0.x/test_scales_log-log.png b/mpl_scatter_density/tests/baseline/2.0.x/test_scales_log-log.png
diff --git a/mpl_scatter_density/tests/baseline/3.0.x/test_axes_basic.png b/mpl_scatter_density/tests/baseline/3.0.x/test_axes_basic.png
diff --git a/mpl_scatter_density/tests/baseline/3.0.x/test_axes_projection.png b/mpl_scatter_density/tests/baseline/3.0.x/test_axes_projection.png
diff --git a/mpl_scatter_density/tests/baseline/3.0.x/test_color.png b/mpl_scatter_density/tests/baseline/3.0.x/test_color.png
diff --git a/mpl_scatter_density/tests/baseline/3.0.x/test_colorcode.png b/mpl_scatter_density/tests/baseline/3.0.x/test_colorcode.png
diff --git a/mpl_scatter_density/tests/baseline/3.0.x/test_colorcode_downres.png b/mpl_scatter_density/tests/baseline/3.0.x/test_colorcode_downres.png
diff --git a/mpl_scatter_density/tests/baseline/3.0.x/test_default.png b/mpl_scatter_density/tests/baseline/3.0.x/test_default.png
diff --git a/mpl_scatter_density/tests/baseline/3.0.x/test_downres_False.png b/mpl_scatter_density/tests/baseline/3.0.x/test_downres_False.png
diff --git a/mpl_scatter_density/tests/baseline/3.0.x/test_downres_True.png b/mpl_scatter_density/tests/baseline/3.0.x/test_downres_True.png
diff --git a/mpl_scatter_density/tests/baseline/3.0.x/test_flipping_False-False.png b/mpl_scatter_density/tests/baseline/3.0.x/test_flipping_False-False.png
diff --git a/mpl_scatter_density/tests/baseline/3.0.x/test_flipping_False-True.png b/mpl_scatter_density/tests/baseline/3.0.x/test_flipping_False-True.png
diff --git a/mpl_scatter_density/tests/baseline/3.0.x/test_flipping_True-False.png b/mpl_scatter_density/tests/baseline/3.0.x/test_flipping_True-False.png
diff --git a/mpl_scatter_density/tests/baseline/3.0.x/test_flipping_True-True.png b/mpl_scatter_density/tests/baseline/3.0.x/test_flipping_True-True.png
diff --git a/mpl_scatter_density/tests/baseline/3.0.x/test_image_settings.png b/mpl_scatter_density/tests/baseline/3.0.x/test_image_settings.png
diff --git a/mpl_scatter_density/tests/baseline/3.0.x/test_manual_limits.png b/mpl_scatter_density/tests/baseline/3.0.x/test_manual_limits.png
diff --git a/mpl_scatter_density/tests/baseline/3.0.x/test_multi_scatter.png b/mpl_scatter_density/tests/baseline/3.0.x/test_multi_scatter.png
diff --git a/...ensity/tests/baseline/2.0.x/test_norm.png → ...ensity/tests/baseline/3.0.x/test_norm.png b/...ensity/tests/baseline/2.0.x/test_norm.png → ...ensity/tests/baseline/3.0.x/test_norm.png
diff --git a/mpl_scatter_density/tests/baseline/3.0.x/test_origin.png b/mpl_scatter_density/tests/baseline/3.0.x/test_origin.png
diff --git a/mpl_scatter_density/tests/baseline/3.0.x/test_remove.png b/mpl_scatter_density/tests/baseline/3.0.x/test_remove.png
diff --git a/mpl_scatter_density/tests/baseline/3.0.x/test_scales_linear-linear.png b/mpl_scatter_density/tests/baseline/3.0.x/test_scales_linear-linear.png
diff --git a/mpl_scatter_density/tests/baseline/3.0.x/test_scales_linear-log.png b/mpl_scatter_density/tests/baseline/3.0.x/test_scales_linear-log.png
diff --git a/mpl_scatter_density/tests/baseline/3.0.x/test_scales_log-linear.png b/mpl_scatter_density/tests/baseline/3.0.x/test_scales_log-linear.png
diff --git a/mpl_scatter_density/tests/baseline/3.0.x/test_scales_log-log.png b/mpl_scatter_density/tests/baseline/3.0.x/test_scales_log-log.png
diff --git a/mpl_scatter_density/tests/test_scatter_density_artist.py b/mpl_scatter_density/tests/test_scatter_density_artist.py
@@ -2,6 +2,7 @@
 from unittest.mock import MagicMock, Mock
 import pytest
 import numpy as np
+from matplotlib import rc_context
 import matplotlib.pyplot as plt
 
 try:
@@ -218,13 +219,13 @@ def test_downres_ignore_unity(self, tmpdir):
 
     def test_default_dpi(self, tmpdir):
 
-        self.fig.set_dpi(90)
-        a = ScatterDensityArtist(self.ax, self.x1, self.y1, dpi=None)
-        self.ax.add_artist(a)
-        # We can't just draw, we need to save, as not all backends actually
-        # draw when calling figure.canvas.draw()
-        self.ax.figure.savefig(tmpdir.join('test.png').strpath)
-        assert a.get_size() == (216, 216)
+        with rc_context({'savefig.dpi': 90}):
+            a = ScatterDensityArtist(self.ax, self.x1, self.y1, dpi=None)
+            self.ax.add_artist(a)
+            # We can't just draw, we need to save, as not all backends actually
+            # draw when calling figure.canvas.draw()
+            self.ax.figure.savefig(tmpdir.join('test.png').strpath)
+            assert a.get_size() == (216, 216)
 
     def test_downres_ignore_other_tools(self, tmpdir):
 

diff --git a/tox.ini b/tox.ini
@@ -1,6 +1,6 @@
 [tox]
 envlist =
-    py{36,37,38}-test{-mpl30,-mpl31,-mpl32,-mpl33,-mpldev}{,-image}
+    py{36,37,38,39,310,311}-test{,-image}
     codestyle
 requires =
     setuptools >= 30.3.0
@@ -17,6 +17,10 @@ deps =
     mpl31: matplotlib==3.1.*
     mpl32: matplotlib==3.2.*
     mpl33: matplotlib==3.3.*
+    mpl34: matplotlib==3.4.*
+    mpl35: matplotlib==3.5.*
+    mpl36: matplotlib==3.6.*
+    mpl37: matplotlib==3.7.*
     mpldev: git+https://github.com/matplotlib/matplotlib.git#egg=matplotlib
 extras =
     test