Skip to content

Commit

Permalink
Remove default test tolerances and sorting the travis package list.
Browse files Browse the repository at this point in the history
  • Loading branch information
greglucas committed Jul 19, 2020
1 parent f8e83c5 commit a177d65
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 9 deletions.
4 changes: 2 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,10 @@ env:
matrix:
- NAME="Minimum dependencies."
PYTHON_VERSION=3.7
PACKAGES="cython=0.28.5 numpy=1.16 matplotlib=2.2.3 proj4=5.2.0 scipy=1.2.0 owslib=0.17"
PACKAGES="cython=0.28.5 matplotlib=2.2.3 numpy=1.16 owslib=0.17 proj4=5.2.0 scipy=1.2.0"
- NAME="Latest everything."
PYTHON_VERSION=3.8
PACKAGES="cython numpy matplotlib-base pykdtree scipy fiona proj"
PACKAGES="cython fiona matplotlib-base numpy proj pykdtree scipy"


sudo: false
Expand Down
3 changes: 1 addition & 2 deletions lib/cartopy/tests/mpl/test_examples.py
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ def new_fn(*args, **kwargs):


@pytest.mark.natural_earth
@ExampleImageTesting(['global_map'], tolerance=0.5)
@ExampleImageTesting(['global_map'])
def test_global_map():
import cartopy.examples.global_map as example
example.main()
Expand All @@ -40,7 +40,6 @@ def test_global_map():
else:
contour_labels_tolerance = 0


@pytest.mark.natural_earth
@ExampleImageTesting(['contour_label'], tolerance=contour_labels_tolerance)
def test_contour_label():
Expand Down
2 changes: 1 addition & 1 deletion lib/cartopy/tests/mpl/test_images.py
Original file line number Diff line number Diff line change
Expand Up @@ -192,7 +192,7 @@ def test_pil_Image():
@pytest.mark.xfail((5, 0, 0) <= ccrs.PROJ4_VERSION < (5, 1, 0),
reason='Proj Orthographic projection is buggy.',
strict=True)
@ImageTesting(['imshow_natural_earth_ortho'], tolerance=0.5)
@ImageTesting(['imshow_natural_earth_ortho'])
def test_background_img():
ax = plt.axes(projection=ccrs.Orthographic())
ax.background_img(name='ne_shaded', resolution='low')
Expand Down
8 changes: 4 additions & 4 deletions lib/cartopy/tests/mpl/test_mpl_integration.py
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@ def test_global_pcolor_wrap_no_transform():


@pytest.mark.natural_earth
@ImageTesting(['global_scatter_wrap'], tolerance=0.5)
@ImageTesting(['global_scatter_wrap'])
def test_global_scatter_wrap_new_transform():
ax = plt.axes(projection=ccrs.PlateCarree())
# By default the coastline feature will be drawn after patches.
Expand All @@ -111,7 +111,7 @@ def test_global_scatter_wrap_new_transform():


@pytest.mark.natural_earth
@ImageTesting(['global_scatter_wrap'], tolerance=0.5)
@ImageTesting(['global_scatter_wrap'])
def test_global_scatter_wrap_no_transform():
ax = plt.axes(projection=ccrs.PlateCarree())
ax.coastlines(zorder=0)
Expand Down Expand Up @@ -576,7 +576,7 @@ def test_quiver_regrid_with_extent():


@pytest.mark.natural_earth
@ImageTesting(['barbs_plate_carree'], tolerance=0.5)
@ImageTesting(['barbs_plate_carree'])
def test_barbs():
x = np.arange(-60, 45, 5)
y = np.arange(30, 75, 5)
Expand All @@ -598,7 +598,7 @@ def test_barbs():


@pytest.mark.natural_earth
@ImageTesting(['barbs_regrid'], tolerance=0.5)
@ImageTesting(['barbs_regrid'])
def test_barbs_regrid():
x = np.arange(-60, 42.5, 2.5)
y = np.arange(30, 72.5, 2.5)
Expand Down

0 comments on commit a177d65

Please sign in to comment.