Skip to content

Commit

Permalink
Fixed Pipfile.lock conflict
Browse files Browse the repository at this point in the history
  • Loading branch information
joshuastegmaier committed Feb 9, 2024
2 parents bb79b96 + 9641900 commit 4995de1
Show file tree
Hide file tree
Showing 21 changed files with 4,179 additions and 10,202 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/black.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- uses: actions/setup-python@v4
- uses: actions/setup-python@v5
with:
python-version: '3.10'
- uses: psf/black@stable
4 changes: 2 additions & 2 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -39,15 +39,15 @@ jobs:
libjpeg-dev libopenjp2-7-dev libwebp-dev zlib1g-dev libpq-dev
- name: Install node and npm
uses: actions/setup-node@v3
uses: actions/setup-node@v4
with:
node-version: '18'

- name: Checkout repository
uses: actions/checkout@v4

- name: Set up Python 3.10
uses: actions/setup-python@v4
uses: actions/setup-python@v5
with:
# Semantic version range syntax or exact version of a Python version
python-version: '3.10'
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/codeql-analysis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ jobs:
uses: actions/checkout@v4

- name: Setup python
uses: actions/setup-python@v4
uses: actions/setup-python@v5
with:
python-version: '3.10'

Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/dev-main-deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ jobs:
libjpeg-dev libopenjp2-7-dev libwebp-dev zlib1g-dev libpq-dev
- name: Install node and npm
uses: actions/setup-node@v3
uses: actions/setup-node@v4
with:
node-version: '18'

Expand All @@ -47,7 +47,7 @@ jobs:
fetch-tags: 'true'

- name: Set up Python 3.10
uses: actions/setup-python@v4
uses: actions/setup-python@v5
with:
# Semantic version range syntax or exact version of a Python version
python-version: '3.10'
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/feature-branch-deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ jobs:
libjpeg-dev libopenjp2-7-dev libwebp-dev zlib1g-dev libpq-dev
- name: Install node and npm
uses: actions/setup-node@v3
uses: actions/setup-node@v4
with:
node-version: '18'

Expand All @@ -47,7 +47,7 @@ jobs:
fetch-tags: 'true'

- name: Set up Python 3.10
uses: actions/setup-python@v4
uses: actions/setup-python@v5
with:
# Semantic version range syntax or exact version of a Python version
python-version: '3.10'
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/pip-audit.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ name: pip-audit
on:
workflow_dispatch:
push:
branches: [main, release]
branches: [release]
pull_request:
branches: [main]

Expand All @@ -12,7 +12,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- uses: actions/setup-python@v4
- uses: actions/setup-python@v5
with:
python-version: '3.10'

Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/stage-hotfix-rel-deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ jobs:
libjpeg-dev libopenjp2-7-dev libwebp-dev zlib1g-dev libpq-dev
- name: Install node and npm
uses: actions/setup-node@v3
uses: actions/setup-node@v4
with:
node-version: '18'

Expand All @@ -37,7 +37,7 @@ jobs:
fetch-tags: 'true'

- name: Set up Python 3.10
uses: actions/setup-python@v4
uses: actions/setup-python@v5
with:
# Semantic version range syntax or exact version of a Python version
python-version: '3.10'
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/stage-release-deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ jobs:
libjpeg-dev libopenjp2-7-dev libwebp-dev zlib1g-dev libpq-dev
- name: Install node and npm
uses: actions/setup-node@v3
uses: actions/setup-node@v4
with:
node-version: '18'

Expand All @@ -48,7 +48,7 @@ jobs:
fetch-tags: 'true'

- name: Set up Python 3.10
uses: actions/setup-python@v4
uses: actions/setup-python@v5
with:
# Semantic version range syntax or exact version of a Python version
python-version: '3.10'
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -75,15 +75,15 @@ jobs:
libjpeg-dev libopenjp2-7-dev libwebp-dev zlib1g-dev libpq-dev
- name: Install node and npm
uses: actions/setup-node@v3
uses: actions/setup-node@v4
with:
node-version: '18'

- name: Checkout repository
uses: actions/checkout@v4

- name: Set up Python 3.10
uses: actions/setup-python@v4
uses: actions/setup-python@v5
with:
python-version: '3.10'
architecture: 'x64'
Expand Down
Loading

0 comments on commit 4995de1

Please sign in to comment.