Skip to content

Commit fe563ee

Browse files
arubdesuarubdesu
committed
2025 updates try 2
no _logic_ changes, just version bumps and 3.13 support/default - some commented-out _potential_ fixes and explanatory text
1 parent 5e5340a commit fe563ee

7 files changed

Lines changed: 138 additions & 42 deletions

‎.github/workflows/build_python_3.10.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ jobs:
8989
files: ${{github.workspace}}/outputs/*.pkg
9090

9191
- name: Upload packages
92-
uses: actions/upload-artifact@0b7f8abb1508181956e8e162db84b466c27e18ce # v3.1.2
92+
uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
9393
with:
9494
name: packages
9595
path: outputs/

‎.github/workflows/build_python_3.11.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ jobs:
8484
files: ${{github.workspace}}/outputs/*.pkg
8585

8686
- name: Upload packages
87-
uses: actions/upload-artifact@0b7f8abb1508181956e8e162db84b466c27e18ce # v3.1.2
87+
uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
8888
with:
8989
name: packages
9090
path: outputs/

‎.github/workflows/build_python_3.12.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ jobs:
8484
files: ${{github.workspace}}/outputs/*.pkg
8585

8686
- name: Upload packages
87-
uses: actions/upload-artifact@0b7f8abb1508181956e8e162db84b466c27e18ce # v3.1.2
87+
uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
8888
with:
8989
name: packages
9090
path: outputs/

‎.github/workflows/build_python_3.13.yml‎

Lines changed: 90 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,90 @@
1+
name: Build Python 3.12
2+
3+
env:
4+
TYPE: "recommended"
5+
DEV_INSTALLER_ID: "Developer ID Installer: Mac Admins Open Source (T4SK8ZXCXG)"
6+
DEV_APPLICATION_ID: "Developer ID Application: Mac Admins Open Source (T4SK8ZXCXG)"
7+
NOTARY_APP_PASSWORD: ${{ secrets.NOTARY_APP_PASSWORD_MAOS }}
8+
PYTHON_VERSION: "3.12.1"
9+
PYTHON_MAJOR_VERSION: "3.12"
10+
11+
on:
12+
workflow_dispatch:
13+
pull_request:
14+
15+
jobs:
16+
build:
17+
runs-on: macos-13
18+
19+
steps:
20+
- name: Checkout python repo
21+
uses: actions/checkout@24cb9080177205b6e8c946b17badbe402adc938f # v3.4.0
22+
with:
23+
fetch-depth: 0
24+
25+
- name: Install Apple Developer ID Application certificates
26+
uses: apple-actions/import-codesign-certs@8f3fb608891dd2244cdab3d69cd68c0d37a7fe93 # v2.0.0
27+
with:
28+
keychain-password: ${{ github.run_id }}
29+
p12-file-base64: ${{ secrets.APP_CERTIFICATES_P12_MAOS }}
30+
p12-password: ${{ secrets.APP_CERTIFICATES_P12_PASSWORD_MAOS }}
31+
32+
- name: Install Apple Developer ID Installer certificates
33+
uses: apple-actions/import-codesign-certs@8f3fb608891dd2244cdab3d69cd68c0d37a7fe93 # v2.0.0
34+
with:
35+
create-keychain: false # do not create a new keychain for this value
36+
keychain-password: ${{ github.run_id }}
37+
p12-file-base64: ${{ secrets.PKG_CERTIFICATES_P12_MAOS }}
38+
p12-password: ${{ secrets.PKG_CERTIFICATES_P12_PASSWORD_MAOS }}
39+
40+
- name: Run build package script
41+
run: ./build_python_framework_pkgs.zsh "$TYPE" "$DEV_INSTALLER_ID" "$DEV_APPLICATION_ID" "$PYTHON_VERSION" "$PYTHON_MAJOR_VERSION" "${NOTARY_APP_PASSWORD}"
42+
43+
- name: get environment variables
44+
id: get_env_var
45+
run: |
46+
echo "PYTHON_BUILD_VERSION=$(/bin/cat ./build_info.txt)" >> $GITHUB_ENV
47+
48+
- name: Generate changelog
49+
id: changelog
50+
uses: metcalfc/changelog-generator@afdcb9470aebdb2252c0c95a1c130723c9e21f3a # v4.1
51+
with:
52+
myToken: ${{ secrets.GITHUB_TOKEN }}
53+
reverse: 'true'
54+
55+
- name: Create Release
56+
id: create_release
57+
uses: softprops/action-gh-release@de2c0eb89ae2a093876385947365aca7b0e5f844 # v0.1.15
58+
with:
59+
name: Python ${{env.PYTHON_BUILD_VERSION}}
60+
tag_name: v${{env.PYTHON_BUILD_VERSION}}
61+
draft: false
62+
prerelease: true
63+
token: ${{ secrets.GITHUB_TOKEN }}
64+
body: |
65+
# Notes
66+
Python ${{env.PYTHON_VERSION}} Framework
67+
68+
## Changes
69+
- Upgraded Python to 3.13.5
70+
**Note: Some of these updates may have breaking changes. Always test your code before deploying to production!**
71+
72+
Please see the `requirements_recommended.txt` for the current libraries being used.
73+
74+
${{ steps.changelog.outputs.changelog }}
75+
76+
# Flavors of Python
77+
At this time, the automated build process will **only** create the Recommended package
78+
79+
## Recommended
80+
This is a Python.framework that contains everything from minimal, and a few libraries that various well known open source projects require.
81+
82+
## Signing/Notarization
83+
The signed package is fully notarized, including the Python.framework file
84+
files: ${{github.workspace}}/outputs/*.pkg
85+
86+
- name: Upload packages
87+
uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
88+
with:
89+
name: packages
90+
path: outputs/

‎.github/workflows/build_python_3.9.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ jobs:
8989
files: ${{github.workspace}}/outputs/*.pkg
9090

9191
- name: Upload packages
92-
uses: actions/upload-artifact@0b7f8abb1508181956e8e162db84b466c27e18ce # v3.1.2
92+
uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
9393
with:
9494
name: packages
9595
path: outputs/

‎build_python_framework_pkgs.zsh‎

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@
55
# IMPORTANT
66
# Run this with your current directory being the path where this script is located
77

8-
# Harcoded versions
9-
RP_SHA="fb4dd9b024b249c71713f14d887f4bcea78aa8b0"
10-
MP_SHA="0fcd47faf0fb2b4e8a0256a77be315a3cb6ab319"
8+
# Harcoded (commit) versions of relocatable-python & munki-pkg
9+
RP_SHA="8ee72fe3a5dbef733365370ebf44f25022b895ef" # https://github.com/gregneagle/relocatable-python/commits/main/
10+
MP_SHA="96cffb4eac9207c1130404ec1fee8f4777fa38fd" # https://github.com/munki/munki-pkg/commits/main/
1111
MACOS_VERSION=11 # use 10.9 for non-universal
1212
PYTHON_PRERELEASE_VERSION=
1313
PYTHON_BASEURL="https://www.python.org/ftp/python/%s/python-%s${PYTHON_PRERELEASE_VERSION}-macos%s.pkg"
@@ -20,6 +20,8 @@ MP_BINDIR="/tmp/munki-pkg"
2020
CONSOLEUSER=$(/usr/bin/stat -f "%Su" /dev/console)
2121
PIPCACHEDIR="/Users/${CONSOLEUSER}/Library/Caches/pip"
2222
XCODE_PATH="/Applications/Xcode_15.2.app"
23+
# XCODE_PATH="/Applications/Xcode.app"
24+
# XCODE_BUILD_PATH="$XCODE_PATH/Contents/Developer/usr/bin/xcodebuild"
2325
XCODE_NOTARY_PATH="$XCODE_PATH/Contents/Developer/usr/bin/notarytool"
2426
XCODE_STAPLER_PATH="$XCODE_PATH/Contents/Developer/usr/bin/stapler"
2527
NEWSUBBUILD=$((80620 + $(/usr/bin/git rev-parse HEAD~0 | xargs -I{} /usr/bin/git rev-list --count {})))
@@ -56,13 +58,13 @@ fi
5658
if [ -n "$4" ]; then
5759
PYTHON_VERSION=$4
5860
else
59-
PYTHON_VERSION=3.12.1
61+
PYTHON_VERSION=3.13.5
6062
fi
6163

6264
if [ -n "$5" ]; then
6365
PYTHON_MAJOR_VERSION=$5
6466
else
65-
PYTHON_MAJOR_VERSION=3.12
67+
PYTHON_MAJOR_VERSION=3.13
6668
fi
6769
# Set python bin version based on PYTHON_VERSION
6870
PYTHON_BIN_VERSION="${PYTHON_VERSION%.*}"
@@ -96,7 +98,7 @@ if [ -d "${PIPCACHEDIR}" ]; then
9698
/usr/bin/sudo /bin/rm -rf "${PIPCACHEDIR}"
9799
fi
98100

99-
# kill homebrew packages
101+
# kill homebrew packages on GitHub runner
100102
/usr/local/bin/brew remove --force $(/usr/local/bin/brew list)
101103

102104
# Ensure Xcode is set to run-time
@@ -153,6 +155,9 @@ fi
153155
if [[ "${PYTHON_MAJOR_VERSION}" == "3.12" ]]; then
154156
/bin/ln -s "$PYTHON_BIN_NEW" "$TOOLSDIR/$TYPE/payload/usr/local/bin/managed_python3"
155157
fi
158+
if [[ "${PYTHON_MAJOR_VERSION}" == "3.13" ]]; then
159+
/bin/ln -s "$PYTHON_BIN_NEW" "$TOOLSDIR/$TYPE/payload/usr/local/bin/managed_python3"
160+
fi
156161

157162
SB_RESULT="$?"
158163
if [ "${SB_RESULT}" != "0" ]; then
@@ -236,6 +241,7 @@ else
236241
/usr/bin/codesign -s - --deep --force --preserve-metadata=identifier,entitlements,flags,runtime "$TOOLSDIR/$TYPE/payload${FRAMEWORKDIR}/Python3.framework/Versions/${PYTHON_BIN_VERSION}/Resources/Python.app"
237242
/usr/bin/codesign -s - --force --preserve-metadata=identifier,entitlements,flags,runtime "$TOOLSDIR/$TYPE/payload${FRAMEWORKDIR}/Python3.framework/Versions/${PYTHON_BIN_VERSION}/Python"
238243
/usr/bin/codesign -s - --force --preserve-metadata=identifier,entitlements,flags,runtime "$TOOLSDIR/$TYPE/payload${FRAMEWORKDIR}Python3.framework/Versions/Current/Python"
244+
# /usr/bin/codesign -s - --force --preserve-metadata=identifier,entitlements,flags,runtime "$TOOLSDIR/$TYPE/payload${FRAMEWORKDIR}/Python3.framework/Versions/Current/Python"
239245
fi
240246

241247
# Print out some information about the signatures

‎requirements_recommended.txt‎

Lines changed: 32 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -1,42 +1,42 @@
11
asn1crypto==1.5.1
22
aspy.yaml==1.3.0
3-
attrs==23.2.0
4-
black==24.1.1
3+
attrs==25.3.0
4+
black==25.1.0
55
--no-binary black
6-
certifi==2023.11.17
7-
cffi==1.16.0
6+
certifi==2025.6.15
7+
cffi==1.17.1
88
--no-binary cffi
99
cfgv==3.4.0
10-
charset-normalizer==3.3.2
10+
charset-normalizer==3.4.2
1111
--no-binary charset-normalizer
12-
click==8.1.7
13-
distlib==0.3.8
14-
docklib==1.3.0
12+
click==8.2.1
13+
distlib==0.3.9
14+
docklib==2.0.0
1515
entrypoints==0.4
16-
filelock==3.13.1
17-
flake8==7.0.0
18-
flake8-bugbear==24.1.17
19-
identify==2.5.33
20-
idna==3.6
21-
isort==5.13.2
16+
filelock==3.18.0
17+
flake8==7.3.0
18+
flake8-bugbear==24.12.12
19+
identify==2.6.12
20+
idna==3.10
21+
isort==6.0.1
2222
mccabe==0.7.0
23-
mypy-extensions==1.0.0
24-
nodeenv==1.8.0
25-
packaging==23.2
23+
mypy-extensions==1.1.0
24+
nodeenv==1.9.1
25+
packaging==25.0
2626
pathspec==0.12.1
27-
platformdirs==4.2.0
28-
pre-commit==3.6.0
29-
pycodestyle==2.11.1
30-
pycparser==2.21
31-
pyflakes==3.2.0
32-
pyobjc==10.1
33-
PyYAML==6.0.1
27+
platformdirs==4.3.8
28+
pre-commit==4.2.0
29+
pycodestyle==2.14.0
30+
pycparser==2.22
31+
pyflakes==3.4.0
32+
pyobjc==11.1
33+
PyYAML==6.0.2
3434
--no-binary PyYAML
35-
requests==2.31.0
36-
six==1.16.0
37-
tokenize-rt==5.2.0
38-
tomli==2.0.1
39-
urllib3==2.2.0
40-
virtualenv==20.25.0
41-
xattr==1.0.0
42-
--no-binary xattr
35+
requests==2.32.4
36+
six==1.17.0
37+
tokenize-rt==6.2.0
38+
tomli==2.2.1
39+
urllib3==2.5.0
40+
virtualenv==20.31.2
41+
xattr==1.1.4
42+
--no-binary xattr

0 commit comments

Comments
 (0)