6215290912

Committed 17 Sep 2023 06:49PM UTC coverage: 59.095% (+1.4%) from 57.68%

Build # 6215290912

Build Type

push

github

Committed by

web-flow

Commit Message

Merge pull request #2891 from misl6/release-2023.09.16

* Update `cffi` recipe for Python 3.10 (#2800)

* Update __init__.py

version bump to 1.15.1

* Update disable-pkg-config.patch

adjust patch for 1.15.1

* Use build rather than pep517 for building (#2784)

pep517 has been renamed to pyproject-hooks, and as a consequence all of
the deprecated functionality has been removed. build now provides the
functionality required, and since we are only interested in the
metadata, we can leverage a helper function for that. I've also removed
all of the subprocess machinery for calling the wrapping function, since
it appears to not be as noisy as pep517.

* Bump actions/setup-python and actions/checkout versions, as old ones are deprecated (#2827)

* Removes `mysqldb` recipe as does not support Python 3 (#2828)

* Removes `Babel` recipe as it's not needed anymore. (#2826)

* Remove dateutil recipe, as it's not needed anymore (#2829)

* Optimize CI runs, by avoiding unnecessary rebuilds (#2833)

* Remove `pytz` recipe, as it's not needed anymore (#2830)

* `freetype` recipe: Changed the url to use https as http doesn't work (#2846)

* Fix `vlc` recipe build (#2841)

* Correct sys_platform (#2852)

On Window, sys.platform = "win32".

I think "nt" is a reference to os.name.

* Fix code string - quickstart.rst

* Bump `kivy` version to `2.2.1` (#2855)

* Use a pinned version of `Cython` for now, as most of the recipes are incompatible with `Cython==3.x.x` (#2862)

* Automatically generate required pre-requisites (#2858)

`get_required_prerequisites()` maintains a list of Prerequisites required by each platform.

But that same information is already stored in each Prerequisite class.

Rather than rather than maintaining two lists which might become inconsistent, auto-generate one.

* Use `platform.uname` instead of `os.uname` (#2857)

Advantages:

- Works cross platform, not just Unix.
- Is a namedtuple, ... (continued)

Run Details

944 of 2241 branches covered (0.0%)

Branch coverage included in aggregate %.

174 of 272 new or added lines in 32 files covered. (63.97%)

9 existing lines in 5 files now uncovered.

4725 of 7352 relevant lines covered (64.27%)

2.56 hits per line

Source File
Press 'n' to go to next uncovered line, 'b' for previous

25.4

/pythonforandroid/recipes/vlc/__init__.py

from pythonforandroid.toolchain import Recipe, current_directory
from pythonforandroid.logger import info, debug, shprint, warning
from os.path import join, isdir, isfile
from os import environ
import sh


class VlcRecipe(Recipe):
    version = '3.0.18'
    url = None
    name = 'vlc'

    depends = []

    port_git = 'http://git.videolan.org/git/vlc-ports/android.git'
#    vlc_git = 'http://git.videolan.org/git/vlc.git'
    ENV_LIBVLC_AAR = 'LIBVLC_AAR'
    aars = {}  # for future use of multiple arch

    def prebuild_arch(self, arch):
        super().prebuild_arch(arch)
        build_dir = self.get_build_dir(arch.arch)
        port_dir = join(build_dir, 'vlc-port-android')
        if self.ENV_LIBVLC_AAR in environ:
            aar = environ.get(self.ENV_LIBVLC_AAR)
            if isdir(aar):
                aar = join(aar, 'libvlc-{}.aar'.format(self.version))
            if not isfile(aar):
                warning("Error: {} is not valid libvlc-<ver>.aar bundle".format(aar))
                info("check {} environment!".format(self.ENV_LIBVLC_AAR))
                exit(1)
            self.aars[arch] = aar
        else:
            aar_path = join(port_dir, 'libvlc', 'build', 'outputs', 'aar')
            self.aars[arch] = aar = join(aar_path, 'libvlc-{}.aar'.format(self.version))
            warning("HINT: set path to precompiled libvlc-<ver>.aar bundle "
                    "in {} environment!".format(self.ENV_LIBVLC_AAR))
            info("libvlc-<ver>.aar should build "
                 "from sources at {}".format(port_dir))
            if not isfile(join(port_dir, 'compile.sh')):
                info("clone vlc port for android sources from {}".format(
                            self.port_git))
                shprint(sh.git, 'clone', self.port_git, port_dir,
                        _tail=20, _critical=True)
# now "git clone ..." is a part of compile.sh
#            vlc_dir = join(port_dir, 'vlc')
#            if not isfile(join(vlc_dir, 'Makefile.am')):
#                info("clone vlc sources from {}".format(self.vlc_git))
#                shprint(sh.git, 'clone', self.vlc_git, vlc_dir,
#                            _tail=20, _critical=True)

    def build_arch(self, arch):
        super().build_arch(arch)
        build_dir = self.get_build_dir(arch.arch)
        port_dir = join(build_dir, 'vlc-port-android', 'buildsystem')
        aar = self.aars[arch]
        if not isfile(aar):
            with current_directory(port_dir):
                env = dict(environ)
                env.update({
                    'ANDROID_ABI': arch.arch,
                    'ANDROID_NDK': self.ctx.ndk_dir,
                    'ANDROID_SDK': self.ctx.sdk_dir,
                })
                info("compiling vlc from sources")
                debug("environment: {}".format(env))
                if not isfile(join('bin', 'VLC-debug.apk')):
                    shprint(sh.Command('./compile.sh'), _env=env,
                            _tail=50, _critical=True)
                shprint(sh.Command('./compile-medialibrary.sh'), _env=env,
                        _tail=50, _critical=True)
        shprint(sh.cp, '-a', aar, self.ctx.aars_dir)


recipe = VlcRecipe()

1	from pythonforandroid.toolchain import Recipe, current_directory	4✔
2	from pythonforandroid.logger import info, debug, shprint, warning	4✔
3	from os.path import join, isdir, isfile	4✔
4	from os import environ	4✔
5	import sh	4✔
6
7
8	class VlcRecipe(Recipe):	4✔
9	version = '3.0.18'	4✔
10	url = None	4✔
11	name = 'vlc'	4✔
12
13	depends = []	4✔
14
15	port_git = 'http://git.videolan.org/git/vlc-ports/android.git'	4✔
16	# vlc_git = 'http://git.videolan.org/git/vlc.git'
17	ENV_LIBVLC_AAR = 'LIBVLC_AAR'	4✔
18	aars = {} # for future use of multiple arch	4✔
19
20	def prebuild_arch(self, arch):	4✔
21	super().prebuild_arch(arch)	×
22	build_dir = self.get_build_dir(arch.arch)	×
23	port_dir = join(build_dir, 'vlc-port-android')	×
24	if self.ENV_LIBVLC_AAR in environ:	×
25	aar = environ.get(self.ENV_LIBVLC_AAR)	×
26	if isdir(aar):	×
27	aar = join(aar, 'libvlc-{}.aar'.format(self.version))	×
28	if not isfile(aar):	×
29	warning("Error: {} is not valid libvlc-<ver>.aar bundle".format(aar))	×
30	info("check {} environment!".format(self.ENV_LIBVLC_AAR))	×
31	exit(1)	×
32	self.aars[arch] = aar	×
33	else:
34	aar_path = join(port_dir, 'libvlc', 'build', 'outputs', 'aar')	×
35	self.aars[arch] = aar = join(aar_path, 'libvlc-{}.aar'.format(self.version))	×
36	warning("HINT: set path to precompiled libvlc-<ver>.aar bundle "	×
37	"in {} environment!".format(self.ENV_LIBVLC_AAR))
38	info("libvlc-<ver>.aar should build "	×
39	"from sources at {}".format(port_dir))
40	if not isfile(join(port_dir, 'compile.sh')):	×
41	info("clone vlc port for android sources from {}".format(	×
42	self.port_git))
43	shprint(sh.git, 'clone', self.port_git, port_dir,	×
44	_tail=20, _critical=True)
45	# now "git clone ..." is a part of compile.sh
46	# vlc_dir = join(port_dir, 'vlc')
47	# if not isfile(join(vlc_dir, 'Makefile.am')):
48	# info("clone vlc sources from {}".format(self.vlc_git))
49	# shprint(sh.git, 'clone', self.vlc_git, vlc_dir,
50	# _tail=20, _critical=True)
51
52	def build_arch(self, arch):	4✔
53	super().build_arch(arch)	×
54	build_dir = self.get_build_dir(arch.arch)	×
NEW 55	port_dir = join(build_dir, 'vlc-port-android', 'buildsystem')	×
56	aar = self.aars[arch]	×
57	if not isfile(aar):	×
58	with current_directory(port_dir):	×
59	env = dict(environ)	×
60	env.update({	×
61	'ANDROID_ABI': arch.arch,
62	'ANDROID_NDK': self.ctx.ndk_dir,
63	'ANDROID_SDK': self.ctx.sdk_dir,
64	})
65	info("compiling vlc from sources")	×
66	debug("environment: {}".format(env))	×
67	if not isfile(join('bin', 'VLC-debug.apk')):	×
68	shprint(sh.Command('./compile.sh'), _env=env,	×
69	_tail=50, _critical=True)
NEW 70	shprint(sh.Command('./compile-medialibrary.sh'), _env=env,	×
71	_tail=50, _critical=True)
72	shprint(sh.cp, '-a', aar, self.ctx.aars_dir)	×
73
74
75	recipe = VlcRecipe()	4✔

kivy / python-for-android / 6215290912

Source File Press 'n' to go to next uncovered line, 'b' for previous

Source File
Press 'n' to go to next uncovered line, 'b' for previous