Skip to content

Commit

Permalink
Merge pull request #22117 from mrclary/macos-12
Browse files Browse the repository at this point in the history
PR: Constrain setuptools for macOS standalone installer
  • Loading branch information
ccordoba12 committed May 22, 2024
2 parents 49b43bf + 0a2b671 commit edd5881
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 3 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/installer-macos.yml
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ jobs:
strategy:
matrix:
build_type: ${{fromJson(needs.matrix_prep.outputs.build_type)}}
os: ["macos-11", "macos-14"]
os: ["macos-12", "macos-14"]
include:
- os: "macos-12"
pyver: "3.9.14"
Expand Down Expand Up @@ -91,7 +91,7 @@ jobs:
if [[ -z ${LITE_FLAG} ]]; then
INSTALL_FLAGS+=('-r' 'req-scientific.txt')
fi
${pythonLocation}/bin/python -m pip install -U pip setuptools wheel
${pythonLocation}/bin/python -m pip install -U pip 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: Install Subrepos
if: ${{github.event_name == 'pull_request'}}
Expand Down
3 changes: 2 additions & 1 deletion installers/macOS/req-build.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
# For building standalone Mac app
black==24.1.1 # Pin it to add missing modules to the bundle. See workflow file for the details.
dmgbuild>=1.4.2
py2app==0.28.4
setuptools<70.0.0
sphinx==5.1.1 # See spyder-ide/spyder#19618 for details.
black==24.1.1 # Pin it to add missing modules to the bundle. See workflow file for the details.

0 comments on commit edd5881

Please sign in to comment.