LBRYCommunity/kivy-ios
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fix markupsafe recipe (#505)

Browse source 
* Fix imports from distutils

* Remove markupsafe exclusion

* Fix python build path

* Remove distutils injection

* 💄 Pep8 fix

Co-authored-by: richard <richard@dotmodus>
This commit is contained in:
Richard Larkin 2020-05-27 07:07:55 +02:00 • committed by GitHub
parent 45875155c5
commit 6d00b7940c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 1 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
.ci/constants.py
View file

@ -2,9 +2,6 @@ BROKEN_RECIPES = set(
[ [
# 'distutils.core' is not a package # 'distutils.core' is not a package
# https://github.com/kivy/kivy-ios/issues/467 # https://github.com/kivy/kivy-ios/issues/467
"markupsafe",
# depends on markupsafe
# https://github.com/kivy/kivy-ios/issues/466
"jinja2", "jinja2",
# bad install directory or PYTHONPATH # bad install directory or PYTHONPATH
# https://github.com/kivy/kivy-ios/issues/468 # https://github.com/kivy/kivy-ios/issues/468

3
kivy_ios/recipes/markupsafe/__init__.py
View file

@ -16,11 +16,10 @@ class MarkupSafeRecipe(PythonRecipe):
os.chdir(build_dir) os.chdir(build_dir)
hostpython = sh.Command(self.ctx.hostpython) hostpython = sh.Command(self.ctx.hostpython)
build_env = arch.get_env() build_env = arch.get_env()
dest_dir = join(self.ctx.dist_dir, "root", "python") dest_dir = join(self.ctx.dist_dir, "root", "python3")
build_env['PYTHONPATH'] = join(dest_dir, 'lib', 'python3.8', 'site-packages') build_env['PYTHONPATH'] = join(dest_dir, 'lib', 'python3.8', 'site-packages')
cmd = sh.Command("sed") cmd = sh.Command("sed")
shprint(cmd, "-i", "", "s/,.*Feature//g", "./setup.py", _env=build_env) shprint(cmd, "-i", "", "s/,.*Feature//g", "./setup.py", _env=build_env)
shprint(cmd, "-i", "", "s/setuptools/distutils.core/g", "./setup.py", _env=build_env)
shprint(cmd, "-i", "", "/^speedups = Feature/,/^)$/s/.*//g", "./setup.py", _env=build_env) shprint(cmd, "-i", "", "/^speedups = Feature/,/^)$/s/.*//g", "./setup.py", _env=build_env)
shprint(cmd, "-i", "", "s/features\['speedups'\].*=.*speedups/pass/g", "./setup.py", _env=build_env) # noqa: W605 shprint(cmd, "-i", "", "s/features\['speedups'\].*=.*speedups/pass/g", "./setup.py", _env=build_env) # noqa: W605
shprint(hostpython, "setup.py", "install", "--prefix", dest_dir, _env=build_env) shprint(hostpython, "setup.py", "install", "--prefix", dest_dir, _env=build_env)