From 9406c9be6479cfc996aaabd0a7218e6750929066 Mon Sep 17 00:00:00 2001 From: Peter Williams Date: Fri, 18 Sep 2020 09:14:01 -0400 Subject: [PATCH 1/3] setup.py: paranoia for robustness based on toasty's setup.py Windows failure --- setup.py | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/setup.py b/setup.py index 5c825b7..51996a6 100644 --- a/setup.py +++ b/setup.py @@ -11,7 +11,7 @@ def get_long_desc(): in_preamble = True lines = [] - with open('README.md') as f: + with open('README.md', 'rt', encoding='utf8') as f: for line in f: if in_preamble: if line.startswith(''): @@ -88,8 +88,5 @@ setup_args = dict( }, ) - -# That was fun. - if __name__ == '__main__': setup(**setup_args) From 46273c4bdbd059e7ec3c7c924d4fc56b9dba64f5 Mon Sep 17 00:00:00 2001 From: Peter Williams Date: Fri, 18 Sep 2020 09:16:58 -0400 Subject: [PATCH 2/3] Release 0.4.1 --- CHANGES.md | 4 ++++ docs/conf.py | 4 ++-- setup.py | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/CHANGES.md b/CHANGES.md index 98a42ec..b6ca838 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -1,3 +1,7 @@ +# 0.4.1 (2020-Sep-18) + +- Fix the test suite on Windows (hopefully). + # 0.4.0 (2020-Sep-15) - Add a bunch of CLI documentation. diff --git a/docs/conf.py b/docs/conf.py index 0e09368..b06c96c 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -4,8 +4,8 @@ project = 'wwt_data_formats' author = 'The AAS WorldWide Telescope Team' copyright = '2019-2020 the .NET Foundation' -release = '0.5.0.dev0' # the full version string; also update ../setup.py -version = '0.5.0.dev0' # the "short" version +release = '0.4.1' # the full version string; also update ../setup.py +version = '0.4.1' # the "short" version extensions = [ 'sphinx.ext.autodoc', diff --git a/setup.py b/setup.py index 51996a6..8508492 100644 --- a/setup.py +++ b/setup.py @@ -34,7 +34,7 @@ project homepage]. setup_args = dict( name = 'wwt_data_formats', - version = '0.5.0.dev0', # also update docs/conf.py + version = '0.4.1', # also update docs/conf.py description = 'Low-level interface to AAS WorldWide Telescope data formats', long_description = get_long_desc(), long_description_content_type = 'text/markdown', From db810a2f8e11d88fa9e2e22fdd8ab97a8940f799 Mon Sep 17 00:00:00 2001 From: Peter Williams Date: Fri, 18 Sep 2020 09:19:10 -0400 Subject: [PATCH 3/3] Back to development --- docs/conf.py | 4 ++-- setup.py | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/docs/conf.py b/docs/conf.py index b06c96c..0e09368 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -4,8 +4,8 @@ project = 'wwt_data_formats' author = 'The AAS WorldWide Telescope Team' copyright = '2019-2020 the .NET Foundation' -release = '0.4.1' # the full version string; also update ../setup.py -version = '0.4.1' # the "short" version +release = '0.5.0.dev0' # the full version string; also update ../setup.py +version = '0.5.0.dev0' # the "short" version extensions = [ 'sphinx.ext.autodoc', diff --git a/setup.py b/setup.py index 8508492..51996a6 100644 --- a/setup.py +++ b/setup.py @@ -34,7 +34,7 @@ project homepage]. setup_args = dict( name = 'wwt_data_formats', - version = '0.4.1', # also update docs/conf.py + version = '0.5.0.dev0', # also update docs/conf.py description = 'Low-level interface to AAS WorldWide Telescope data formats', long_description = get_long_desc(), long_description_content_type = 'text/markdown',