From db40dc1b1197816d12f9bc7ed0b2a807b74a9b98 Mon Sep 17 00:00:00 2001 From: avollkopf <43980694+avollkopf@users.noreply.github.com> Date: Thu, 10 Oct 2024 19:29:29 +0200 Subject: [PATCH] fix for restore, update requirements --- cbpi/__init__.py | 2 +- cbpi/configFolder.py | 5 ++++- requirements.txt | 4 ++-- setup.py | 4 ++-- 4 files changed, 9 insertions(+), 6 deletions(-) diff --git a/cbpi/__init__.py b/cbpi/__init__.py index 1b6a6aa..893d6d2 100644 --- a/cbpi/__init__.py +++ b/cbpi/__init__.py @@ -1,3 +1,3 @@ -__version__ = "4.4.5" +__version__ = "4.4.6" __codename__ = "Yeast Starter" diff --git a/cbpi/configFolder.py b/cbpi/configFolder.py index 736342b..5386b8d 100644 --- a/cbpi/configFolder.py +++ b/cbpi/configFolder.py @@ -86,7 +86,10 @@ class ConfigFolder: print(f"Changing owner and group of config folder recursively to {owner}:{group}") self.recursive_chown(output_path, owner, group) print("Removing backup file") - os.remove(backupfile) + try: + os.remove(backupfile) + except: + pass Line1="Contents of restored_config.zip file have been restored." Line2="In case of a partial backup you will still be prompted to run 'cbpi setup'." print(Line1) diff --git a/requirements.txt b/requirements.txt index 294425e..a6a1b32 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,5 +1,5 @@ typing-extensions>=4 -aiohttp==3.10.5 +aiohttp==3.10.8 aiohttp-auth==0.1.1 aiohttp-route-decorator==0.1.4 aiohttp-security==0.5.0 @@ -8,7 +8,7 @@ aiohttp-swagger==1.0.16 async-timeout==4.0.3 aiojobs==1.2.1 aiosqlite==0.17.0 -cryptography==42.0.8 +cryptography==43.0.1 pyopenssl==24.1.0 requests==2.32.2 voluptuous==0.14.2 diff --git a/setup.py b/setup.py index 22e6450..b1e3414 100644 --- a/setup.py +++ b/setup.py @@ -39,7 +39,7 @@ setup(name='cbpi4', long_description_content_type='text/markdown', install_requires=[ "typing-extensions>=4", - "aiohttp==3.10.5", + "aiohttp==3.10.8", "aiohttp-auth==0.1.1", "aiohttp-route-decorator==0.1.4", "aiohttp-security==0.5.0", @@ -48,7 +48,7 @@ setup(name='cbpi4', "async-timeout==4.0.3", "aiojobs==1.2.1 ", "aiosqlite==0.17.0", - "cryptography==42.0.8", + "cryptography==43.0.1", "pyopenssl==24.1.0", "requests==2.32.2", "voluptuous==0.14.2",