Skip to content

Commit f47e35e

Browse files
authored
Merge pull request #1278 from AndreMiras/feature/ticket1263_setup_testapp_python2_sqlite_openssl
Build `testapp_sqlite_openssl` using `setup_testapp_python2.py`
2 parents ec9247e + 82575a1 commit f47e35e

File tree

2 files changed

+13
-7
lines changed

2 files changed

+13
-7
lines changed

.travis.yml

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,13 @@ services:
88
before_install:
99
- docker build --tag=p4a .
1010

11+
env:
12+
- COMMAND='uname -a'
13+
- COMMAND='. venv/bin/activate && p4a apk --help'
14+
- COMMAND='. venv/bin/activate && cd testapps/ && python setup_testapp_python2.py apk --sdk-dir /opt/android/android-sdk --ndk-dir /opt/android/android-ndk'
15+
# overrides requirements to skip `peewee` pure python module, see:
16+
# https://github.com/kivy/python-for-android/issues/1263#issuecomment-390421054
17+
- COMMAND='. venv/bin/activate && cd testapps/ && python setup_testapp_python2_sqlite_openssl.py apk --sdk-dir /opt/android/android-sdk --ndk-dir /opt/android/android-ndk --requirements sdl2,pyjnius,kivy,python2,openssl,requests,sqlite3'
18+
1119
script:
12-
- docker run p4a /bin/sh -c 'uname -a'
13-
- docker run p4a /bin/sh -c '. venv/bin/activate && p4a apk --help'
14-
- docker run p4a /bin/sh -c '. venv/bin/activate && cd testapps/ && python setup_testapp_python2.py apk --sdk-dir /opt/android/android-sdk --ndk-dir /opt/android/android-ndk'
20+
- docker run p4a /bin/sh -c "$COMMAND"

Dockerfile

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -29,16 +29,16 @@ ENV ANDROID_NDK_DL_URL="https://dl.google.com/android/repository/${ANDROID_NDK_A
2929
ANDROID_SDK_TOOLS_DL_URL="https://dl.google.com/android/repository/${ANDROID_SDK_TOOLS_ARCHIVE}"
3030

3131
# install system dependencies
32-
RUN apt update && apt install --yes --no-install-recommends \
32+
RUN apt update -qq && apt install -qq --yes --no-install-recommends \
3333
python virtualenv python-pip wget curl lbzip2 patch
3434

3535
# build dependencies
3636
# https://buildozer.readthedocs.io/en/latest/installation.html#android-on-ubuntu-16-04-64bit
37-
RUN dpkg --add-architecture i386 && apt-get update && apt install --yes --no-install-recommends \
37+
RUN dpkg --add-architecture i386 && apt update -qq && apt install -qq --yes --no-install-recommends \
3838
build-essential ccache git libncurses5:i386 libstdc++6:i386 libgtk2.0-0:i386 \
3939
libpangox-1.0-0:i386 libpangoxft-1.0-0:i386 libidn11:i386 python2.7 python2.7-dev \
4040
openjdk-8-jdk unzip zlib1g-dev zlib1g:i386
41-
RUN pip install --upgrade cython==0.21
41+
RUN pip install --quiet --upgrade cython==0.21
4242

4343
# download and install Android NDK
4444
RUN curl --progress-bar "${ANDROID_NDK_DL_URL}" --output "${ANDROID_NDK_ARCHIVE}" && \
@@ -61,4 +61,4 @@ RUN "${ANDROID_SDK_HOME}/tools/bin/sdkmanager" "build-tools;26.0.2"
6161
# install python-for-android from current branch
6262
WORKDIR /app
6363
COPY . /app
64-
RUN virtualenv --python=python venv && . venv/bin/activate && pip install -e .
64+
RUN virtualenv --python=python venv && . venv/bin/activate && pip install --quiet -e .

0 commit comments

Comments
 (0)