Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package python-scitokens for
openSUSE:Factory checked in at 2022-11-15 13:18:43
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/python-scitokens (Old)
and /work/SRC/openSUSE:Factory/.python-scitokens.new.1597 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "python-scitokens"
Tue Nov 15 13:18:43 2022 rev:5 rq:1035662 version:1.7.2
Changes:
--------
--- /work/SRC/openSUSE:Factory/python-scitokens/python-scitokens.changes
2022-10-31 13:04:29.885744732 +0100
+++
/work/SRC/openSUSE:Factory/.python-scitokens.new.1597/python-scitokens.changes
2022-11-15 13:21:29.640821989 +0100
@@ -1,0 +2,7 @@
+Mon Nov 14 08:47:39 UTC 2022 - [email protected]
+
+- added patches
+ fix https://github.com/scitokens/scitokens/issues/169
+ + python-scitokens-no-six.patch
+
+-------------------------------------------------------------------
New:
----
python-scitokens-no-six.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ python-scitokens.spec ++++++
--- /var/tmp/diff_new_pack.Nmipe2/_old 2022-11-15 13:21:30.028823991 +0100
+++ /var/tmp/diff_new_pack.Nmipe2/_new 2022-11-15 13:21:30.036824033 +0100
@@ -27,6 +27,8 @@
License: Apache-2.0
URL: https://scitokens.org
Source:
https://github.com/scitokens/scitokens/archive/refs/tags/v%{version}.tar.gz#/%{bname}-%{version}.tar.gz
+# https://github.com/scitokens/scitokens/issues/169
+Patch0: python-scitokens-no-six.patch
BuildRequires: %{python_module PyJWT}
BuildRequires: %{python_module pytest}
BuildRequires: %{python_module setuptools}
@@ -49,6 +51,7 @@
%prep
%setup -q -n scitokens-%{version}
+%patch0 -p1
%build
%python_build
++++++ python-scitokens-no-six.patch ++++++
Index: scitokens-1.7.2/requirements.txt
===================================================================
--- scitokens-1.7.2.orig/requirements.txt
+++ scitokens-1.7.2/requirements.txt
@@ -1,3 +1,2 @@
cryptography
PyJWT>=1.6.1
-six
Index: scitokens-1.7.2/setup.py
===================================================================
--- scitokens-1.7.2.orig/setup.py
+++ scitokens-1.7.2/setup.py
@@ -64,7 +64,6 @@ setuptools.setup(
install_requires=[
'cryptography',
'PyJWT>=1.6.1',
- 'six',
'setuptools'
],
# classifiers
Index: scitokens-1.7.2/src/scitokens/scitokens.py
===================================================================
--- scitokens-1.7.2.orig/src/scitokens/scitokens.py
+++ scitokens-1.7.2/src/scitokens/scitokens.py
@@ -12,7 +12,6 @@ import os
import jwt
from . import urltools
import logging
-from six import string_types
LOGGER = logging.getLogger("scitokens")
import uuid
@@ -697,7 +696,7 @@ class Enforcer(object):
return True
def _validate_scope(self, value):
- if not isinstance(value, string_types):
+ if not isinstance(value, str):
raise InvalidAuthorizationResource("Scope is invalid. Must be a
space separated string")
if self._test_access:
if not self._test_path:
Index: scitokens-1.7.2/src/scitokens/utils/config.py
===================================================================
--- scitokens-1.7.2.orig/src/scitokens/utils/config.py
+++ scitokens-1.7.2/src/scitokens/utils/config.py
@@ -5,8 +5,7 @@ Module for configuration management
# Config parser is renamed in python 3
-from six.moves import configparser
-import six
+import configparser
import logging
import logging.handlers
@@ -30,7 +29,7 @@ def set_config(config = None):
"""
global configuration # pylint: disable=C0103
- if isinstance(config, six.string_types):
+ if isinstance(config, str):
configuration = configparser.ConfigParser(CONFIG_DEFAULTS)
configuration.read([config])
elif isinstance(config, configparser.RawConfigParser):
Index: scitokens-1.7.2/tests/test_config.py
===================================================================
--- scitokens-1.7.2.orig/tests/test_config.py
+++ scitokens-1.7.2/tests/test_config.py
@@ -8,8 +8,7 @@ import tempfile
import logging
import scitokens
import scitokens.utils.config
-
-from six.moves import configparser
+import configparser
class TestConfig(unittest.TestCase):
"""
