[Python-modules-commits] [pytest-qt] 03/09: Update the patch queue

[Ghislain Vaillant]

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

ghisvail-guest pushed a commit to branch master
in repository pytest-qt.

commit 6d97fe7e558fa67d11a41e9ac32fbf9b7d539e2f
Author: Ghislain Antony Vaillant <ghisvail at gmail.com>
Date:   Thu Jul 13 09:36:09 2017 +0100

    Update the patch queue
    
    - Drop Fix-query-of-module-version-in-docs.patch, applied upstream
    - Refresh Skip-tests-requiring-a-window-manager.patch
    
    Gbp-Dch: Full
---
 .../Fix-query-of-module-version-in-docs.patch      | 22 ----------------------
 .../Skip-tests-requiring-a-window-manager.patch    |  2 +-
 debian/patches/series                              |  1 -
 3 files changed, 1 insertion(+), 24 deletions(-)

diff --git a/debian/patches/Fix-query-of-module-version-in-docs.patch b/debian/patches/Fix-query-of-module-version-in-docs.patch
deleted file mode 100644
index d9b39fe..0000000
--- a/debian/patches/Fix-query-of-module-version-in-docs.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-From: Ghislain Antony Vaillant <ghisvail at gmail.com>
-Date: Wed, 8 Feb 2017 15:09:59 +0000
-Subject: Fix query of module version in docs
-
----
- docs/conf.py | 3 +--
- 1 file changed, 1 insertion(+), 2 deletions(-)
-
-diff --git a/docs/conf.py b/docs/conf.py
-index 7dae585..a4cf838 100644
---- a/docs/conf.py
-+++ b/docs/conf.py
-@@ -47,8 +47,7 @@ copyright = u'2013, Bruno Oliveira'
- # |version| and |release|, also used in various other places throughout the
- # built documents.
- #
--import pkg_resources
--version = pkg_resources.get_distribution('pytest-qt').version
-+from pytestqt import version
- # The short X.Y version.
- # The full version, including alpha/beta/rc tags.
- 
diff --git a/debian/patches/Skip-tests-requiring-a-window-manager.patch b/debian/patches/Skip-tests-requiring-a-window-manager.patch
index 9222992..f8e84ec 100644
--- a/debian/patches/Skip-tests-requiring-a-window-manager.patch
+++ b/debian/patches/Skip-tests-requiring-a-window-manager.patch
@@ -7,7 +7,7 @@ Subject: Skip tests requiring a window manager
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/tests/test_basics.py b/tests/test_basics.py
-index 0464cb8..c884764 100644
+index fddac5c..d246470 100644
 --- a/tests/test_basics.py
 +++ b/tests/test_basics.py
 @@ -70,7 +70,7 @@ def test_stop_for_interaction(qtbot, timer):
diff --git a/debian/patches/series b/debian/patches/series
index 4a606ca..8bacd0b 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1 @@
-Fix-query-of-module-version-in-docs.patch
 Skip-tests-requiring-a-window-manager.patch

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