From 64faebd06ca089fffd1c0b4787d909141d4b0c1f Mon Sep 17 00:00:00 2001 From: jevans Date: Sun, 21 Jul 2013 11:25:46 -0400 Subject: [PATCH 1/6] Prepping for 0.2.4 bug fix release. --- CHANGES.txt | 4 ++++ docs/source/conf.py | 2 +- setup.py | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/CHANGES.txt b/CHANGES.txt index b1ab624..f80b04b 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -1,3 +1,7 @@ +Jul 21, 2013 - v0.2.4 Fixed markdown bug for Fedora 17 information, fixed + out-of-date windows information (issue79). Fixed incorrect + interpretation of Psot parameter (issue78). + Jul 18, 2013 - v0.2.3 Support for Python 2.6, OpenJPEG 1.4. Incompatible change to ChannelDefinitionBox constructor. Added RGBA example. diff --git a/docs/source/conf.py b/docs/source/conf.py index 96eeba9..bd59b1b 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.1' # The full version, including alpha/beta/rc tags. -release = '0.2.3' +release = '0.2.4' # The language for content autogenerated by Sphinx. Refer to documentation # for a list of supported languages. diff --git a/setup.py b/setup.py index 1f17ddc..ba8d257 100644 --- a/setup.py +++ b/setup.py @@ -2,7 +2,7 @@ from setuptools import setup, find_packages import sys kwargs = {'name': 'Glymur', - 'version': '0.2.3', + 'version': '0.2.4rc1', 'description': 'Tools for accessing JPEG2000 files', 'long_description': open('README.md').read(), 'author': 'John Evans', From 371bb90fa22f36e204d28051dcf08d51056a60b2 Mon Sep 17 00:00:00 2001 From: John Evans Date: Sun, 21 Jul 2013 11:50:07 -0400 Subject: [PATCH 2/6] Qualified on centos 6.4. --- glymur/test/test_opj_suite.py | 4 ++++ release.txt | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/glymur/test/test_opj_suite.py b/glymur/test/test_opj_suite.py index 19b0d5a..6e027fa 100644 --- a/glymur/test/test_opj_suite.py +++ b/glymur/test/test_opj_suite.py @@ -7813,6 +7813,8 @@ class TestSuite15(unittest.TestCase): data = jp2.read() self.assertTrue(True) + @unittest.skipIf(glymur.lib.openjpeg.version().startswith('1.3'), + "Segfaults openjpeg 1.3.") def test_NR_DEC_broken2_jp2_5_decode(self): # Null pointer access jfile = os.path.join(data_root, 'input/nonregression/broken2.jp2') @@ -7834,6 +7836,8 @@ class TestSuite15(unittest.TestCase): with self.assertRaises(ValueError) as ce: d = j.read() + @unittest.skipIf(glymur.lib.openjpeg.version().startswith('1.3'), + "Segfaults openjpeg 1.3.") def test_NR_DEC_broken4_jp2_7_decode(self): # Null pointer access jfile = os.path.join(data_root, 'input/nonregression/broken4.jp2') diff --git a/release.txt b/release.txt index 532c3dc..9107589 100644 --- a/release.txt +++ b/release.txt @@ -26,7 +26,7 @@ | Fedora 17 | | X | | Ships with 1.4.0. 169 of 449 tests | | | | | | should pass. | +-----------+--------+--------+--------+--------------------------------------+ -| CentOS | X | | | Ships with 1.3.0. 167 of 449 tests | +| CentOS | X | | | Ships with 1.3.0. 164 of 450 tests | | 6.3 | | | | should pass. | +-----------+--------+--------+--------+--------------------------------------+ | Raspberry | | X | | Ships with 1.3.0. 169 of 449 tests | From 162fa8f9c4342e8ec4dea321443b9f81837826e1 Mon Sep 17 00:00:00 2001 From: John Evans Date: Sun, 21 Jul 2013 12:01:29 -0400 Subject: [PATCH 3/6] Qualified on FC17. --- glymur/test/test_opj_suite.py | 8 ++++---- release.txt | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/glymur/test/test_opj_suite.py b/glymur/test/test_opj_suite.py index 6e027fa..cedd9cf 100644 --- a/glymur/test/test_opj_suite.py +++ b/glymur/test/test_opj_suite.py @@ -7813,8 +7813,8 @@ class TestSuite15(unittest.TestCase): data = jp2.read() self.assertTrue(True) - @unittest.skipIf(glymur.lib.openjpeg.version().startswith('1.3'), - "Segfaults openjpeg 1.3.") + @unittest.skipIf(int(glymur.lib.openjpeg.version().split('.')[1]) < 5, + "Segfaults openjpeg 1.4 and earlier.") def test_NR_DEC_broken2_jp2_5_decode(self): # Null pointer access jfile = os.path.join(data_root, 'input/nonregression/broken2.jp2') @@ -7836,8 +7836,8 @@ class TestSuite15(unittest.TestCase): with self.assertRaises(ValueError) as ce: d = j.read() - @unittest.skipIf(glymur.lib.openjpeg.version().startswith('1.3'), - "Segfaults openjpeg 1.3.") + @unittest.skipIf(int(glymur.lib.openjpeg.version().split('.')[1]) < 5, + "Segfaults openjpeg 1.4 and earlier.") def test_NR_DEC_broken4_jp2_7_decode(self): # Null pointer access jfile = os.path.join(data_root, 'input/nonregression/broken4.jp2') diff --git a/release.txt b/release.txt index 9107589..0ecc20b 100644 --- a/release.txt +++ b/release.txt @@ -23,7 +23,7 @@ | Fedora 18 | | | X | Ships with 1.5.1. 169 of 449 tests | | | | | | should pass. | +-----------+--------+--------+--------+--------------------------------------+ -| Fedora 17 | | X | | Ships with 1.4.0. 169 of 449 tests | +| Fedora 17 | | X | | Ships with 1.4.0. 166 of 450 tests | | | | | | should pass. | +-----------+--------+--------+--------+--------------------------------------+ | CentOS | X | | | Ships with 1.3.0. 164 of 450 tests | From de59be99b520af3b683262dd20182ada6c46966f Mon Sep 17 00:00:00 2001 From: John Evans Date: Sun, 21 Jul 2013 12:13:28 -0400 Subject: [PATCH 4/6] Qualified on raspberry pi. --- release.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/release.txt b/release.txt index 0ecc20b..c504976 100644 --- a/release.txt +++ b/release.txt @@ -29,7 +29,7 @@ | CentOS | X | | | Ships with 1.3.0. 164 of 450 tests | | 6.3 | | | | should pass. | +-----------+--------+--------+--------+--------------------------------------+ -| Raspberry | | X | | Ships with 1.3.0. 169 of 449 tests | +| Raspberry | | X | | Ships with 1.3.0. 166 of 450 tests | | Pi | | | | should pass. | | Debian 7 | | | | | +-----------+--------+--------+--------+--------------------------------------+ From b6cb36cb5b72a8d5047277c4f824324defbf4c60 Mon Sep 17 00:00:00 2001 From: jevans Date: Sun, 21 Jul 2013 12:24:51 -0400 Subject: [PATCH 5/6] Qualified on mac, 2.6, 2.7, 3.3 --- release.txt | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/release.txt b/release.txt index c504976..f41ecb4 100644 --- a/release.txt +++ b/release.txt @@ -6,19 +6,19 @@ | | | | | pass. | +-----------+--------+--------+--------+--------------------------------------+ | Mac | X | | | MacPorts with both OpenJPEG 1.5.1 | -| 10.6.8 | | | | and OpenJPEG svn. 353 of 449 tests | +| 10.6.8 | | | | and OpenJPEG svn. 352 of 450 tests | | | | | | should pass. | +-----------+--------+--------+--------+--------------------------------------+ | Mac | | X | | MacPorts with both OpenJPEG 1.5.1 | -| 10.6.8 | | | | and OpenJPEG svn. 376 of 454 tests | +| 10.6.8 | | | | and OpenJPEG svn. 377 of 455 tests | | | | | | should pass. | +-----------+--------+--------+--------+--------------------------------------+ | Mac | | | X | MacPorts with both OpenJPEG 1.5.1 | -| 10.6.8 | | | | and OpenJPEG svn. 401 of 454 | +| 10.6.8 | | | | and OpenJPEG svn. 402 of 455 | | | | | | tests should pass. | +-----------+--------+--------+-----------------------------------------------+ | Fedora 19 | | | X | Ships with 1.5.1, openjp2 built too. | -| | | | | 401 of 454 tests should pass. | +| | | | | 402 of 455 tests should pass. | +-----------+--------+--------+--------+--------------------------------------+ | Fedora 18 | | | X | Ships with 1.5.1. 169 of 449 tests | | | | | | should pass. | From 64cdbc3ad3ceb3ece3a7854fcabeff652edcbe4f Mon Sep 17 00:00:00 2001 From: jevans Date: Sun, 21 Jul 2013 12:31:14 -0400 Subject: [PATCH 6/6] Bumping setup.py to 0.2.4 official. --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index ba8d257..95e778b 100644 --- a/setup.py +++ b/setup.py @@ -2,7 +2,7 @@ from setuptools import setup, find_packages import sys kwargs = {'name': 'Glymur', - 'version': '0.2.4rc1', + 'version': '0.2.4', 'description': 'Tools for accessing JPEG2000 files', 'long_description': open('README.md').read(), 'author': 'John Evans',