From a99d72418d2349ba782fa4e48e68c46426641a01 Mon Sep 17 00:00:00 2001 From: Frederick Muriuki Muriithi Date: Tue, 9 Jan 2024 16:37:12 +0300 Subject: Update module paths With the reorganisation, a number of module paths changed, and need to be updated. This commit fixes a few obvious ones. --- bin/genenetwork2 | 2 +- gn2/jobs/jobs.py | 2 +- gn2/runserver.py | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/bin/genenetwork2 b/bin/genenetwork2 index 3e2f31d3..01026811 100755 --- a/bin/genenetwork2 +++ b/bin/genenetwork2 @@ -223,4 +223,4 @@ fi # Start the flask server running GN2 echo "Starting with $settings" -python gn2.runserver.py +python -m gn2.runserver diff --git a/gn2/jobs/jobs.py b/gn2/jobs/jobs.py index f796fa9a..dfcdf274 100644 --- a/gn2/jobs/jobs.py +++ b/gn2/jobs/jobs.py @@ -58,7 +58,7 @@ def queue(redis_conn: Redis, job: dict) -> UUID: def run(job_id: UUID, redis_uri: str): command = [ - sys.executable, "-m", "scripts.run_external", + sys.executable, "-m", "gn2.scripts.run_external", f"--redis-uri={redis_uri}", "run-job", str(job_id)] print(f"COMMAND: {shlex.join(command)}") subprocess.Popen(command) diff --git a/gn2/runserver.py b/gn2/runserver.py index 45a51385..0c95f715 100644 --- a/gn2/runserver.py +++ b/gn2/runserver.py @@ -7,7 +7,7 @@ # # /sbin/iptables -A INPUT -p tcp -i eth0 -s ! 71.236.239.43 --dport 5003 -j DROP -from gn2_main import app +from gn2.gn2_main import app from gn2.utility.startup_config import app_config from gn2.utility.tools import WEBSERVER_MODE, SERVER_PORT -- cgit v1.2.3