From d8ad0ed9cb03d1ad35aae3f87eb53bff8eb602f116c459f2835f78310ae386f7 Mon Sep 17 00:00:00 2001 From: Oliver Kurz Date: Wed, 8 Jun 2022 14:32:02 +0000 Subject: [PATCH] Accepting request 981290 from home:darix:apps - reenable testsuite - Update to version 1.1.4 - Bugfixes - Fix a bug introduced in signedjson 1.1.3 where signedjson could not be imported due to an MRO resolution error. (#22) - Do not require importlib_metadata on Python 3.8 and above. By @MeggyCal. (#9) - Internal Changes - Configure @matrix-org/synapse-core to be the code owner for the repository. (#11) - Use assertEqual for Python 3.11. By @hugovk. (#17) - Run linters (flake8, mypy, black, isort). (#20) - Mark the package as containing type hints. (#20) - drop no-importlib-on-py38.patch: included in update OBS-URL: https://build.opensuse.org/request/show/981290 OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-signedjson?expand=0&rev=16 --- no-importlib-on-py38.patch | 29 ----------------------------- python-signedjson.changes | 23 +++++++++++++++++++++++ python-signedjson.spec | 8 +++----- signedjson-1.1.1.tar.gz | 3 --- signedjson-1.1.4.tar.gz | 3 +++ 5 files changed, 29 insertions(+), 37 deletions(-) delete mode 100644 no-importlib-on-py38.patch delete mode 100644 signedjson-1.1.1.tar.gz create mode 100644 signedjson-1.1.4.tar.gz diff --git a/no-importlib-on-py38.patch b/no-importlib-on-py38.patch deleted file mode 100644 index 9e2c6e6..0000000 --- a/no-importlib-on-py38.patch +++ /dev/null @@ -1,29 +0,0 @@ -Index: signedjson-1.1.1/setup.py -=================================================================== ---- signedjson-1.1.1.orig/setup.py -+++ signedjson-1.1.1/setup.py -@@ -41,7 +41,7 @@ setup( - "pynacl>=0.3.0", - "typing_extensions>=3.5", - 'typing>=3.5;python_version<"3.5"', -- "importlib_metadata", -+ 'importlib_metadata;python_version<"3.8"', - ], - long_description=read_file(("README.rst",)), - keywords="json", -Index: signedjson-1.1.1/signedjson/__init__.py -=================================================================== ---- signedjson-1.1.1.orig/signedjson/__init__.py -+++ signedjson-1.1.1/signedjson/__init__.py -@@ -12,7 +12,10 @@ - # See the License for the specific language governing permissions and - # limitations under the License. - --from importlib_metadata import version, PackageNotFoundError -+try: -+ from importlib.metadata import version, PackageNotFoundError -+except ImportError: -+ from importlib_metadata import version, PackageNotFoundError - - try: - __version__ = version(__name__) diff --git a/python-signedjson.changes b/python-signedjson.changes index 6a5d92a..6d5c748 100644 --- a/python-signedjson.changes +++ b/python-signedjson.changes @@ -1,3 +1,26 @@ +------------------------------------------------------------------- +Wed Jun 8 11:08:12 UTC 2022 - Marcus Rueckert + +- reenable testsuite + +------------------------------------------------------------------- +Tue Jun 7 16:15:18 UTC 2022 - Marcus Rueckert + +- Update to version 1.1.4 + - Bugfixes + - Fix a bug introduced in signedjson 1.1.3 where signedjson + could not be imported due to an MRO resolution error. (#22) + - Do not require importlib_metadata on Python 3.8 and above. By + @MeggyCal. (#9) + - Internal Changes + - Configure @matrix-org/synapse-core to be the code owner for + the repository. (#11) + - Use assertEqual for Python 3.11. By @hugovk. (#17) + - Run linters (flake8, mypy, black, isort). (#20) + - Mark the package as containing type hints. (#20) +- drop no-importlib-on-py38.patch: + included in update + ------------------------------------------------------------------- Sun Aug 16 20:48:03 UTC 2020 - John Vandenberg diff --git a/python-signedjson.spec b/python-signedjson.spec index ebee37a..43f18e0 100644 --- a/python-signedjson.spec +++ b/python-signedjson.spec @@ -1,7 +1,7 @@ # -# spec file for package python-signedjson +# spec file # -# Copyright (c) 2020 SUSE LLC +# Copyright (c) 2022 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -20,14 +20,13 @@ %global modname signedjson %bcond_without python2 Name: python-%{modname} -Version: 1.1.1 +Version: 1.1.4 Release: 0 Summary: Python module to sign JSON with Ed25519 signatures License: Apache-2.0 Group: Development/Languages/Python URL: https://github.com/matrix-org/%{name} Source0: https://files.pythonhosted.org/packages/source/s/signedjson/%{modname}-%{version}.tar.gz -Patch0: no-importlib-on-py38.patch BuildRequires: %{python_module setuptools_scm} BuildRequires: fdupes BuildRequires: python-rpm-macros @@ -64,7 +63,6 @@ Features: %prep %setup -q -n %{modname}-%{version} -%patch0 -p1 %build %python_build diff --git a/signedjson-1.1.1.tar.gz b/signedjson-1.1.1.tar.gz deleted file mode 100644 index 2444976..0000000 --- a/signedjson-1.1.1.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:350586e7570ba208f7729dcda09d43f554ead0207a15e3e3695533ef3f720009 -size 10906 diff --git a/signedjson-1.1.4.tar.gz b/signedjson-1.1.4.tar.gz new file mode 100644 index 0000000..76c6cd5 --- /dev/null +++ b/signedjson-1.1.4.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:cd91c56af53f169ef032c62e9c4a3292dc158866933318d0592e3462db3d6492 +size 13565