From bbf6896423d1fc23045b38afe46b1178d7f72dda Mon Sep 17 00:00:00 2001 From: Liu Chao Date: Sat, 30 Jul 2016 10:52:11 +0800 Subject: [PATCH 1/2] add sed command for replace `setuptools` to `distutils.core`. --- recipes/click/__init__.py | 2 ++ recipes/flask/__init__.py | 2 ++ recipes/itsdangerous/__init__.py | 2 ++ recipes/jinja2/__init__.py | 2 ++ recipes/markupsafe/__init__.py | 5 +++++ 5 files changed, 13 insertions(+) diff --git a/recipes/click/__init__.py b/recipes/click/__init__.py index b141f78..ff0c8ee 100644 --- a/recipes/click/__init__.py +++ b/recipes/click/__init__.py @@ -16,6 +16,8 @@ class ClickRecipe(PythonRecipe): build_env = arch.get_env() dest_dir = join(self.ctx.dist_dir, "root", "python") build_env['PYTHONPATH'] = join(dest_dir, 'lib', 'python2.7', '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) recipe = ClickRecipe() diff --git a/recipes/flask/__init__.py b/recipes/flask/__init__.py index 46ebda9..60bd798 100644 --- a/recipes/flask/__init__.py +++ b/recipes/flask/__init__.py @@ -16,6 +16,8 @@ class FlaskRecipe(PythonRecipe): build_env = arch.get_env() dest_dir = join(self.ctx.dist_dir, "root", "python") build_env['PYTHONPATH'] = join(dest_dir, 'lib', 'python2.7', '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) recipe = FlaskRecipe() diff --git a/recipes/itsdangerous/__init__.py b/recipes/itsdangerous/__init__.py index a6f9f34..e5a3182 100644 --- a/recipes/itsdangerous/__init__.py +++ b/recipes/itsdangerous/__init__.py @@ -16,6 +16,8 @@ class ItsDangerousRecipe(PythonRecipe): build_env = arch.get_env() dest_dir = join(self.ctx.dist_dir, "root", "python") build_env['PYTHONPATH'] = join(dest_dir, 'lib', 'python2.7', '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) recipe = ItsDangerousRecipe() diff --git a/recipes/jinja2/__init__.py b/recipes/jinja2/__init__.py index 5c892bd..75d1a18 100644 --- a/recipes/jinja2/__init__.py +++ b/recipes/jinja2/__init__.py @@ -16,6 +16,8 @@ class Jinja2Recipe(PythonRecipe): build_env = arch.get_env() dest_dir = join(self.ctx.dist_dir, "root", "python") build_env['PYTHONPATH'] = join(dest_dir, 'lib', 'python2.7', '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) recipe = Jinja2Recipe() diff --git a/recipes/markupsafe/__init__.py b/recipes/markupsafe/__init__.py index 09a826a..ca3dcf2 100644 --- a/recipes/markupsafe/__init__.py +++ b/recipes/markupsafe/__init__.py @@ -16,6 +16,11 @@ class MarkupSafeRecipe(PythonRecipe): build_env = arch.get_env() dest_dir = join(self.ctx.dist_dir, "root", "python") build_env['PYTHONPATH'] = join(dest_dir, 'lib', 'python2.7', 'site-packages') + cmd = sh.Command("sed") + 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", "", "s/features\['speedups'\].*=.*speedups/pass/g", "./setup.py", _env=build_env) shprint(hostpython, "setup.py", "install", "--prefix", dest_dir, _env=build_env) From 6ddb6fef4901d24a12118642259f378197e78d6b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Jirotka?= Date: Tue, 2 Aug 2016 10:22:07 +0200 Subject: [PATCH 2/2] Fix missing parentheses at 2 lines in toolchain.py --- toolchain.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/toolchain.py b/toolchain.py index f55a9d8..4c7f951 100755 --- a/toolchain.py +++ b/toolchain.py @@ -1076,7 +1076,7 @@ Xcode: parser.add_argument("command", help="Command to run") args = parser.parse_args(sys.argv[1:2]) if not hasattr(self, args.command): - print 'Unrecognized command' + print('Unrecognized command') parser.print_help() exit(1) getattr(self, args.command)() @@ -1244,7 +1244,7 @@ Xcode: "PYTHONOPTIMIZE": "2", "PIP_INSTALL_TARGET": ctx.site_packages_dir } - print pip_env + print(pip_env) pip_path = sh.which("pip") args = [pip_path] + sys.argv[2:] if not pip_path: