From 218b6211cf876e7c5803bf19cf9298f636e9d0b7 Mon Sep 17 00:00:00 2001 From: Gringo Suave Date: Wed, 12 Apr 2017 15:50:06 -0700 Subject: [PATCH 1/3] support ruamel.yaml --- pythonforandroid/recipes/ruamel.yaml/__init__.py | 14 ++++++++++++++ .../recipes/ruamel.yaml/disable-pip-req.patch | 11 +++++++++++ 2 files changed, 25 insertions(+) create mode 100644 pythonforandroid/recipes/ruamel.yaml/__init__.py create mode 100644 pythonforandroid/recipes/ruamel.yaml/disable-pip-req.patch diff --git a/pythonforandroid/recipes/ruamel.yaml/__init__.py b/pythonforandroid/recipes/ruamel.yaml/__init__.py new file mode 100644 index 0000000000..fda6ec0d94 --- /dev/null +++ b/pythonforandroid/recipes/ruamel.yaml/__init__.py @@ -0,0 +1,14 @@ +from pythonforandroid.toolchain import PythonRecipe + + +class RuamelYamlRecipe(PythonRecipe): + version = '0.14.5' + url = 'https://pypi.python.org/packages/5c/13/c120a06b3add0f9763ca9190e5f6edb9faf9d34b158dd3cff7cc9097be03/ruamel.yaml-{version}.tar.gz' + + depends = [ ('python2', 'python3crystax') ] + site_packages_name = 'ruamel' + call_hostpython_via_targetpython = False + + patches = ['disable-pip-req.patch'] + +recipe = RuamelYamlRecipe() diff --git a/pythonforandroid/recipes/ruamel.yaml/disable-pip-req.patch b/pythonforandroid/recipes/ruamel.yaml/disable-pip-req.patch new file mode 100644 index 0000000000..fd3cb365cf --- /dev/null +++ b/pythonforandroid/recipes/ruamel.yaml/disable-pip-req.patch @@ -0,0 +1,11 @@ +--- setup.py 2017-03-23 05:28:37.000000000 -0700 ++++ b/setup.py 2017-04-12 15:03:28.218529255 -0700 +@@ -316,7 +316,7 @@ + os.system('pip install .') + sys.exit(0) + print('error: you have to install with "pip install ."') +- sys.exit(1) ++ # sys.exit(1) + # If you only support an extension module on Linux, Windows thinks it + # is pure. That way you would get pure python .whl files that take + # precedence for downloading on Linux over source with compilable C From d8d01d89710cd1d752809b8cd91d934092e99adf Mon Sep 17 00:00:00 2001 From: Andre Miras Date: Sun, 11 Nov 2018 18:35:47 +0100 Subject: [PATCH 2/3] Update to last version, fixes import and deps --- pythonforandroid/recipes/ruamel.yaml/__init__.py | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/pythonforandroid/recipes/ruamel.yaml/__init__.py b/pythonforandroid/recipes/ruamel.yaml/__init__.py index fda6ec0d94..049a5f707f 100644 --- a/pythonforandroid/recipes/ruamel.yaml/__init__.py +++ b/pythonforandroid/recipes/ruamel.yaml/__init__.py @@ -1,14 +1,13 @@ -from pythonforandroid.toolchain import PythonRecipe +from pythonforandroid.recipe import PythonRecipe class RuamelYamlRecipe(PythonRecipe): - version = '0.14.5' - url = 'https://pypi.python.org/packages/5c/13/c120a06b3add0f9763ca9190e5f6edb9faf9d34b158dd3cff7cc9097be03/ruamel.yaml-{version}.tar.gz' - - depends = [ ('python2', 'python3crystax') ] + version = '0.15.77' + url = 'https://pypi.python.org/packages/source/r/ruamel.yaml/ruamel.yaml-{version}.tar.gz' + depends = [('python2', 'python3crystax'), 'setuptools'] site_packages_name = 'ruamel' call_hostpython_via_targetpython = False - patches = ['disable-pip-req.patch'] + recipe = RuamelYamlRecipe() From 95cd2dd3f0be96b9bafa809d8a859fb6edd85d86 Mon Sep 17 00:00:00 2001 From: Andre Miras Date: Sun, 11 Nov 2018 18:36:17 +0100 Subject: [PATCH 3/3] Updates patch to last version --- .../recipes/ruamel.yaml/disable-pip-req.patch | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/pythonforandroid/recipes/ruamel.yaml/disable-pip-req.patch b/pythonforandroid/recipes/ruamel.yaml/disable-pip-req.patch index fd3cb365cf..b033774c4c 100644 --- a/pythonforandroid/recipes/ruamel.yaml/disable-pip-req.patch +++ b/pythonforandroid/recipes/ruamel.yaml/disable-pip-req.patch @@ -1,11 +1,11 @@ ---- setup.py 2017-03-23 05:28:37.000000000 -0700 -+++ b/setup.py 2017-04-12 15:03:28.218529255 -0700 -@@ -316,7 +316,7 @@ - os.system('pip install .') +--- setup.py 2018-11-11 18:27:31.936424140 +0100 ++++ b/setup.py 2018-11-11 18:28:19.873507071 +0100 +@@ -396,7 +396,7 @@ sys.exit(0) - print('error: you have to install with "pip install ."') -- sys.exit(1) -+ # sys.exit(1) + if not os.environ.get('RUAMEL_NO_PIP_INSTALL_CHECK', False): + print('error: you have to install with "pip install ."') +- sys.exit(1) ++ # sys.exit(1) # If you only support an extension module on Linux, Windows thinks it # is pure. That way you would get pure python .whl files that take - # precedence for downloading on Linux over source with compilable C + # precedence for downloading on Linux over source with compilable C code