From 397d82f45fb4a7cbbc15108580f29b24ea276a4b Mon Sep 17 00:00:00 2001 From: Jennifer Power Date: Tue, 16 Jul 2024 19:53:56 -0400 Subject: [PATCH] fix: adds back fromJson Signed-off-by: Jennifer Power --- .github/workflows/python-push.yml | 26 +++++++++++++------------- .github/workflows/python-test.yml | 2 +- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/.github/workflows/python-push.yml b/.github/workflows/python-push.yml index ed1ca4032..82017afaf 100644 --- a/.github/workflows/python-push.yml +++ b/.github/workflows/python-push.yml @@ -36,7 +36,7 @@ jobs: path: ~/Library/Caches/pip - os: windows-latest path: ~\AppData\Local\pip\Cache - python-version: [ '${{ needs.set-versions.outputs.min }}', '${{ needs.set-versions.outputs.max }}'] + python-version: [ '${{ fromJson(needs.set-versions.outputs.min) }}', '${{ fromJson(needs.set-versions.outputs.max) }}'] steps: - name: Don't mess with line endings @@ -60,39 +60,39 @@ jobs: run: | make develop - name: Setup pre-commit - if: ${{ (matrix.os == 'ubuntu-latest' && matrix.python-version == needs.set-versions.outputs.max ) }} + if: ${{ (matrix.os == 'ubuntu-latest' && matrix.python-version == fromJson(needs.set-versions.outputs.max) ) }} run: | make pre-commit - name: Install dependencies run: | make install - name: Run md document formatting (mdformat) - if: ${{ (matrix.os == 'ubuntu-latest' && matrix.python-version == needs.set-versions.outputs.max) }} + if: ${{ (matrix.os == 'ubuntu-latest' && matrix.python-version == fromJson(needs.set-versions.outputs.max)) }} run: | make mdformat - name: Run code formatting (yapf) - if: ${{ (matrix.os == 'ubuntu-latest' && matrix.python-version == needs.set-versions.outputs.max) }} + if: ${{ (matrix.os == 'ubuntu-latest' && matrix.python-version == fromJson(needs.set-versions.outputs.max)) }} run: | make code-format - name: Run code linting (flake8) - if: ${{ (matrix.os == 'ubuntu-latest' && matrix.python-version == needs.set-versions.outputs.max) }} + if: ${{ (matrix.os == 'ubuntu-latest' && matrix.python-version == fromJson(needs.set-versions.outputs.max)) }} run: | make code-lint - name: Run code typing check (mypy) - if: ${{ (matrix.os == 'ubuntu-latest' && matrix.python-version == needs.set-versions.outputs.max) }} + if: ${{ (matrix.os == 'ubuntu-latest' && matrix.python-version == fromJson(needs.set-versions.outputs.max)) }} continue-on-error: true run: | make code-typing - name: Validate website content (mkdocs) - if: ${{ (matrix.os == 'ubuntu-latest' && matrix.python-version == needs.set-versions.outputs.max) }} + if: ${{ (matrix.os == 'ubuntu-latest' && matrix.python-version == fromJson(needs.set-versions.outputs.max)) }} run: | make docs-validate - name: Pytest Fast - if: ${{ !(matrix.os == 'ubuntu-latest' && matrix.python-version == needs.set-versions.outputs.max) }} + if: ${{ !(matrix.os == 'ubuntu-latest' && matrix.python-version == fromJson(needs.set-versions.outputs.max)) }} run: | make test - name: Pytest Cov - if: ${{ matrix.os == 'ubuntu-latest' && matrix.python-version == needs.set-versions.outputs.max }} + if: ${{ matrix.os == 'ubuntu-latest' && matrix.python-version == fromJson(needs.set-versions.outputs.max) }} run: | make test-cov deploy: @@ -110,10 +110,10 @@ jobs: submodules: true fetch-depth: 0 token: ${{ secrets.ADMIN_PAT }} - - name: Set up Python ${{ needs.set-versions.outputs.max }} + - name: Set up Python ${{ fromJson(needs.set-versions.outputs.max) }} uses: actions/setup-python@v5 with: - python-version: ${{ needs.set-versions.outputs.max }} + python-version: ${{ fromJson(needs.set-versions.outputs.max) }} - name: Install build tools run: | make develop @@ -151,11 +151,11 @@ jobs: submodules: true fetch-depth: 0 token: ${{ secrets.ADMIN_PAT }} - - name: Set up Python ${{ needs.set-versions.outputs.max }} + - name: Set up Python ${{ fromJson(needs.set-versions.outputs.max) }} uses: actions/setup-python@v5 # This is deliberately not using a custom credential as it relies on native github actions token to have push rights. with: - python-version: ${{ needs.set-versions.outputs.max }} + python-version: ${{ fromJson(needs.set-versions.outputs.max) }} - name: Install build tools run: | make develop diff --git a/.github/workflows/python-test.yml b/.github/workflows/python-test.yml index be7336a41..27aa24a56 100644 --- a/.github/workflows/python-test.yml +++ b/.github/workflows/python-test.yml @@ -108,7 +108,7 @@ jobs: strategy: matrix: os: [ubuntu-latest, macos-latest, windows-latest] - python-version: [ '${{ needs.set-versions.outputs.min }}', '${{ needs.set-versions.outputs.max }}' ] + python-version: [ '${{ fromJson(needs.set-versions.outputs.min) }}', '${{ needs.set-versions.outputs.max }}' ] include: - os: ubuntu-latest path: ~/.cache/pip