This is an automated email from the git hooks/post-receive script.
a_valentino-guest pushed a commit to branch master
in repository pyresample.
commit 3e17b35cbe8d93bcbfc3fb10bd185598aee96601
Author: Antonio Valentino <antonio.valent...@tiscali.it>
Date: Sat Jun 21 08:46:30 2014 +0000
Drop force_add_backend.patch (fixed upstream)
---
debian/patches/force_add_backend.patch | 105 ---------------------------------
debian/patches/series | 1 -
2 files changed, 106 deletions(-)
diff --git a/debian/patches/force_add_backend.patch
b/debian/patches/force_add_backend.patch
deleted file mode 100644
index 9b8c3cb..0000000
--- a/debian/patches/force_add_backend.patch
+++ /dev/null
@@ -1,105 +0,0 @@
-Force matplotlib AGG backend
-
-Forcing the AGG backend avoids errors at built time due to missing DISPLAY
-environment variable
-
---- a/test/test_plot.py
-+++ b/test/test_plot.py
-@@ -2,16 +2,19 @@
- import os
-
- import numpy as np
--
-+
-+import matplotlib
-+matplotlib.use('agg', warn=False)
-+
- import pyresample as pr
-
- def tmp(f):
- f.tmp = True
-- return f
-+ return f
-
- class Test(unittest.TestCase):
--
-- filename = os.path.abspath(os.path.join(os.path.dirname(__file__),
-+
-+ filename = os.path.abspath(os.path.join(os.path.dirname(__file__),
- 'test_files', 'ssmis_swath.npz'))
- data = np.load(filename)['data']
- lons = data[:, 0].astype(np.float64)
-@@ -21,51 +24,51 @@
-
- def test_ellps2axis(self):
- a, b = pr.plot.ellps2axis('WGS84')
-- self.assertAlmostEqual(a, 6378137.0,
-+ self.assertAlmostEqual(a, 6378137.0,
- msg='Failed to get semi-major axis of
ellipsis')
-- self.assertAlmostEqual(b, 6356752.3142451793,
-+ self.assertAlmostEqual(b, 6356752.3142451793,
- msg='Failed to get semi-minor axis of
ellipsis')
--
-- @tmp
-+
-+ @tmp
- def test_area_def2basemap(self):
-- area_def =
pr.utils.parse_area_file(os.path.join(os.path.dirname(__file__),
-+ area_def =
pr.utils.parse_area_file(os.path.join(os.path.dirname(__file__),
- 'test_files', 'areas.cfg'),
'ease_sh')[0]
- bmap = pr.plot.area_def2basemap(area_def)
-- self.assertTrue(bmap.rmajor == bmap.rminor and
-- bmap.rmajor == 6371228.0,
-+ self.assertTrue(bmap.rmajor == bmap.rminor and
-+ bmap.rmajor == 6371228.0,
- 'Failed to create Basemap object')
-
--
-+
- def test_plate_carreeplot(self):
- import matplotlib
- matplotlib.use('Agg')
-- area_def =
pr.utils.parse_area_file(os.path.join(os.path.dirname(__file__),
-+ area_def =
pr.utils.parse_area_file(os.path.join(os.path.dirname(__file__),
- 'test_files', 'areas.cfg'),
'pc_world')[0]
- swath_def = pr.geometry.SwathDefinition(self.lons, self.lats)
-- result = pr.kd_tree.resample_nearest(swath_def, self.tb37v, area_def,
-- radius_of_influence=20000,
-- fill_value=None)
-- plt = pr.plot._get_quicklook(area_def, result, num_meridians=0,
-+ result = pr.kd_tree.resample_nearest(swath_def, self.tb37v, area_def,
-+ radius_of_influence=20000,
-+ fill_value=None)
-+ plt = pr.plot._get_quicklook(area_def, result, num_meridians=0,
- num_parallels=0)
--
-+
- def test_easeplot(self):
- import matplotlib
- matplotlib.use('Agg')
-- area_def =
pr.utils.parse_area_file(os.path.join(os.path.dirname(__file__),
-+ area_def =
pr.utils.parse_area_file(os.path.join(os.path.dirname(__file__),
- 'test_files', 'areas.cfg'),
'ease_sh')[0]
- swath_def = pr.geometry.SwathDefinition(self.lons, self.lats)
-- result = pr.kd_tree.resample_nearest(swath_def, self.tb37v, area_def,
-- radius_of_influence=20000,
-- fill_value=None)
-+ result = pr.kd_tree.resample_nearest(swath_def, self.tb37v, area_def,
-+ radius_of_influence=20000,
-+ fill_value=None)
- plt = pr.plot._get_quicklook(area_def, result)
-
- def test_orthoplot(self):
- import matplotlib
- matplotlib.use('Agg')
-- area_def =
pr.utils.parse_area_file(os.path.join(os.path.dirname(__file__),
-+ area_def =
pr.utils.parse_area_file(os.path.join(os.path.dirname(__file__),
- 'test_files', 'areas.cfg'),
'ortho')[0]
- swath_def = pr.geometry.SwathDefinition(self.lons, self.lats)
-- result = pr.kd_tree.resample_nearest(swath_def, self.tb37v, area_def,
-- radius_of_influence=20000,
-- fill_value=None)
-+ result = pr.kd_tree.resample_nearest(swath_def, self.tb37v, area_def,
-+ radius_of_influence=20000,
-+ fill_value=None)
- plt = pr.plot._get_quicklook(area_def, result)
diff --git a/debian/patches/series b/debian/patches/series
index a415973..4f35079 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1 @@
fix_egginfo_source.patch
-force_add_backend.patch
--
Alioth's /usr/local/bin/git-commit-notice on
/srv/git.debian.org/git/pkg-grass/pyresample.git
_______________________________________________
Pkg-grass-devel mailing list
Pkg-grass-devel@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
