Merge pull request #1 from dinkelk/main

Updating Github Actions
lasp · Nov 20, 2023 · b4d66ca · b4d66ca
2 parents 9ea8df4 + 706ae17
commit b4d66ca
Show file tree

Hide file tree

Showing 7 changed files with 9 additions and 19 deletions.
diff --git a/.github/workflows/build_user_guide.yml b/.github/workflows/build_user_guide.yml
@@ -9,10 +9,7 @@ jobs:
     name: build_user_guide
     runs-on: ubuntu-latest
     container:
-      image: dinkelk/adamant:example-latest
-      credentials:
-        username: ${{ secrets.DOCKERHUB_USERNAME }}
-        password: ${{ secrets.DOCKERHUB_TOKEN }}
+      image: ghcr.io/lasp/adamant:example-latest
     env:
       INSTALL_DIR: /home/user/env
       ADAMANT_DIR: ${{ github.workspace }}

diff --git a/.github/workflows/publish_all.yml b/.github/workflows/publish_all.yml
@@ -9,10 +9,7 @@ jobs:
     name: publish_all
     runs-on: ubuntu-latest
     container:
-      image: dinkelk/adamant:example-latest
-      credentials:
-        username: ${{ secrets.DOCKERHUB_USERNAME }}
-        password: ${{ secrets.DOCKERHUB_TOKEN }}
+      image: ghcr.io/lasp/adamant:example-latest
     env:
       INSTALL_DIR: /home/user/env
       ADAMANT_DIR: ${{ github.workspace }}

diff --git a/.github/workflows/style_all.yml b/.github/workflows/style_all.yml
@@ -9,10 +9,7 @@ jobs:
     name: style_all
     runs-on: ubuntu-latest
     container:
-      image: dinkelk/adamant:example-latest
-      credentials:
-        username: ${{ secrets.DOCKERHUB_USERNAME }}
-        password: ${{ secrets.DOCKERHUB_TOKEN }}
+      image: ghcr.io/lasp/adamant:example-latest
     env:
       INSTALL_DIR: /home/user/env
       ADAMANT_DIR: ${{ github.workspace }}

diff --git a/.github/workflows/test_all.yml b/.github/workflows/test_all.yml
@@ -9,10 +9,7 @@ jobs:
     name: test_all
     runs-on: ubuntu-latest
     container:
-      image: dinkelk/adamant:example-latest
-      credentials:
-        username: ${{ secrets.DOCKERHUB_USERNAME }}
-        password: ${{ secrets.DOCKERHUB_TOKEN }}
+      image: ghcr.io/lasp/adamant:example-latest
     env:
       INSTALL_DIR: /home/user/env
       ADAMANT_DIR: ${{ github.workspace }}

diff --git a/gen/models/base.py b/gen/models/base.py
@@ -262,7 +262,8 @@ def _loadYaml(yaml_text):
             warnings.simplefilter("ignore", yaml.error.UnsafeLoaderWarning)
             # with open(self.full_filename, 'r') as stream:
             try:
-                return yaml.load(yaml_text, Loader=yaml.RoundTripLoader)
+                yml = yaml.YAML(typ='rt')
+                return yml.load(yaml_text)
                 # import sys
                 # sys.stderr.write(str(self.data) + "\n")
                 # sys.stderr.write(str(type(self.data)) + "\n")

diff --git a/gen/models/exceptions.py b/gen/models/exceptions.py
@@ -36,7 +36,7 @@ def inner(*args, **kwargs):
 # Decorator which catches a model exception and addes
 # a line number if the argument of the function contains
 # an attribue "lc.line" which is the line number attribute
-# of a rout trip loaded yaml dictionary from ruamel.yaml
+# of a round trip loaded yaml dictionary from ruamel.yaml
 def throw_exception_with_lineno(func):
     def inner(*args, **kwargs):
         try:

diff --git a/redo/bin/yaml_sloc_counter.py b/redo/bin/yaml_sloc_counter.py
@@ -14,7 +14,8 @@ def _loadYaml(yaml_text):
         import warnings
 
         warnings.simplefilter("ignore", yaml.error.UnsafeLoaderWarning)
-        return yaml.load(yaml_text, Loader=yaml.RoundTripLoader)
+        yml = yaml.YAML(typ='rt')
+        return yml.load(yaml_text)
 
     # Open and read the yaml file:
     with open(yaml_file, "r") as f: