Skip to content

Commit

Permalink
fix: adds back fromJson
Browse files Browse the repository at this point in the history
Signed-off-by: Jennifer Power <[email protected]>
  • Loading branch information
jpower432 committed Jul 16, 2024
1 parent 1af4da1 commit 397d82f
Show file tree
Hide file tree
Showing 2 changed files with 14 additions and 14 deletions.
26 changes: 13 additions & 13 deletions .github/workflows/python-push.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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:
Expand All @@ -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
Expand Down Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/python-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 397d82f

Please sign in to comment.