From b174a2f323e2cb0151017966e0c7358c80562c05 Mon Sep 17 00:00:00 2001 From: Mirko Galimberti Date: Thu, 18 Aug 2022 22:04:58 +0200 Subject: [PATCH] Remove six and enum34 dependency (#2657) --- pythonforandroid/recipe.py | 3 +-- pythonforandroid/toolchain.py | 3 +-- setup.py | 4 ++-- 3 files changed, 4 insertions(+), 6 deletions(-) diff --git a/pythonforandroid/recipe.py b/pythonforandroid/recipe.py index a97f264f04..b4cd9bb3cf 100644 --- a/pythonforandroid/recipe.py +++ b/pythonforandroid/recipe.py @@ -1,7 +1,6 @@ from os.path import basename, dirname, exists, isdir, isfile, join, realpath, split import glob from shutil import rmtree -from six import with_metaclass import hashlib from re import match @@ -40,7 +39,7 @@ def __new__(cls, name, bases, dct): return super().__new__(cls, name, bases, dct) -class Recipe(with_metaclass(RecipeMeta)): +class Recipe(metaclass=RecipeMeta): _url = None '''The address from which the recipe may be downloaded. This is not essential, it may be omitted if the source is available some other diff --git a/pythonforandroid/toolchain.py b/pythonforandroid/toolchain.py index 839ab4d4f1..1b81aa923c 100644 --- a/pythonforandroid/toolchain.py +++ b/pythonforandroid/toolchain.py @@ -29,8 +29,7 @@ def check_python_dependencies(): ok = True - modules = [('colorama', '0.3.3'), 'appdirs', ('sh', '1.10'), 'jinja2', - 'six'] + modules = [('colorama', '0.3.3'), 'appdirs', ('sh', '1.10'), 'jinja2'] for module in modules: if isinstance(module, tuple): diff --git a/setup.py b/setup.py index ed270774fe..fb3f24d535 100644 --- a/setup.py +++ b/setup.py @@ -20,8 +20,8 @@ # must be a single statement since buildozer is currently parsing it, refs: # https://github.com/kivy/buildozer/issues/722 install_reqs = [ - 'appdirs', 'colorama>=0.3.3', 'jinja2', 'six', - 'enum34; python_version<"3.4"', 'sh>=1.10; sys_platform!="nt"', + 'appdirs', 'colorama>=0.3.3', 'jinja2', + 'sh>=1.10; sys_platform!="nt"', 'pep517<0.7.0', 'toml', ] # (pep517 and toml are used by pythonpackage.py)