jyapayne/glymur
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'master' into devel

Browse source
This commit is contained in:
jevans 2013-09-16 19:48:11 -04:00
commit d51f9cb031
6 changed files with 13 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

2
CHANGES.txt
View file

@ -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 Aug 21, 2013 - v0.4.1 Fixed segfault with openjpeg 1.x when rlevel=-1

4
docs/source/conf.py
View file

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

5
docs/source/introduction.rst
View file

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

6
docs/source/roadmap.rst
View file

@ -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 Roadmap
------- -------

8
glymur/version.py
View file

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

5
setup.py
View file

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