From 42ed216952f3c7578fbbfffe6cd5edf04c58309a Mon Sep 17 00:00:00 2001 From: Alexander VanTol Date: Mon, 31 Jul 2023 13:46:57 -0500 Subject: [PATCH 1/5] fix(useryaml): upgrade pip, fix installation --- .github/workflows/user_yaml_ci.yaml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/user_yaml_ci.yaml b/.github/workflows/user_yaml_ci.yaml index e9a7f924..811a1507 100644 --- a/.github/workflows/user_yaml_ci.yaml +++ b/.github/workflows/user_yaml_ci.yaml @@ -41,8 +41,8 @@ jobs: python-version: 3.9 - name: Install dependencies run: | + pip install --upgrade pip pip install gen3users - pip install pyyaml==5.4 - name: Checkout, lint and test run: | # checkout the code - this supports checking out from a private fork @@ -67,7 +67,8 @@ jobs: for commons in os.listdir("./users"): with open(os.path.join("users", commons, "user.yaml"), "r") as f: data = yaml.safe_load(f) - # pyyaml auto sort + # + auto sort with open(os.path.join("users", commons, "user.yaml"), "w") as f: yaml.dump(data, f) From 94ba56c2acb5baa4e7c81cc358bf164803fa18ba Mon Sep 17 00:00:00 2001 From: Alexander VanTol Date: Mon, 31 Jul 2023 13:48:06 -0500 Subject: [PATCH 2/5] Update user_yaml_ci.yaml --- .github/workflows/user_yaml_ci.yaml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/user_yaml_ci.yaml b/.github/workflows/user_yaml_ci.yaml index 811a1507..7ec41726 100644 --- a/.github/workflows/user_yaml_ci.yaml +++ b/.github/workflows/user_yaml_ci.yaml @@ -67,8 +67,7 @@ jobs: for commons in os.listdir("./users"): with open(os.path.join("users", commons, "user.yaml"), "r") as f: data = yaml.safe_load(f) - # - auto sort + # pyyaml auto sort with open(os.path.join("users", commons, "user.yaml"), "w") as f: yaml.dump(data, f) From 716cfdfd7849d91419aecc2c0fea38f2171d6bb5 Mon Sep 17 00:00:00 2001 From: Alexander VanTol Date: Mon, 31 Jul 2023 13:51:25 -0500 Subject: [PATCH 3/5] Update user_yaml_ci.yaml --- .github/workflows/user_yaml_ci.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/user_yaml_ci.yaml b/.github/workflows/user_yaml_ci.yaml index 7ec41726..0b387585 100644 --- a/.github/workflows/user_yaml_ci.yaml +++ b/.github/workflows/user_yaml_ci.yaml @@ -67,7 +67,6 @@ jobs: for commons in os.listdir("./users"): with open(os.path.join("users", commons, "user.yaml"), "r") as f: data = yaml.safe_load(f) - # pyyaml auto sort with open(os.path.join("users", commons, "user.yaml"), "w") as f: yaml.dump(data, f) From a52615b4341609fc66b9a632aca6539e6e768d2c Mon Sep 17 00:00:00 2001 From: Alexander VanTol Date: Mon, 31 Jul 2023 13:51:38 -0500 Subject: [PATCH 4/5] Update user_yaml_ci.yaml --- .github/workflows/user_yaml_ci.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/user_yaml_ci.yaml b/.github/workflows/user_yaml_ci.yaml index 0b387585..7ec41726 100644 --- a/.github/workflows/user_yaml_ci.yaml +++ b/.github/workflows/user_yaml_ci.yaml @@ -67,6 +67,7 @@ jobs: for commons in os.listdir("./users"): with open(os.path.join("users", commons, "user.yaml"), "r") as f: data = yaml.safe_load(f) + # pyyaml auto sort with open(os.path.join("users", commons, "user.yaml"), "w") as f: yaml.dump(data, f) From 3b96bfc76dce91c0d389b5c9bc8211021fc2928e Mon Sep 17 00:00:00 2001 From: Alexander VanTol Date: Mon, 31 Jul 2023 14:48:44 -0500 Subject: [PATCH 5/5] Update user_yaml_ci.yaml --- .github/workflows/user_yaml_ci.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/user_yaml_ci.yaml b/.github/workflows/user_yaml_ci.yaml index 7ec41726..f9a6aae0 100644 --- a/.github/workflows/user_yaml_ci.yaml +++ b/.github/workflows/user_yaml_ci.yaml @@ -43,6 +43,7 @@ jobs: run: | pip install --upgrade pip pip install gen3users + pip install pyyaml - name: Checkout, lint and test run: | # checkout the code - this supports checking out from a private fork