From 4bc829b812b8cdb845c229d9fe1f4067e5d170bc Mon Sep 17 00:00:00 2001 From: aviau Date: Thu, 6 Sep 2018 14:57:48 -0400 Subject: [PATCH] remove unneeded patches --- debian/changelog | 1 + debian/patches/series | 2 -- debian/patches/skip_test_legacy_callbacks.patch | 17 ----------------- debian/patches/sphinx1-7-support.patch | 16 ---------------- 4 files changed, 1 insertion(+), 35 deletions(-) delete mode 100644 debian/patches/series delete mode 100644 debian/patches/skip_test_legacy_callbacks.patch delete mode 100644 debian/patches/sphinx1-7-support.patch diff --git a/debian/changelog b/debian/changelog index 87f0466..0b82540 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,7 @@ python-click (6.7+git20180829-1) UNRELEASED; urgency=medium * New upstream snapshot. + * Remove unneeded patches. -- Alexandre Viau Thu, 06 Sep 2018 14:55:26 -0400 diff --git a/debian/patches/series b/debian/patches/series deleted file mode 100644 index 79c2bf9..0000000 --- a/debian/patches/series +++ /dev/null @@ -1,2 +0,0 @@ -sphinx1-7-support.patch -skip_test_legacy_callbacks.patch diff --git a/debian/patches/skip_test_legacy_callbacks.patch b/debian/patches/skip_test_legacy_callbacks.patch deleted file mode 100644 index 1105ce4..0000000 --- a/debian/patches/skip_test_legacy_callbacks.patch +++ /dev/null @@ -1,17 +0,0 @@ -Description: Temporarily skip test_legacy_callbacks -Bug: 868816 -Forwarded: https://github.com/pallets/click/issues/823 -Author: Alexandre Viau -Last-Update: 2017-07-19 - ---- a/tests/test_compat.py -+++ b/tests/test_compat.py -@@ -1,7 +1,7 @@ - import click - - --if click.__version__ >= '3.0': -+if False: - def test_legacy_callbacks(runner): - def legacy_callback(ctx, value): - return value.upper() diff --git a/debian/patches/sphinx1-7-support.patch b/debian/patches/sphinx1-7-support.patch deleted file mode 100644 index a8b4d7f..0000000 --- a/debian/patches/sphinx1-7-support.patch +++ /dev/null @@ -1,16 +0,0 @@ -Description: Support Sphinx 1.7+ -Origin: https://github.com/pallets/click/pull/991 -Author: Randy Daw-Ran Liou -Applied-Upstream: https://github.com/pallets/click/pull/991 - ---- a/docs/clickdoctools.py -+++ b/docs/clickdoctools.py -@@ -15,7 +15,7 @@ - from docutils.statemachine import ViewList - - from sphinx.domains import Domain --from sphinx.util.compat import Directive -+from docutils.parsers.rst import Directive - - - class EchoingStdin(object):