diff --git a/advlabdb/database_import.py b/advlabdb/database_import.py index 14ea40d..584d7d1 100644 --- a/advlabdb/database_import.py +++ b/advlabdb/database_import.py @@ -5,7 +5,7 @@ from shutil import copy2 from flask import flash, has_request_context -from advlabdb import app, db +from advlabdb import db from advlabdb.exceptions import DataBaseImportException from advlabdb.models import ( Appointment, diff --git a/scripts/logged_server_setup.py b/scripts/logged_server_setup.py index c126ccd..c9be8fa 100644 --- a/scripts/logged_server_setup.py +++ b/scripts/logged_server_setup.py @@ -7,7 +7,7 @@ script_dir = Path(__file__).parent.absolute() sys.path.insert(0, str(script_dir)) -from shared import install_latest_pipx, local_bin, poetry_install_latest, run, step +from shared import install_latest_pipx, local_bin, poetry_update, run, step logs_dir = Path("/var/log/advlabdb/") @@ -84,7 +84,7 @@ root_update_log = logs_dir / "root_update.log" run(f'echo "15 4 * * 0 root python3 -u {root_update_script} &>> {root_update_log}" | sudo tee -a /etc/crontab') step("Install latest Poetry packages") -poetry_install_latest(script_dir) +poetry_update(script_dir) step("Deactivate the 'root' user") run("sudo passwd -l root") diff --git a/scripts/shared.py b/scripts/shared.py index 8877440..ee31334 100644 --- a/scripts/shared.py +++ b/scripts/shared.py @@ -46,7 +46,7 @@ def install_latest_pipx(): run("pip install --user --upgrade pipx") -def poetry_install_latest(script_dir): +def poetry_update(script_dir): poetry_bin = local_bin / "poetry" run(f"{poetry_bin} update", cwd=script_dir / "..") diff --git a/scripts/user_update.py b/scripts/user_update.py index bb7b45f..fd46859 100644 --- a/scripts/user_update.py +++ b/scripts/user_update.py @@ -8,14 +8,7 @@ script_dir = Path(__file__).parent.absolute() sys.path.insert(0, str(script_dir)) -from shared import ( - box, - install_latest_pipx, - local_bin, - poetry_install_latest, - run, - spaced_hl, -) +from shared import box, install_latest_pipx, local_bin, poetry_update, run, spaced_hl spaced_hl() @@ -33,4 +26,4 @@ run(f"{pipx_bin} upgrade-all --include-injected") # TODO: Backup box("Install latest Poetry packages") -poetry_install_latest(script_dir) +poetry_update(script_dir)