From 632f377f0b59cefcaeb4b3ee6fe1d48ad1488bcae249c741c360f9d07a21a6a9 Mon Sep 17 00:00:00 2001
From: Steve Kowalik <steven.kowalik@suse.com>
Date: Wed, 8 Sep 2021 04:27:59 +0000
Subject: [PATCH] - Update to 1.8.2:   * allow hyphens in sub domains (#96)   *
 Fix argument declaration (#95)   * use better host validation(#92)   * do not
 enforce dot in sub claim email host part (#90)   * switch to pytest from nose
   * fix JWT padding (Thanks @JohnDoee) #81 - Drop skip-test_sign_01.patch, no
 longer required

OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-py-vapid?expand=0&rev=3
---
 py-vapid-1.7.0.tar.gz   |  3 ---
 py-vapid-1.8.2.tar.gz   |  3 +++
 python-py-vapid.changes | 12 ++++++++++++
 python-py-vapid.spec    | 13 +++++--------
 skip-test_sign_01.patch | 12 ------------
 5 files changed, 20 insertions(+), 23 deletions(-)
 delete mode 100644 py-vapid-1.7.0.tar.gz
 create mode 100644 py-vapid-1.8.2.tar.gz
 delete mode 100644 skip-test_sign_01.patch

diff --git a/py-vapid-1.7.0.tar.gz b/py-vapid-1.7.0.tar.gz
deleted file mode 100644
index 0f3894a..0000000
--- a/py-vapid-1.7.0.tar.gz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:03057a3270ddc7d53c31e2915083d01ba8a3169f4032cab3dd9f4ebe44e2564a
-size 18888
diff --git a/py-vapid-1.8.2.tar.gz b/py-vapid-1.8.2.tar.gz
new file mode 100644
index 0000000..6fee30e
--- /dev/null
+++ b/py-vapid-1.8.2.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:874f21910f2103c56228cded941d6e733dd8f1eb12876137919533bfacb65a48
+size 19971
diff --git a/python-py-vapid.changes b/python-py-vapid.changes
index a6e2f91..bd54353 100644
--- a/python-py-vapid.changes
+++ b/python-py-vapid.changes
@@ -1,3 +1,15 @@
+-------------------------------------------------------------------
+Wed Sep  8 04:27:28 UTC 2021 - Steve Kowalik <steven.kowalik@suse.com>
+
+- Update to 1.8.2:
+  * allow hyphens in sub domains (#96)
+  * Fix argument declaration (#95)
+  * use better host validation(#92)
+  * do not enforce dot in sub claim email host part (#90)
+  * switch to pytest from nose
+  * fix JWT padding (Thanks @JohnDoee) #81 
+- Drop skip-test_sign_01.patch, no longer required
+
 -------------------------------------------------------------------
 Sun Jun  7 06:14:33 UTC 2020 - John Vandenberg <jayvdb@gmail.com>
 
diff --git a/python-py-vapid.spec b/python-py-vapid.spec
index f9d6873..d645498 100644
--- a/python-py-vapid.spec
+++ b/python-py-vapid.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package python-py-vapid
 #
-# 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,25 +18,23 @@
 
 %{?!python_module:%define python_module() python-%{**} python3-%{**}}
 Name:           python-py-vapid
-Version:        1.7.0
+Version:        1.8.2
 Release:        0
 Summary:        VAPID header generation library
 License:        MPL-2.0
-Group:          Development/Languages/Python
 URL:            https://github.com/mozilla-services/vapid
 Source:         https://files.pythonhosted.org/packages/source/p/py-vapid/py-vapid-%{version}.tar.gz
-Patch0:         skip-test_sign_01.patch
 BuildRequires:  %{python_module setuptools}
 BuildRequires:  fdupes
 BuildRequires:  python-rpm-macros
 Requires:       python-cryptography >= 2.5
 Requires(post): update-alternatives
-Requires(postun): update-alternatives
+Requires(postun):update-alternatives
 BuildArch:      noarch
 # SECTION test requirements
 BuildRequires:  %{python_module cryptography >= 2.5}
 BuildRequires:  %{python_module mock >= 1.0.1}
-BuildRequires:  %{python_module nose}
+BuildRequires:  %{python_module pytest}
 # /SECTION
 %python_subpackages
 
@@ -45,7 +43,6 @@ VAPID header generation library.
 
 %prep
 %setup -q -n py-vapid-%{version}
-%patch0 -p1
 
 %build
 %python_build
@@ -56,7 +53,7 @@ VAPID header generation library.
 %python_expand %fdupes %{buildroot}%{$python_sitelib}
 
 %check
-%python_exec -m nose
+%pytest
 
 %post
 %python_install_alternative vapid
diff --git a/skip-test_sign_01.patch b/skip-test_sign_01.patch
deleted file mode 100644
index 730c7d2..0000000
--- a/skip-test_sign_01.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-Index: py-vapid-1.7.0/py_vapid/tests/test_vapid.py
-===================================================================
---- py-vapid-1.7.0.orig/py_vapid/tests/test_vapid.py
-+++ py-vapid-1.7.0/py_vapid/tests/test_vapid.py
-@@ -130,6 +130,7 @@ class VapidTestCase(unittest.TestCase):
-         self.check_keys(v1)
-         self.check_keys(v2)
- 
-+    @unittest.skip("Fails randomly")
-     def test_sign_01(self):
-         v = Vapid01.from_string(T_DER)
-         claims = {"aud": "https://example.com",