Skip to content

Commit

Permalink
Remove six and enum34 dependency (kivy#2657)
Browse files Browse the repository at this point in the history
  • Loading branch information
misl6 authored and ShyamQt committed Feb 17, 2023
1 parent 2802c29 commit b174a2f
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 6 deletions.
3 changes: 1 addition & 2 deletions pythonforandroid/recipe.py
Original file line number Diff line number Diff line change
@@ -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
Expand Down Expand Up @@ -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
Expand Down
3 changes: 1 addition & 2 deletions pythonforandroid/toolchain.py
Original file line number Diff line number Diff line change
Expand Up @@ -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):
Expand Down
4 changes: 2 additions & 2 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down

0 comments on commit b174a2f

Please sign in to comment.