From 2126e51cfe86ad7f1b6ddbb539bb7de87a01aeac Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 26 May 2022 07:12:56 +0000 Subject: [PATCH 1/2] Bump mypy from 0.950 to 0.960 Bumps [mypy](https://github.com/python/mypy) from 0.950 to 0.960. - [Release notes](https://github.com/python/mypy/releases) - [Commits](https://github.com/python/mypy/compare/v0.950...v0.960) --- updated-dependencies: - dependency-name: mypy dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- mypy-requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mypy-requirements.txt b/mypy-requirements.txt index 17269d564..3dce5dc6a 100644 --- a/mypy-requirements.txt +++ b/mypy-requirements.txt @@ -1,4 +1,4 @@ -mypy==0.950 +mypy==0.960 types-requests types-setuptools types-psutil From 904d5af0db64b8d6ada8bd04a4ca61f9c057b188 Mon Sep 17 00:00:00 2001 From: "Michael R. Crusoe" Date: Thu, 26 May 2022 16:51:02 +0200 Subject: [PATCH 2/2] fix py3.6 compat --- requirements.txt | 1 + setup.py | 3 ++- test-requirements.txt | 2 +- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/requirements.txt b/requirements.txt index 34c8ec114..75e735464 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,6 +1,7 @@ requests>=2.4.3 ruamel.yaml>=0.15,<0.17.22 rdflib>=4.2.2,<6.2 +rdflib>= 4.2.2, < 6.0.0;python_version<='3.6' shellescape>=3.4.1,<3.9 schema-salad>=8.2.20211104054942,<9 prov==1.5.1 diff --git a/setup.py b/setup.py index c3bb9a381..f40af653d 100644 --- a/setup.py +++ b/setup.py @@ -110,6 +110,7 @@ # https://github.com/ionrock/cachecontrol/issues/137 "ruamel.yaml >= 0.15, < 0.17.22", "rdflib >= 4.2.2, < 6.2.0", + "rdflib >= 4.2.2, < 6.0.0;python_version<='3.6'", "shellescape >= 3.4.1, < 3.9", "schema-salad >= 8.2.20211104054942, < 9", "mypy-extensions", @@ -134,7 +135,7 @@ "mock >= 2.0.0", "pytest-mock >= 1.10.0", "arcp >= 0.2.0", - "rdflib-jsonld >= 0.4.0", + "rdflib-jsonld>=0.4.0, <= 0.6.1;python_version<='3.6'", ], entry_points={"console_scripts": ["cwltool=cwltool.main:run"]}, zip_safe=True, diff --git a/test-requirements.txt b/test-requirements.txt index 59d325d3b..fe487740a 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -4,5 +4,5 @@ mock >= 2.0.0 pytest-mock >= 1.10.0 pytest-cov arcp >= 0.2.0 -rdflib-jsonld >= 0.4.0 +rdflib-jsonld>=0.4.0, <= 0.6.1;python_version<='3.6' -rrequirements.txt