Skip to content

Commit 17f6b03

Browse files
authored
Merge branch 'main' into pyproject-build
2 parents a9fe258 + 28699f5 commit 17f6b03

File tree

5 files changed

+26
-54
lines changed

5 files changed

+26
-54
lines changed

.github/workflows/python-checks.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ jobs:
3232
python-version: ${{ matrix.python-version }}
3333

3434
- name: Install uv
35-
uses: install-pinned/uv@51bb057ca8857db7531f188d414ba32b7bb16d2b # 0.4.12
35+
uses: install-pinned/uv@05389e8b8c79922b1376aee8c2d598b3219da230 # 0.4.12
3636

3737
- name: Install dependencies
3838
env:
@@ -66,7 +66,7 @@ jobs:
6666
python-version: "3.13"
6767

6868
- name: Install uv
69-
uses: install-pinned/uv@51bb057ca8857db7531f188d414ba32b7bb16d2b # 0.4.12
69+
uses: install-pinned/uv@05389e8b8c79922b1376aee8c2d598b3219da230 # 0.4.12
7070

7171
- name: Install dependencies
7272
run: |
@@ -88,7 +88,7 @@ jobs:
8888
python-version: "3.13"
8989

9090
- name: Install uv
91-
uses: install-pinned/uv@51bb057ca8857db7531f188d414ba32b7bb16d2b # 0.4.12
91+
uses: install-pinned/uv@05389e8b8c79922b1376aee8c2d598b3219da230 # 0.4.12
9292

9393
- name: Install dependencies
9494
run: |
@@ -110,7 +110,7 @@ jobs:
110110
python-version: "3.13"
111111

112112
- name: Install uv
113-
uses: install-pinned/uv@51bb057ca8857db7531f188d414ba32b7bb16d2b # 0.4.12
113+
uses: install-pinned/uv@05389e8b8c79922b1376aee8c2d598b3219da230 # 0.4.12
114114

115115
- name: Install bandit
116116
run: |
@@ -145,7 +145,7 @@ jobs:
145145
cache: pip
146146

147147
- name: Install uv
148-
uses: install-pinned/uv@51bb057ca8857db7531f188d414ba32b7bb16d2b # 0.4.12
148+
uses: install-pinned/uv@05389e8b8c79922b1376aee8c2d598b3219da230 # 0.4.12
149149

150150
- name: Install module and dependencies
151151
run: |

.github/workflows/release.yml

Lines changed: 15 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -2,20 +2,24 @@ name: Build & Publish Wheels + Source
22

33
on:
44
release:
5-
types: [published]
5+
types:
6+
- published
7+
workflow_dispatch:
68

79
permissions:
810
contents: read
11+
912

1013
jobs:
11-
build_wheels:
12-
name: Build wheels on ${{ matrix.os }}
13-
runs-on: ${{ matrix.os }}
14+
build_source:
15+
if: github.repository_owner == 'move-coop'
16+
environment: release
17+
18+
runs-on: ubuntu-latest
1419

15-
strategy:
16-
fail-fast: false
17-
matrix:
18-
os: [ubuntu-latest, windows-latest, macos-latest]
20+
permissions:
21+
# IMPORTANT: this permission is mandatory for trusted publishing
22+
id-token: write
1923

2024
steps:
2125
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
@@ -27,7 +31,7 @@ jobs:
2731
cache: "pip"
2832

2933
- name: Install uv
30-
uses: install-pinned/uv@b9511b633710c8bbe8ba48376771dba624746799 # 0.4.12
34+
uses: install-pinned/uv@05389e8b8c79922b1376aee8c2d598b3219da230 # 0.4.12
3135

3236
- name: Install dependencies
3337
run: |
@@ -39,46 +43,14 @@ jobs:
3943
python setup.py check
4044
4145
- name: Build src dist
42-
if: ${{ matrix.os == 'ubuntu-latest' }}
4346
run: |
44-
python -m build --sdist --outdir wheels parsons
45-
46-
- name: Build wheels
47-
run: git pull && python -m cibuildwheel parsons/ --output-dir wheels
48-
49-
# Save wheels as artifacts
50-
- name: Upload built wheels
51-
uses: actions/upload-artifact@4cec3d8aa04e39d1a68397de0c4cd6fb9dce8ec1 # v4.6.1
52-
with:
53-
name: wheels-${{ matrix.os }}
54-
path: wheels
55-
56-
publish_wheels:
57-
if: github.repository_owner == 'move-coop'
58-
needs: build_wheels
59-
60-
runs-on: ubuntu-latest
61-
environment: release
62-
63-
permissions:
64-
# IMPORTANT: this permission is mandatory for trusted publishing
65-
id-token: write
66-
67-
steps:
68-
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
69-
70-
- name: Download wheels
71-
uses: actions/download-artifact@cc203385981b70ca67e1cc392babf9cc229d5806 # v4.1.9
72-
with:
73-
pattern: wheels-*
74-
path: wheels
75-
merge-multiple: true
47+
python -m build --sdist --outdir dist
7648
7749
# Publish
7850
- name: Publish
7951
uses: pypa/gh-action-pypi-publish@76f52bc884231f62b9a034ebfe128415bbaabdfc # v1.12.4
8052
with:
8153
verify-metadata: true
8254
skip-existing: true
83-
packages-dir: wheels
55+
packages-dir: dist
8456
verbose: true

.github/workflows/security_scorecard.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,6 +74,6 @@ jobs:
7474
# Upload the results to GitHub's code scanning dashboard (optional).
7575
# Commenting out will disable upload of results to your repo's Code Scanning dashboard
7676
- name: "Upload to code-scanning"
77-
uses: github/codeql-action/upload-sarif@39edc492dbe16b1465b0cafca41432d857bdb31a # v3.29.1
77+
uses: github/codeql-action/upload-sarif@181d5eefc20863364f96762470ba6f862bdef56b # v3.29.2
7878
with:
7979
sarif_file: results.sarif

requirements-dev.txt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ bandit[toml]==1.8.3
33
coverage==7.8.0
44
pre-commit==4.2.0
55
pytest-cov==6.1.1
6-
pytest-datadir==1.6.1
6+
pytest-datadir==1.7.2
77
pytest-mock==3.14.0
88
pytest-xdist==3.6.1
99
pytest==8.4.1
@@ -12,9 +12,9 @@ ruff==0.11.7
1212
testfixtures==8.3.0
1313

1414
# Build and publish requirements
15-
cibuildwheel==2.23.0
1615
twine==6.1.0
17-
wheel==0.45.1
16+
build
17+
1818

1919
# Docs Requirements
2020
myst-parser==3.0.1;python_version<'3.10'

requirements.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,12 @@ pyairtable==3.0.2
22
azure-storage-blob==12.25.1
33
boto3>=1.17.98
44
boxsdk==3.14.0
5-
braintree==4.31.0
5+
braintree==4.37.0
66
bs4==0.0.2
77
censusgeocode==0.5.2
88
civis==1.16.1;python_version<"3.10" # later Civis versions do not support Python 3.9
99
civis==2.4.3;python_version>="3.10"
10-
curlify==2.2.1
10+
curlify==3.0.0
1111
dbt_core>=1.5.0
1212
defusedxml>=0.7.1, <=0.8.0
1313
facebook-business==22.0.2

0 commit comments

Comments
 (0)