From 9dc7e41f73d7a4a9aa62d069f58093ccfb958241 Mon Sep 17 00:00:00 2001 From: Richard Larkin Date: Fri, 29 May 2020 07:33:32 +0200 Subject: [PATCH] Pin flask version and dependencies (#510) * Pin flask version and dependencies * Fix pep8 check Co-authored-by: richard --- README.md | 12 ++++++------ kivy_ios/recipes/click/__init__.py | 6 ++---- kivy_ios/recipes/flask/__init__.py | 4 +--- kivy_ios/recipes/itsdangerous/__init__.py | 6 ++---- kivy_ios/recipes/jinja2/__init__.py | 2 +- kivy_ios/recipes/markupsafe/__init__.py | 2 +- kivy_ios/recipes/werkzeug/__init__.py | 2 +- 7 files changed, 14 insertions(+), 20 deletions(-) diff --git a/README.md b/README.md index 467944a..29a8a89 100644 --- a/README.md +++ b/README.md @@ -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: diff --git a/kivy_ios/recipes/click/__init__.py b/kivy_ios/recipes/click/__init__.py index 3ae4a1c..55bf76f 100644 --- a/kivy_ios/recipes/click/__init__.py +++ b/kivy_ios/recipes/click/__init__.py @@ -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) diff --git a/kivy_ios/recipes/flask/__init__.py b/kivy_ios/recipes/flask/__init__.py index 0c107f3..5d2847f 100644 --- a/kivy_ios/recipes/flask/__init__.py +++ b/kivy_ios/recipes/flask/__init__.py @@ -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) diff --git a/kivy_ios/recipes/itsdangerous/__init__.py b/kivy_ios/recipes/itsdangerous/__init__.py index 22bac2b..d30dd9f 100644 --- a/kivy_ios/recipes/itsdangerous/__init__.py +++ b/kivy_ios/recipes/itsdangerous/__init__.py @@ -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) diff --git a/kivy_ios/recipes/jinja2/__init__.py b/kivy_ios/recipes/jinja2/__init__.py index b07758e..23adcad 100644 --- a/kivy_ios/recipes/jinja2/__init__.py +++ b/kivy_ios/recipes/jinja2/__init__.py @@ -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"] diff --git a/kivy_ios/recipes/markupsafe/__init__.py b/kivy_ios/recipes/markupsafe/__init__.py index baccc28..19181bf 100644 --- a/kivy_ios/recipes/markupsafe/__init__.py +++ b/kivy_ios/recipes/markupsafe/__init__.py @@ -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"] diff --git a/kivy_ios/recipes/werkzeug/__init__.py b/kivy_ios/recipes/werkzeug/__init__.py index 9c07795..6dbf272 100644 --- a/kivy_ios/recipes/werkzeug/__init__.py +++ b/kivy_ios/recipes/werkzeug/__init__.py @@ -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"]