Merge 0e7c8ec into 3c52ac3

.pylint.ini

@@ -126,6 +126,7 @@ disable=print-statement,
         too-many-locals,
         no-else-return,
         arguments-differ,
+        too-many-statements,
 
 # Enable the message, report, category or checker with the given id(s). You can
 # either give multiple identifier separated by comma (,) or put this option

.travis.yml

@@ -3,7 +3,11 @@ python:
   - 3.4
   - 3.5
   - 3.6
-  - 3.7
+matrix:
+  include:
+    - python: 3.7
+      dist: xenial
+      sudo: true
 
 cache:
   pip: true

Pipfile

@@ -6,7 +6,7 @@ name = "pypi"
 
 [requires]
 
-python_version = "3"
+python_version = "3.7.0"
 
 [packages]
 

scent.py

@@ -1,5 +1,5 @@
 """Configuration file for sniffer."""
-# pylint: disable=superfluous-parens,bad-continuation
+# pylint: disable=superfluous-parens,bad-continuation,unpacking-non-sequence
 
 import time
 import subprocess
@@ -16,7 +16,7 @@
 watch_paths = ["yorm", "tests"]
 
 
-class Options(object):
+class Options:
     group = int(time.time())  # unique per run
     show_coverage = False
     rerun_args = None

setup.py

@@ -76,7 +76,7 @@ def build_description():
     ],
 
     install_requires=[
-        'PyYAML ~= 3.12',
+        'PyYAML >= 3.13, < 4',
         'simplejson ~= 3.8',
         'parse ~= 1.8.0',
     ],

yorm/__init__.py

@@ -8,4 +8,4 @@
 from .mixins import ModelMixin
 
 __project__ = 'YORM'
-__version__ = '1.6a3'
+__version__ = '1.6a4'

yorm/common.py

@@ -44,7 +44,7 @@ def _trace(self, message, *args, **kwargs):
 # DECORATORS ##################################################################
 
 
-class classproperty(object):
+class classproperty:
     """Read-only class property decorator."""
 
     def __init__(self, getter):

yorm/utilities.py

@@ -161,8 +161,6 @@ def delete(instance):
 
     mapper.delete()
 
-    return None
-
 
 def _instantiate(class_or_instance, *args, **kwargs):
     if inspect.isclass(class_or_instance):