From b1edfbe29621cf9cfd9ac0e92f1e6fe4d9390c27 Mon Sep 17 00:00:00 2001 From: John Evans Date: Wed, 25 Sep 2013 10:34:16 -0400 Subject: [PATCH 1/2] When working with 3.3, really should catch both IOError and OSError. On 2.7, the mac seems to issue an IOError, other platforms an OSError. Just catch both. #123 --- glymur/test/test_jp2k.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/glymur/test/test_jp2k.py b/glymur/test/test_jp2k.py index 2519246..ec174bf 100644 --- a/glymur/test/test_jp2k.py +++ b/glymur/test/test_jp2k.py @@ -146,7 +146,7 @@ class TestJp2k_2_0(unittest.TestCase): def test_extra_components_on_v2(self): """must error out in 1.x with extra components.""" # Extra components seems to require 2.0+. Verify that we error out. - with self.assertRaises(OSError): + with self.assertRaises((IOError, OSError)): with tempfile.NamedTemporaryFile(suffix='.jp2') as tfile: j = Jp2k(tfile.name, 'wb') data = np.zeros((128, 128, 4), dtype=np.uint8) From b50f19bed32c467d64a2701c6d941d8df2452c4c Mon Sep 17 00:00:00 2001 From: jevans Date: Wed, 25 Sep 2013 20:55:40 -0400 Subject: [PATCH 2/2] Prepping 0.5.4 release. --- CHANGES.txt | 2 ++ docs/source/conf.py | 2 +- glymur/version.py | 2 +- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/CHANGES.txt b/CHANGES.txt index 838f4a3..d0e2bce 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -1,3 +1,5 @@ +Sep 24, 2013 - v0.5.4 Fixed test error restricted to v2.0. + Sep 24, 2013 - v0.5.3 Removed a duplicated channel definition test in test_jp2box that could cause a segfault in 1.3 if not properly skipped. diff --git a/docs/source/conf.py b/docs/source/conf.py index 78eb705..e01cc91 100644 --- a/docs/source/conf.py +++ b/docs/source/conf.py @@ -78,7 +78,7 @@ copyright = u'2013, John Evans' # The short X.Y version. version = '0.5' # The full version, including alpha/beta/rc tags. -release = '0.5.3' +release = '0.5.4' # The language for content autogenerated by Sphinx. Refer to documentation # for a list of supported languages. diff --git a/glymur/version.py b/glymur/version.py index 5a2fe1e..5e4122b 100644 --- a/glymur/version.py +++ b/glymur/version.py @@ -13,7 +13,7 @@ from distutils.version import LooseVersion from .lib import openjpeg as opj from .lib import openjp2 as opj2 -version = "0.5.3" +version = "0.5.4" _sv = LooseVersion(version) version_tuple = _sv.version