From 84aa87a285e737a851f83ce3d2f03316f21b561c Mon Sep 17 00:00:00 2001 From: Florian Obersteiner Date: Mon, 7 Mar 2022 09:04:08 +0100 Subject: [PATCH 1/5] get __version__ from package metadata --- _version.py | 5 +++++ src/icartt/__init__.py | 19 +++++++++++++++++-- 2 files changed, 22 insertions(+), 2 deletions(-) create mode 100644 _version.py diff --git a/_version.py b/_version.py new file mode 100644 index 0000000..c5f2449 --- /dev/null +++ b/_version.py @@ -0,0 +1,5 @@ +# coding: utf-8 +# file generated by setuptools_scm +# don't change, don't track in version control +version = '0.0.2.dev0+gb93bf20.d20220303' +version_tuple = (0, 0, 2, 'dev0', 'gb93bf20.d20220303') diff --git a/src/icartt/__init__.py b/src/icartt/__init__.py index 9edd259..d94e8e2 100644 --- a/src/icartt/__init__.py +++ b/src/icartt/__init__.py @@ -1,5 +1,20 @@ from .dataset import Dataset, StandardNormalComments, Variable, Formats, VariableType -# TODO: add __version__ ? -# TODO: add __all__ = ("names of exported classes etc.",) ? \ No newline at end of file +def get_version(): + try: + # Python >= 3.8 + from importlib import metadata + + return metadata.version("icartt") + except ImportError: + # Python <= 3.7 + import pkg_resources + + return pkg_resources.get_distribution("icartt").version + + +__version__ = get_version() + + +# TODO: add __all__ = ("names of exported classes etc.",) ? -- GitLab From 1b6145af02a179ccb4c0163c4585d757284b86de Mon Sep 17 00:00:00 2001 From: Florian Obersteiner Date: Mon, 7 Mar 2022 09:07:59 +0100 Subject: [PATCH 2/5] Revert "get __version__ from package metadata" Dies reverted den Commit 84aa87a285e737a851f83ce3d2f03316f21b561c. --- _version.py | 5 ----- src/icartt/__init__.py | 19 ++----------------- 2 files changed, 2 insertions(+), 22 deletions(-) delete mode 100644 _version.py diff --git a/_version.py b/_version.py deleted file mode 100644 index c5f2449..0000000 --- a/_version.py +++ /dev/null @@ -1,5 +0,0 @@ -# coding: utf-8 -# file generated by setuptools_scm -# don't change, don't track in version control -version = '0.0.2.dev0+gb93bf20.d20220303' -version_tuple = (0, 0, 2, 'dev0', 'gb93bf20.d20220303') diff --git a/src/icartt/__init__.py b/src/icartt/__init__.py index d94e8e2..9edd259 100644 --- a/src/icartt/__init__.py +++ b/src/icartt/__init__.py @@ -1,20 +1,5 @@ from .dataset import Dataset, StandardNormalComments, Variable, Formats, VariableType +# TODO: add __version__ ? -def get_version(): - try: - # Python >= 3.8 - from importlib import metadata - - return metadata.version("icartt") - except ImportError: - # Python <= 3.7 - import pkg_resources - - return pkg_resources.get_distribution("icartt").version - - -__version__ = get_version() - - -# TODO: add __all__ = ("names of exported classes etc.",) ? +# TODO: add __all__ = ("names of exported classes etc.",) ? \ No newline at end of file -- GitLab From b310aded94fa0b6ab353c52f40a8b7d30be9aef7 Mon Sep 17 00:00:00 2001 From: Florian Obersteiner Date: Mon, 7 Mar 2022 09:10:48 +0100 Subject: [PATCH 3/5] __version__ from metadata --- src/icartt/__init__.py | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-) diff --git a/src/icartt/__init__.py b/src/icartt/__init__.py index 9edd259..d94e8e2 100644 --- a/src/icartt/__init__.py +++ b/src/icartt/__init__.py @@ -1,5 +1,20 @@ from .dataset import Dataset, StandardNormalComments, Variable, Formats, VariableType -# TODO: add __version__ ? -# TODO: add __all__ = ("names of exported classes etc.",) ? \ No newline at end of file +def get_version(): + try: + # Python >= 3.8 + from importlib import metadata + + return metadata.version("icartt") + except ImportError: + # Python <= 3.7 + import pkg_resources + + return pkg_resources.get_distribution("icartt").version + + +__version__ = get_version() + + +# TODO: add __all__ = ("names of exported classes etc.",) ? -- GitLab From 0f96aa79a3f91abc8182c39b6a08840411987809 Mon Sep 17 00:00:00 2001 From: Florian Obersteiner Date: Thu, 10 Mar 2022 16:30:15 +0100 Subject: [PATCH 4/5] bugfix: counting multiline keyword entries in NCOM --- src/icartt/dataset.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/icartt/dataset.py b/src/icartt/dataset.py index ffd0a32..afac9fd 100644 --- a/src/icartt/dataset.py +++ b/src/icartt/dataset.py @@ -216,7 +216,7 @@ class StandardNormalComments(collections.UserList): def nlines(self): n = 1 # shortnames line, and keywords might be multiline... n += len(self.freeform) - n += sum(len(k.data) or 1 for k in self.keywords.values()) + n += sum(len(k.data[0].split("\n")) or 1 for k in self.keywords.values()) # was: len(self.freeform) + 1 + sum([len(k.data) for k in self.keywords.values()]) return n -- GitLab From cb1c771c1fda26c997c4f27ee757bdc8c06cf19e Mon Sep 17 00:00:00 2001 From: Florian Obersteiner Date: Thu, 10 Mar 2022 16:41:03 +0100 Subject: [PATCH 5/5] bugfix of the bugfix - should really write tests first --- src/icartt/dataset.py | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/src/icartt/dataset.py b/src/icartt/dataset.py index afac9fd..7167b0c 100644 --- a/src/icartt/dataset.py +++ b/src/icartt/dataset.py @@ -214,10 +214,14 @@ class KeywordComment: class StandardNormalComments(collections.UserList): @property def nlines(self): - n = 1 # shortnames line, and keywords might be multiline... - n += len(self.freeform) - n += sum(len(k.data[0].split("\n")) or 1 for k in self.keywords.values()) - # was: len(self.freeform) + 1 + sum([len(k.data) for k in self.keywords.values()]) + """calculates the number of lines in the normal comments section""" + n = 1 # shortnames line + n += len(self.freeform) # freeform comment + for k in self.keywords.values(): + try: + n += len(k.data[0].split("\n")) # and keywords might be multiline... + except IndexError: # ok we have no list, + n += 1 # just add 1 return n @property -- GitLab