Use enaml {version} rather than master, fixes #1409

Also fixes PEP8 after recent flake8==3.7.1 update
kivy · Jan 30, 2019 · 81a1b6a · 81a1b6a
1 parent 3cc0657
commit 81a1b6a
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 6 deletions.
diff --git a/ci/constants.py b/ci/constants.py
@@ -16,8 +16,6 @@ class TargetPython(Enum):
     # https://github.com/kivy/python-for-android/issues/550
     'audiostream',
     'brokenrecipe',
-    # https://github.com/kivy/python-for-android/issues/1409
-    'enaml',
     'evdev',
     # distutils.errors.DistutilsError
     # Could not find suitable distribution for Requirement.parse('cython')

diff --git a/pythonforandroid/logger.py b/pythonforandroid/logger.py
@@ -44,9 +44,9 @@ def format(self, record):
 
 
 logger = logging.getLogger('p4a')
-if not hasattr(logger, 'touched'):  # Necessary as importlib reloads
-                                    # this, which would add a second
-                                    # handler and reset the level
+# Necessary as importlib reloads this,
+# which would add a second handler and reset the level
+if not hasattr(logger, 'touched'):
     logger.setLevel(logging.INFO)
     logger.touched = True
     ch = logging.StreamHandler(stderr)

diff --git a/pythonforandroid/recipes/enaml/__init__.py b/pythonforandroid/recipes/enaml/__init__.py
@@ -4,7 +4,7 @@
 class EnamlRecipe(CppCompiledComponentsPythonRecipe):
     site_packages_name = 'enaml'
     version = '0.9.8'
-    url = 'https://github.com/nucleic/enaml/archive/master.zip'
+    url = 'https://github.com/nucleic/enaml/archive/{version}.zip'
     patches = ['0001-Update-setup.py.patch']  # Remove PyQt dependency
     depends = ['setuptools', 'atom', 'kiwisolver']