Merge branch 'master' into devel

CHANGES.txt

@@ -1,4 +1,4 @@
-Sep 12, 2013 - v0.4.2r  Added write support for 1.5.x.
+Sep 16, 2013 - v0.5.0  Added write support for 1.5.x.  Added version module.
 
 Aug 21, 2013 - v0.4.1  Fixed segfault with openjpeg 1.x when rlevel=-1
 

docs/source/conf.py

@@ -76,9 +76,9 @@ copyright = u'2013, John Evans'
 # built documents.
 #
 # The short X.Y version.
-version = '0.4'
+version = '0.5'
 # The full version, including alpha/beta/rc tags.
-release = '0.4.1'
+release = '0.5.0'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.

docs/source/introduction.rst

@@ -20,7 +20,7 @@ OpenJPEG Installation
 =====================
 Glymur will read JPEG 2000 images with versions 1.3, 1.4, 1.5, 2.0,
 and the trunk/development version of OpenJPEG.  Writing images is
-only supported with the 2.0 series, however, and the trunk/development
+only supported with the 1.5 or better, however, and the trunk/development
 version is strongly recommended.  For more information about OpenJPEG,
 please consult http://www.openjpeg.org.
 
@@ -55,6 +55,5 @@ You can run the tests from within python as follows::
     >>> import glymur
     >>> glymur.runtests()
 
-Many tests are currently skipped; in fact most of them are skipped if you 
-are relying on OpenJPEG 1.X.  The important thing, though, is whether or
+Many tests are currently skipped, but the The important thing is whether or
 not any tests fail.

docs/source/roadmap.rst

@@ -1,9 +1,3 @@
-------------
-Known Issues
-------------
-
-    * WinPython 3.3.2 and OpenJPEG 2.0 don't seem to want to play well together.  If you do not need write support, just use OpenJPEG 1.5 instead.  If you do need write support, try the development version of OpenJPEG.
-
 -------
 Roadmap
 -------

glymur/version.py

@@ -8,13 +8,13 @@
 
 import sys
 import numpy as np
-from distutils.version import StrictVersion
+from distutils.version import LooseVersion
 
 from .lib import openjpeg as opj
 from .lib import openjp2 as opj2
 
-version = "0.4.1"
-_sv = StrictVersion(version)
+version = "0.5.0"
+_sv = LooseVersion(version)
 version_tuple = _sv.version
 
 
@@ -25,7 +25,7 @@ elif opj2.OPENJP2 is None:
 else:
     openjpeg_version = opj2.version()
 
-_sv = StrictVersion(openjpeg_version)
+_sv = LooseVersion(openjpeg_version)
 openjpeg_version_tuple = _sv.version
 
 __doc__ = """\

setup.py

@@ -2,7 +2,6 @@ from setuptools import setup, find_packages
 import sys
 
 kwargs = {'name': 'Glymur',
-          'version': '0.4.1',
           'description': 'Tools for accessing JPEG2000 files',
           'long_description': open('README.md').read(),
           'author': 'John Evans',
@@ -38,4 +37,8 @@ clssfrs = ["Programming Language :: Python",
            "Intended Audience :: Information Technology",
            "Topic :: Software Development :: Libraries :: Python Modules"]
 kwargs['classifiers'] = clssfrs
+
+import glymur
+kwargs['version'] = glymur.version.version
+
 setup(**kwargs)