Skip to content

Commit 4329f2e

Browse files
committed
Use venv python, remove verbose output
1 parent 2d2973b commit 4329f2e

File tree

3 files changed

+8
-8
lines changed

3 files changed

+8
-8
lines changed

clean-build-copy.sh

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -54,17 +54,17 @@ androidYoutubeDlProject="$(dirname "$PWD")/android-youtube-dl"
5454

5555
clean() {
5656
echo "[INFO] Clean"
57-
/usr/bin/python $p4a clean_builds
58-
rm -rfv $distFolder
59-
rm -rfv $PWD/build
57+
python $p4a clean_builds
58+
rm -rf $distFolder
59+
rm -rf $PWD/build
6060
echo "[INFO] Clean done"
6161
}
6262

6363

6464
build() {
6565
echo "[INFO] Build [$1]"
6666
python $p4a clean_builds
67-
rm -rfv $distFolder
67+
rm -rf $distFolder
6868
python $p4a apk --private $pythonApp --dist_name=$pythonAppDistName --package=$pythonAppPackageName --name=$pythonAppName --version=1 --ndk_dir $ANDROID_NDK_HOME --ndk_version r16b --requirements=android,pyopenssl,pycrypto,openssl --android_api=23 --arch=$1 --java-build-tool gradle
6969
# if [ -z "$TRAVIS" ]
7070
# then

pythonforandroid/bootstraps/sdl2/build/build.py

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33

44
from __future__ import print_function
55

6-
import jinja2
76
import json
87
import os
98
import shutil
@@ -18,6 +17,8 @@
1817
dirname, join, isfile, realpath, relpath, split, exists, basename)
1918
from zipfile import ZipFile
2019

20+
import jinja2
21+
2122
curdir = dirname(__file__)
2223

2324
# Try to find a host version of Python that matches our ARM version.
@@ -220,8 +221,6 @@ def compile_dir(dfn):
220221
def make_package(args):
221222
# Ignore warning if the launcher is in args
222223
if not args.launcher:
223-
print('args.private path: {}'.format(args.private))
224-
print('realpath: {}'.format(join(realpath(args.private), 'main.py')))
225224
if not (exists(join(realpath(args.private), 'main.py')) or
226225
exists(join(realpath(args.private), 'main.pyo'))):
227226
print('''BUILD FAILURE: No main.py(o) found in your app directory. This

requirements.txt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,5 @@ colorama==0.3.3
22
appdirs==1.4.3
33
sh==1.10
44
jinja2==2.10
5-
Cython==0.29.7
5+
Cython==0.29.7
6+
six==1.4.1

0 commit comments

Comments
 (0)