Pin flask version and dependencies (#510)

* Pin flask version and dependencies

* Fix pep8 check

Co-authored-by: richard <richard@dotmodus>
This commit is contained in:
Richard Larkin 2020-05-29 07:33:32 +02:00 committed by GitHub
parent 2ef99a4924
commit 9dc7e41f73
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
7 changed files with 14 additions and 20 deletions

View file

@ -60,22 +60,22 @@ You can list the available recipes and their versions with:
$ toolchain recipes
audiostream master
click master
click 7.1.2
cymunk master
ffmpeg 2.6.3
ffpyplayer v3.2
flask master
flask 1.1.2
freetype 2.5.5
hostlibffi 3.2.1
hostpython3 3.7.1
ios master
itsdangerous master
jinja2 master
itsdangerous 1.1.0
jinja2 2.11.2
kivy 1.10.1
libffi 3.2.1
libjpeg v9a
libpng 1.6.26
markupsafe master
markupsafe 1.1.1
moodstocks 4.1.5
numpy 1.16.4
openssl 1.0.2k
@ -92,7 +92,7 @@ You can list the available recipes and their versions with:
sdl2_image 2.0.0
sdl2_mixer 2.0.0
sdl2_ttf 2.0.12
werkzeug master
werkzeug 1.0.1
Then, start the compilation with:

View file

@ -6,7 +6,7 @@ import os
class ClickRecipe(PythonRecipe):
version = "master"
version = "7.1.2"
url = "https://github.com/mitsuhiko/click/archive/{version}.zip"
depends = ["python"]
@ -16,10 +16,8 @@ class ClickRecipe(PythonRecipe):
os.chdir(build_dir)
hostpython = sh.Command(self.ctx.hostpython)
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')
cmd = sh.Command("sed")
shprint(cmd, "-i", "", "s/setuptools/distutils.core/g", "./setup.py", _env=build_env)
shprint(hostpython, "setup.py", "install", "--prefix", dest_dir, _env=build_env)

View file

@ -6,7 +6,7 @@ import os
class FlaskRecipe(PythonRecipe):
version = "master"
version = "1.1.2"
url = "https://github.com/mitsuhiko/flask/archive/{version}.zip"
depends = ["python", "jinja2", "werkzeug", "itsdangerous", "click"]
@ -18,8 +18,6 @@ class FlaskRecipe(PythonRecipe):
build_env = arch.get_env()
dest_dir = join(self.ctx.dist_dir, "root", "python")
build_env['PYTHONPATH'] = join(dest_dir, 'lib', 'python3.8', 'site-packages')
cmd = sh.Command("sed")
shprint(cmd, "-i", "", "s/setuptools/distutils.core/g", "./setup.py", _env=build_env)
shprint(hostpython, "setup.py", "install", "--prefix", dest_dir, _env=build_env)

View file

@ -5,7 +5,7 @@ import sh
class ItsDangerousRecipe(PythonRecipe):
version = "master"
version = "1.1.0"
url = "https://github.com/mitsuhiko/itsdangerous/archive/{version}.zip"
depends = ["python"]
@ -14,11 +14,9 @@ class ItsDangerousRecipe(PythonRecipe):
build_dir = self.get_build_dir(arch.arch)
hostpython = sh.Command(self.ctx.hostpython)
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')
cmd = sh.Command("sed")
with cd(build_dir):
shprint(cmd, "-i", "", "s/setuptools/distutils.core/g", "./setup.py", _env=build_env)
shprint(hostpython, "setup.py", "install", "--prefix", dest_dir, _env=build_env)

View file

@ -6,7 +6,7 @@ import os
class Jinja2Recipe(PythonRecipe):
version = "master"
version = "2.11.2"
url = "https://github.com/mitsuhiko/jinja2/archive/{version}.zip"
depends = ["python", "markupsafe"]

View file

@ -6,7 +6,7 @@ import os
class MarkupSafeRecipe(PythonRecipe):
version = "master"
version = "1.1.1"
url = "https://github.com/mitsuhiko/markupsafe/archive/{version}.zip"
depends = ["python"]

View file

@ -6,7 +6,7 @@ import os
class WerkzeugRecipe(PythonRecipe):
version = "master"
version = "1.0.1"
url = "https://github.com/mitsuhiko/werkzeug/archive/{version}.zip"
depends = ["python", "openssl"]