diff --git a/.gitignore b/.gitignore index d9730b4..d210113 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,4 @@ /frozendict-1.2.tar.gz +/frozendict-2.3.0.tar.gz +/frozendict-2.3.2.tar.gz +/frozendict-2.3.4.tar.gz diff --git a/24e65b1f197a8c0dcca82a6ada53a8a29445c21c.patch b/24e65b1f197a8c0dcca82a6ada53a8a29445c21c.patch deleted file mode 100644 index 92d563b..0000000 --- a/24e65b1f197a8c0dcca82a6ada53a8a29445c21c.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 24e65b1f197a8c0dcca82a6ada53a8a29445c21c Mon Sep 17 00:00:00 2001 -From: Hugo van Kemenade -Date: Thu, 23 Jan 2020 07:52:06 +0200 -Subject: [PATCH] Try .abc first - ---- - frozendict/__init__.py | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/frozendict/__init__.py b/frozendict/__init__.py -index e5b0368..4d76bc7 100644 ---- a/frozendict/__init__.py -+++ b/frozendict/__init__.py -@@ -4,9 +4,9 @@ - - try: - # Python 3.3+ -- from collections import Mapping --except ImportError: - from collections.abc import Mapping -+except ImportError: -+ from collections import Mapping - - try: - from collections import OrderedDict diff --git a/6ad44b54139e9b298a9281d85abf4f940f5d852a.patch b/6ad44b54139e9b298a9281d85abf4f940f5d852a.patch deleted file mode 100644 index e35c2c4..0000000 --- a/6ad44b54139e9b298a9281d85abf4f940f5d852a.patch +++ /dev/null @@ -1,39 +0,0 @@ -From 6ad44b54139e9b298a9281d85abf4f940f5d852a Mon Sep 17 00:00:00 2001 -From: Hugo -Date: Mon, 20 Jan 2020 18:46:57 +0200 -Subject: [PATCH] Fix imports for Python 3.9 - ---- - frozendict/__init__.py | 10 +++++++--- - 1 file changed, 7 insertions(+), 3 deletions(-) - -diff --git a/frozendict/__init__.py b/frozendict/__init__.py -index 399948a..e5b0368 100644 ---- a/frozendict/__init__.py -+++ b/frozendict/__init__.py -@@ -1,8 +1,12 @@ --import collections - import operator - import functools - import sys - -+try: -+ # Python 3.3+ -+ from collections import Mapping -+except ImportError: -+ from collections.abc import Mapping - - try: - from collections import OrderedDict -@@ -13,9 +17,9 @@ - iteritems = getattr(dict, 'iteritems', dict.items) # py2-3 compatibility - - --class frozendict(collections.Mapping): -+class frozendict(Mapping): - """ -- An immutable wrapper around dictionaries that implements the complete :py:class:`collections.Mapping` -+ An immutable wrapper around dictionaries that implements the complete :py:class:`collections.abc.Mapping` - interface. It can be used as a drop-in replacement for dictionaries where immutability is desired. - """ - diff --git a/python-frozendict.spec b/python-frozendict.spec index 52e6253..89bc4a7 100644 --- a/python-frozendict.spec +++ b/python-frozendict.spec @@ -2,17 +2,13 @@ %global srcname frozendict Name: python-%{srcname} -Version: 1.2 -Release: 23%{?dist} +Version: 2.3.4 +Release: 1%{?dist} Summary: An immutable dictionary License: MIT URL: https://pypi.python.org/pypi/frozendict Source0: %{pypi_source} - -Patch0: https://github.com/slezica/python-frozendict/pull/30/commits/6ad44b54139e9b298a9281d85abf4f940f5d852a.patch -Patch1: https://github.com/slezica/python-frozendict/pull/30/commits/24e65b1f197a8c0dcca82a6ada53a8a29445c21c.patch - BuildArch: noarch %global _description %{expand: @@ -27,6 +23,7 @@ Summary: %{summary} %{?python_provide:%python_provide python3-%{srcname}} BuildRequires: python3-devel BuildRequires: python3-setuptools +BuildRequires: python3-wheel %description -n python3-%{srcname} %{_description} @@ -34,18 +31,23 @@ BuildRequires: python3-setuptools %autosetup -n %{srcname}-%{version} -p1 %build -%py3_build +# Build the python only version (no python 3.11 support) +%global py_setup_args py +%py3_build_wheel %install %py3_install %files -n python3-%{srcname} %license LICENSE.txt -%doc README.rst +%doc README.md %{python3_sitelib}/%{srcname}-*.egg-info/ %{python3_sitelib}/%{srcname}/ %changelog +* Fri Jan 06 2023 Orion Poplawski - 2.3.4-1 +- Update to 2.3.4 + * Fri Jul 22 2022 Fedora Release Engineering - 1.2-23 - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild diff --git a/sources b/sources index 0c25ba4..a7bf5ee 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (frozendict-1.2.tar.gz) = 095cf5f6f8b02bf5666e04200431992bf4b3160aae3464d528bc256b1ab643e29dda78fe94d9e8c983dbfe66cd2459e0559122e17b6b8660c0552adc5318b3da +SHA512 (frozendict-2.3.4.tar.gz) = a73aabcb7449f8c1876c7acbf58e41016dd8177c08321cd66082e0fec08f53cdd3d21ed3034fbadad2c188267c4adfdbcd1b761dfbc0641b2d3710b9ddad29bc