From 992f9c41e5f44b734472e0d2164d74d8b3f06998 Mon Sep 17 00:00:00 2001 From: "Martin K. Scherer" Date: Thu, 5 Jan 2023 13:30:35 +0100 Subject: [PATCH 1/6] test matrix for old asdf minors --- .github/workflows/pytest_asdf.yml | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/.github/workflows/pytest_asdf.yml b/.github/workflows/pytest_asdf.yml index 834e6c0f5..e9ea07725 100644 --- a/.github/workflows/pytest_asdf.yml +++ b/.github/workflows/pytest_asdf.yml @@ -12,6 +12,18 @@ defaults: shell: bash -l {0} jobs: + asdf_versions: + strategy: + matrix: + asdf_version: + - 2.8 + - 2.9 + - 2.10 + - 2.11 + - 2.12 + - 2.13 + - 2.14 + #- TODO: this will grow in the future... pytest_asdf: name: pytest asdf runs-on: ubuntu-latest @@ -42,7 +54,7 @@ jobs: - name: pip installs run: | - python -m pip install -e . + python -m pip install -e . asdf==${{ asdf_version }} - name: run asdf schema pytest run: | @@ -74,7 +86,7 @@ jobs: ${{ runner.os }}-pip- - name: pip installs run: | - pip install asdf>=2.10 + pip install asdf==${{ asdf_version }} - uses: jannekem/run-python-script-action@v1 with: script: | From 0b5c0d71d10de8a7ddec784d0ed551f20e23cb77 Mon Sep 17 00:00:00 2001 From: "Martin K. Scherer" Date: Thu, 5 Jan 2023 13:39:21 +0100 Subject: [PATCH 2/6] f --- .github/workflows/pytest_asdf.yml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/.github/workflows/pytest_asdf.yml b/.github/workflows/pytest_asdf.yml index e9ea07725..8b2aa7396 100644 --- a/.github/workflows/pytest_asdf.yml +++ b/.github/workflows/pytest_asdf.yml @@ -12,7 +12,7 @@ defaults: shell: bash -l {0} jobs: - asdf_versions: + pytest_asdf: strategy: matrix: asdf_version: @@ -24,7 +24,6 @@ jobs: - 2.13 - 2.14 #- TODO: this will grow in the future... - pytest_asdf: name: pytest asdf runs-on: ubuntu-latest steps: @@ -54,7 +53,7 @@ jobs: - name: pip installs run: | - python -m pip install -e . asdf==${{ asdf_version }} + python -m pip install -e . asdf==${{ asdf_version }} # TODO: how can we avoid trouble with Conda pkg and pip install? - name: run asdf schema pytest run: | From 228556f44747c57b4c43881967c575f4a8736878 Mon Sep 17 00:00:00 2001 From: "Martin K. Scherer" Date: Thu, 5 Jan 2023 13:45:43 +0100 Subject: [PATCH 3/6] fix ref --- .github/workflows/pytest_asdf.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/pytest_asdf.yml b/.github/workflows/pytest_asdf.yml index 8b2aa7396..df74711ce 100644 --- a/.github/workflows/pytest_asdf.yml +++ b/.github/workflows/pytest_asdf.yml @@ -53,7 +53,7 @@ jobs: - name: pip installs run: | - python -m pip install -e . asdf==${{ asdf_version }} # TODO: how can we avoid trouble with Conda pkg and pip install? + python -m pip install -e . asdf==${{ matrix.asdf_version }} # TODO: how can we avoid trouble with Conda pkg and pip install? - name: run asdf schema pytest run: | From 1e5ed2ac25b28f344f297730701ea16514533a22 Mon Sep 17 00:00:00 2001 From: "Martin K. Scherer" Date: Thu, 5 Jan 2023 13:57:04 +0100 Subject: [PATCH 4/6] no matrix for manifest validation --- .github/workflows/pytest_asdf.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/pytest_asdf.yml b/.github/workflows/pytest_asdf.yml index df74711ce..8229a3a54 100644 --- a/.github/workflows/pytest_asdf.yml +++ b/.github/workflows/pytest_asdf.yml @@ -85,7 +85,7 @@ jobs: ${{ runner.os }}-pip- - name: pip installs run: | - pip install asdf==${{ asdf_version }} + pip install asdf>=2.10 - uses: jannekem/run-python-script-action@v1 with: script: | From c36d807ae038fe03c058717c7e76350455fe135b Mon Sep 17 00:00:00 2001 From: "Martin K. Scherer" Date: Thu, 5 Jan 2023 14:04:11 +0100 Subject: [PATCH 5/6] stringify, install loose --- .github/workflows/pytest_asdf.yml | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/.github/workflows/pytest_asdf.yml b/.github/workflows/pytest_asdf.yml index 8229a3a54..64e6106c9 100644 --- a/.github/workflows/pytest_asdf.yml +++ b/.github/workflows/pytest_asdf.yml @@ -16,13 +16,13 @@ jobs: strategy: matrix: asdf_version: - - 2.8 - - 2.9 - - 2.10 - - 2.11 - - 2.12 - - 2.13 - - 2.14 + - "2.8" + - "2.9" + - "2.10" + - "2.11" + - "2.12" + - "2.13" + - "2.14" #- TODO: this will grow in the future... name: pytest asdf runs-on: ubuntu-latest @@ -53,7 +53,7 @@ jobs: - name: pip installs run: | - python -m pip install -e . asdf==${{ matrix.asdf_version }} # TODO: how can we avoid trouble with Conda pkg and pip install? + python -m pip install -e . asdf~=${{ matrix.asdf_version }} # TODO: how can we avoid trouble with Conda pkg and pip install? - name: run asdf schema pytest run: | From fa8c44e75806587318a4e412eaa1a0bcb6febf8e Mon Sep 17 00:00:00 2001 From: "Martin K. Scherer" Date: Thu, 5 Jan 2023 14:18:06 +0100 Subject: [PATCH 6/6] cleanup --- .github/workflows/pytest_asdf.yml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/.github/workflows/pytest_asdf.yml b/.github/workflows/pytest_asdf.yml index 64e6106c9..6ab638db5 100644 --- a/.github/workflows/pytest_asdf.yml +++ b/.github/workflows/pytest_asdf.yml @@ -23,7 +23,6 @@ jobs: - "2.12" - "2.13" - "2.14" - #- TODO: this will grow in the future... name: pytest asdf runs-on: ubuntu-latest steps: @@ -51,9 +50,9 @@ jobs: - name: activate env run: micromamba activate weldx - - name: pip installs + - name: pip install weldx-dev and asdf-matrix-version run: | - python -m pip install -e . asdf~=${{ matrix.asdf_version }} # TODO: how can we avoid trouble with Conda pkg and pip install? + python -m pip install -e . asdf~=${{ matrix.asdf_version }} - name: run asdf schema pytest run: |