Skip to content

Commit

Permalink
Merge branch 'main' into main
Browse files Browse the repository at this point in the history
  • Loading branch information
Charlie-Kramer authored Dec 23, 2024
2 parents ca820dd + d3e4ae5 commit 9daa7d0
Show file tree
Hide file tree
Showing 4 changed files with 12 additions and 12 deletions.
10 changes: 5 additions & 5 deletions .github/workflows/python-checks.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ jobs:
python-version: ${{ matrix.python-version }}

- name: Install uv
uses: install-pinned/uv@79cef4cccc47c7fb191b653a4184e34d83437a8b # 0.4.12
uses: install-pinned/uv@79408d4e43d557f731ba612bec337d5414737a70 # 0.4.12

- name: Patch install error when using Python 3.9, limited dependencies, and MacOS
if: ${{ matrix.limited-dependencies }} == True and ${{ matrix.os }} == "macos-latest" and ${{ matrix.python-version }} == "3.9"
Expand Down Expand Up @@ -59,7 +59,7 @@ jobs:
python-version: "3.12"

- name: Install uv
uses: install-pinned/uv@79cef4cccc47c7fb191b653a4184e34d83437a8b # 0.4.12
uses: install-pinned/uv@79408d4e43d557f731ba612bec337d5414737a70 # 0.4.12

- name: Install dependencies
run: |
Expand All @@ -81,7 +81,7 @@ jobs:
python-version: "3.12"

- name: Install uv
uses: install-pinned/uv@79cef4cccc47c7fb191b653a4184e34d83437a8b # 0.4.12
uses: install-pinned/uv@79408d4e43d557f731ba612bec337d5414737a70 # 0.4.12

- name: Install dependencies
run: |
Expand All @@ -103,7 +103,7 @@ jobs:
python-version: "3.12"

- name: Install uv
uses: install-pinned/uv@79cef4cccc47c7fb191b653a4184e34d83437a8b # 0.4.12
uses: install-pinned/uv@79408d4e43d557f731ba612bec337d5414737a70 # 0.4.12

- name: Install bandit
run: |
Expand All @@ -125,7 +125,7 @@ jobs:
python-version: "3.12"

- name: Install uv
uses: install-pinned/uv@79cef4cccc47c7fb191b653a4184e34d83437a8b # 0.4.12
uses: install-pinned/uv@79408d4e43d557f731ba612bec337d5414737a70 # 0.4.12

- name: Install dependencies
run: |
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/security_scorecard.yml
Original file line number Diff line number Diff line change
Expand Up @@ -74,6 +74,6 @@ jobs:
# Upload the results to GitHub's code scanning dashboard (optional).
# Commenting out will disable upload of results to your repo's Code Scanning dashboard
- name: "Upload to code-scanning"
uses: github/codeql-action/upload-sarif@aa578102511db1f4524ed59b8cc2bae4f6e88195 # v3.27.6
uses: github/codeql-action/upload-sarif@df409f7d9260372bd5f19e5b04e83cb3c43714ae # v3.27.9
with:
sarif_file: results.sarif
2 changes: 1 addition & 1 deletion requirements-dev.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Testing Requirements
bandit[toml]==1.7.10
bandit[toml]==1.8.0
coverage==7.6.1
pycodestyle==2.12.1
pytest-datadir==1.5.0
Expand Down
10 changes: 5 additions & 5 deletions requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,10 @@ civis==1.16.1
curlify==2.2.1
dbt_redshift==1.4.0
defusedxml>=0.7.1, <=0.8.0
facebook-business==13.0.0
facebook-business==21.0.5
google-api-core==2.23.0
google-api-python-client==1.7.7
google-auth==2.29.0
google-auth==2.37.0
google-cloud-bigquery==3.26.0
google-cloud-storage-transfer==1.9.1
google-cloud-storage==2.18.2
Expand All @@ -23,13 +23,13 @@ joblib==1.2.0
mysql-connector-python==9.1.0
newmode==0.1.6
oauth2client==4.1.3
paramiko==3.4.0
paramiko==3.5.0
petl==1.7.15
psycopg2-binary==2.9.9
PyGitHub==2.4.0
python-dateutil==2.8.2
requests==2.32.3
requests_oauthlib==1.3.0
requests_oauthlib==2.0.0
setuptools==70.0.0
simple-salesforce==1.11.6
simplejson==3.16.0
Expand All @@ -40,7 +40,7 @@ surveygizmo==1.2.3
twilio==9.3.8
urllib3==1.26.19
validate-email==1.3
xmltodict==0.14.1
xmltodict==0.14.2

# Stuff for TMC scripts
# TODO Remove when we have a TMC-specific Docker image
Expand Down

0 comments on commit 9daa7d0

Please sign in to comment.