[med-svn] [Git][med-team/cwltool][master] 3 commits: debian/patches/rdflib5: add compatibility with python3-rdflib >= 5.0

[Michael R. Crusoe]

Michael R. Crusoe pushed to branch master at Debian Med / cwltool


Commits:
85ab4885 by Michael R. Crusoe at 2021-01-24T10:23:28+01:00
debian/patches/rdflib5: add compatibility with python3-rdflib >= 5.0

- - - - -
3beb5fe5 by Michael R. Crusoe at 2021-01-24T10:27:54+01:00
refresh patch headers

- - - - -
509eba81 by Michael R. Crusoe at 2021-01-24T10:29:59+01:00
release 3.0.20200807132242-4

- - - - -


8 changed files:

- debian/changelog
- debian/patches/accept_newer_ruamel
- debian/patches/disable_prov
- debian/patches/pytest
- debian/patches/pytest6.patch
- debian/patches/python3
- + debian/patches/rdflib5
- debian/patches/series


Changes:

=====================================
debian/changelog
=====================================
@@ -1,3 +1,10 @@
+cwltool (3.0.20200807132242-4) unstable; urgency=high
+
+  * debian/patches/rdflib5: add compatibility with python3-rdflib >= 5.0
+    Closes: #978295
+
+ -- Michael R. Crusoe <crusoe at debian.org>  Sun, 24 Jan 2021 10:29:33 +0100
+
 cwltool (3.0.20200807132242-3) unstable; urgency=medium
 
   * Team upload.


=====================================
debian/patches/accept_newer_ruamel
=====================================
@@ -1,13 +1,13 @@
 Author: Micharl R. Crusoe <crusoe at debian.org>
 Description: allower newer ruamel.yaml versions
-
+Forwarded: not-needed
 --- cwltool.orig/requirements.txt
 +++ cwltool/requirements.txt
 @@ -1,5 +1,5 @@
  requests>=2.4.3
 -ruamel.yaml>=0.12.4,<=0.16.5
 +ruamel.yaml>=0.12.4
- rdflib>=4.2.2,<4.3
+ rdflib>=4.2.2,<5.1
  shellescape>=3.4.1,<3.5
  schema-salad>=7,<8
 --- cwltool.orig/setup.py
@@ -18,6 +18,6 @@ Description: allower newer ruamel.yaml versions
          # https://github.com/ionrock/cachecontrol/issues/137
 -        "ruamel.yaml >= 0.12.4, <= 0.16.5",
 +        "ruamel.yaml >= 0.12.4",
-         "rdflib >= 4.2.2, < 4.3.0",
+         "rdflib >= 4.2.2, < 5.1",
          "shellescape >= 3.4.1, < 3.5",
          "schema-salad >= 7, < 8",


=====================================
debian/patches/disable_prov
=====================================
@@ -1,5 +1,6 @@
-Author: Michael R. Crusoe <michael.crusoe at gmail.com>
-Description: Disable --provance until python3-proc issue is resolved
+Author: Michael R. Crusoe <crusoe at debian.org>
+Description: Disable --provance until python3-prov issue is resolved
+Forwarded: not-needed
 --- cwltool.orig/cwltool/argparser.py
 +++ cwltool/cwltool/argparser.py
 @@ -207,66 +207,7 @@


=====================================
debian/patches/pytest
=====================================
@@ -1,5 +1,6 @@
-From: Michael R. Crusoe <michael.crusoe at gmail.com>
+From: Michael R. Crusoe <crusoe at debian.org>
 Description: Deal with pytest 4.6 changes
+Forwarded: not-needed
 --- cwltool.orig/cwltool/main.py
 +++ cwltool/cwltool/main.py
 @@ -42,7 +42,7 @@


=====================================
debian/patches/pytest6.patch
=====================================
@@ -2,6 +2,7 @@ Description: Abbreviated option names are no longer allowed in pytest 6
 Bug-Debian: https://bugs.debian.org/977067
 Author: Andreas Tille <tille at debian.org>
 Last-Update Thu, 10 Dec 2020 22:06:24 +0100
+Forwarded: not-needed
 
 --- a/PKG-INFO
 +++ b/PKG-INFO


=====================================
debian/patches/python3
=====================================
@@ -1,5 +1,6 @@
-Author: Michael R. Crusoe <michael.crusoe at gmail.com>
+Author: Michael R. Crusoe <crusoe at debian.org>
 Description: Use python3 in test CWL tool description
+Forwarded: not-needed
 --- cwltool.orig/tests/wf/echo.cwl
 +++ cwltool/tests/wf/echo.cwl
 @@ -21,4 +21,4 @@


=====================================
debian/patches/rdflib5
=====================================
@@ -0,0 +1,24 @@
+Author: Michael R. Crusoe <crusoe at debian.org>
+Description: work with newer rdlfib
+Forwarded: not-needed
+--- cwltool.orig/requirements.txt
++++ cwltool/requirements.txt
+@@ -1,6 +1,6 @@
+ requests>=2.4.3
+ ruamel.yaml>=0.12.4,<=0.16.5
+-rdflib>=4.2.2,<4.3
++rdflib>=4.2.2,<5.1
+ shellescape>=3.4.1,<3.5
+ schema-salad>=7,<8
+ typing>=3.5.3; python_version<"3.6"
+--- cwltool.orig/setup.py
++++ cwltool/setup.py
+@@ -95,7 +95,7 @@
+         "requests >= 2.6.1",  # >= 2.6.1 to workaround
+         # https://github.com/ionrock/cachecontrol/issues/137
+         "ruamel.yaml >= 0.12.4, <= 0.16.5",
+-        "rdflib >= 4.2.2, < 4.3.0",
++        "rdflib >= 4.2.2, < 5.1",
+         "shellescape >= 3.4.1, < 3.5",
+         "schema-salad >= 7, < 8",
+         "mypy-extensions",


=====================================
debian/patches/series
=====================================
@@ -1,5 +1,6 @@
 # no-typing
 # use_debian_packaged_ruamel.yaml.patch
+rdflib5
 disable_prov
 python3
 pytest



View it on GitLab: https://salsa.debian.org/med-team/cwltool/-/compare/81c96a9ae150298738e96f599495f756b655cf5b...509eba81ee7fb60bf29570f9fe464cc23e105d5e

-- 
View it on GitLab: https://salsa.debian.org/med-team/cwltool/-/compare/81c96a9ae150298738e96f599495f756b655cf5b...509eba81ee7fb60bf29570f9fe464cc23e105d5e
You're receiving this email because of your account on salsa.debian.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/debian-med-commit/attachments/20210124/7d95e6f3/attachment-0001.html>