From f9b86f64ad7749df845ed83644a7302d16eca693b72733bd5ae731c078f01b52 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= <tchvatal@suse.com>
Date: Fri, 20 Mar 2020 14:01:53 +0000
Subject: [PATCH] Accepting request 786901 from
 home:mcalabkova:branches:devel:languages:python

- Update to 2.1.0
  * Dropping old python 2.7/3.5 and ensuring 3 latest versions are supported
  * Adding mypy + cleanup + further removal of python2 code
  * Bugfix: Httpretty is not used outside tests and breaks install on newer python versions for some systems
  * Add option to get nodes without using event-counts
  * define the project status as stable
  * bundle requirements-test.txt in python package
  * Bugfix: Fixed metric() function to query the new v2 endpoint based on Jolokia
  * added few new parameters
- Added patch loosen-requirements.patch

OBS-URL: https://build.opensuse.org/request/show/786901
OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-pypuppetdb?expand=0&rev=10
---
 loosen-requirements.patch |  8 ++++++++
 python-pypuppetdb.changes | 14 ++++++++++++++
 python-pypuppetdb.spec    | 13 ++++++++-----
 v1.1.0.tar.gz             |  3 ---
 v2.1.0.tar.gz             |  3 +++
 5 files changed, 33 insertions(+), 8 deletions(-)
 create mode 100644 loosen-requirements.patch
 delete mode 100644 v1.1.0.tar.gz
 create mode 100644 v2.1.0.tar.gz

diff --git a/loosen-requirements.patch b/loosen-requirements.patch
new file mode 100644
index 0000000..08d9113
--- /dev/null
+++ b/loosen-requirements.patch
@@ -0,0 +1,8 @@
+Index: pypuppetdb-2.0.0/requirements.txt
+===================================================================
+--- pypuppetdb-2.0.0.orig/requirements.txt
++++ pypuppetdb-2.0.0/requirements.txt
+@@ -1,2 +1 @@
+-requests==2.22.0
+-six==1.13.0
++requests>=2.22.0
diff --git a/python-pypuppetdb.changes b/python-pypuppetdb.changes
index 6aea100..2e62ce9 100644
--- a/python-pypuppetdb.changes
+++ b/python-pypuppetdb.changes
@@ -1,3 +1,17 @@
+-------------------------------------------------------------------
+Fri Mar 20 12:59:19 UTC 2020 - Marketa Calabkova <mcalabkova@suse.com>
+
+- Update to 2.1.0
+  * Dropping old python 2.7/3.5 and ensuring 3 latest versions are supported
+  * Adding mypy + cleanup + further removal of python2 code
+  * Bugfix: Httpretty is not used outside tests and breaks install on newer python versions for some systems
+  * Add option to get nodes without using event-counts
+  * define the project status as stable
+  * bundle requirements-test.txt in python package
+  * Bugfix: Fixed metric() function to query the new v2 endpoint based on Jolokia
+  * added few new parameters
+- Added patch loosen-requirements.patch
+
 -------------------------------------------------------------------
 Tue Sep 10 11:49:00 UTC 2019 - Tomáš Chvátal <tchvatal@suse.com>
 
diff --git a/python-pypuppetdb.spec b/python-pypuppetdb.spec
index 7767809..6f647d4 100644
--- a/python-pypuppetdb.spec
+++ b/python-pypuppetdb.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package python-pypuppetdb
 #
-# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2020 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -17,26 +17,26 @@
 
 
 %{?!python_module:%define python_module() python-%{**} python3-%{**}}
+%define skip_python2 1
 Name:           python-pypuppetdb
-Version:        1.1.0
+Version:        2.1.0
 Release:        0
 Summary:        Library to work with PuppetDB's REST API
 License:        Apache-2.0
 Group:          Development/Languages/Python
 URL:            https://github.com/nedap/pypuppetdb
 Source:         https://github.com/voxpupuli/pypuppetdb/archive/v%{version}.tar.gz
+# PATCH-FIX-OPENSUSE Fix requirements in generated egg-info
+Patch0:         loosen-requirements.patch
 BuildRequires:  %{python_module httpretty >= 0.9.6}
 BuildRequires:  %{python_module mock >= 1.0.1}
 BuildRequires:  %{python_module pytest >= 3.0.1}
 BuildRequires:  %{python_module pytest-cov >= 2.2.1}
 BuildRequires:  %{python_module requests >= 2.22.0}
 BuildRequires:  %{python_module setuptools}
-BuildRequires:  %{python_module six >= 1.12.0}
 BuildRequires:  fdupes
 BuildRequires:  python-rpm-macros
-Requires:       python-httpretty >= 0.9.6
 Requires:       python-requests >= 2.22.0
-Requires:       python-six >= 1.12.0
 BuildArch:      noarch
 %python_subpackages
 
@@ -46,6 +46,7 @@ More information: https://github.com/nedap/pypuppetdb
 
 %prep
 %setup -q -n pypuppetdb-%{version}
+%patch0 -p1
 
 %build
 %python_build
@@ -56,6 +57,8 @@ More information: https://github.com/nedap/pypuppetdb
 
 %check
 %pytest
+# requirements-test.txt packages oddly
+rm %{buildroot}/usr/requirements_for_tests/requirements-test.txt
 
 %files %{python_files}
 %doc README.rst CHANGELOG.rst
diff --git a/v1.1.0.tar.gz b/v1.1.0.tar.gz
deleted file mode 100644
index 03e7a87..0000000
--- a/v1.1.0.tar.gz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:057461424982f4f11c5569fb94148961073b4b108a0bda6a6f8e14d9fa4862f1
-size 49307
diff --git a/v2.1.0.tar.gz b/v2.1.0.tar.gz
new file mode 100644
index 0000000..c031464
--- /dev/null
+++ b/v2.1.0.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:f5d28528af75b6a0b31d66454d71baf643c5978f5b477300ee225ed69829a734
+size 51398