From 146b0cde99f50d8686a84aebbc568073480f1a8d Mon Sep 17 00:00:00 2001 From: Kypros Andreou <100076168+kyprosantreou@users.noreply.github.com> Date: Mon, 19 Feb 2024 13:32:01 +0200 Subject: [PATCH 01/10] This is a recipe for mysql-connector-python --- .../recipes/mysql-connector-python/__init__.py | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 pythonforandroid/recipes/mysql-connector-python/__init__.py diff --git a/pythonforandroid/recipes/mysql-connector-python/__init__.py b/pythonforandroid/recipes/mysql-connector-python/__init__.py new file mode 100644 index 0000000000..d4ef808ff2 --- /dev/null +++ b/pythonforandroid/recipes/mysql-connector-python/__init__.py @@ -0,0 +1,11 @@ +from pythonforandroid.recipe import CompiledComponentsPythonRecipe + +class MySQLConnectorPythonRecipe(CompiledComponentsPythonRecipe): + name = 'mysql-connector-python' + version = '8.3.0' + url = f'https://dev.mysql.com/get/Downloads/Connector-J/mysql-connector-j-{version}.tar.gz' + call_hostpython_via_targetpython = False + + depends = ['python3','setuptools'] + +recipe = MySQLConnectorPythonRecipe() \ No newline at end of file From 333a9dded9e019e7db7749b06bd26b72a9b42b5b Mon Sep 17 00:00:00 2001 From: Kypros Andreou <100076168+kyprosantreou@users.noreply.github.com> Date: Mon, 19 Feb 2024 19:41:21 +0200 Subject: [PATCH 02/10] mysql-connector-python update --- .../mysql-connector-python/__init__.py | 24 ++++++++++--------- 1 file changed, 13 insertions(+), 11 deletions(-) diff --git a/pythonforandroid/recipes/mysql-connector-python/__init__.py b/pythonforandroid/recipes/mysql-connector-python/__init__.py index d4ef808ff2..457cec21b6 100644 --- a/pythonforandroid/recipes/mysql-connector-python/__init__.py +++ b/pythonforandroid/recipes/mysql-connector-python/__init__.py @@ -1,11 +1,13 @@ -from pythonforandroid.recipe import CompiledComponentsPythonRecipe - -class MySQLConnectorPythonRecipe(CompiledComponentsPythonRecipe): - name = 'mysql-connector-python' - version = '8.3.0' - url = f'https://dev.mysql.com/get/Downloads/Connector-J/mysql-connector-j-{version}.tar.gz' - call_hostpython_via_targetpython = False - - depends = ['python3','setuptools'] - -recipe = MySQLConnectorPythonRecipe() \ No newline at end of file +from pythonforandroid.recipe import CompiledComponentsPythonRecipe + + +class MySQLConnectorPythonRecipe(CompiledComponentsPythonRecipe): + + name = 'mysql-connector-python' + version = '8.3.0' + url = f'https://dev.mysql.com/get/Downloads/Connector-J/mysql-connector-j-{version}.tar.gz' + call_hostpython_via_targetpython = False + + depends = ['python3', 'setuptools'] + +recipe = MySQLConnectorPythonRecipe() From 0e506c0cb24fc24ae5900b8ad5dcb556fcc550e7 Mon Sep 17 00:00:00 2001 From: Kypros Andreou <100076168+kyprosantreou@users.noreply.github.com> Date: Wed, 21 Feb 2024 13:25:01 +0200 Subject: [PATCH 03/10] mysql-connector-python fix --- pythonforandroid/recipes/mysql-connector-python/__init__.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pythonforandroid/recipes/mysql-connector-python/__init__.py b/pythonforandroid/recipes/mysql-connector-python/__init__.py index 457cec21b6..38c287666a 100644 --- a/pythonforandroid/recipes/mysql-connector-python/__init__.py +++ b/pythonforandroid/recipes/mysql-connector-python/__init__.py @@ -3,6 +3,7 @@ class MySQLConnectorPythonRecipe(CompiledComponentsPythonRecipe): + name = 'mysql-connector-python' version = '8.3.0' url = f'https://dev.mysql.com/get/Downloads/Connector-J/mysql-connector-j-{version}.tar.gz' @@ -10,4 +11,5 @@ class MySQLConnectorPythonRecipe(CompiledComponentsPythonRecipe): depends = ['python3', 'setuptools'] + recipe = MySQLConnectorPythonRecipe() From b42cd1ebae8b31569ae75783fdbb4e839793316a Mon Sep 17 00:00:00 2001 From: Kypros Andreou <100076168+kyprosantreou@users.noreply.github.com> Date: Wed, 21 Feb 2024 17:14:37 +0200 Subject: [PATCH 04/10] fix the bug of 2 lines --- .../recipes/mysql-connector-python/__init__.py | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/pythonforandroid/recipes/mysql-connector-python/__init__.py b/pythonforandroid/recipes/mysql-connector-python/__init__.py index 38c287666a..2ef3217f23 100644 --- a/pythonforandroid/recipes/mysql-connector-python/__init__.py +++ b/pythonforandroid/recipes/mysql-connector-python/__init__.py @@ -1,15 +1,13 @@ from pythonforandroid.recipe import CompiledComponentsPythonRecipe - class MySQLConnectorPythonRecipe(CompiledComponentsPythonRecipe): - + name = 'mysql-connector-python' version = '8.3.0' url = f'https://dev.mysql.com/get/Downloads/Connector-J/mysql-connector-j-{version}.tar.gz' call_hostpython_via_targetpython = False - depends = ['python3', 'setuptools'] - + depends = ['python3','setuptools'] -recipe = MySQLConnectorPythonRecipe() +recipe = MySQLConnectorPythonRecipe() \ No newline at end of file From 89f18697f2ec259abdc961fc5f67657e7244136d Mon Sep 17 00:00:00 2001 From: Kypros Andreou <100076168+kyprosantreou@users.noreply.github.com> Date: Sat, 24 Feb 2024 17:21:55 +0200 Subject: [PATCH 05/10] error fixed --- .../recipes/mysql-connector-python/__init__.py | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/pythonforandroid/recipes/mysql-connector-python/__init__.py b/pythonforandroid/recipes/mysql-connector-python/__init__.py index 2ef3217f23..ca26d65714 100644 --- a/pythonforandroid/recipes/mysql-connector-python/__init__.py +++ b/pythonforandroid/recipes/mysql-connector-python/__init__.py @@ -1,13 +1,17 @@ from pythonforandroid.recipe import CompiledComponentsPythonRecipe + class MySQLConnectorPythonRecipe(CompiledComponentsPythonRecipe): - name = 'mysql-connector-python' version = '8.3.0' - url = f'https://dev.mysql.com/get/Downloads/Connector-J/mysql-connector-j-{version}.tar.gz' + url = ( + f'https://dev.mysql.com/get/Downloads/' + f'Connector-J/mysql-connector-j-{version}.tar.gz' + ) call_hostpython_via_targetpython = False - depends = ['python3','setuptools'] + depends = ['python3', 'setuptools'] + -recipe = MySQLConnectorPythonRecipe() \ No newline at end of file +recipe = MySQLConnectorPythonRecipe() From ae6e07770d2d674c575d76d7cb9af097923530ce Mon Sep 17 00:00:00 2001 From: Kypros Andreou <100076168+kyprosantreou@users.noreply.github.com> Date: Mon, 26 Feb 2024 19:02:20 +0200 Subject: [PATCH 06/10] Update pythonforandroid/recipes/mysql-connector-python/__init__.py Co-authored-by: Andre Miras --- pythonforandroid/recipes/mysql-connector-python/__init__.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pythonforandroid/recipes/mysql-connector-python/__init__.py b/pythonforandroid/recipes/mysql-connector-python/__init__.py index ca26d65714..9a6841ee54 100644 --- a/pythonforandroid/recipes/mysql-connector-python/__init__.py +++ b/pythonforandroid/recipes/mysql-connector-python/__init__.py @@ -7,7 +7,8 @@ class MySQLConnectorPythonRecipe(CompiledComponentsPythonRecipe): version = '8.3.0' url = ( f'https://dev.mysql.com/get/Downloads/' - f'Connector-J/mysql-connector-j-{version}.tar.gz' + f'Connector-J/mysql-connector-python-{version}.tar.gz' + ) call_hostpython_via_targetpython = False From 9d6f18290f125502ece8c01906a76c314b6a0c84 Mon Sep 17 00:00:00 2001 From: Kypros Andreou <100076168+kyprosantreou@users.noreply.github.com> Date: Mon, 26 Feb 2024 19:07:53 +0200 Subject: [PATCH 07/10] update --- pythonforandroid/recipes/mysql-connector-python/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pythonforandroid/recipes/mysql-connector-python/__init__.py b/pythonforandroid/recipes/mysql-connector-python/__init__.py index 9a6841ee54..d647666aa9 100644 --- a/pythonforandroid/recipes/mysql-connector-python/__init__.py +++ b/pythonforandroid/recipes/mysql-connector-python/__init__.py @@ -7,8 +7,8 @@ class MySQLConnectorPythonRecipe(CompiledComponentsPythonRecipe): version = '8.3.0' url = ( f'https://dev.mysql.com/get/Downloads/' + f'Connector-J/mysql-connector-j-{version}.tar.gz' f'Connector-J/mysql-connector-python-{version}.tar.gz' - ) call_hostpython_via_targetpython = False From 0823f816004276af49c70e79ac6267d663a06570 Mon Sep 17 00:00:00 2001 From: Kypros Andreou <100076168+kyprosantreou@users.noreply.github.com> Date: Sat, 23 Mar 2024 14:09:32 +0200 Subject: [PATCH 08/10] update --- .../mysql-connector-python/__init__.py | 35 +++++++++---------- 1 file changed, 17 insertions(+), 18 deletions(-) diff --git a/pythonforandroid/recipes/mysql-connector-python/__init__.py b/pythonforandroid/recipes/mysql-connector-python/__init__.py index d647666aa9..6e24e3cd8e 100644 --- a/pythonforandroid/recipes/mysql-connector-python/__init__.py +++ b/pythonforandroid/recipes/mysql-connector-python/__init__.py @@ -1,18 +1,17 @@ -from pythonforandroid.recipe import CompiledComponentsPythonRecipe - - -class MySQLConnectorPythonRecipe(CompiledComponentsPythonRecipe): - - name = 'mysql-connector-python' - version = '8.3.0' - url = ( - f'https://dev.mysql.com/get/Downloads/' - f'Connector-J/mysql-connector-j-{version}.tar.gz' - f'Connector-J/mysql-connector-python-{version}.tar.gz' - ) - call_hostpython_via_targetpython = False - - depends = ['python3', 'setuptools'] - - -recipe = MySQLConnectorPythonRecipe() +from pythonforandroid.recipe import CompiledComponentsPythonRecipe + + +class MySQLConnectorPythonRecipe(CompiledComponentsPythonRecipe): + + name = 'mysql-connector-python' + version = '8.3.0' + url = ( + f"https://downloads.mysql.com/archives/get/p/29/file/" + f"mysql-connector-python-py{version}-1ubuntu23.10_amd64.deb" + ) + call_hostpython_via_targetpython = False + + depends = ['python3', 'setuptools'] + + +recipe = MySQLConnectorPythonRecipe() From 64f3216649d5b036a0f8104cca83b8f9979dbb3f Mon Sep 17 00:00:00 2001 From: Kypros Andreou <100076168+kyprosantreou@users.noreply.github.com> Date: Tue, 26 Mar 2024 09:35:48 +0200 Subject: [PATCH 09/10] Update __init__.py --- pythonforandroid/recipes/mysql-connector-python/__init__.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pythonforandroid/recipes/mysql-connector-python/__init__.py b/pythonforandroid/recipes/mysql-connector-python/__init__.py index 6e24e3cd8e..b8d90e7cfd 100644 --- a/pythonforandroid/recipes/mysql-connector-python/__init__.py +++ b/pythonforandroid/recipes/mysql-connector-python/__init__.py @@ -6,8 +6,8 @@ class MySQLConnectorPythonRecipe(CompiledComponentsPythonRecipe): name = 'mysql-connector-python' version = '8.3.0' url = ( - f"https://downloads.mysql.com/archives/get/p/29/file/" - f"mysql-connector-python-py{version}-1ubuntu23.10_amd64.deb" + "https://dev.mysql.com/get/Downloads/Connector-Python/" + f"mysql-connector-python-{version}-src.tar.gz" ) call_hostpython_via_targetpython = False From 8605308fa6626885f514f0d0e8e33bf099657c34 Mon Sep 17 00:00:00 2001 From: Kypros Andreou <100076168+kyprosantreou@users.noreply.github.com> Date: Fri, 5 Apr 2024 13:29:16 +0300 Subject: [PATCH 10/10] update --- .../mysql-connector-python/__init__.py | 53 +++++++++++++------ 1 file changed, 36 insertions(+), 17 deletions(-) diff --git a/pythonforandroid/recipes/mysql-connector-python/__init__.py b/pythonforandroid/recipes/mysql-connector-python/__init__.py index b8d90e7cfd..74f1d92bcf 100644 --- a/pythonforandroid/recipes/mysql-connector-python/__init__.py +++ b/pythonforandroid/recipes/mysql-connector-python/__init__.py @@ -1,17 +1,36 @@ -from pythonforandroid.recipe import CompiledComponentsPythonRecipe - - -class MySQLConnectorPythonRecipe(CompiledComponentsPythonRecipe): - - name = 'mysql-connector-python' - version = '8.3.0' - url = ( - "https://dev.mysql.com/get/Downloads/Connector-Python/" - f"mysql-connector-python-{version}-src.tar.gz" - ) - call_hostpython_via_targetpython = False - - depends = ['python3', 'setuptools'] - - -recipe = MySQLConnectorPythonRecipe() +from pythonforandroid.recipe import CompiledComponentsPythonRecipe +import shutil +import os + + +class MySQLConnectorPythonRecipe(CompiledComponentsPythonRecipe): + + name = 'mysql-connector-python' + version = '8.3.0' + url = ( + "https://dev.mysql.com/get/Downloads/Connector-Python/" + f"mysql-connector-python-{version}-src.tar.gz" + ) + call_hostpython_via_targetpython = False + + depends = ['python3', 'setuptools'] + + def post_download(self, archive_fn, destination_dir): + super(MySQLConnectorPythonRecipe, self).post_download(archive_fn, destination_dir) + # Extract the downloaded tarball and ensure correct directory structure + self.extract_tar(archive_fn, destination_dir) + # Move contents to the expected directory structure + extracted_dir = os.path.join( + destination_dir, + f'mysql-connector-python-{self.version}-src' + ) + if os.path.exists(extracted_dir): + for item in os.listdir(extracted_dir): + shutil.move( + os.path.join(extracted_dir, item), + destination_dir + ) + shutil.rmtree(extracted_dir) + + +recipe = MySQLConnectorPythonRecipe()