PR#8: Backport 0.6.1 to F36 - rpms/python-isodate

rpms / python-isodate

#8 Backport 0.6.1 to F36

Merged 2 years ago by mhayden. Opened 2 years ago by mhayden.

rawhide into f36

Update to use pyproject-rpm-macros

Major Hayden • 2 years ago

dc7d4ac

Switch to rpmautospec

Major Hayden • 2 years ago

1536360

Update to 0.6.1

Major Hayden • 2 years ago

0d2e1bf

.gitignore

file modified

		`@@ -4,3 +4,4 @@`
		`/isodate-0.5.0.tar.gz`
		`/isodate-0.5.4.tar.gz`
		`/isodate-0.6.0.tar.gz`
		`+ /isodate-0.6.1.tar.gz`

0001-Fix-interpret-decimal-object-as-an-integer.patch

file removed

-67

		`@@ -1,67 +0,0 @@`
		`- From 03e2d16f3306e3450da0e69ae47c427d715457a9 Mon Sep 17 00:00:00 2001`
		`- From: Tomas Hrnciar <thrnciar@redhat.com>`
		`- Date: Fri, 30 Oct 2020 10:01:24 +0100`
		`- Subject: [PATCH] Fix interpret decimal.Decimal object as an integer`
		`-`
		`- Ref: https://docs.python.org/3.8/whatsnew/3.8.html`
		`-`
		`- Many builtin and extension functions that take integer arguments will`
		`- now emit a deprecation warning for Decimals, Fractions and any other`
		`- objects that can be converted to integers only with a loss (e.g. that`
		- have the `__int__()` method but do not have the `__index__()` method).
		`- In future version they will be errors. (Contributed by Serhiy`
		`- Storchaka in bpo-36048.)`
		`-`
		`- ---`
		`- src/isodate/duration.py \| 6 ++++--`
		`- src/isodate/tests/__init__.py \| 3 +++`
		`- 2 files changed, 7 insertions(+), 2 deletions(-)`
		`-`
		`- diff --git a/src/isodate/duration.py b/src/isodate/duration.py`
		`- index 6d1848c..96127ab 100644`
		`- --- a/src/isodate/duration.py`
		`- +++ b/src/isodate/duration.py`
		`- @@ -180,7 +180,8 @@ class Duration(object):`
		`- newday = maxdays`
		`- else:`
		`- newday = other.day`
		`- - newdt = other.replace(year=newyear, month=newmonth, day=newday)`
		`- + newdt = other.replace(`
		`- + year=int(newyear), month=int(newmonth), day=newday)`
		`- # does a timedelta + date/datetime`
		`- return self.tdelta + newdt`
		`- except AttributeError:`
		`- @@ -264,7 +265,8 @@ class Duration(object):`
		`- newday = maxdays`
		`- else:`
		`- newday = other.day`
		`- - newdt = other.replace(year=newyear, month=newmonth, day=newday)`
		`- + newdt = other.replace(`
		`- + year=int(newyear), month=int(newmonth), day=newday)`
		`- return newdt - self.tdelta`
		`- except AttributeError:`
		`- # other probably was not compatible with data/datetime`
		`- diff --git a/src/isodate/tests/__init__.py b/src/isodate/tests/__init__.py`
		`- index b1d46bd..7208cbd 100644`
		`- --- a/src/isodate/tests/__init__.py`
		`- +++ b/src/isodate/tests/__init__.py`
		`- @@ -29,6 +29,7 @@ Collect all test suites into one TestSuite instance.`
		`- '''`
		`-`
		`- import unittest`
		`- +import warnings`
		`- from isodate.tests import (test_date, test_time, test_datetime, test_duration,`
		`- test_strf, test_pickle)`
		`-`
		`- @@ -37,6 +38,8 @@ def test_suite():`
		`- '''`
		`- Return a new TestSuite instance consisting of all available TestSuites.`
		`- '''`
		`- + warnings.filterwarnings("error", module=r"isodate(\..)*")`
		`- +`
		`- return unittest.TestSuite([`
		`- test_date.test_suite(),`
		`- test_time.test_suite(),`
		`- --`
		`- 2.26.2`
		`-`

python-isodate.spec

file modified

