Merge 087bc21 into c95a84f

.pylint.ini

@@ -127,6 +127,7 @@ disable=print-statement,
         no-else-return,
         arguments-differ,
         too-many-statements,
+        cyclic-import,
 
 # 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

CHANGELOG.md

@@ -1,5 +1,9 @@
 # Revision History
 
+## 1.6.1 (2019-03-22)
+
+- Updated `PyYAML` to `5.1` for security fixes.
+
 ## 1.6 (2018-09-07)
 
 - Added `Number` (and `NullableNumber`) type for floats that store as integers when possible.

mkdocs.yml

@@ -5,7 +5,7 @@ repo_url: https://github.com/jacebrowning/yorm
 
 theme: readthedocs
 
-pages:
+nav:
 - Home: index.md
 - API:
   - Instance Mapping: api/instance-mapping.md

setup.py

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

tests/test_imports.py

@@ -1,6 +1,6 @@
 """Integration tests for the package namespace."""
 
-# pylint: disable=missing-docstring,no-self-use,unused-variable
+# pylint: disable=missing-docstring,no-self-use,unused-variable,unused-import
 
 
 def test_top():

yorm/diskutils.py

@@ -4,8 +4,8 @@
 import shutil
 import logging
 
-import simplejson as json
 import yaml
+import simplejson as json
 
 from . import exceptions
 

yorm/mapper.py

@@ -18,11 +18,10 @@ def wrapped(self, *args, **kwargs):
         if self.deleted:
             msg = "File deleted: {}".format(self.path)
             raise exceptions.DeletedFileError(msg)
-        elif self.missing and not settings.fake:
+        if self.missing and not settings.fake:
             msg = "File missing: {}".format(self.path)
             raise exceptions.MissingFileError(msg)
-        else:
-            return method(self, *args, **kwargs)
+        return method(self, *args, **kwargs)
 
     return wrapped