[Python-modules-commits] [pygithub] 09/09: merge patched into master

[Filip Pytloun]

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

fpytloun-guest pushed a commit to branch master
in repository pygithub.

commit 0947e26599d7d3ca2044a95fd1aeeea3442e909d
Merge: 490ae3a 778a970
Author: Filip Pytloun <filip at pytloun.cz>
Date:   Tue Jan 23 11:40:28 2018 +0100

    merge patched into master

 debian/.git-dpm                                         | 6 +++---
 debian/patches/0001-Disable-installation-of-tests.patch | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --cc debian/.git-dpm
index 31880a1,0000000..8c7b7c0
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
- 36395fe945df2e6c7c060a675a157bc89573a4df
- 36395fe945df2e6c7c060a675a157bc89573a4df
- 7b4acdc4874fca492cab21f2e225803fb9091503
++778a970d0e5e7e36f675bb99cd986e61703b1898
++778a970d0e5e7e36f675bb99cd986e61703b1898
++63ee62442eefda6d2dae063864ef281b85f8ae89
 +63ee62442eefda6d2dae063864ef281b85f8ae89
 +pygithub_1.35.orig.tar.gz
 +a27a319fe8c64b559ba59aa1ce24c21198fcbc51
 +2625163
diff --cc debian/patches/0001-Disable-installation-of-tests.patch
index 184f2ee,0000000..f4ec4de
mode 100644,000000..100644
--- a/debian/patches/0001-Disable-installation-of-tests.patch
+++ b/debian/patches/0001-Disable-installation-of-tests.patch
@@@ -1,27 -1,0 +1,27 @@@
- From 36395fe945df2e6c7c060a675a157bc89573a4df Mon Sep 17 00:00:00 2001
++From 778a970d0e5e7e36f675bb99cd986e61703b1898 Mon Sep 17 00:00:00 2001
 +From: Dmitry Bogatov <KAction at gnu.org>
 +Date: Tue, 23 Jan 2018 11:39:24 +0100
 +Subject: Disable installation of tests
 +
 +Forwarded: not-needed
 +Last-Update: 2015-12-28
 +---
 + setup.py | 4 ----
 + 1 file changed, 4 deletions(-)
 +
 +diff --git a/setup.py b/setup.py
 +index 6658f40..74b81c5 100755
 +--- a/setup.py
 ++++ b/setup.py
 +@@ -69,11 +69,7 @@ if __name__ == "__main__":
 +             See http://pygithub.github.io/PyGithub/v1/index.html"""),
 +         packages=[
 +             "github",
 +-            "github.tests",
 +         ],
 +-        package_data={
 +-            "github": ["tests/ReplayData/*.txt"]
 +-        },
 +         classifiers=[
 +             "Development Status :: 5 - Production/Stable",
 +             "Environment :: Web Environment",

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