From 7e1bd413c34bdddb8528f5022f0a1f349bd0b014fcfe4044abacd2b4782e2a0f Mon Sep 17 00:00:00 2001
From: Dirk Mueller <dmueller@suse.com>
Date: Fri, 5 Feb 2021 15:20:30 +0000
Subject: [PATCH] Accepting request 869557 from
 home:bnavigator:branches:devel:languages:python

- Update to 1.18.2
  * add hosts entries and ssh keys only once
  * Do not fail if routes are missing from a network
- Changes in 1.18.1
  * Add container build jobs
  * Drop release test
  * Update functional tests
- Only test on python3: OpenStack oslotest only available there

OBS-URL: https://build.opensuse.org/request/show/869557
OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-glean?expand=0&rev=15
---
 glean-1.18.0.tar.gz  |  3 ---
 glean-1.18.2.tar.gz  |  3 +++
 python-glean.changes | 12 ++++++++++++
 python-glean.spec    | 25 ++++++++++++-------------
 4 files changed, 27 insertions(+), 16 deletions(-)
 delete mode 100644 glean-1.18.0.tar.gz
 create mode 100644 glean-1.18.2.tar.gz

diff --git a/glean-1.18.0.tar.gz b/glean-1.18.0.tar.gz
deleted file mode 100644
index 4bfa3ca..0000000
--- a/glean-1.18.0.tar.gz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:87bb6a0550c38e3886c52daffd2fcc3d9f9ba1daf34c98fcee4d01c91b1e7497
-size 61257
diff --git a/glean-1.18.2.tar.gz b/glean-1.18.2.tar.gz
new file mode 100644
index 0000000..69d7624
--- /dev/null
+++ b/glean-1.18.2.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:af8224d164988bb7e67e57a7548f1662bf2983a71d0164a78e1105f7c8b7c537
+size 67642
diff --git a/python-glean.changes b/python-glean.changes
index 608de99..9a2cede 100644
--- a/python-glean.changes
+++ b/python-glean.changes
@@ -1,3 +1,15 @@
+-------------------------------------------------------------------
+Thu Feb  4 18:39:08 UTC 2021 - Ben Greiner <code@bnavigator.de>
+
+- Update to 1.18.2
+  * add hosts entries and ssh keys only once
+  * Do not fail if routes are missing from a network
+- Changes in 1.18.1
+  * Add container build jobs
+  * Drop release test
+  * Update functional tests
+- Only test on python3: OpenStack oslotest only available there
+
 -------------------------------------------------------------------
 Thu Jun  4 16:13:19 UTC 2020 - Dirk Mueller <dmueller@suse.com>
 
diff --git a/python-glean.spec b/python-glean.spec
index fcd672d..bb6b530 100644
--- a/python-glean.spec
+++ b/python-glean.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package python-glean
 #
-# Copyright (c) 2020 SUSE LLC
+# Copyright (c) 2021 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -18,7 +18,7 @@
 
 %{?!python_module:%define python_module() python-%{**} python3-%{**}}
 Name:           python-glean
-Version:        1.18.0
+Version:        1.18.2
 Release:        0
 Summary:        Program to write static config from config-drive
 License:        Apache-2.0
@@ -33,13 +33,13 @@ Requires(post): update-alternatives
 Requires(postun): update-alternatives
 BuildArch:      noarch
 # SECTION test requirements
-BuildRequires:  %{python_module Sphinx >= 1.1.2}
-BuildRequires:  %{python_module mock >= 1.0}
-BuildRequires:  %{python_module oslotest >= 1.1.0.0a1}
-BuildRequires:  %{python_module python-subunit}
-BuildRequires:  %{python_module testrepository >= 0.0.18}
-BuildRequires:  %{python_module testscenarios >= 0.4}
-BuildRequires:  %{python_module testtools >= 0.9.34}
+# The OpenStack package oslotest is only available for the primary python3 flavor on TW.
+# On Leap (backports at least), the python2 package conflicts with the python3 package.
+BuildRequires:  python3-oslotest >= 1.1.0.0a1
+BuildRequires:  python3-python-subunit
+BuildRequires:  python3-testrepository >= 0.0.18
+BuildRequires:  python3-testscenarios >= 0.4
+BuildRequires:  python3-testtools >= 0.9.34
 # /SECTION
 %python_subpackages
 
@@ -64,10 +64,9 @@ notably Rackspace, use configuration provided via a configuration drive.
 %python_expand %fdupes %{buildroot}%{$python_sitelib}
 
 %check
-%{python_expand rm -rf .testrepository
-export PYTHON=$python
-$python setup.py test
-}
+# only test the primary python3 flavor
+export PYTHON=%{_bindir}/python3
+python3 setup.py testr
 
 %post
 %python_install_alternative glean-install