Skip to content

Commit cc2364d

Browse files
authored
Merge pull request #48 from astrofrog/fix-ci
Fix CI
2 parents 949787e + 353ca7b commit cc2364d

File tree

2 files changed

+15
-4
lines changed

2 files changed

+15
-4
lines changed

mpl_scatter_density/tests/test_scatter_density_artist.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -101,12 +101,12 @@ def test_downres(self, log):
101101
self.ax.set_yscale('log')
102102
return self.fig
103103

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

111111
@pytest.mark.mpl_image_compare(style={}, baseline_dir=baseline_dir)
112112
@pytest.mark.parametrize(('xscale', 'yscale'), [('linear', 'linear'), ('linear', 'log'),

tox.ini

Lines changed: 13 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[tox]
22
envlist =
3-
py{36,37,38,39,310,311}-test{,-image}
3+
py{36,37,38,39,310,311}-test{,-image}{-mpl30,-mpl31,-mpl32,-mpl33,-mpl34,-mpl35,-mpl36,-mpl37,-mpl38,-mpldev}
44
codestyle
55
requires =
66
setuptools >= 30.3.0
@@ -11,6 +11,7 @@ isolated_build = true
1111
setenv =
1212
image: MPLFLAGS = --mpl
1313
!image: MPLFLAGS =
14+
mpldev: PIP_EXTRA_INDEX_URL = https://pypi.anaconda.org/scientific-python-nightly-wheels/simple
1415
changedir = .tmp/{envname}
1516
deps =
1617
mpl30: matplotlib==3.0.*
@@ -20,8 +21,18 @@ deps =
2021
mpl34: matplotlib==3.4.*
2122
mpl35: matplotlib==3.5.*
2223
mpl36: matplotlib==3.6.*
24+
25+
mpl30: numpy<2
26+
mpl31: numpy<2
27+
mpl32: numpy<2
28+
mpl33: numpy<2
29+
mpl34: numpy<2
30+
mpl35: numpy<2
31+
mpl36: numpy<2
32+
2333
mpl37: matplotlib==3.7.*
24-
mpldev: git+https://github.com/matplotlib/matplotlib.git#egg=matplotlib
34+
mpldev: matplotlib>=0.0.dev0
35+
2536
extras =
2637
test
2738

0 commit comments

Comments
 (0)