From 079695e476d1239168e81d34ef4790948724b91f Mon Sep 17 00:00:00 2001 From: Michael Banck Date: Tue, 23 Feb 2021 12:00:48 +0100 Subject: [PATCH] * debian/patches/acceptance_tests_system_patroni.patch: Refreshed. * debian/patches/regression_tests_disable_requirement_download.patch: Likewise. --- debian/changelog | 5 +++++ debian/patches/acceptance_tests_system_patroni.patch | 2 +- .../regression_tests_disable_requirement_download.patch | 8 +++++--- 3 files changed, 11 insertions(+), 4 deletions(-) diff --git a/debian/changelog b/debian/changelog index f8881b1..d4a626b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,6 +2,11 @@ patroni (2.0.2-1) UNRELEASED; urgency=medium * New upstream release. + [ Michael Banck ] + * debian/patches/acceptance_tests_system_patroni.patch: Refreshed. + * debian/patches/regression_tests_disable_requirement_download.patch: + Likewise. + -- Debian PostgreSQL Maintainers Fri, 22 Jan 2021 12:46:05 +0100 patroni (2.0.1-3) unstable; urgency=medium diff --git a/debian/patches/acceptance_tests_system_patroni.patch b/debian/patches/acceptance_tests_system_patroni.patch index 5834fe0..05565de 100644 --- a/debian/patches/acceptance_tests_system_patroni.patch +++ b/debian/patches/acceptance_tests_system_patroni.patch @@ -2,7 +2,7 @@ Index: patroni/features/environment.py =================================================================== --- patroni.orig/features/environment.py +++ patroni/features/environment.py -@@ -138,8 +138,7 @@ class PatroniController(AbstractControll +@@ -140,8 +140,7 @@ class PatroniController(AbstractControll if isinstance(self._context.dcs_ctl, KubernetesController): self._context.dcs_ctl.create_pod(self._name[8:], self._scope) os.environ['PATRONI_KUBERNETES_POD_IP'] = '10.0.0.' + self._name[-1] diff --git a/debian/patches/regression_tests_disable_requirement_download.patch b/debian/patches/regression_tests_disable_requirement_download.patch index a40127f..3e031e9 100644 --- a/debian/patches/regression_tests_disable_requirement_download.patch +++ b/debian/patches/regression_tests_disable_requirement_download.patch @@ -1,6 +1,8 @@ ---- ./setup.py.orig 2020-10-02 23:25:24.398840743 +0200 -+++ ./setup.py 2020-10-02 23:25:31.798538438 +0200 -@@ -149,7 +149,6 @@ +Index: patroni/setup.py +=================================================================== +--- patroni.orig/setup.py ++++ patroni/setup.py +@@ -151,7 +151,6 @@ class PyTest(Command): if not k.startswith(':') or evaluate_marker(k[1:]): requirements.update(v)