update comput vm scripts

AlexandreOndet · Jul 18, 2023 · 68f70cf · 68f70cf
1 parent bb142b0
commit 68f70cf
Show file tree

Hide file tree

Showing 7 changed files with 31 additions and 31 deletions.
diff --git a/backend/load_db/README.md b/backend/load_db/README.md
@@ -13,9 +13,9 @@ You can create a new VM at https://console.cloud.google.com/compute/instancesAdd
 
 ```sh
 apt upgrade
-cd speedcubing-canada
+cd speedcubing-canada/backend
 git pull
-backend/load_db/startup.sh
+load_db/startup.sh
 ```
 
 Next, SSH into the instance and follow the instructions in `vm_setup.sh`.

diff --git a/backend/load_db/cleanup.py b/backend/load_db/cleanup.py
@@ -1,6 +1,6 @@
 from google.cloud import ndb
 
-from backend.models.wca.export import get_latest_export
+from models.wca.export import get_latest_export
 
 client = ndb.Client()
 

diff --git a/backend/load_db/delete_old_exports.py b/backend/load_db/delete_old_exports.py
@@ -5,7 +5,7 @@
 from absl import flags
 from google.cloud import ndb
 
-from backend.models.wca.export import get_latest_export
+from models.wca.export import get_latest_export
 
 FLAGS = flags.FLAGS
 

diff --git a/backend/load_db/get_latest_export.py b/backend/load_db/get_latest_export.py
@@ -1,6 +1,6 @@
 from google.cloud import ndb
 
-from backend.models.wca.export import get_latest_export
+from models.wca.export import get_latest_export
 
 client = ndb.Client()
 

diff --git a/backend/load_db/load_db.py b/backend/load_db/load_db.py
@@ -5,19 +5,19 @@
 from absl import logging
 from google.cloud import ndb
 
-from backend.load_db.update_champions import UpdateChampions
-from backend.models.user import User
-from backend.models.wca.competition import Competition
-from backend.models.wca.continent import Continent
-from backend.models.wca.country import Country
-from backend.models.wca.event import Event
-from backend.models.wca.export import set_latest_export
-from backend.models.wca.format import Format
-from backend.models.wca.person import Person
-from backend.models.wca.rank import RankAverage
-from backend.models.wca.rank import RankSingle
-from backend.models.wca.result import Result
-from backend.models.wca.round import RoundType
+from load_db.update_champions import UpdateChampions
+from models.user import User
+from models.wca.competition import Competition
+from models.wca.continent import Continent
+from models.wca.country import Country
+from models.wca.event import Event
+from models.wca.export import set_latest_export
+from models.wca.format import Format
+from models.wca.person import Person
+from models.wca.rank import RankAverage
+from models.wca.rank import RankSingle
+from models.wca.result import Result
+from models.wca.round import RoundType
 
 
 FLAGS = flags.FLAGS

diff --git a/backend/load_db/load_db.sh b/backend/load_db/load_db.sh
@@ -9,10 +9,10 @@ then
 fi
 
 echo "Deleting old exports"
-python3 backend/load_db/delete_old_exports.py \
+python3 load_db/delete_old_exports.py \
     --export_base=exports/
 
-SAVED_EXPORT=$(python3 backend/load_db/get_latest_export.py)
+SAVED_EXPORT=$(python3 load_db/get_latest_export.py)
 LATEST_EXPORT=$(curl https://www.worldcubeassociation.org/export/results \
 | grep TSV:.*WCA_export \
 | sed -s 's/.*\(WCA_export[0-9A-Za-z_]*\).tsv.zip.*/\1/')
@@ -36,7 +36,7 @@ then
   unzip $ZIP_FILE -d $EXPORT_DIR
   rm $ZIP_FILE
 
-  python3 backend/load_db/load_db.py \
+  python3 load_db/load_db.py \
       --old_export_id="$SAVED_EXPORT" \
       --new_export_id="$LATEST_EXPORT" \
       --export_base=exports/

diff --git a/backend/load_db/update_champions.py b/backend/load_db/update_champions.py
@@ -5,16 +5,16 @@
 
 from google.cloud import ndb
 
-from backend.models.champion import Champion
-from backend.models.championship import Championship
-from backend.models.eligibility import RegionalChampionshipEligibility
-from backend.models.eligibility import ProvinceChampionshipEligibility
-from backend.models.province import Province
-from backend.models.user import User
-from backend.models.wca.country import Country
-from backend.models.wca.event import Event
-from backend.models.wca.result import Result
-from backend.models.wca.result import RoundType
+from models.champion import Champion
+from models.championship import Championship
+from models.eligibility import RegionalChampionshipEligibility
+from models.eligibility import ProvinceChampionshipEligibility
+from models.province import Province
+from models.user import User
+from models.wca.country import Country
+from models.wca.event import Event
+from models.wca.result import Result
+from models.wca.result import RoundType
 
 
 def ComputeEligibleCompetitors(championship, competition, results):