Skip to content

Commit

Permalink
Merge pull request #48 from astrofrog/fix-ci
Browse files Browse the repository at this point in the history
Fix CI
  • Loading branch information
astrofrog authored Dec 3, 2024
2 parents 949787e + 353ca7b commit cc2364d
Show file tree
Hide file tree
Showing 2 changed files with 15 additions and 4 deletions.
4 changes: 2 additions & 2 deletions mpl_scatter_density/tests/test_scatter_density_artist.py
Original file line number Diff line number Diff line change
Expand Up @@ -101,12 +101,12 @@ def test_downres(self, log):
self.ax.set_yscale('log')
return self.fig

def test_no_dpi(self):
def test_no_dpi(self, tmp_path):
# this is just to make sure things work, but can't do an image test
# since dpi might be device-dependent
a = ScatterDensityArtist(self.ax, self.x1, self.y1, dpi=None)
self.ax.add_artist(a)
return self.fig
self.fig.savefig(tmp_path / 'test.png')

@pytest.mark.mpl_image_compare(style={}, baseline_dir=baseline_dir)
@pytest.mark.parametrize(('xscale', 'yscale'), [('linear', 'linear'), ('linear', 'log'),
Expand Down
15 changes: 13 additions & 2 deletions tox.ini
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[tox]
envlist =
py{36,37,38,39,310,311}-test{,-image}
py{36,37,38,39,310,311}-test{,-image}{-mpl30,-mpl31,-mpl32,-mpl33,-mpl34,-mpl35,-mpl36,-mpl37,-mpl38,-mpldev}
codestyle
requires =
setuptools >= 30.3.0
Expand All @@ -11,6 +11,7 @@ isolated_build = true
setenv =
image: MPLFLAGS = --mpl
!image: MPLFLAGS =
mpldev: PIP_EXTRA_INDEX_URL = https://pypi.anaconda.org/scientific-python-nightly-wheels/simple
changedir = .tmp/{envname}
deps =
mpl30: matplotlib==3.0.*
Expand All @@ -20,8 +21,18 @@ deps =
mpl34: matplotlib==3.4.*
mpl35: matplotlib==3.5.*
mpl36: matplotlib==3.6.*

mpl30: numpy<2
mpl31: numpy<2
mpl32: numpy<2
mpl33: numpy<2
mpl34: numpy<2
mpl35: numpy<2
mpl36: numpy<2

mpl37: matplotlib==3.7.*
mpldev: git+https://github.com/matplotlib/matplotlib.git#egg=matplotlib
mpldev: matplotlib>=0.0.dev0

extras =
test

Expand Down

0 comments on commit cc2364d

Please sign in to comment.