Skip to content

Commit 76c2452

Browse files
authored
Merge branch 'main' into permissive-requirements
2 parents 2137c8b + 3627499 commit 76c2452

File tree

5 files changed

+34
-63
lines changed

5 files changed

+34
-63
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: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,9 @@ rich>=13
2020
nodeenv>=1.4 # pre-commit depends on nodeenv>=0.11.1, but nodeenv requires pipes until 1.4
2121

2222
# Build and publish requirements
23-
build==1.2.2.post1
24-
cibuildwheel==2.23.0
2523
twine==6.1.0
26-
wheel==0.45.1
24+
build
25+
2726

2827
# Docs Requirements
2928
myst-parser==3.0.1;python_version<'3.10'

requirements.txt

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -2,31 +2,31 @@
22
azure-storage-blob>=12.25,<13
33
beautifulsoup4>=4.10,<5
44
boto3>=1.34,<2
5-
boxsdk>=3.13,<4
6-
braintree>=4.31,<5
5+
boxsdk>=3.14,<4
6+
braintree>=4.37,<5
77
censusgeocode>=0.5,<1
88
civis>=1.16,<2;python_version<"3.10" # later Civis versions do not support Python 3.9
99
civis>=2;python_version>="3.10"
10-
curlify>=2.2.1,<3
10+
curlify>=3.0,<4
1111
dbt_core>=1.5,<2
1212
defusedxml>=0.7,<1
1313
facebook-business>=22.0,<23
1414
google-api-core>=2.24,<3
15-
google-api-python-client>=2.163,<3
16-
google-auth>=2.38,<3
17-
google-cloud-bigquery>=3.31,<4
15+
google-api-python-client>=2.174,<3
16+
google-auth>=2.40,<3
17+
google-cloud-bigquery>=3.34,<4
1818
google-cloud-storage-transfer>=1.16,<2
1919
google-cloud-storage>=3.1,<4
2020
grpcio>=1.68,<2
21-
gspread>=6.1,<7
21+
gspread>=6.2,<7
2222
httplib2>=0.22,<1
2323
jellyfish>=1.1.1,<2
2424
joblib>=1.2,<2
25-
mysql-connector-python>=9.2,<10
25+
mysql-connector-python>=9.3,<10
2626
newmode>=0.1.6,<2
2727
oauth2client>=4.1,<5
2828
paramiko>=3.5,<4
29-
petl>=1.7.10,<2;python_version<"3.11"
29+
petl>=1.7.10,<1.7.15;python_version<"3.11"
3030
petl>=1.7.15,<2;python_version>="3.11"
3131
psycopg2-binary>=2.9.7,<2.9.10;python_version<"3.12"
3232
psycopg2-binary>=2.9.10,<3;python_version>="3.12"
@@ -35,15 +35,15 @@ PyGitHub>=2.6,<3
3535
python-dateutil>=2.9,<3
3636
requests>=2.32,<3
3737
requests_oauthlib>=2,<3
38-
setuptools>=78.1, <79
38+
setuptools>=80.9, <79
3939
simple-salesforce>=1.12.4,<2
4040
simplejson>=3.20,<4
4141
slackclient>=1.3,<2
4242
sqlalchemy>=1.4,<3 # Prefect does not work with 1.4.33
4343
sshtunnel>=0.4,<1
4444
suds-py3>=1.4,<2
4545
surveygizmo>=1.2,<2
46-
twilio>=9.5,<10
46+
twilio>=9.6,<10
4747
urllib3>=1.26.19,<2
4848
validate-email>=1.3,<2
4949
xmltodict>=0.14,<1

0 commit comments

Comments
 (0)