Bump cachecontrol[filecache] from 0.12.11 to 0.13.0

Drop cwl-utils dependency for mypy to break the dependency loop

Author: mr-c

mypy-requirements.txt

@@ -3,5 +3,4 @@ black>=19.10b0
 types-pkg_resources
 types-requests
 types-dataclasses
-cwl-utils
 objgraph

requirements.txt

@@ -1,10 +1,12 @@
-ruamel.yaml >= 0.17.6, < 0.18;python_version>='3.7'
+requests >= 1.0
 ruamel.yaml >= 0.16.12, < 0.18
+ruamel.yaml >= 0.17.6;python_version>='3.7'
 rdflib>= 4.2.2, < 7.0.0
-rdflib>= 4.2.2, < 6.0.0;python_version<='3.6'
+rdflib< 6.0.0;python_version<='3.6'
 rdflib-jsonld>=0.4.0, <= 0.6.1;python_version<='3.6'
 mistune>=2.0.3,<2.1
-CacheControl[filecache]==0.12.11
-urllib3<2  # until there is a new CacheControl release containing a fix
+CacheControl[filecache]>= 0.11.7, < 0.14
+CacheControl[filecache]< 0.13;python_version<='3.6'
+urllib3<2;python_version<='3.6'
 black<23.4
 mypy_extensions

schema_salad/tests/memory-leak-check.py

@@ -2,7 +2,7 @@
 
 import sys
 
-import cwl_utils.parser
+import cwl_utils.parser  # type: ignore[import]
 import objgraph  # type: ignore[import]
 
 growth = []

setup.py

@@ -81,13 +81,15 @@
 
 install_requires = [
     "requests >= 1.0",
-    "ruamel.yaml >= 0.17.6, < 0.18;python_version>='3.7'",
     "ruamel.yaml >= 0.16.12, < 0.18",
+    "ruamel.yaml >= 0.17.6;python_version>='3.7'",
     "rdflib >= 4.2.2, < 7.0.0",
+    "rdflib < 6.0.0;python_version<='3.6'",
     "rdflib-jsonld>=0.4.0, <= 0.6.1;python_version<='3.6'",
     "mistune>=2.0.3,<2.1",
-    "CacheControl[filecache] >= 0.11.7, < 0.13",
-    "urllib3<2",  # until CacheControl fixes their incompatability
+    "CacheControl[filecache] >= 0.11.7, < 0.14",
+    "CacheControl[filecache] < 0.13;python_version<='3.6'",
+    "urllib3<2;python_version<='3.6'",
     "mypy_extensions",
 ]