From a2d8943c97378e822582893f4bc00141150be664 Mon Sep 17 00:00:00 2001 From: Jake Rosenberg Date: Thu, 24 Aug 2023 14:17:40 -0500 Subject: [PATCH 1/3] update My Data mount path to point to /ds-mydata --- server/main.py | 2 +- server/tests/test_utils.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/server/main.py b/server/main.py index 10a29db..dba7cf5 100644 --- a/server/main.py +++ b/server/main.py @@ -32,7 +32,7 @@ def read_root(request: Request): def get_system_root(system: str) -> str: match system: case "designsafe.storage.default": - root_dir = "/corral-repl/tacc/NHERI/shared" + root_dir = "/ds-mydata" case "designsafe.storage.community": root_dir = "/corral-repl/tacc/NHERI/community" case "designsafe.storage.published": diff --git a/server/tests/test_utils.py b/server/tests/test_utils.py index 2c5d541..ec2023b 100644 --- a/server/tests/test_utils.py +++ b/server/tests/test_utils.py @@ -8,7 +8,7 @@ def test_get_system_root(): assert ( get_system_root("designsafe.storage.default") - == "/corral-repl/tacc/NHERI/shared" + == "/ds-mydata" ) assert ( get_system_root("designsafe.storage.community") From 8ceaaa930a43c4ddc5de8aeecb5b7a830e7f8240 Mon Sep 17 00:00:00 2001 From: Jake Rosenberg Date: Thu, 24 Aug 2023 14:20:41 -0500 Subject: [PATCH 2/3] update action runners --- .github/workflows/main.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index b0d641c..a7922c1 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -10,7 +10,7 @@ on: # A workflow run is made up of one or more jobs that can run sequentially or in parallel jobs: Server_Side_Unit_Tests: - runs-on: ubuntu-18.04 + runs-on: ubuntu-22.04 steps: # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it - uses: actions/checkout@v2 @@ -35,7 +35,7 @@ jobs: pytest server Server_Side_Linting: - runs-on: ubuntu-18.04 + runs-on: ubuntu-22.04 steps: # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it - uses: actions/checkout@v2 From d85c053c3598fefbdb7ccdc8258be3f2898f663f Mon Sep 17 00:00:00 2001 From: Jake Rosenberg Date: Thu, 24 Aug 2023 14:26:44 -0500 Subject: [PATCH 3/3] formatting --- pyproject.toml | 2 +- server/tests/test_utils.py | 5 +---- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index 0632dc5..a08b932 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -5,7 +5,7 @@ description = "" authors = ["Jarosenb "] [tool.poetry.dependencies] -python = "3.10.0" +python = "3.10.10" uvicorn = {extras = ["standard"], version = "^0.15.0"} fastapi = "^0.70.0" agavepy = "^0.9.5" diff --git a/server/tests/test_utils.py b/server/tests/test_utils.py index ec2023b..36ce32f 100644 --- a/server/tests/test_utils.py +++ b/server/tests/test_utils.py @@ -6,10 +6,7 @@ def test_get_system_root(): - assert ( - get_system_root("designsafe.storage.default") - == "/ds-mydata" - ) + assert get_system_root("designsafe.storage.default") == "/ds-mydata" assert ( get_system_root("designsafe.storage.community") == "/corral-repl/tacc/NHERI/community"