diff --git a/.gitignore b/.gitignore index 96de26a..7734adb 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ /python-utils-2.0.1.tar.gz /python-utils-2.1.0.tar.gz /python-utils-2.3.0.tar.gz +/python-utils-2.4.0.tar.gz diff --git a/7.patch b/7.patch deleted file mode 100644 index 831a5ac..0000000 --- a/7.patch +++ /dev/null @@ -1,46 +0,0 @@ -From 46b2192c1c146bffda04ffe696a8934015af5777 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= -Date: Mon, 13 May 2019 10:48:03 +0200 -Subject: [PATCH] Build docs with Python 3 - -Fixes https://github.com/WoLpH/python-utils/issues/6 ---- - docs/conf.py | 4 +++- - tox.ini | 2 +- - 2 files changed, 4 insertions(+), 2 deletions(-) - -diff --git a/docs/conf.py b/docs/conf.py -index 6f1ccba..f2225c5 100644 ---- a/docs/conf.py -+++ b/docs/conf.py -@@ -67,7 +67,7 @@ - - # Monkey patch to disable nonlocal image warning - import sphinx --if hasattr(sphinx, 'environment'): -+try: - original_warn_mode = sphinx.environment.BuildEnvironment.warn_node - - def allow_nonlocal_image_warn_node(self, msg, *args, **kwargs): -@@ -76,6 +76,8 @@ def allow_nonlocal_image_warn_node(self, msg, *args, **kwargs): - - sphinx.environment.BuildEnvironment.warn_node = \ - allow_nonlocal_image_warn_node -+except AttributeError: -+ pass - - suppress_warnings = [ - 'image.nonlocal_uri', -diff --git a/tox.ini b/tox.ini -index 33b165c..b588f0a 100644 ---- a/tox.ini -+++ b/tox.ini -@@ -19,7 +19,7 @@ deps = flake8 - commands = flake8 --ignore=W391 python_utils {posargs} - - [testenv:docs] --basepython = python2.7 -+basepython = python3 - whitelist_externals = - rm - cd diff --git a/python-utils.spec b/python-utils.spec index 565840d..b974fd2 100644 --- a/python-utils.spec +++ b/python-utils.spec @@ -1,15 +1,11 @@ Name: python-utils -Version: 2.3.0 -Release: 10%{?dist} +Version: 2.4.0 +Release: 1%{?dist} Summary: Python Utils is a module with some convenient utilities License: BSD URL: https://github.com/WoLpH/python-utils Source0: %{url}/archive/v%{version}.tar.gz#/%{name}-%{version}.tar.gz -# Build docs with python3 -# https://bugzilla.redhat.com/show_bug.cgi?id=1709063 -# https://github.com/WoLpH/python-utils/pull/7 -Patch0: https://patch-diff.githubusercontent.com/raw/WoLpH/python-utils/pull/7.patch BuildArch: noarch BuildRequires: python3-devel @@ -43,9 +39,6 @@ and making sure a string is in unicode or bytes format. # Remove bundled egg-info rm -rf %{name}.egg-info -# 2.3.0 tarball has 2.2.0 in metadata -sed -i 's/2.2.0/%{version}/' python_utils/__about__.py - # Stop linting code in %%check and measuring coverage, this is upstream's business sed -Ei '/--(cov|pep8|flakes)/d' pytest.ini @@ -72,6 +65,9 @@ rm -rf html/{.doctrees,.buildinfo,*.inv} %{python3_sitelib}/python_utils-%{version}-py?.?.egg-info %changelog +* Mon Jun 01 2020 Charalampos Stratakis - 2.4.0-1 +- Update to 2.4.0 (#1809705) + * Tue May 26 2020 Miro HronĨok - 2.3.0-10 - Rebuilt for Python 3.9 diff --git a/sources b/sources index bf1aa22..66b4675 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (python-utils-2.3.0.tar.gz) = 26e8261b612c7e66a891424ce4ecdf38b72051ee9976c7b35fd61cb3512483b7b8776c5289c2def0c283655eced31e9ec17bc03298a78bdea37a6b3e1670eca5 +SHA512 (python-utils-2.4.0.tar.gz) = a66c0a59e01668a0e4f0ae565fd9fd7ec6519d9df9847db9c94ff1ac7ddf68df021aaf62ffb8c97913aaa4988fb4ad627f25cac6a457bfbff7f6d340b434b0a1