diff --git a/.circleci/config.yml b/.circleci/config.yml new file mode 100644 index 00000000..972d93bb --- /dev/null +++ b/.circleci/config.yml @@ -0,0 +1,45 @@ +version: 2 + +steps: &steps + - checkout + - run: + name: Run tests + command: MPLBACKEND=Agg pytest tests --mpl + +jobs: + + image-tests-mpl153: + docker: + - image: astropy/image-tests-py35-mpl153:1.3 + steps: *steps + + image-tests-mpl202: + docker: + - image: astropy/image-tests-py35-mpl202:1.3 + steps: *steps + + image-tests-mpl212: + docker: + - image: astropy/image-tests-py35-mpl212:1.3 + steps: *steps + + image-tests-mpl222: + docker: + - image: astropy/image-tests-py35-mpl222:1.3 + steps: *steps + + image-tests-mpl300: + docker: + - image: astropy/image-tests-py35-mpl300:1.3 + steps: *steps + + +workflows: + version: 2 + tests: + jobs: + - image-tests-mpl153 + - image-tests-mpl202 + - image-tests-mpl212 + - image-tests-mpl222 + - image-tests-mpl300 diff --git a/.gitignore b/.gitignore index f1413402..a220ebc8 100644 --- a/.gitignore +++ b/.gitignore @@ -6,3 +6,5 @@ __pycache__ *.egg *.egg-info .idea +build +dist diff --git a/tests/baseline/1.5.x/test_dpi.png b/tests/baseline/1.5.x/test_dpi.png index 3c1b441a..3b642615 100644 Binary files a/tests/baseline/1.5.x/test_dpi.png and b/tests/baseline/1.5.x/test_dpi.png differ diff --git a/tests/baseline/1.5.x/test_succeeds.png b/tests/baseline/1.5.x/test_succeeds.png index 130ada90..e803210e 100644 Binary files a/tests/baseline/1.5.x/test_succeeds.png and b/tests/baseline/1.5.x/test_succeeds.png differ diff --git a/tests/baseline/1.5.x/test_succeeds_remote.png b/tests/baseline/1.5.x/test_succeeds_remote.png new file mode 100644 index 00000000..e803210e Binary files /dev/null and b/tests/baseline/1.5.x/test_succeeds_remote.png differ diff --git a/tests/baseline/1.5.x/test_tolerance.png b/tests/baseline/1.5.x/test_tolerance.png index 46b124c9..c2ca3538 100644 Binary files a/tests/baseline/1.5.x/test_tolerance.png and b/tests/baseline/1.5.x/test_tolerance.png differ diff --git a/tests/baseline/2.0.x/test_base_style.png b/tests/baseline/2.0.x/test_base_style.png index 3502b495..2e6a7ed2 100644 Binary files a/tests/baseline/2.0.x/test_base_style.png and b/tests/baseline/2.0.x/test_base_style.png differ diff --git a/tests/baseline/2.0.x/test_dpi.png b/tests/baseline/2.0.x/test_dpi.png index dc3cd302..d8c6ffc4 100644 Binary files a/tests/baseline/2.0.x/test_dpi.png and b/tests/baseline/2.0.x/test_dpi.png differ diff --git a/tests/baseline/2.0.x/test_succeeds.png b/tests/baseline/2.0.x/test_succeeds.png index 66223536..d3d13dc7 100644 Binary files a/tests/baseline/2.0.x/test_succeeds.png and b/tests/baseline/2.0.x/test_succeeds.png differ diff --git a/tests/baseline/2.0.x/test_succeeds_remote.png b/tests/baseline/2.0.x/test_succeeds_remote.png new file mode 100644 index 00000000..d3d13dc7 Binary files /dev/null and b/tests/baseline/2.0.x/test_succeeds_remote.png differ diff --git a/tests/baseline/2.0.x/test_tolerance.png b/tests/baseline/2.0.x/test_tolerance.png index 0d2c12e9..1c536221 100644 Binary files a/tests/baseline/2.0.x/test_tolerance.png and b/tests/baseline/2.0.x/test_tolerance.png differ diff --git a/tests/test_pytest_mpl.py b/tests/test_pytest_mpl.py index 1fa0379c..bda9dc1b 100644 --- a/tests/test_pytest_mpl.py +++ b/tests/test_pytest_mpl.py @@ -12,6 +12,9 @@ baseline_dir = 'baseline' +# NOTE: Matplotlib 2.1.x, 2.2.x, and 3.0.x can all use the baseline images +# from 2.0.x, so we just use those rather than duplicate files. + if MPL_VERSION >= LooseVersion('2'): baseline_subdir = '2.0.x' elif MPL_VERSION >= LooseVersion('1.5'): @@ -41,7 +44,7 @@ def test_succeeds_remote(): # The following tries an invalid URL first (or at least a URL where the baseline # image won't exist), but should succeed with the second mirror. -@pytest.mark.mpl_image_compare(baseline_dir='http://www.python.org,' + baseline_dir_remote, +@pytest.mark.mpl_image_compare(baseline_dir='http://www.python.org/,' + baseline_dir_remote, filename='test_succeeds_remote.png') def test_succeeds_faulty_mirror(): fig = plt.figure()