From c1c6080b18a6e203233be6241669ac287df8933a Mon Sep 17 00:00:00 2001 From: John Evans Date: Sat, 27 Jul 2013 19:31:24 -0400 Subject: [PATCH 1/3] Windows if-statement is now a catch-all for config file location. Closes #91, again. --- glymur/lib/config.py | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/glymur/lib/config.py b/glymur/lib/config.py index 21c1205..764934e 100644 --- a/glymur/lib/config.py +++ b/glymur/lib/config.py @@ -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') From c3afd41bc8c12f9a5dbf38970f81e1e89dbb79ca Mon Sep 17 00:00:00 2001 From: John Evans Date: Sat, 27 Jul 2013 19:47:26 -0400 Subject: [PATCH 2/3] Prepping for 0.2.8 release. --- CHANGES.txt | 3 +++ docs/source/conf.py | 2 +- setup.py | 2 +- 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/CHANGES.txt b/CHANGES.txt index 8461f8e..b6441a8 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -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). diff --git a/docs/source/conf.py b/docs/source/conf.py index b501034..0225ce8 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.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. diff --git a/setup.py b/setup.py index 52df311..8bb2c6b 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.7', + 'version': '0.2.8rc1', 'description': 'Tools for accessing JPEG2000 files', 'long_description': open('README.md').read(), 'author': 'John Evans', From cd9492ad708e1b8c5f80271c704ae816b6143ef4 Mon Sep 17 00:00:00 2001 From: jevans Date: Sat, 27 Jul 2013 20:28:45 -0400 Subject: [PATCH 3/3] Finalizing 0.2.8 release. --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index 8bb2c6b..b611908 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.8rc1', + 'version': '0.2.8', 'description': 'Tools for accessing JPEG2000 files', 'long_description': open('README.md').read(), 'author': 'John Evans',