type cleanup, ruamel.yaml version narrowing

Author: mr-c

cwltool/provenance.py

@@ -1416,10 +1416,10 @@ def packed_workflow(self, packed):  # type: (Text) -> None
 
     def has_data_file(self, sha1hash):  # type: (str) -> bool
         """Confirms the presence of the given file in the RO."""
-        assert self.folder or self.final_location
-        folder = os.path.join(self.folder or self.final_location,  # type: ignore
-                              DATA, sha1hash[0:2])
-        return os.path.isfile(os.path.join(folder, sha1hash))
+        folder = cast(str, self.folder or self.final_location)
+        folder = os.path.join(folder, DATA, sha1hash[0:2])
+        hash_path = os.path.join(folder, sha1hash)
+        return os.path.isfile(hash_path)
 
     def add_data_file(self, from_fp, when=None, content_type=None):
         # type: (IO, Optional[datetime.datetime], Optional[str]) -> Text

requirements.txt

@@ -1,5 +1,5 @@
 requests>=2.4.3
-ruamel.yaml>=0.12.4,<=0.15.51
+ruamel.yaml>=0.12.4,<=0.15.66
 rdflib>=4.2.2,<4.3
 shellescape>=3.4.1,<3.5
 schema-salad>=2.7.20180905124720,<3

setup.py

@@ -53,7 +53,7 @@
           'setuptools',
           'requests >= 2.6.1',  # >= 2.6.1 to workaround
           # https://github.com/ionrock/cachecontrol/issues/137
-          'ruamel.yaml >= 0.12.4, < 0.16',
+          'ruamel.yaml >= 0.12.4, <= 0.15.66',
           'rdflib >= 4.2.2, < 4.3.0',
           'shellescape >= 3.4.1, < 3.5',
           'schema-salad >= 2.7.20180905124720, < 3',