From be747576defc62eba4b4b8dfc03d5b93a3b3d42d Mon Sep 17 00:00:00 2001 From: Michael Banck Date: Tue, 6 Jul 2021 19:54:31 +0200 Subject: [PATCH] * debian/patches/regression_tests_disable_requirement_download.patch: Refreshed. * debian/patches/requirements_cdiff.patch: Likewise. * debian/patches/requirements_setuptools.patch: Likewise. --- debian/changelog | 6 ++++++ ...gression_tests_disable_requirement_download.patch | 2 +- debian/patches/requirements_cdiff.patch | 12 +++++++----- debian/patches/requirements_setuptools.patch | 4 ++-- 4 files changed, 16 insertions(+), 8 deletions(-) diff --git a/debian/changelog b/debian/changelog index 87cd544..11c0019 100644 --- a/debian/changelog +++ b/debian/changelog @@ -9,6 +9,12 @@ patroni (2.1.0-1) UNRELEASED; urgency=medium + Prometheus /metrics endpoint + Reduced chattiness of Patroni logs + [ Michael Banck ] + * debian/patches/regression_tests_disable_requirement_download.patch: + Refreshed. + * debian/patches/requirements_cdiff.patch: Likewise. + * debian/patches/requirements_setuptools.patch: Likewise. + -- Debian PostgreSQL Maintainers Thu, 04 Mar 2021 09:01:01 +0100 patroni (2.0.2-1) unstable; urgency=medium diff --git a/debian/patches/regression_tests_disable_requirement_download.patch b/debian/patches/regression_tests_disable_requirement_download.patch index 3e031e9..25fa94f 100644 --- a/debian/patches/regression_tests_disable_requirement_download.patch +++ b/debian/patches/regression_tests_disable_requirement_download.patch @@ -2,7 +2,7 @@ Index: patroni/setup.py =================================================================== --- patroni.orig/setup.py +++ patroni/setup.py -@@ -151,7 +151,6 @@ class PyTest(Command): +@@ -152,7 +152,6 @@ class PyTest(Command): if not k.startswith(':') or evaluate_marker(k[1:]): requirements.update(v) diff --git a/debian/patches/requirements_cdiff.patch b/debian/patches/requirements_cdiff.patch index 28d0e4f..69ca263 100644 --- a/debian/patches/requirements_cdiff.patch +++ b/debian/patches/requirements_cdiff.patch @@ -1,8 +1,10 @@ ---- ./requirements.txt.orig 2020-10-03 10:04:07.677928960 +0200 -+++ ./requirements.txt 2020-10-03 10:04:13.861018707 +0200 -@@ -11,5 +11,5 @@ - python-dateutil - pysyncobj>=0.3.7 +Index: patroni/requirements.txt +=================================================================== +--- patroni.orig/requirements.txt ++++ patroni/requirements.txt +@@ -12,5 +12,5 @@ python-dateutil + pysyncobj>=0.3.8 + cryptography>=1.4 psutil>=2.0.0 -ydiff>=1.2.0 +cdiff diff --git a/debian/patches/requirements_setuptools.patch b/debian/patches/requirements_setuptools.patch index 42f5409..a20ad13 100644 --- a/debian/patches/requirements_setuptools.patch +++ b/debian/patches/requirements_setuptools.patch @@ -2,8 +2,8 @@ Index: patroni/requirements.txt =================================================================== --- patroni.orig/requirements.txt +++ patroni/requirements.txt -@@ -12,3 +12,4 @@ python-dateutil - pysyncobj>=0.3.7 +@@ -13,3 +13,4 @@ pysyncobj>=0.3.8 + cryptography>=1.4 psutil>=2.0.0 ydiff>=1.2.0 +setuptools