[Python-modules-commits] [python-datrie] 03/07: merge patched into master

[Ondřej Nový]

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

onovy pushed a commit to branch master
in repository python-datrie.

commit 3c0b6a7b8ebdd17689a09a10289ce16cdac01477
Merge: 25b63d5 8adadbf
Author: Ondřej Nový <onovy at debian.org>
Date:   Sun Jun 26 06:45:38 2016 +0200

    merge patched into master

 debian/.git-dpm                                      |  4 ++--
 ...n-t-require-pytest-running-on-regular-setup.patch | 20 ++++++++++++++++++++
 debian/patches/series                                |  1 +
 setup.py                                             |  2 --
 4 files changed, 23 insertions(+), 4 deletions(-)

diff --cc debian/.git-dpm
index 4e06f2a,0000000..cb196c9
mode 100644,000000..100644
--- a/debian/.git-dpm
+++ b/debian/.git-dpm
@@@ -1,11 -1,0 +1,11 @@@
 +# see git-dpm(1) from git-dpm package
- 2a0b14f84a2b1c84d01e5e90a0f9cd22197402f5
- 2a0b14f84a2b1c84d01e5e90a0f9cd22197402f5
++8adadbf1e0a450a6efc0f2abb76b94f4972a8afb
++8adadbf1e0a450a6efc0f2abb76b94f4972a8afb
 +2a0b14f84a2b1c84d01e5e90a0f9cd22197402f5
 +2a0b14f84a2b1c84d01e5e90a0f9cd22197402f5
 +python-datrie_0.7.1.orig.tar.gz
 +757c73a5d6b65dd981b370582f529e3156808662
 +189413
 +debianTag="debian/%e%v"
 +patchedTag="patched/%e%v"
 +upstreamTag="upstream/%e%u"
diff --cc debian/patches/0001-Don-t-require-pytest-running-on-regular-setup.patch
index 0000000,0000000..23037c6
new file mode 100644
--- /dev/null
+++ b/debian/patches/0001-Don-t-require-pytest-running-on-regular-setup.patch
@@@ -1,0 -1,0 +1,20 @@@
++From 8adadbf1e0a450a6efc0f2abb76b94f4972a8afb Mon Sep 17 00:00:00 2001
++From: =?UTF-8?q?Ond=C5=99ej=20Nov=C3=BD?= <onovy at debian.org>
++Date: Sun, 26 Jun 2016 06:45:34 +0200
++Subject: Don't require pytest-running on regular setup
++
++---
++ setup.py | 2 --
++ 1 file changed, 2 deletions(-)
++
++diff --git a/setup.py b/setup.py
++index d84c09d..eea48b6 100755
++--- a/setup.py
+++++ b/setup.py
++@@ -53,6 +53,4 @@ setup(name="datrie",
++               'src/stdio_ext.c'
++           ], include_dirs=[LIBDATRIE_DIR])
++       ],
++-
++-      setup_requires=["pytest-runner"],
++       tests_require=["pytest", "hypothesis"])
diff --cc debian/patches/series
index 0000000,0000000..2c9265a
new file mode 100644
--- /dev/null
+++ b/debian/patches/series
@@@ -1,0 -1,0 +1,1 @@@
++0001-Don-t-require-pytest-running-on-regular-setup.patch

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