From 08aaa0fae6749d83db8551d50789a38803eb6a8c Mon Sep 17 00:00:00 2001 From: Troy Dawson Date: Mon, 16 Nov 2020 14:51:30 -0800 Subject: [PATCH] RHEL 9.0.0 Alpha bootstrap The content of this branch was automatically imported from Fedora ELN with the following as its source: https://src.fedoraproject.org/rpms/babel#2c7f3316c2eec70bb0031fb986487faaec3aee0d --- .gitignore | 11 ++---- babel-python39a6-compat.patch | 66 ----------------------------------- babel.spec | 25 ++++--------- sources | 2 +- 4 files changed, 10 insertions(+), 94 deletions(-) delete mode 100644 babel-python39a6-compat.patch diff --git a/.gitignore b/.gitignore index 32fd9c7..7b7bf09 100644 --- a/.gitignore +++ b/.gitignore @@ -1,8 +1,3 @@ -Babel-0.9.5.tar.gz -/Babel-0.9.6.tar.gz -/Babel-1.3.tar.gz -/Babel-2.3.4.tar.gz -/Babel-2.5.1.tar.gz -/Babel-2.6.0.tar.gz -/Babel-2.7.0.tar.gz -/Babel-2.8.0.tar.gz +/Babel-0.9.*.tar.gz +/Babel-1.*.tar.gz +/Babel-2.*.tar.gz diff --git a/babel-python39a6-compat.patch b/babel-python39a6-compat.patch deleted file mode 100644 index 2679200..0000000 --- a/babel-python39a6-compat.patch +++ /dev/null @@ -1,66 +0,0 @@ -commit f3651bebd3216cc276f7642c3807cc8d08f2bd23 -Author: Felix Schwarz -Date: Tue May 5 08:05:56 2020 +0000 - - fix tests when using Python 3.9a6 - - In Python 3.9a6 integer values for future flags were changed to prevent - collision with compiler flags. We need to retrieve these at runtime so - the test suite works with Python <= 3.8 as well as Python 3.9. - -diff --git a/tests/test_util.py b/tests/test_util.py -index a6a4450..b9343aa 100644 ---- a/tests/test_util.py -+++ b/tests/test_util.py -@@ -11,6 +11,7 @@ - # individuals. For the exact contribution history, see the revision - # history and logs, available at http://babel.edgewall.org/log/. - -+import __future__ - import unittest - - import pytest -@@ -20,6 +21,12 @@ from babel._compat import BytesIO - from babel.util import parse_future_flags - - -+class _FF: -+ division = __future__.division.compiler_flag -+ print_function = __future__.print_function.compiler_flag -+ with_statement = __future__.with_statement.compiler_flag -+ unicode_literals = __future__.unicode_literals.compiler_flag -+ - def test_distinct(): - assert list(util.distinct([1, 2, 1, 3, 4, 4])) == [1, 2, 3, 4] - assert list(util.distinct('foobar')) == ['f', 'o', 'b', 'a', 'r'] -@@ -70,25 +77,25 @@ def test_parse_encoding_non_ascii(): - from __future__ import print_function, - division, with_statement, - unicode_literals --''', 0x10000 | 0x2000 | 0x8000 | 0x20000), -+''', _FF.print_function | _FF.division | _FF.with_statement | _FF.unicode_literals), - (''' - from __future__ import print_function, division - print('hello') --''', 0x10000 | 0x2000), -+''', _FF.print_function | _FF.division), - (''' - from __future__ import print_function, division, unknown,,,,, - print 'hello' --''', 0x10000 | 0x2000), -+''', _FF.print_function | _FF.division), - (''' - from __future__ import ( - print_function, - division) --''', 0x10000 | 0x2000), -+''', _FF.print_function | _FF.division), - (''' - from __future__ import \\ - print_function, \\ - division --''', 0x10000 | 0x2000), -+''', _FF.print_function | _FF.division), - ]) - def test_parse_future(source, result): - fp = BytesIO(source.encode('latin-1')) diff --git a/babel.spec b/babel.spec index a3cb7e2..c7b3df1 100644 --- a/babel.spec +++ b/babel.spec @@ -7,35 +7,22 @@ %bcond_with bootstrap %bcond_without python2 -# We ship python2-pytest only up to F31. -%if !0%{?fedora}%{?rhel} || 0%{?fedora} >= 32 || 0%{?rhel} >= 9 -%bcond_with python2_pytest -%else -%bcond_without python2_pytest -%endif Name: babel -Version: 2.8.0 -Release: 7%{?dist} +Version: 2.9.0 +Release: 1%{?dist} Summary: Tools for internationalizing Python applications License: BSD URL: https://babel.pocoo.org/ Source0: %{pypi_source} -# https://github.com/python-babel/babel/pull/712 -Patch0: babel-python39a6-compat.patch BuildArch: noarch %if %{with python2} BuildRequires: python2-devel BuildRequires: python2-setuptools -%if %{with python2_pytest} -BuildRequires: python2-pytz -BuildRequires: python2-pytest -BuildRequires: python2-freezegun -%endif %endif BuildRequires: python3-devel BuildRequires: python3-setuptools @@ -146,10 +133,7 @@ rm -f "$BUILDDIR/html/.buildinfo" %py3_install %check -export TZ=America/New_York -%if %{with python2} && %{with python2_pytest} -%{__python2} -m pytest -%endif +export TZ=UTC %if !%{with bootstrap} %{__python3} -m pytest %endif @@ -175,6 +159,9 @@ export TZ=America/New_York %endif %changelog +* Mon Nov 16 22:22:25 CET 2020 Felix Schwarz - 2.9.0-1 +- update to 2.9.0 + * Mon Jul 27 2020 Fedora Release Engineering - 2.8.0-7 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild diff --git a/sources b/sources index 20b1c73..a6ff9c5 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (Babel-2.8.0.tar.gz) = f9687b36176c146a8ace073197111463d24fca343bb1dbee8b0e37a7f37b68b4cd77ffbe3bf14a20f8f64c701aa860e0b5e6076658a95dbee2556f0688d68d91 +SHA512 (Babel-2.9.0.tar.gz) = 250d1a19741eb0d1bda9d6b862f2d4779b6c67f10b8e045f450a271a16587e30f26f35ccccfea8ca13bb519582d2ef83569fa4381d0590fb9b61bf3ebf67e5f6