[Python-modules-commits] [sparqlwrapper] 03/05: merge patched into master

[chrysn]

This is an automated email from the git hooks/post-receive script.

chrysn-guest pushed a commit to branch master
in repository sparqlwrapper.

commit 6f95fc6276ed9827fc94bedb6a15edf64b6149bb
Merge: 784c4da 50ce830
Author: chrysn <chrysn at fsfe.org>
Date:   Mon Dec 5 20:23:30 2016 +0100

    merge patched into master

 debian/.git-dpm                                    |  4 +--
 ...alive-from-requirements.txt-Closes-846871.patch | 37 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 requirements.txt                                   |  1 -
 setup.py                                           |  3 ++
 5 files changed, 43 insertions(+), 3 deletions(-)

diff --cc debian/.git-dpm
index 314ced0,0000000..c85e8a7
mode 100644,000000..100644
--- a/debian/.git-dpm
+++ b/debian/.git-dpm
@@@ -1,8 -1,0 +1,8 @@@
 +# see git-dpm(1) from git-dpm package
- ecd5c3dc5869e3bc4f0cc7f8c41a8a93eb8ab291
- ecd5c3dc5869e3bc4f0cc7f8c41a8a93eb8ab291
++50ce8301ed453915a58dd9403c02dee74f89236d
++50ce8301ed453915a58dd9403c02dee74f89236d
 +ecd5c3dc5869e3bc4f0cc7f8c41a8a93eb8ab291
 +ecd5c3dc5869e3bc4f0cc7f8c41a8a93eb8ab291
 +sparql-wrapper-python_1.7.6.orig.tar.gz
 +504cb01474071c547a6413b4f14351783d0826f1
 +32973
diff --cc debian/patches/0001-Drop-keepalive-from-requirements.txt-Closes-846871.patch
index 0000000,0000000..8e18134
new file mode 100644
--- /dev/null
+++ b/debian/patches/0001-Drop-keepalive-from-requirements.txt-Closes-846871.patch
@@@ -1,0 -1,0 +1,37 @@@
++From 50ce8301ed453915a58dd9403c02dee74f89236d Mon Sep 17 00:00:00 2001
++From: chrysn <chrysn at fsfe.org>
++Date: Mon, 5 Dec 2016 19:20:56 +0100
++Subject: Drop keepalive from requirements.txt (Closes: #846871)
++
++As keepalive support is a weak dependency (absence makes keepalive
++enabling only raise a warning and otherwise a no-op), listing it as a
++dependency causes trouble with test setups. Demoting it to an extra
++(feature) dependency.
++
++Bug: https://github.com/RDFLib/sparqlwrapper/pull/79
++---
++ requirements.txt | 1 -
++ setup.py         | 3 +++
++ 2 files changed, 3 insertions(+), 1 deletion(-)
++
++diff --git a/requirements.txt b/requirements.txt
++index cdd0693..55ec214 100644
++--- a/requirements.txt
+++++ b/requirements.txt
++@@ -1,2 +1 @@
++ rdflib>=4.0
++-keepalive>=0.5
++diff --git a/setup.py b/setup.py
++index 5198f46..035525f 100755
++--- a/setup.py
+++++ b/setup.py
++@@ -57,6 +57,9 @@ setup(
++       platforms = ['any'],
++       packages = ['SPARQLWrapper'],
++       install_requires = _install_requires,
+++      extras_require = {
+++        'keepalive': ['keepalive>=0.5'],
+++      },
++       classifiers =  [
++         'Development Status :: 5 - Production/Stable',
++         'Intended Audience :: Developers',
diff --cc debian/patches/series
index 0000000,0000000..5024301
new file mode 100644
--- /dev/null
+++ b/debian/patches/series
@@@ -1,0 -1,0 +1,1 @@@
++0001-Drop-keepalive-from-requirements.txt-Closes-846871.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/python-modules/packages/sparqlwrapper.git