Skip to content

Commit

Permalink
chaning kivy depend from source to wheel
Browse files Browse the repository at this point in the history
and also upgrading pip, as is required for using the kivy-released manylinux2010 binary/wheel. See also:

 * #2 (comment)
  • Loading branch information
maltfield committed Jul 8, 2020
1 parent 9d598a9 commit 37c1d0b
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 3 deletions.
Binary file not shown.
6 changes: 5 additions & 1 deletion build/deps/download.sh
Original file line number Diff line number Diff line change
Expand Up @@ -37,8 +37,12 @@ ${CURL} -s https://check.torproject.org | grep Congratulations | head -n1
# and today's date
date -u +"%Y-%m-%d"

# first download and upgrade pip (required to get some wheels)
${PYTHON} -m pip download --no-cache-dir pip==20.1.1
${PYTHON} -m pip install --upgrade pip==20.1.1

# pip (all platforms)
${PYTHON} -m pip download kivy==1.11.1 libusb1==1.8 pyinstaller==3.6 altgraph==0.17 macholib==1.14 future==0.18.2 pefile==2019.4.18 pywin32-ctypes==0.2.0
${PYTHON} -m pip download --no-cache-dir kivy==1.11.1 libusb1==1.8 pyinstaller==3.6 altgraph==0.17 macholib==1.14 future==0.18.2 pefile==2019.4.18 pywin32-ctypes==0.2.0

# pip (platform-specific binaries/wheels)
${WGET} `${CURL} -s https://pypi.org/simple/kivy/ | grep -oE 'https://.*Kivy-1.11.1-cp37-cp37m-win_amd64.whl#'`
Expand Down
Binary file added build/deps/pip-20.1.1-py2.py3-none-any.whl
Binary file not shown.
5 changes: 3 additions & 2 deletions build/linux/buildAppImage.sh
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ firecfg --clean
# PREPARE APPDIR #
##################

# We use this ppython-appimage release as a base for building our own python
# We use this python-appimage release as a base for building our own python
# AppImage. We only have to add our code and depends to it.
cp build/deps/python3.7.8-cp37-cp37m-manylinux2014_x86_64.AppImage /tmp/python.AppImage
chmod +x /tmp/python.AppImage
Expand All @@ -98,7 +98,8 @@ mv /tmp/squashfs-root /tmp/kivy_appdir
# install our pip depends from the files in the repo since pip doesn't provide
# decent authentication and integrity checks on what it downloads from PyPI
# * https://security.stackexchange.com/a/234098/213165
${FIREJAIL} /tmp/kivy_appdir/opt/python*/bin/python* -m pip install --ignore-installed --upgrade --cache-dir build/deps/ build/deps/Kivy-1.11.1.tar.gz
${FIREJAIL} /tmp/kivy_appdir/opt/python*/bin/python* -m pip install --ignore-installed --upgrade --cache-dir build/deps/ build/deps/pip-20.1.1-py2.py3-none-any.whl
${FIREJAIL} /tmp/kivy_appdir/opt/python*/bin/python* -m pip install --ignore-installed --upgrade --cache-dir build/deps/ build/deps/Kivy-1.11.1-cp37-cp37m-manylinux2010_x86_64.whl
${FIREJAIL} /tmp/kivy_appdir/opt/python*/bin/python* -m pip install --ignore-installed --upgrade --cache-dir build/deps/ build/deps/libusb-1.0.23.tar.bz2

# add our code to the AppDir
Expand Down

0 comments on commit 37c1d0b

Please sign in to comment.