Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

PR: Use Python 3.9.14 for x86_64 macOS application build #21770

Merged
merged 1 commit into from
Feb 7, 2024
Merged

PR: Use Python 3.9.14 for x86_64 macOS application build #21770

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 15 additions & 6 deletions .github/workflows/installer-macos.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,11 @@ jobs:
matrix:
build_type: ${{fromJson(needs.matrix_prep.outputs.build_type)}}
os: ["macos-11", "macos-14"]
include:
- os: "macos-11"
pyver: "3.9.14"
- os: "macos-14"
pyver: "3.10.11"
defaults:
run:
shell: bash -l {0}
Expand All @@ -72,7 +77,7 @@ jobs:
- name: Setup Python
uses: actions/setup-python@v5
with:
python-version: '3.10.11'
python-version: ${{ matrix.pyver }}
- name: Install pcregrep
run: |
if [[ -z "$(which pcregrep)" ]]; then
Expand All @@ -88,8 +93,6 @@ jobs:
fi
${pythonLocation}/bin/python -m pip install -U pip setuptools wheel
${pythonLocation}/bin/python -m pip install -r req-build.txt -r req-extras.txt -r req-plugins.txt "${INSTALL_FLAGS[@]}" -e ${GITHUB_WORKSPACE}
- name: Add missing file to Black dist-info
run: touch ${pythonLocation}/lib/python3.10/site-packages/black-24.1.1.dist-info/top_level.txt
- name: Install Subrepos
if: ${{github.event_name == 'pull_request'}}
run: ${pythonLocation}/bin/python -bb -X dev -W error ${GITHUB_WORKSPACE}/install_dev_repos.py --not-editable --no-install spyder
Expand All @@ -103,9 +106,15 @@ jobs:
curl -Ls https://micro.mamba.pm/api/micromamba/osx-64/latest | tar -xvj bin/micromamba
install_name_tool -change @rpath/libc++.1.dylib /usr/lib/libc++.1.dylib bin/micromamba
- name: Build Application Bundle
run: ${pythonLocation}/bin/python setup.py ${LITE_FLAG} --dist-dir ${DISTDIR}
- name: Add missing Black module to bundle
run: cp -v ${pythonLocation}/lib/python3.10/site-packages/629853fdff261ed89b74__mypyc* ${DISTDIR}/Spyder.app/Contents/Resources/lib/python3.10/
run: |
echo "Patch Black 1 of 2"
sitepkgs=$($pythonLocation/bin/python -c "import site; print(site.getsitepackages()[0])")
touch ${sitepkgs}/black-24.1.1.dist-info/top_level.txt

${pythonLocation}/bin/python setup.py ${LITE_FLAG} --dist-dir ${DISTDIR}

echo "Patch Black 2 of 2"
cp -v ${sitepkgs}/629853fdff261ed89b74__mypyc* ${DISTDIR}/Spyder.app/Contents/Resources/lib/python*/
- name: Create Keychain
if: ${{env.IS_RELEASE == 'true' || env.IS_PRE == 'true'}}
run: ./certkeychain.sh "${MACOS_CERTIFICATE}" "${MACOS_CERTIFICATE_PWD}"
Expand Down
Loading