From e100800f9189ac88a94bfd8e4671a5f11eb4ba49 Mon Sep 17 00:00:00 2001 From: Mark Jessop Date: Sat, 26 Feb 2022 10:58:22 +1030 Subject: [PATCH] Updarte verison, increase horusdemodlib requirement to 0.3.4 --- horusgui/__init__.py | 2 +- horusgui/config.py | 2 +- horusgui/habitat.py | 2 +- pyproject.toml | 2 +- requirements.txt | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/horusgui/__init__.py b/horusgui/__init__.py index 260c070..334b899 100755 --- a/horusgui/__init__.py +++ b/horusgui/__init__.py @@ -1 +1 @@ -__version__ = "0.3.1" +__version__ = "0.3.4" diff --git a/horusgui/config.py b/horusgui/config.py index b4ea8b8..b11fb8c 100644 --- a/horusgui/config.py +++ b/horusgui/config.py @@ -69,7 +69,7 @@ def read_config(widgets): """ Read in configuration settings from Qt """ global qt_settings, default_config - OK_VERSIONS = [__version__, '0.2.1'] + OK_VERSIONS = [__version__, '0.3.1', '0.2.1'] # Try and read in the version parameter from QSettings if qt_settings.value("version") not in OK_VERSIONS: diff --git a/horusgui/habitat.py b/horusgui/habitat.py index 56ceee1..cf13093 100644 --- a/horusgui/habitat.py +++ b/horusgui/habitat.py @@ -113,7 +113,7 @@ class HabitatUploader(object): # Run the request. try: _req = requests.put( - _url, data=json.dumps(_data), timeout=self.upload_timeout + _url, data=json.dumps(_data), timeout=(self.upload_timeout, 6.1) ) except Exception as e: logging.error("Habitat - Upload Failed: %s" % str(e)) diff --git a/pyproject.toml b/pyproject.toml index 68da828..9bfc204 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -12,7 +12,7 @@ PyQt5 = "^5.13.0" pyqtgraph = "^0.11.0" pyaudio = "^0.2.11" "ruamel.yaml" = "^0.16.10" -horusdemodlib = "^0.3.1" +horusdemodlib = "^0.3.4" [tool.poetry.dev-dependencies] diff --git a/requirements.txt b/requirements.txt index 8c827b2..3a61f60 100644 --- a/requirements.txt +++ b/requirements.txt @@ -5,4 +5,4 @@ PyQt5 pyqtgraph ruamel.yaml requests -horusdemodlib>=0.3.1 \ No newline at end of file +horusdemodlib>=0.3.4 \ No newline at end of file