Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package python-pywebpush for
openSUSE:Factory checked in at 2023-06-28 21:33:23
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/python-pywebpush (Old)
and /work/SRC/openSUSE:Factory/.python-pywebpush.new.13546 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "python-pywebpush"
Wed Jun 28 21:33:23 2023 rev:4 rq:1095729 version:1.14.0
Changes:
--------
--- /work/SRC/openSUSE:Factory/python-pywebpush/python-pywebpush.changes
2022-04-10 00:41:57.365079276 +0200
+++
/work/SRC/openSUSE:Factory/.python-pywebpush.new.13546/python-pywebpush.changes
2023-06-28 21:33:29.257905354 +0200
@@ -1,0 +2,7 @@
+Wed Jun 28 06:43:49 UTC 2023 - Steve Kowalik <[email protected]>
+
+- Add patch no-more-six.patch:
+ * Do not require six.
+- Do not use greedy globs in %files.
+
+-------------------------------------------------------------------
New:
----
no-more-six.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ python-pywebpush.spec ++++++
--- /var/tmp/diff_new_pack.cMJhZI/_old 2023-06-28 21:33:30.013909818 +0200
+++ /var/tmp/diff_new_pack.cMJhZI/_new 2023-06-28 21:33:30.017909841 +0200
@@ -1,7 +1,7 @@
#
# spec file for package python-pywebpush
#
-# Copyright (c) 2022 SUSE LLC
+# Copyright (c) 2023 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -16,7 +16,6 @@
#
-%{?!python_module:%define python_module() python-%{**} python3-%{**}}
Name: python-pywebpush
Version: 1.14.0
Release: 0
@@ -24,6 +23,8 @@
License: MPL-2.0
URL: https://github.com/web-push-libs/pywebpush
Source:
https://files.pythonhosted.org/packages/source/p/pywebpush/pywebpush-%{version}.tar.gz
+# PATCH-FIX-OPENSUSE Do not require six module
+Patch0: no-more-six.patch
BuildRequires: %{python_module setuptools}
BuildRequires: fdupes
BuildRequires: python-rpm-macros
@@ -47,7 +48,7 @@
WebPush publication library.
%prep
-%setup -q -n pywebpush-%{version}
+%autosetup -p1 -n pywebpush-%{version}
%build
%python_build
@@ -72,6 +73,7 @@
%doc CHANGELOG.md README.md README.rst
%license LICENSE
%python_alternative %{_bindir}/pywebpush
-%{python_sitelib}/*
+%{python_sitelib}/pywebpush
+%{python_sitelib}/pywebpush-%{version}*-*info
%changelog
++++++ no-more-six.patch ++++++
Index: pywebpush-1.14.0/pywebpush/__init__.py
===================================================================
--- pywebpush-1.14.0.orig/pywebpush/__init__.py
+++ pywebpush-1.14.0/pywebpush/__init__.py
@@ -13,7 +13,6 @@ try:
except ImportError: # pragma nocover
from urlparse import urlparse
-import six
import http_ece
import requests
from cryptography.hazmat.backends import default_backend
@@ -152,7 +151,7 @@ class WebPusher:
for k in ['p256dh', 'auth']:
if keys.get(k) is None:
raise WebPushException("Missing keys value: {}".format(k))
- if isinstance(keys[k], six.text_type):
+ if isinstance(keys[k], str):
keys[k] = bytes(keys[k].encode('utf8'))
receiver_raw = base64.urlsafe_b64decode(
self._repad(keys['p256dh']))
@@ -206,7 +205,7 @@ class WebPusher:
format=serialization.PublicFormat.UncompressedPoint
)
- if isinstance(data, six.text_type):
+ if isinstance(data, str):
data = bytes(data.encode('utf8'))
if content_encoding == "aes128gcm":
self.verb("Encrypting to aes128gcm...")
Index: pywebpush-1.14.0/requirements.txt
===================================================================
--- pywebpush-1.14.0.orig/requirements.txt
+++ pywebpush-1.14.0/requirements.txt
@@ -1,5 +1,4 @@
cryptography>=2.6.1
http-ece>=1.1.0
requests>=2.21.0
-six>=1.15.0
py-vapid>=1.7.0
