From 3a68493dcca47ad22c03c0128c580e9f9aa554cd Mon Sep 17 00:00:00 2001 From: Paulo Almeida Date: Fri, 8 Oct 2021 05:20:34 +0000 Subject: [PATCH 1/3] fix module import on check command --- CHANGELOG.md | 1 + scompose/client/check.py | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 39195a4..0dba79f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -15,6 +15,7 @@ The versions coincide with releases on pypi. ## [0.0.x](https://github.com/singularityhub/singularity-compose/tree/master) (0.0.x) + - fix module import used by check command (0.0.13) - adding jsonschema validation and check command (0.0.12) - implement configuration override feature - implement `--preview` argument for the `check` command diff --git a/scompose/client/check.py b/scompose/client/check.py index f1408de..5b3e480 100644 --- a/scompose/client/check.py +++ b/scompose/client/check.py @@ -10,7 +10,7 @@ from scompose.logger import bot from scompose.config import merge_config -from scompose.config.validate import validate_config +from scompose.config.schema import validate_config import yaml From d3fe1d8bc66c0f09c7216ec8bb2175827a5296e3 Mon Sep 17 00:00:00 2001 From: Paulo Almeida Date: Fri, 8 Oct 2021 05:43:47 +0000 Subject: [PATCH 2/3] try pinning down the pyflakes version --- .github/workflows/main.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 3a4e80b..0764ab6 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -14,12 +14,12 @@ jobs: - uses: actions/checkout@v2 - name: Setup black environment - run: conda create --quiet --name black pyflakes + run: conda create --quiet --name black - name: Check formatting with black run: | export PATH="/usr/share/miniconda/bin:$PATH" - source activate black + source activate blackpy pip install black==21.6b0 black --check scompose @@ -27,6 +27,7 @@ jobs: run: | export PATH="/usr/share/miniconda/bin:$PATH" source activate black + pip install pyflakes==2.4.0 pyflakes scompose/utils # Will have some issues pyflakes scompose/client scompose/project scompose/config || true From f2fc9562cb0bdb691866d4a17f2e78bfa9a5c380 Mon Sep 17 00:00:00 2001 From: Paulo Almeida Date: Fri, 8 Oct 2021 05:44:38 +0000 Subject: [PATCH 3/3] oops, typo --- .github/workflows/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 0764ab6..0258ec3 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -19,7 +19,7 @@ jobs: - name: Check formatting with black run: | export PATH="/usr/share/miniconda/bin:$PATH" - source activate blackpy + source activate black pip install black==21.6b0 black --check scompose