Merge pull request #147 from PiBrewing/development

fix for restore, update requirements
This commit is contained in:
Alexander Vollkopf 2024-10-10 19:30:30 +02:00 committed by GitHub
commit 20c5f25fe4
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
4 changed files with 9 additions and 6 deletions

View file

@ -1,3 +1,3 @@
__version__ = "4.4.5" __version__ = "4.4.6"
__codename__ = "Yeast Starter" __codename__ = "Yeast Starter"

View file

@ -86,7 +86,10 @@ class ConfigFolder:
print(f"Changing owner and group of config folder recursively to {owner}:{group}") print(f"Changing owner and group of config folder recursively to {owner}:{group}")
self.recursive_chown(output_path, owner, group) self.recursive_chown(output_path, owner, group)
print("Removing backup file") print("Removing backup file")
try:
os.remove(backupfile) os.remove(backupfile)
except:
pass
Line1="Contents of restored_config.zip file have been restored." 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'." Line2="In case of a partial backup you will still be prompted to run 'cbpi setup'."
print(Line1) print(Line1)

View file

@ -1,5 +1,5 @@
typing-extensions>=4 typing-extensions>=4
aiohttp==3.10.5 aiohttp==3.10.8
aiohttp-auth==0.1.1 aiohttp-auth==0.1.1
aiohttp-route-decorator==0.1.4 aiohttp-route-decorator==0.1.4
aiohttp-security==0.5.0 aiohttp-security==0.5.0
@ -8,7 +8,7 @@ aiohttp-swagger==1.0.16
async-timeout==4.0.3 async-timeout==4.0.3
aiojobs==1.2.1 aiojobs==1.2.1
aiosqlite==0.17.0 aiosqlite==0.17.0
cryptography==42.0.8 cryptography==43.0.1
pyopenssl==24.1.0 pyopenssl==24.1.0
requests==2.32.2 requests==2.32.2
voluptuous==0.14.2 voluptuous==0.14.2

View file

@ -39,7 +39,7 @@ setup(name='cbpi4',
long_description_content_type='text/markdown', long_description_content_type='text/markdown',
install_requires=[ install_requires=[
"typing-extensions>=4", "typing-extensions>=4",
"aiohttp==3.10.5", "aiohttp==3.10.8",
"aiohttp-auth==0.1.1", "aiohttp-auth==0.1.1",
"aiohttp-route-decorator==0.1.4", "aiohttp-route-decorator==0.1.4",
"aiohttp-security==0.5.0", "aiohttp-security==0.5.0",
@ -48,7 +48,7 @@ setup(name='cbpi4',
"async-timeout==4.0.3", "async-timeout==4.0.3",
"aiojobs==1.2.1 ", "aiojobs==1.2.1 ",
"aiosqlite==0.17.0", "aiosqlite==0.17.0",
"cryptography==42.0.8", "cryptography==43.0.1",
"pyopenssl==24.1.0", "pyopenssl==24.1.0",
"requests==2.32.2", "requests==2.32.2",
"voluptuous==0.14.2", "voluptuous==0.14.2",