[med-svn] [Git][python-team/packages/python-schema-salad][master] 5 commits: fix changelog
Michael R. Crusoe
gitlab at salsa.debian.org
Sun Jan 24 09:25:47 GMT 2021
Michael R. Crusoe pushed to branch master at Debian Python Team / packages / python-schema-salad
Commits:
b4baf01f by Michael R. Crusoe at 2021-01-24T08:57:43+01:00
fix changelog
- - - - -
94a3e47a by Michael R. Crusoe at 2021-01-24T09:00:26+01:00
debian/rules, debian/tests/run-test: fix pytest invocation (--pyargs instead of --pyarg)
- - - - -
267b1418 by Michael R. Crusoe at 2021-01-24T09:15:17+01:00
update some copyright years
- - - - -
981b5fca by Michael R. Crusoe at 2021-01-24T10:04:14+01:00
debian/patches/rdflib5: Add rdflib 5.0.x compatability
- - - - -
9da26325 by Michael R. Crusoe at 2021-01-24T10:08:15+01:00
release 7.0.20200811075006-2
- - - - -
8 changed files:
- debian/changelog
- debian/copyright
- debian/patches/CacheControl
- debian/patches/newer_ruamel_yaml
- + debian/patches/rdflib5
- debian/patches/series
- debian/rules
- debian/tests/run-tests
Changes:
=====================================
debian/changelog
=====================================
@@ -1,11 +1,17 @@
-python-schema-salad (7.0.20200811075006-2) UNRELEASED; urgency=medium
+python-schema-salad (7.0.20200811075006-2) unstable; urgency=high
+ [ Ondřej Nový ]
* d/control: Update Maintainer field with new Debian Python Team
contact address.
* d/control: Update Vcs-* fields with new Debian Python Team Salsa
layout.
- -- Ondřej Nový <onovy at debian.org> Thu, 24 Sep 2020 08:49:23 +0200
+ [ Michael R. Crusoe ]
+ * debian/rules, debian/tests/run-test: fix pytest invocation (--pyargs
+ instead of --pyarg)
+ * debian/patches/rdflib5: Add rdflib 5.0.x compatability. Closes: #978327
+
+ -- Michael R. Crusoe <crusoe at debian.org> Sun, 24 Jan 2021 10:07:59 +0100
python-schema-salad (7.0.20200811075006-1) unstable; urgency=medium
=====================================
debian/copyright
=====================================
@@ -3,12 +3,12 @@ Upstream-Name: schema-salad
Source: https://pypi.python.org/pypi/schema-salad
Files: *
-Copyright: 2015-2016 Peter Amstutz
+Copyright: 2015-2021 Peter Amstutz
2015 Michael R. Crusoe
License: Apache-2.0
Files: debian/*
-Copyright: © 2016 Michael R. Crusoe <crusoe at ucdavis.edu>
+Copyright: © 2016-2021 Michael R. Crusoe <crusoe at debian.org
License: Apache-2.0
License: Apache-2.0
=====================================
debian/patches/CacheControl
=====================================
@@ -4,7 +4,7 @@ Forwarded: not-needed
--- python-schema-salad.orig/setup.py
+++ python-schema-salad/setup.py
@@ -88,7 +88,7 @@
- "rdflib >= 4.2.2, < 4.3.0",
+ "rdflib >= 4.2.2, < 5.1.0",
"rdflib-jsonld >= 0.3.0, < 0.6.0",
"mistune >= 0.8.1, < 0.9",
- "CacheControl >= 0.11.7, < 0.12",
=====================================
debian/patches/newer_ruamel_yaml
=====================================
@@ -11,4 +11,4 @@ Description: allow for a newer ruaml.yaml package
+ "ruamel.yaml >= 0.12.4",
# once the minimum version for ruamel.yaml >= 0.15.99
# then please update the mypy targets in the Makefile
- "rdflib >= 4.2.2, < 4.3.0",
+ "rdflib >= 4.2.2, < 5.1.0",
=====================================
debian/patches/rdflib5
=====================================
@@ -0,0 +1,63 @@
+From 304a17e861774475ccb62cb677ac179276662fcd Mon Sep 17 00:00:00 2001
+From: Panaetius <ralf.grubenmann at sdsc.ethz.ch>
+Last-Updated: 2021-01-24
+Subject: Add rdflib 5.0 compatibility
+Origin: upstream, https://github.com/common-workflow-language/schema_salad/pull/334
+
+--- python-schema-salad.orig/requirements.txt
++++ python-schema-salad/requirements.txt
+@@ -1,7 +1,7 @@
+ typing==3.7.4 ; python_version < "3.5"
+ ruamel.yaml>=0.12.4, <= 0.16.5
+-rdflib==4.2.2
+-rdflib-jsonld==0.4.0
++rdflib>=4.2.2, < 5.1.0
++rdflib-jsonld>=0.4.0, <0.6.0
+ mistune>=0.8.1,<0.9
+ CacheControl==0.11.7
+ lockfile==0.12.2
+--- python-schema-salad.orig/schema_salad/jsonld_context.py
++++ python-schema-salad/schema_salad/jsonld_context.py
+@@ -149,7 +149,30 @@
+ v = v["_ at id"] if v.get("_ at id", "@")[0] != "@" else None
+
+ if bool(v):
+- (ns, ln) = rdflib.namespace.split_uri(str(v))
++ try:
++ (ns, ln) = rdflib.namespace.split_uri(str(v))
++ except ValueError:
++ # rdflib 5.0.0 compatibility
++ uri = str(v)
++ colon_index = str(v).rfind(":")
++
++ if colon_index < 0:
++ raise
++ split_start = rdflib.namespace.SPLIT_START_CATEGORIES
++ for j in range(-1 - colon_index, len(uri)):
++ if (
++ rdflib.namespace.category(uri[j]) in split_start
++ or uri[j] == "_"
++ ):
++ # _ prevents early split, roundtrip not generate
++ ns = uri[:j]
++ if not ns:
++ break
++ ln = uri[j:]
++ break
++ if not ns or not ln:
++ raise
++
+ if ns[0:-1] in namespaces:
+ propnode = namespaces[ns[0:-1]][ln]
+ else:
+--- python-schema-salad.orig/setup.py
++++ python-schema-salad/setup.py
+@@ -85,7 +85,7 @@
+ "ruamel.yaml >= 0.12.4, <= 0.16.5",
+ # once the minimum version for ruamel.yaml >= 0.15.99
+ # then please update the mypy targets in the Makefile
+- "rdflib >= 4.2.2, < 4.3.0",
++ "rdflib >= 4.2.2, < 5.1.0",
+ "rdflib-jsonld >= 0.3.0, < 0.6.0",
+ "mistune >= 0.8.1, < 0.9",
+ "CacheControl >= 0.11.7, < 0.12",
=====================================
debian/patches/series
=====================================
@@ -1,3 +1,4 @@
+rdflib5
rework_all
better_is_fs_case_sensitive
CacheControl
=====================================
debian/rules
=====================================
@@ -38,7 +38,7 @@ ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS)))
PYBUILD_SYSTEM=custom \
PYBUILD_TEST_ARGS="cd {dir}; export PATH={destdir}/usr/bin:$$PATH ; \
cd {build_dir}; export PYTHONPATH=$$(pwd); {interpreter} -m pytest \
- -n auto --dist=loadfile --pyarg schema_salad" dh_auto_test
+ -n auto --dist=loadfile --pyargs schema_salad" dh_auto_test
endif
override_dh_auto_install:
=====================================
debian/tests/run-tests
=====================================
@@ -5,4 +5,4 @@ if [ "$AUTOPKGTEST_TMP" = "" ] ; then
AUTOPKGTEST_TMP=$(mktemp -d /tmp/${pkg}-test.XXXXXX)
fi
cd "$AUTOPKGTEST_TMP"
-py.test-3 --numprocesses=auto --dist=loadfile --pyarg schema_salad
+py.test-3 --numprocesses=auto --dist=loadfile --pyargs schema_salad
View it on GitLab: https://salsa.debian.org/python-team/packages/python-schema-salad/-/compare/6291d382faa4a7151aee8d4aac3bd5f10f9cc501...9da263251d45c786a808587d42f6a1023ae523a4
--
View it on GitLab: https://salsa.debian.org/python-team/packages/python-schema-salad/-/compare/6291d382faa4a7151aee8d4aac3bd5f10f9cc501...9da263251d45c786a808587d42f6a1023ae523a4
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/b5d21c9d/attachment-0001.html>
More information about the debian-med-commit
mailing list