Skip to content

Commit 0affc0c

Browse files
committed
adding python/kivy/sdl dependencies directly to repo
MacOS builds keep failing because the MacStadium cloud keeps moving around its version of and path to python. By pinning the exact brew bottle directly in the repo, we not only future-proof the repo from future changes, but we also reduce the risk of a MITM infecting ours at the source.
1 parent 078f202 commit 0affc0c

9 files changed

+21
-14
lines changed

build/deps/PyInstaller-3.6.tar.gz

3.38 MB
Binary file not shown.
1.42 MB
Binary file not shown.
15 MB
Binary file not shown.
1.28 MB
Binary file not shown.
127 KB
Binary file not shown.
128 KB
Binary file not shown.
23.5 KB
Binary file not shown.

build/mac/buildDmg.sh

Lines changed: 21 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -11,17 +11,17 @@ set -x
1111
#
1212
# Authors: Michael Altfield <[email protected]>
1313
# Created: 2020-06-22
14-
# Updated: 2020-09-17
15-
# Version: 0.2
14+
# Updated: 2021-08-09
15+
# Version: 0.3
1616
################################################################################
1717

1818

1919
############
2020
# SETTINGS #
2121
############
2222

23-
PYTHON_PATH="`find /usr/local/Cellar/python@3.7 -type f -name python3.7 | head -n1`"
24-
PIP_PATH="`find /usr/local/Cellar/python@3.7 -type f -name pip3.7 | head -n1`"
23+
PYTHON_PATH="`find /usr/local/Cellar/python -type f -wholename *bin/python3* | sort -n | uniq | head -n1`"
24+
PIP_PATH="`find /usr/local/Cellar/python -type f -wholename *bin/pip3* | sort -n | uniq | head -n1`"
2525
APP_NAME='helloWorld'
2626

2727
PYTHON_VERSION="`${PYTHON_PATH} --version | cut -d' ' -f2`"
@@ -49,23 +49,30 @@ ls -lah
4949

5050
# first update brew
5151
# * https://blog.fossasia.org/deploying-a-kivy-application-with-pyinstaller-for-mac-osx-to-github/
52-
brew update
52+
#brew update
5353

5454
# install os-level depends
55-
brew install wget python3
56-
brew reinstall sdl2 sdl2_image sdl2_ttf sdl2_mixer
55+
#brew install wget python3
56+
#brew reinstall sdl2 sdl2_image sdl2_ttf sdl2_mixer
57+
58+
brew -v uninstall --ignore-dependencies python
59+
brew -v reinstall build/deps/python-3.7.8.catalina.bottle.tar.gz
60+
PYTHON_PATH="`find /usr/local/Cellar/python -type f -wholename *bin/python3* | sort -n | uniq | head -n1`"
61+
62+
brew reinstall build/deps/sdl2-2.0.12_1.catalina.bottle.tar.gz
63+
brew reinstall build/deps/sdl2_image-2.0.5.catalina.bottle.tar.gz
64+
brew reinstall build/deps/sdl2_mixer-2.0.4.catalina.bottle.tar.gz
65+
brew reinstall build/deps/sdl2_ttf-2.0.15.catalina.bottle.tar.gz
5766

5867
# setup a virtualenv to isolate our app's python depends
59-
sudo ${PYTHON_PATH} -m ensurepip
60-
${PIP_PATH} install --upgrade --force-reinstall --user pip setuptools
68+
#sudo ${PYTHON_PATH} -m ensurepip
69+
#${PIP_PATH} install --upgrade --force-reinstall --user pip setuptools
6170
#${PYTHON_PATH} -m pip install --upgrade --user virtualenv
6271
#${PYTHON_PATH} -m virtualenv /tmp/kivy_venv
6372

64-
# install kivy and all other python dependencies with pip into our virtual env
65-
#source /tmp/kivy_venv/bin/activate
66-
${PIP_PATH} install --upgrade --force-reinstall --user Cython==0.29.10 || exit 1
67-
${PIP_PATH} install --upgrade --force-reinstall --user -r requirements.txt || exit 1
68-
${PIP_PATH} install --upgrade --force-reinstall --user PyInstaller || exit 1
73+
# install kivy and all other python dependencies with pip
74+
${PIP_PATH} install --ignore-installed --upgrade --cache-dir build/deps/ --no-index --find-links file://`pwd`/build/deps/ build/deps/Kivy-1.11.1-cp37-cp37m-macosx_10_6_intel.macosx_10_9_intel.macosx_10_9_x86_64.macosx_10_10_intel.macosx_10_10_x86_64.whl
75+
${PIP_PATH} install --ignore-installed --upgrade --cache-dir build/deps/ --no-index --find-links file://`pwd`/build/deps/ build/deps/PyInstaller-3.6.tar.gz
6976

7077
#####################
7178
# PYINSTALLER BUILD #

0 commit comments

Comments
 (0)