+23 -126

		`@@ -1,21 +1,22 @@`
		`+ # Run tests by default.`
		`+ %bcond_without tests`
		`+`
		`%global srcname isodate`

		`Name: python-%{srcname}`
		`- Version: 0.6.0`
		`- Release: 11%{?dist}`
		`+ Version: 0.6.1`
		`+ Release: %autorelease`
		`Summary: An ISO 8601 date/time/duration parser and formatter`
		`License: BSD`
		`URL: https://pypi.org/project/isodate/`
		`Source0: %pypi_source`
		`- # Python3.10 cannot interpret decimal.Decimal object as an integer.`
		`- # This patch fixes it until PR is not merged in upstream.`
		`- # https://github.com/gweis/isodate/issues/58`
		`- Patch1: 0001-Fix-interpret-decimal-object-as-an-integer.patch`
		`BuildArch: noarch`

		`BuildRequires: python3-devel`
		`- BuildRequires: python3-setuptools`
		`- BuildRequires: python3-six`
		`+`
		`+ %if %{with tests}`
		`+ BuildRequires: python3dist(pytest)`
		`+ %endif`


		`%global _description This module implements ISO 8601 date, time and duration \`
		`@@ -49,135 +50,31 @@`


		`%prep`
		`- %autosetup -n %{srcname}-%{version} -p1`
		`+ %autosetup -n %{srcname}-%{version}`
		`+`
		`+`
		`+ %generate_buildrequires`
		`+ %pyproject_buildrequires`


		`%build`
		`- %py3_build`
		`+ %pyproject_wheel`
		`+`

		`%install`
		`- %py3_install`
		`+ %pyproject_install`
		`+ %pyproject_save_files %{srcname}`


		`+ %if %{with tests}`
		`%check`
		`- %{__python3} setup.py test`
		`+ %pytest`
		`+ %endif`


		`- %files -n python3-%{srcname}`
		`+ %files -n python3-%{srcname} -f %{pyproject_files}`
		`%doc CHANGES.txt README.rst TODO.txt`
		`- %{python3_sitelib}/%{srcname}-*.egg-info/`
		`- %{python3_sitelib}/%{srcname}/`


		`%changelog`
		`- * Fri Jan 21 2022 Fedora Release Engineering <releng@fedoraproject.org> - 0.6.0-11`
		`- - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild`
		`-`
		`- * Fri Jul 23 2021 Fedora Release Engineering <releng@fedoraproject.org> - 0.6.0-10`
		`- - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild`
		`-`
		`- * Thu Jun 03 2021 Python Maint <python-maint@redhat.com> - 0.6.0-9`
		`- - Rebuilt for Python 3.10`
		`-`
		`- * Wed Jan 27 2021 Fedora Release Engineering <releng@fedoraproject.org> - 0.6.0-8`
		`- - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild`
		`-`
		`- * Wed Jul 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 0.6.0-7`
		`- - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild`
		`-`
		`- * Sat May 23 2020 Miro Hrončok <mhroncok@redhat.com> - 0.6.0-6`
		`- - Rebuilt for Python 3.9`
		`-`
		`- * Thu Jan 30 2020 Fedora Release Engineering <releng@fedoraproject.org> - 0.6.0-5`
		`- - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild`
		`-`
		`- * Mon Sep 23 2019 Miro Hrončok <mhroncok@redhat.com> - 0.6.0-4`
		`- - Subpackage python2-isodate has been removed`
		`- See https://fedoraproject.org/wiki/Changes/Mass_Python_2_Package_Removal`
		`-`
		`- * Fri Aug 16 2019 Miro Hrončok <mhroncok@redhat.com> - 0.6.0-3`
		`- - Rebuilt for Python 3.8`
		`-`
		`- * Fri Jul 26 2019 Fedora Release Engineering <releng@fedoraproject.org> - 0.6.0-2`
		`- - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild`
		`-`
		`- * Wed Apr 24 2019 Jeremy Cline <jcline@redhat.com> - 0.6.0-1`
		`- - Modernize specfile`
		`- - Update to 0.6.0`
		`-`
		`- * Sat Feb 02 2019 Fedora Release Engineering <releng@fedoraproject.org> - 0.5.4-12`
		`- - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild`
		`-`
		`- * Sat Jul 14 2018 Fedora Release Engineering <releng@fedoraproject.org> - 0.5.4-11`
		`- - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild`
		`-`
		`- * Sat Jun 16 2018 Miro Hrončok <mhroncok@redhat.com> - 0.5.4-10`
		`- - Rebuilt for Python 3.7`
		`-`
		`- * Mon Feb 12 2018 Iryna Shcherbina <ishcherb@redhat.com> - 0.5.4-9`
		`- - Update Python 2 dependency declarations to new packaging standards`
		`- (See https://fedoraproject.org/wiki/FinalizingFedoraSwitchtoPython3)`
		`-`
		`- * Fri Feb 09 2018 Fedora Release Engineering <releng@fedoraproject.org> - 0.5.4-8`
		`- - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild`
		`-`
		`- * Sat Aug 19 2017 Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> - 0.5.4-7`
		`- - Python 2 binary package renamed to python2-isodate`
		`- See https://fedoraproject.org/wiki/FinalizingFedoraSwitchtoPython3`
		`-`
		`- * Thu Jul 27 2017 Fedora Release Engineering <releng@fedoraproject.org> - 0.5.4-6`
		`- - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild`
		`-`
		`- * Sat Feb 11 2017 Fedora Release Engineering <releng@fedoraproject.org> - 0.5.4-5`
		`- - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild`
		`-`
		`- * Mon Dec 12 2016 Charalampos Stratakis <cstratak@redhat.com> - 0.5.4-4`
		`- - Rebuild for Python 3.6`
		`-`
		`- * Tue Jul 19 2016 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.5.4-3`
		`- - https://fedoraproject.org/wiki/Changes/Automatic_Provides_for_Python_RPM_Packages`
		`-`
		`- * Thu Feb 04 2016 Fedora Release Engineering <releng@fedoraproject.org> - 0.5.4-2`
		`- - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild`
		`-`
		`- * Thu Nov 19 2015 John Matthews <jwmatthews@gmail.com> - 0.5.4-1`
		`- - Update to 0.5.4`
		`-`
		`- * Tue Nov 03 2015 Robert Kuska <rkuska@redhat.com> - 0.5.0-5`
		`- - Rebuilt for Python3.5 rebuild`
		`-`
		`- * Thu Jun 18 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.5.0-4`
		`- - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild`
		`-`
		`- * Sat Jun 07 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.5.0-3`
		`- - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild`
		`-`
		`- * Wed May 28 2014 Kalev Lember <kalevlember@gmail.com> - 0.5.0-2`
		`- - Rebuilt for https://fedoraproject.org/wiki/Changes/Python_3.4`
		`-`
		`- * Fri Apr 18 2014 Dan Scott <dan@coffeecode.net> - 0.5.0-1`
		`- - Update to 0.5.0`
		`- - Add a Python3 build`
		`- - Run unit tests`
		`- - Remove python-setuptools-devel BR per https://fedoraproject.org/wiki/Changes/Remove_Python-setuptools-devel`
		`-`
		`- * Sun Aug 04 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.4.7-4`
		`- - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild`
		`-`
		`- * Thu Feb 14 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.4.7-3`
		`- - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild`
		`-`
		`- * Sat Jul 21 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.4.7-2`
		`- - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild`
		`-`
		`- * Thu Jan 26 2012 James Laska <jlaska@redhat.com> - 0.4.7-1`
		`- - Update to 0.4.7`
		`-`
		`- * Mon Jan 23 2012 James Laska <jlaska@redhat.com> - 0.4.6-1`
		`- - Update to 0.4.6`
		`-`
		`- * Sat Jan 14 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.4.4-2`
		`- - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild`
		`-`
		`- * Wed Sep 28 2011 James Laska <jlaska@redhat.com> - 0.4.4-1`
		`- - Initial package build`
		`+ %autochangelog`

sources

file modified

+1 -1

		`@@ -1,1 +1,1 @@`
		`- SHA512 (isodate-0.6.0.tar.gz) = e977748e13ee2c94ab47bfc47113d152280e9acff6f70e773de73717392148dd2c111a7db2d9fa3679d37936c6ed9a23dc526cb00bd601df45459b6a244f9f7d`
		`+ SHA512 (isodate-0.6.1.tar.gz) = 437e420ec7ee68dedded825f30d3289eeb0da526208443e5a8e50fe70f12309515e1285b21132d26e6d4c1683f90dfa1d401582042b5e4381fe7ab0e34af26b6`