Skip to content

Commit

Permalink
Merge pull request #3 from DesignSafe-CI/fix/update-mydata-mount-path
Browse files Browse the repository at this point in the history
Update My Data mount path to point to /ds-mydata
  • Loading branch information
jarosenb authored Aug 24, 2023
2 parents b7ca5c5 + d85c053 commit 0ae28d4
Show file tree
Hide file tree
Showing 4 changed files with 5 additions and 8 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down
2 changes: 1 addition & 1 deletion pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ description = ""
authors = ["Jarosenb <[email protected]>"]

[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"
Expand Down
2 changes: 1 addition & 1 deletion server/main.py
Original file line number Diff line number Diff line change
Expand Up @@ -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":
Expand Down
5 changes: 1 addition & 4 deletions server/tests/test_utils.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,7 @@


def test_get_system_root():
assert (
get_system_root("designsafe.storage.default")
== "/corral-repl/tacc/NHERI/shared"
)
assert get_system_root("designsafe.storage.default") == "/ds-mydata"
assert (
get_system_root("designsafe.storage.community")
== "/corral-repl/tacc/NHERI/community"
Expand Down

0 comments on commit 0ae28d4

Please sign in to comment.