Merge branch 'release-0.5.4'

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.
 

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.

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)

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