Merge branch 'master' into devel

This commit is contained in:
jevans 2013-07-27 20:43:24 -04:00
commit 5c022f6460
4 changed files with 8 additions and 6 deletions

View file

@ -1,3 +1,6 @@
Jul 27, 2013 - v0.2.8 Fixed inconsistency regarding configuration
file directory on windows (issue91).
Jul 25, 2013 - v0.2.7 Warns but no longer errors out when neither library is
found (issue89).

View file

@ -78,7 +78,7 @@ copyright = u'2013, John Evans'
# The short X.Y version.
version = '0.2'
# The full version, including alpha/beta/rc tags.
release = '0.2.7'
release = '0.2.8'
# The language for content autogenerated by Sphinx. Refer to documentation
# for a list of supported languages.

View file

@ -145,9 +145,8 @@ def get_configdir():
if 'HOME' in os.environ and os.name != 'nt':
# HOME is set by WinPython to something unusual, so we don't
# want that.
# necessarily want that.
return os.path.join(os.environ['HOME'], '.config', 'glymur')
if os.name == 'nt':
# Windows.
return os.path.join(os.path.expanduser('~'), 'glymur')
# Last stand. Should handle windows... others?
return os.path.join(os.path.expanduser('~'), 'glymur')

View file

@ -2,7 +2,7 @@ from setuptools import setup, find_packages
import sys
kwargs = {'name': 'Glymur',
'version': '0.2.7',
'version': '0.2.8',
'description': 'Tools for accessing JPEG2000 files',
'long_description': open('README.md').read(),
'author': 'John Evans',