diff --git a/.travis.yml b/.travis.yml index 7479c36df..5f79ae8e1 100644 --- a/.travis.yml +++ b/.travis.yml @@ -41,7 +41,7 @@ install: # Customise the testing environment # --------------------------------- - - conda config --add channels scitools + - conda config --add channels conda-forge - PACKAGES="$PACKAGES cython pillow nose pep8 proj4 pyshp shapely six requests pyepsg owslib" - conda install --quiet $PACKAGES diff --git a/lib/cartopy/tests/mpl/test_img_transform.py b/lib/cartopy/tests/mpl/test_img_transform.py index 6e685037b..321d5be04 100644 --- a/lib/cartopy/tests/mpl/test_img_transform.py +++ b/lib/cartopy/tests/mpl/test_img_transform.py @@ -1,4 +1,4 @@ -# (C) British Crown Copyright 2011 - 2016, Met Office +# (C) British Crown Copyright 2011 - 2017, Met Office # # This file is part of cartopy. # @@ -91,7 +91,7 @@ def test_different_dims(self): target_proj, target_x, target_y) -@ImageTesting(['regrid_image'], tolerance=0.4) +@ImageTesting(['regrid_image'], tolerance=0.7) def test_regrid_image(): # Source data fname = os.path.join(config["repo_data_dir"], 'raster', 'natural_earth', diff --git a/lib/cartopy/tests/mpl/test_mpl_integration.py b/lib/cartopy/tests/mpl/test_mpl_integration.py index 876af785c..ef9ee12ab 100644 --- a/lib/cartopy/tests/mpl/test_mpl_integration.py +++ b/lib/cartopy/tests/mpl/test_mpl_integration.py @@ -1,4 +1,4 @@ -# (C) British Crown Copyright 2011 - 2016, Met Office +# (C) British Crown Copyright 2011 - 2017, Met Office # # This file is part of cartopy. # @@ -308,7 +308,7 @@ def test_pcolormesh_global_with_wrap3(): ax.set_global() # make sure everything is visible -@ImageTesting(['pcolormesh_limited_area_wrap']) +@ImageTesting(['pcolormesh_limited_area_wrap'], tolerance=0.7) def test_pcolormesh_limited_area_wrap(): # make up some realistic data with bounds (such as data from the UM's North # Atlantic Europe model) @@ -335,7 +335,7 @@ def test_pcolormesh_limited_area_wrap(): # draw the same plot, only more zoomed in, and using the 2d versions # of the coordinates (just to test that 1d and 2d are both suitably # being fixed) - ax = plt.subplot(223, projection=ccrs.PlateCarree(180)) + ax = plt.subplot(223, projection=ccrs.PlateCarree()) plt.pcolormesh(x, y, data, transform=rp, cmap='Set1') ax.coastlines() ax.set_extent([-70, 0, 0, 80]) diff --git a/lib/cartopy/tests/test_crs.py b/lib/cartopy/tests/test_crs.py index 71980bc63..2e6e93e94 100644 --- a/lib/cartopy/tests/test_crs.py +++ b/lib/cartopy/tests/test_crs.py @@ -1,4 +1,4 @@ -# (C) British Crown Copyright 2011 - 2016, Met Office +# (C) British Crown Copyright 2011 - 2017, Met Office # # This file is part of cartopy. # @@ -89,10 +89,10 @@ def test_osgb(self): def test_epsg(self): uk = ccrs.epsg(27700) self.assertEqual(uk.epsg_code, 27700) - self.assertEqual(uk.x_limits, (-84667.135022467002, - 676354.14167904831)) - self.assertEqual(uk.y_limits, (-2957.1831134549138, - 1242951.4397385262 + self.assertEqual(uk.x_limits, (-84667.135022467062, + 676354.14167904819)) + self.assertEqual(uk.y_limits, (-2957.1831134535023, + 1242951.4397385279 )) self.assertEqual(uk.threshold, 7610.2127670151531) self._check_osgb(uk)