From c3f3ef399e85e742c3a0a7f6a75e313c974ab361 Mon Sep 17 00:00:00 2001 From: dominikwelke Date: Mon, 12 May 2025 18:17:24 +0100 Subject: [PATCH 1/5] add version string --- curryreader.py | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/curryreader.py b/curryreader.py index 4752345..7a0935d 100644 --- a/curryreader.py +++ b/curryreader.py @@ -6,6 +6,14 @@ from tkinter import filedialog import matplotlib.pyplot as plt +try: + from importlib.metadata import version + + __version__ = version("curryreader") +except Exception: + __version__ = "0.0.0" + + def read(inputfilename='', plotdata = 1, verbosity = 2): """Curry Reader Help From 08fe6d4244a1153728cd324d78cd9242b1da88d7 Mon Sep 17 00:00:00 2001 From: dominikwelke Date: Mon, 12 May 2025 19:20:54 +0100 Subject: [PATCH 2/5] nest tkinter import --- curryreader.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/curryreader.py b/curryreader.py index 7a0935d..cc2363a 100644 --- a/curryreader.py +++ b/curryreader.py @@ -2,8 +2,6 @@ import sys import logging as log import numpy as np -import tkinter as tk -from tkinter import filedialog import matplotlib.pyplot as plt try: @@ -50,6 +48,9 @@ def read(inputfilename='', plotdata = 1, verbosity = 2): if inputfilename == '': try: + import tkinter as tk + from tkinter import filedialog + # create root window for filedialog root = tk.Tk() root.withdraw() From a5bcf41b2f20fec8314090d1312358e0967f6ceb Mon Sep 17 00:00:00 2001 From: dominikwelke Date: Mon, 12 May 2025 19:36:25 +0100 Subject: [PATCH 3/5] more verbose nesting --- curryreader.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/curryreader.py b/curryreader.py index cc2363a..35d8e96 100644 --- a/curryreader.py +++ b/curryreader.py @@ -74,6 +74,8 @@ def read(inputfilename='', plotdata = 1, verbosity = 2): # handle cancel if not filepath: raise Exception + except ImportError as e: + raise ImportError(e) except: raise Exception("Unable to open file") else: From 7d2e3355aa18c5cefb26ed4e4fdab60a47eec2a2 Mon Sep 17 00:00:00 2001 From: Dominik Welke Date: Mon, 12 May 2025 20:44:03 +0200 Subject: [PATCH 4/5] accept revision Co-authored-by: Eric Larson --- curryreader.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/curryreader.py b/curryreader.py index 35d8e96..ee5ae7b 100644 --- a/curryreader.py +++ b/curryreader.py @@ -75,7 +75,7 @@ def read(inputfilename='', plotdata = 1, verbosity = 2): if not filepath: raise Exception except ImportError as e: - raise ImportError(e) + raise except: raise Exception("Unable to open file") else: From 98f1c7d845357dc0d075185974be58a4ed08a211 Mon Sep 17 00:00:00 2001 From: Dominik Welke Date: Mon, 12 May 2025 21:28:26 +0200 Subject: [PATCH 5/5] accept revision Co-authored-by: Eric Larson --- curryreader.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/curryreader.py b/curryreader.py index ee5ae7b..3e26493 100644 --- a/curryreader.py +++ b/curryreader.py @@ -74,7 +74,7 @@ def read(inputfilename='', plotdata = 1, verbosity = 2): # handle cancel if not filepath: raise Exception - except ImportError as e: + except ImportError: raise except: raise Exception("Unable to open file")