From 41c99f7fcdcbb396d5c036d686a7f9937911b7f6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Mon, 14 May 2018 09:12:27 +0000 Subject: [PATCH 01/96] Fix the pytz require --- babel.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/babel.spec b/babel.spec index bd8840f..a031703 100644 --- a/babel.spec +++ b/babel.spec @@ -71,7 +71,7 @@ Babel is composed of two major parts: Summary: %sum Requires: python2-setuptools -Requires: pytz +Requires: python2-pytz %{?python_provide:%python_provide python2-babel} From 4590e2fc658b9c6f33a6ff4dfc2dc53cacd49325 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Thu, 14 Jun 2018 13:18:51 +0200 Subject: [PATCH 02/96] Bootstrap for Python 3.7 --- babel.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/babel.spec b/babel.spec index a031703..a2a35c9 100644 --- a/babel.spec +++ b/babel.spec @@ -13,11 +13,11 @@ # There is some bootstrapping involved when upgrading Python 3 # First of all we need babel (this package) to use sphinx # And pytest is at this point not yet ready -%global bootstrap 0 +%global bootstrap 1 Name: babel Version: 2.5.1 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Tools for internationalizing Python applications License: BSD @@ -164,6 +164,9 @@ export TZ=America/New_York %doc built-docs/html/* %changelog +* Thu Jun 14 2018 Miro Hrončok - 2.5.1-3 +- Bootstrap for Python 3.7 + * Wed Feb 07 2018 Fedora Release Engineering - 2.5.1-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild From ceb0099b10bad86ef351aae3d890c27dc9ec5b05 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Sat, 16 Jun 2018 03:03:25 +0200 Subject: [PATCH 03/96] Rebuilt for Python 3.7 --- babel.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/babel.spec b/babel.spec index a2a35c9..1d8b70a 100644 --- a/babel.spec +++ b/babel.spec @@ -13,11 +13,11 @@ # There is some bootstrapping involved when upgrading Python 3 # First of all we need babel (this package) to use sphinx # And pytest is at this point not yet ready -%global bootstrap 1 +%global bootstrap 0 Name: babel Version: 2.5.1 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Tools for internationalizing Python applications License: BSD @@ -164,6 +164,9 @@ export TZ=America/New_York %doc built-docs/html/* %changelog +* Sat Jun 16 2018 Miro Hrončok - 2.5.1-4 +- Rebuilt for Python 3.7 + * Thu Jun 14 2018 Miro Hrončok - 2.5.1-3 - Bootstrap for Python 3.7 From e43430b068b32291e0d13439e171342315e5ad34 Mon Sep 17 00:00:00 2001 From: Tomas Orsava Date: Mon, 18 Jun 2018 16:37:29 +0200 Subject: [PATCH 04/96] Run tests in pytest (as declared in BuildRequires) --- babel.spec | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/babel.spec b/babel.spec index 1d8b70a..f736429 100644 --- a/babel.spec +++ b/babel.spec @@ -17,7 +17,7 @@ Name: babel Version: 2.5.1 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Tools for internationalizing Python applications License: BSD @@ -142,9 +142,9 @@ rm -f "$BUILDDIR/html/.buildinfo" %check export TZ=America/New_York -%{__python2} setup.py test +%{__python2} -m pytest %if !%{bootstrap} -%{__python3} setup.py test +%{__python3} -m pytest %endif %files @@ -164,6 +164,9 @@ export TZ=America/New_York %doc built-docs/html/* %changelog +* Mon Jun 18 2018 Tomas Orsava - 2.5.1-5 +- Run tests in pytest (as declared in BuildRequires) + * Sat Jun 16 2018 Miro Hrončok - 2.5.1-4 - Rebuilt for Python 3.7 From 40a5e580a315d6b11d3a85fc04095958606217cc Mon Sep 17 00:00:00 2001 From: Felix Schwarz Date: Fri, 29 Jun 2018 10:32:59 +0200 Subject: [PATCH 05/96] update to upstream version 2.6.0 --- .gitignore | 1 + babel.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 549b4fb..2fb7aa6 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,4 @@ Babel-0.9.5.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 diff --git a/babel.spec b/babel.spec index f736429..a5482eb 100644 --- a/babel.spec +++ b/babel.spec @@ -16,8 +16,8 @@ %global bootstrap 0 Name: babel -Version: 2.5.1 -Release: 5%{?dist} +Version: 2.6.0 +Release: 1%{?dist} Summary: Tools for internationalizing Python applications License: BSD @@ -164,6 +164,9 @@ export TZ=America/New_York %doc built-docs/html/* %changelog +* Fri Jun 29 2018 Felix Schwarz - 2.6.0-1 +- update to upstream version 2.6.0 + * Mon Jun 18 2018 Tomas Orsava - 2.5.1-5 - Run tests in pytest (as declared in BuildRequires) diff --git a/sources b/sources index e114675..edd9f7c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (Babel-2.5.1.tar.gz) = a2999bd75213bf2447079a210f774d49ae0d658476563ba5cdc4ddce8b58d4eb84bc70812d7e972923d1fa6283bc282b226a045db39ec65e2e95327d82271eb9 +SHA512 (Babel-2.6.0.tar.gz) = a87f26c25f1e48a64d1e7ee112bc0c325a6268e0e716a81cb6814a53f0add8f3d579babd2ba064f160298ebe3ac9711aa5d28f112582ee287767b6ed8427b6e0 From b35ead6ac2c3173dfc84a8415dcf334462ef3ca5 Mon Sep 17 00:00:00 2001 From: Felix Schwarz Date: Fri, 29 Jun 2018 10:46:36 +0200 Subject: [PATCH 06/96] remove "default_python" setting from spec file I think this setting is obsolete now as we are moving towards Python 3-only. --- babel.spec | 22 +--------------------- 1 file changed, 1 insertion(+), 21 deletions(-) diff --git a/babel.spec b/babel.spec index a5482eb..503501b 100644 --- a/babel.spec +++ b/babel.spec @@ -1,15 +1,6 @@ %global srcname Babel %global sum Library for internationalizing Python applications -# On fedora 24 and beyond we want to use the python3 version by default -# (Only reason earlier versions aren't switched is that we didn't push it out -# before the release) -%if 0%{?fedora} >= 24 -%global default_python 3 -%else -%global default_python 2 -%endif - # There is some bootstrapping involved when upgrading Python 3 # First of all we need babel (this package) to use sphinx # And pytest is at this point not yet ready @@ -43,7 +34,6 @@ BuildRequires: python3-freezegun # build the documentation BuildRequires: make -%if %{default_python} >= 3 %if %{bootstrap} BuildRequires: python2-sphinx %else @@ -51,11 +41,6 @@ BuildRequires: python3-sphinx %endif Requires: python3-babel Requires: python3-setuptools -%else -BuildRequires: python2-sphinx -Requires: python2-babel -Requires: python2-setuptools -%endif %description @@ -121,7 +106,7 @@ BUILDDIR="$PWD/built-docs" rm -rf "$BUILDDIR" pushd docs make \ -%if %{default_python} >= 3 && !%{bootstrap} +%if !%{bootstrap} SPHINXBUILD=sphinx-build-3 \ %else SPHINXBUILD=sphinx-build \ @@ -132,13 +117,8 @@ popd rm -f "$BUILDDIR/html/.buildinfo" %install -%if %{default_python} >= 3 %py2_install %py3_install -%else -%py3_install -%py2_install -%endif %check export TZ=America/New_York From d069919a9af8966f98275241c453a2fa55be73e7 Mon Sep 17 00:00:00 2001 From: Felix Schwarz Date: Fri, 29 Jun 2018 10:51:03 +0200 Subject: [PATCH 07/96] add setting "with_python2" to build Babel without Python 2 packages Prepare for a future removal of Python 2 in Fedora (30?). --- babel.spec | 26 ++++++++++++++++++++++++-- 1 file changed, 24 insertions(+), 2 deletions(-) diff --git a/babel.spec b/babel.spec index 503501b..cd7527b 100644 --- a/babel.spec +++ b/babel.spec @@ -6,9 +6,14 @@ # And pytest is at this point not yet ready %global bootstrap 0 +# build without Python 2 support. This setting allows us to +# "flip the switch" easily once Fedora actually drops support +# for Python 2. +%global with_python2 1 + Name: babel Version: 2.6.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Tools for internationalizing Python applications License: BSD @@ -18,11 +23,13 @@ Patch0: babel-2.3.4-remove-pytz-version.patch BuildArch: noarch +%if %{with_python2} BuildRequires: python2-devel BuildRequires: python2-setuptools BuildRequires: python2-pytz BuildRequires: python2-pytest BuildRequires: python2-freezegun +%endif BuildRequires: python3-devel BuildRequires: python3-setuptools %if !%{bootstrap} @@ -34,7 +41,7 @@ BuildRequires: python3-freezegun # build the documentation BuildRequires: make -%if %{bootstrap} +%if %{bootstrap} && %{with_python2} BuildRequires: python2-sphinx %else BuildRequires: python3-sphinx @@ -52,6 +59,8 @@ Babel is composed of two major parts: providing access to various locale display names, localized number and date formatting, etc. + +%if %{with_python2} %package -n python2-babel Summary: %sum @@ -68,6 +77,8 @@ Babel is composed of two major parts: * a Python interface to the CLDR (Common Locale Data Repository), providing access to various locale display names, localized number and date formatting, etc. +%endif + %package -n python3-babel Summary: %sum @@ -99,7 +110,9 @@ Documentation for Babel %autosetup -n %{srcname}-%{version} %build +%if %{with_python2} %py2_build +%endif %py3_build BUILDDIR="$PWD/built-docs" @@ -117,12 +130,16 @@ popd rm -f "$BUILDDIR/html/.buildinfo" %install +%if %{with_python2} %py2_install +%endif %py3_install %check export TZ=America/New_York +%if %{with_python2} %{__python2} -m pytest +%endif %if !%{bootstrap} %{__python3} -m pytest %endif @@ -132,9 +149,11 @@ export TZ=America/New_York %license LICENSE %{_bindir}/pybabel +%if %{with_python2} %files -n python2-babel %{python2_sitelib}/Babel-%{version}-py*.egg-info %{python2_sitelib}/babel +%endif %files -n python3-babel %{python3_sitelib}/Babel-%{version}-py*.egg-info @@ -144,6 +163,9 @@ export TZ=America/New_York %doc built-docs/html/* %changelog +* Fri Jun 29 2018 Felix Schwarz - 2.6.0-2 +- add setting to build without Python 2 support + * Fri Jun 29 2018 Felix Schwarz - 2.6.0-1 - update to upstream version 2.6.0 From d01726224380bb9a17a35c2f8147926d847cc857 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Mon, 2 Jul 2018 18:22:01 +0200 Subject: [PATCH 08/96] Rebuilt for Python 3.7 --- babel.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/babel.spec b/babel.spec index cd7527b..7033797 100644 --- a/babel.spec +++ b/babel.spec @@ -13,7 +13,7 @@ Name: babel Version: 2.6.0 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Tools for internationalizing Python applications License: BSD @@ -163,6 +163,9 @@ export TZ=America/New_York %doc built-docs/html/* %changelog +* Mon Jul 02 2018 Miro Hrončok - 2.6.0-3 +- Rebuilt for Python 3.7 + * Fri Jun 29 2018 Felix Schwarz - 2.6.0-2 - add setting to build without Python 2 support From ab2f5610110d63f6e36a5fb253c8e46893eb54e3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Mon, 2 Jul 2018 18:48:52 +0200 Subject: [PATCH 09/96] Bootstrap once again for 3.7 --- babel.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/babel.spec b/babel.spec index 7033797..a8b47dc 100644 --- a/babel.spec +++ b/babel.spec @@ -4,7 +4,7 @@ # There is some bootstrapping involved when upgrading Python 3 # First of all we need babel (this package) to use sphinx # And pytest is at this point not yet ready -%global bootstrap 0 +%global bootstrap 1 # build without Python 2 support. This setting allows us to # "flip the switch" easily once Fedora actually drops support From d67f7137fa0d3947268a889b3f2b11bf2ca70afe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Mon, 2 Jul 2018 19:47:07 +0200 Subject: [PATCH 10/96] Finish bootstrapping --- babel.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/babel.spec b/babel.spec index a8b47dc..925ee0a 100644 --- a/babel.spec +++ b/babel.spec @@ -4,7 +4,7 @@ # There is some bootstrapping involved when upgrading Python 3 # First of all we need babel (this package) to use sphinx # And pytest is at this point not yet ready -%global bootstrap 1 +%global bootstrap 0 # build without Python 2 support. This setting allows us to # "flip the switch" easily once Fedora actually drops support @@ -13,7 +13,7 @@ Name: babel Version: 2.6.0 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Tools for internationalizing Python applications License: BSD @@ -163,6 +163,9 @@ export TZ=America/New_York %doc built-docs/html/* %changelog +* Mon Jul 02 2018 Miro Hrončok - 2.6.0-4 +- Rebuilt for Python 3.7 + * Mon Jul 02 2018 Miro Hrončok - 2.6.0-3 - Rebuilt for Python 3.7 From ec12711fe1e511405f0e33ef11ad78682a9cdff5 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 12 Jul 2018 20:53:49 +0000 Subject: [PATCH 11/96] - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- babel.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/babel.spec b/babel.spec index 925ee0a..a4bbf22 100644 --- a/babel.spec +++ b/babel.spec @@ -13,7 +13,7 @@ Name: babel Version: 2.6.0 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Tools for internationalizing Python applications License: BSD @@ -163,6 +163,9 @@ export TZ=America/New_York %doc built-docs/html/* %changelog +* Thu Jul 12 2018 Fedora Release Engineering - 2.6.0-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + * Mon Jul 02 2018 Miro Hrončok - 2.6.0-4 - Rebuilt for Python 3.7 From 3be97e102a39bae426c4721f37cf3e3bfc322fd6 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 31 Jan 2019 14:20:22 +0000 Subject: [PATCH 12/96] - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- babel.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/babel.spec b/babel.spec index a4bbf22..f8788b9 100644 --- a/babel.spec +++ b/babel.spec @@ -13,7 +13,7 @@ Name: babel Version: 2.6.0 -Release: 5%{?dist} +Release: 6%{?dist} Summary: Tools for internationalizing Python applications License: BSD @@ -163,6 +163,9 @@ export TZ=America/New_York %doc built-docs/html/* %changelog +* Thu Jan 31 2019 Fedora Release Engineering - 2.6.0-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + * Thu Jul 12 2018 Fedora Release Engineering - 2.6.0-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild From de07ff7ad33295338f917f7a978d7f0c92c10e20 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Thu, 14 Mar 2019 18:01:38 +0100 Subject: [PATCH 13/96] There is no more python2-sphinx to bootstrap with --- babel.spec | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/babel.spec b/babel.spec index f8788b9..58567e7 100644 --- a/babel.spec +++ b/babel.spec @@ -41,9 +41,7 @@ BuildRequires: python3-freezegun # build the documentation BuildRequires: make -%if %{bootstrap} && %{with_python2} -BuildRequires: python2-sphinx -%else +%if !%{bootstrap} BuildRequires: python3-sphinx %endif Requires: python3-babel @@ -97,6 +95,7 @@ Babel is composed of two major parts: providing access to various locale display names, localized number and date formatting, etc. +%if !%{bootstrap} %package doc Summary: Documentation for Babel Provides: python-babel-doc = %{version}-%{release} @@ -105,6 +104,7 @@ Provides: python3-babel-doc = %{version}-%{release} %description doc Documentation for Babel +%endif %prep %autosetup -n %{srcname}-%{version} @@ -117,17 +117,16 @@ Documentation for Babel BUILDDIR="$PWD/built-docs" rm -rf "$BUILDDIR" + +%if !%{bootstrap} pushd docs make \ -%if !%{bootstrap} SPHINXBUILD=sphinx-build-3 \ -%else - SPHINXBUILD=sphinx-build \ -%endif BUILDDIR="$BUILDDIR" \ html popd rm -f "$BUILDDIR/html/.buildinfo" +%endif %install %if %{with_python2} @@ -159,8 +158,10 @@ export TZ=America/New_York %{python3_sitelib}/Babel-%{version}-py*.egg-info %{python3_sitelib}/babel +%if !%{bootstrap} %files doc %doc built-docs/html/* +%endif %changelog * Thu Jan 31 2019 Fedora Release Engineering - 2.6.0-6 From 901ddaa7e5aab4115ecfed61a6b9c494fa0a5f0e Mon Sep 17 00:00:00 2001 From: Felix Schwarz Date: Mon, 27 May 2019 15:11:26 +0200 Subject: [PATCH 14/96] update to upstream version 2.7.0 --- .gitignore | 1 + babel-2.3.4-remove-pytz-version.patch | 15 --------------- babel.spec | 8 +++++--- sources | 2 +- 4 files changed, 7 insertions(+), 19 deletions(-) delete mode 100644 babel-2.3.4-remove-pytz-version.patch diff --git a/.gitignore b/.gitignore index 2fb7aa6..4c71b78 100644 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,4 @@ Babel-0.9.5.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 diff --git a/babel-2.3.4-remove-pytz-version.patch b/babel-2.3.4-remove-pytz-version.patch deleted file mode 100644 index 9025179..0000000 --- a/babel-2.3.4-remove-pytz-version.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff -up Babel-2.3.4/setup.py.orig Babel-2.3.4/setup.py ---- Babel-2.3.4/setup.py.orig 2016-04-11 11:58:25.000000000 +0200 -+++ Babel-2.3.4/setup.py 2016-04-25 13:35:54.458765892 +0200 -@@ -59,7 +59,10 @@ setup( - # This version identifier is currently necessary as - # pytz otherwise does not install on pip 1.4 or - # higher. -- 'pytz>=0a', -+ ### But the version confuses setuptools 8 and higher so remove it in the -+ ### system package -+ #'pytz>=0a', -+ 'pytz', - ], - - cmdclass={'import_cldr': import_cldr}, diff --git a/babel.spec b/babel.spec index 58567e7..acb2c89 100644 --- a/babel.spec +++ b/babel.spec @@ -12,14 +12,13 @@ %global with_python2 1 Name: babel -Version: 2.6.0 -Release: 6%{?dist} +Version: 2.7.0 +Release: 1%{?dist} Summary: Tools for internationalizing Python applications License: BSD URL: http://babel.pocoo.org/ Source0: https://files.pythonhosted.org/packages/source/B/%{srcname}/%{srcname}-%{version}.tar.gz -Patch0: babel-2.3.4-remove-pytz-version.patch BuildArch: noarch @@ -164,6 +163,9 @@ export TZ=America/New_York %endif %changelog +* Mon May 27 2019 Felix Schwarz - 2.7.0-1 +- update to upstream version 2.7.0 + * Thu Jan 31 2019 Fedora Release Engineering - 2.6.0-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild diff --git a/sources b/sources index edd9f7c..e4bbad5 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (Babel-2.6.0.tar.gz) = a87f26c25f1e48a64d1e7ee112bc0c325a6268e0e716a81cb6814a53f0add8f3d579babd2ba064f160298ebe3ac9711aa5d28f112582ee287767b6ed8427b6e0 +SHA512 (Babel-2.7.0.tar.gz) = 96314c7b26f6915a825e0344fa06e4f1d9a71b97a52b16f2f696c2e81c69318974547620135912b11edb95668a717ec49f1be68eef5a4753092d8e4cdc39a1e5 From 5bed3a632762810b48d0e1e99c8d5b58e1b7c528 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 24 Jul 2019 18:58:26 +0000 Subject: [PATCH 15/96] - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- babel.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/babel.spec b/babel.spec index acb2c89..17f5afb 100644 --- a/babel.spec +++ b/babel.spec @@ -13,7 +13,7 @@ Name: babel Version: 2.7.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Tools for internationalizing Python applications License: BSD @@ -163,6 +163,9 @@ export TZ=America/New_York %endif %changelog +* Wed Jul 24 2019 Fedora Release Engineering - 2.7.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + * Mon May 27 2019 Felix Schwarz - 2.7.0-1 - update to upstream version 2.7.0 From 9b56e7d12f3184948795e61a994b0c9c66b15460 Mon Sep 17 00:00:00 2001 From: Richard Shaw Date: Thu, 15 Aug 2019 01:41:48 -0500 Subject: [PATCH 16/96] Rebuild for Python 3.8 and drop Python 2 package. --- babel.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/babel.spec b/babel.spec index 17f5afb..b7132b3 100644 --- a/babel.spec +++ b/babel.spec @@ -9,11 +9,11 @@ # build without Python 2 support. This setting allows us to # "flip the switch" easily once Fedora actually drops support # for Python 2. -%global with_python2 1 +%global with_python2 0 Name: babel Version: 2.7.0 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Tools for internationalizing Python applications License: BSD @@ -163,6 +163,9 @@ export TZ=America/New_York %endif %changelog +* Thu Aug 15 2019 Richard Shaw - 2.7.0-3 +- Rebuild for Python 3.8 and drop Python 2 package. + * Wed Jul 24 2019 Fedora Release Engineering - 2.7.0-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild From 1925dbe11867c06b76fb5343530f0ff9aa542cb6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Thu, 15 Aug 2019 10:26:42 +0200 Subject: [PATCH 17/96] Don't drop Python 2 yet, there are still dependent packages --- babel.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/babel.spec b/babel.spec index b7132b3..8c95493 100644 --- a/babel.spec +++ b/babel.spec @@ -9,7 +9,7 @@ # build without Python 2 support. This setting allows us to # "flip the switch" easily once Fedora actually drops support # for Python 2. -%global with_python2 0 +%global with_python2 1 Name: babel Version: 2.7.0 @@ -164,7 +164,7 @@ export TZ=America/New_York %changelog * Thu Aug 15 2019 Richard Shaw - 2.7.0-3 -- Rebuild for Python 3.8 and drop Python 2 package. +- Rebuild for Python 3.8 * Wed Jul 24 2019 Fedora Release Engineering - 2.7.0-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild From 53ba55bfe7370360a5fa6e44f53a5ace84d3777c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Thu, 15 Aug 2019 15:52:36 +0200 Subject: [PATCH 18/96] Bootstrap for Python 3.8 --- babel.spec | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/babel.spec b/babel.spec index 8c95493..bdfc6c2 100644 --- a/babel.spec +++ b/babel.spec @@ -4,7 +4,7 @@ # There is some bootstrapping involved when upgrading Python 3 # First of all we need babel (this package) to use sphinx # And pytest is at this point not yet ready -%global bootstrap 0 +%global bootstrap 1 # build without Python 2 support. This setting allows us to # "flip the switch" easily once Fedora actually drops support @@ -163,8 +163,8 @@ export TZ=America/New_York %endif %changelog -* Thu Aug 15 2019 Richard Shaw - 2.7.0-3 -- Rebuild for Python 3.8 +* Thu Aug 15 2019 Miro Hrončok - 2.7.0-3 +- Bootstrap for Python 3.8 * Wed Jul 24 2019 Fedora Release Engineering - 2.7.0-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild From acd8064845e6c6b8b7ddc7e4dcfabb89cca6b67c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Fri, 16 Aug 2019 15:09:15 +0200 Subject: [PATCH 19/96] Rebuilt for Python 3.8 --- babel.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/babel.spec b/babel.spec index bdfc6c2..ce9b9e5 100644 --- a/babel.spec +++ b/babel.spec @@ -4,7 +4,7 @@ # There is some bootstrapping involved when upgrading Python 3 # First of all we need babel (this package) to use sphinx # And pytest is at this point not yet ready -%global bootstrap 1 +%global bootstrap 0 # build without Python 2 support. This setting allows us to # "flip the switch" easily once Fedora actually drops support @@ -13,7 +13,7 @@ Name: babel Version: 2.7.0 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Tools for internationalizing Python applications License: BSD @@ -163,6 +163,9 @@ export TZ=America/New_York %endif %changelog +* Fri Aug 16 2019 Miro Hrončok - 2.7.0-4 +- Rebuilt for Python 3.8 + * Thu Aug 15 2019 Miro Hrončok - 2.7.0-3 - Bootstrap for Python 3.8 From 28d477e6b1650d29e63bf4b3272dfbee5b174520 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Sat, 14 Sep 2019 00:21:04 +0200 Subject: [PATCH 20/96] Don't run %check with Python 2 on Fedora 32+ We will be removing python2-pytest anyway and this allows us to remove packages more gradually. --- babel.spec | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/babel.spec b/babel.spec index ce9b9e5..30610bd 100644 --- a/babel.spec +++ b/babel.spec @@ -13,7 +13,7 @@ Name: babel Version: 2.7.0 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Tools for internationalizing Python applications License: BSD @@ -25,10 +25,12 @@ BuildArch: noarch %if %{with_python2} BuildRequires: python2-devel BuildRequires: python2-setuptools +%if 0%{?fedora} < 32 BuildRequires: python2-pytz BuildRequires: python2-pytest BuildRequires: python2-freezegun %endif +%endif BuildRequires: python3-devel BuildRequires: python3-setuptools %if !%{bootstrap} @@ -135,7 +137,7 @@ rm -f "$BUILDDIR/html/.buildinfo" %check export TZ=America/New_York -%if %{with_python2} +%if %{with_python2} && 0%{?fedora} < 32 %{__python2} -m pytest %endif %if !%{bootstrap} @@ -163,6 +165,9 @@ export TZ=America/New_York %endif %changelog +* Fri Sep 13 2019 Miro Hrončok - 2.7.0-5 +- Reduce Python 2 build dependencies on Fedora 32 + * Fri Aug 16 2019 Miro Hrončok - 2.7.0-4 - Rebuilt for Python 3.8 From 23d90ba101d81e82305e3d386822e72821c13176 Mon Sep 17 00:00:00 2001 From: Nils Philippsen Date: Thu, 31 Oct 2019 11:31:48 +0100 Subject: [PATCH 21/96] drop python2-babel from F32 on --- babel.spec | 31 ++++++++++++++++++++----------- 1 file changed, 20 insertions(+), 11 deletions(-) diff --git a/babel.spec b/babel.spec index 30610bd..55e3086 100644 --- a/babel.spec +++ b/babel.spec @@ -6,14 +6,16 @@ # And pytest is at this point not yet ready %global bootstrap 0 -# build without Python 2 support. This setting allows us to -# "flip the switch" easily once Fedora actually drops support -# for Python 2. -%global with_python2 1 +# Build without Python 2 support from F32 on. +%if !0%{?fedora}%{?rhel} || 0%{?fedora} >= 32 || 0%{?rhel} >= 9 +%bcond_with python2 +%else +%bcond_without python2 +%endif Name: babel Version: 2.7.0 -Release: 5%{?dist} +Release: 6%{?dist} Summary: Tools for internationalizing Python applications License: BSD @@ -22,7 +24,7 @@ Source0: https://files.pythonhosted.org/packages/source/B/%{srcname}/%{sr BuildArch: noarch -%if %{with_python2} +%if %{with python2} BuildRequires: python2-devel BuildRequires: python2-setuptools %if 0%{?fedora} < 32 @@ -59,7 +61,7 @@ Babel is composed of two major parts: and date formatting, etc. -%if %{with_python2} +%if %{with python2} %package -n python2-babel Summary: %sum @@ -82,6 +84,10 @@ Babel is composed of two major parts: %package -n python3-babel Summary: %sum +%if %{without python2} +Obsoletes: python2-babel < 2.7.0-6%{?dist} +%endif + Requires: python3-setuptools Requires: python3-pytz @@ -111,7 +117,7 @@ Documentation for Babel %autosetup -n %{srcname}-%{version} %build -%if %{with_python2} +%if %{with python2} %py2_build %endif %py3_build @@ -130,14 +136,14 @@ rm -f "$BUILDDIR/html/.buildinfo" %endif %install -%if %{with_python2} +%if %{with python2} %py2_install %endif %py3_install %check export TZ=America/New_York -%if %{with_python2} && 0%{?fedora} < 32 +%if %{with python2} %{__python2} -m pytest %endif %if !%{bootstrap} @@ -149,7 +155,7 @@ export TZ=America/New_York %license LICENSE %{_bindir}/pybabel -%if %{with_python2} +%if %{with python2} %files -n python2-babel %{python2_sitelib}/Babel-%{version}-py*.egg-info %{python2_sitelib}/babel @@ -165,6 +171,9 @@ export TZ=America/New_York %endif %changelog +* Thu Oct 31 2019 Nils Philippsen - 2.7.0-6 +- drop python2-babel from F32 on + * Fri Sep 13 2019 Miro Hrončok - 2.7.0-5 - Reduce Python 2 build dependencies on Fedora 32 From 1a7f9b34cd03e21e18c1553cdd440ef1e68db212 Mon Sep 17 00:00:00 2001 From: Nils Philippsen Date: Thu, 31 Oct 2019 12:42:47 +0100 Subject: [PATCH 22/96] drop python2-babel only from F33 on It is needed for trac (for the time being, #1737930). --- babel.spec | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/babel.spec b/babel.spec index 55e3086..1ef9c22 100644 --- a/babel.spec +++ b/babel.spec @@ -6,8 +6,8 @@ # And pytest is at this point not yet ready %global bootstrap 0 -# Build without Python 2 support from F32 on. -%if !0%{?fedora}%{?rhel} || 0%{?fedora} >= 32 || 0%{?rhel} >= 9 +# Build without Python 2 support from F33 on. +%if !0%{?fedora}%{?rhel} || 0%{?fedora} >= 33 || 0%{?rhel} >= 9 %bcond_with python2 %else %bcond_without python2 @@ -15,7 +15,7 @@ Name: babel Version: 2.7.0 -Release: 6%{?dist} +Release: 7%{?dist} Summary: Tools for internationalizing Python applications License: BSD @@ -171,6 +171,10 @@ export TZ=America/New_York %endif %changelog +* Thu Oct 31 2019 Nils Philippsen - 2.7.0-7 +- drop python2-babel only from F33 on as it is needed for trac (for the time + being, #1737930) + * Thu Oct 31 2019 Nils Philippsen - 2.7.0-6 - drop python2-babel from F32 on From 1e4b31e7f8f2de05ec49206b2be3a46ac9408b24 Mon Sep 17 00:00:00 2001 From: Nils Philippsen Date: Thu, 31 Oct 2019 15:14:23 +0100 Subject: [PATCH 23/96] oops, python2-pytest isn't available on F32 --- babel.spec | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/babel.spec b/babel.spec index 1ef9c22..ccc8e2b 100644 --- a/babel.spec +++ b/babel.spec @@ -11,7 +11,14 @@ %bcond_with python2 %else %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 +%endif + Name: babel Version: 2.7.0 @@ -27,7 +34,7 @@ BuildArch: noarch %if %{with python2} BuildRequires: python2-devel BuildRequires: python2-setuptools -%if 0%{?fedora} < 32 +%if %{with python2_pytest} BuildRequires: python2-pytz BuildRequires: python2-pytest BuildRequires: python2-freezegun @@ -143,7 +150,7 @@ rm -f "$BUILDDIR/html/.buildinfo" %check export TZ=America/New_York -%if %{with python2} +%if %{with python2} && %{with python2_pytest} %{__python2} -m pytest %endif %if !%{bootstrap} From 2b029368fdeef9ec721f027ba9de1eea3ba87c9c Mon Sep 17 00:00:00 2001 From: Lumir Balhar Date: Mon, 18 Nov 2019 10:01:34 +0100 Subject: [PATCH 24/96] Switch bootstrap to bcond --- babel.spec | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/babel.spec b/babel.spec index ccc8e2b..4db13d4 100644 --- a/babel.spec +++ b/babel.spec @@ -4,7 +4,7 @@ # There is some bootstrapping involved when upgrading Python 3 # First of all we need babel (this package) to use sphinx # And pytest is at this point not yet ready -%global bootstrap 0 +%bcond_with bootstrap # Build without Python 2 support from F33 on. %if !0%{?fedora}%{?rhel} || 0%{?fedora} >= 33 || 0%{?rhel} >= 9 @@ -42,7 +42,7 @@ BuildRequires: python2-freezegun %endif BuildRequires: python3-devel BuildRequires: python3-setuptools -%if !%{bootstrap} +%if !%{with bootstrap} BuildRequires: python3-pytz BuildRequires: python3-pytest BuildRequires: python3-freezegun @@ -51,7 +51,7 @@ BuildRequires: python3-freezegun # build the documentation BuildRequires: make -%if !%{bootstrap} +%if !%{with bootstrap} BuildRequires: python3-sphinx %endif Requires: python3-babel @@ -109,7 +109,7 @@ Babel is composed of two major parts: providing access to various locale display names, localized number and date formatting, etc. -%if !%{bootstrap} +%if !%{with bootstrap} %package doc Summary: Documentation for Babel Provides: python-babel-doc = %{version}-%{release} @@ -132,7 +132,7 @@ Documentation for Babel BUILDDIR="$PWD/built-docs" rm -rf "$BUILDDIR" -%if !%{bootstrap} +%if !%{with bootstrap} pushd docs make \ SPHINXBUILD=sphinx-build-3 \ @@ -153,7 +153,7 @@ export TZ=America/New_York %if %{with python2} && %{with python2_pytest} %{__python2} -m pytest %endif -%if !%{bootstrap} +%if !%{with bootstrap} %{__python3} -m pytest %endif @@ -172,7 +172,7 @@ export TZ=America/New_York %{python3_sitelib}/Babel-%{version}-py*.egg-info %{python3_sitelib}/babel -%if !%{bootstrap} +%if !%{with bootstrap} %files doc %doc built-docs/html/* %endif From e42c0ba3bbd8a08e72799701b6d27497abba3b1c Mon Sep 17 00:00:00 2001 From: Felix Schwarz Date: Thu, 2 Jan 2020 09:39:25 +0100 Subject: [PATCH 25/96] update to upstream version 2.8.0 --- .gitignore | 1 + babel.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 4c71b78..32fd9c7 100644 --- a/.gitignore +++ b/.gitignore @@ -5,3 +5,4 @@ Babel-0.9.5.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 diff --git a/babel.spec b/babel.spec index 4db13d4..4f6d4b3 100644 --- a/babel.spec +++ b/babel.spec @@ -21,8 +21,8 @@ Name: babel -Version: 2.7.0 -Release: 7%{?dist} +Version: 2.8.0 +Release: 1%{?dist} Summary: Tools for internationalizing Python applications License: BSD @@ -178,6 +178,9 @@ export TZ=America/New_York %endif %changelog +* Thu Jan 02 2020 Felix Schwarz - 2.8.0-1 +- update to upstream version 2.8.0 + * Thu Oct 31 2019 Nils Philippsen - 2.7.0-7 - drop python2-babel only from F33 on as it is needed for trac (for the time being, #1737930) diff --git a/sources b/sources index e4bbad5..20b1c73 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (Babel-2.7.0.tar.gz) = 96314c7b26f6915a825e0344fa06e4f1d9a71b97a52b16f2f696c2e81c69318974547620135912b11edb95668a717ec49f1be68eef5a4753092d8e4cdc39a1e5 +SHA512 (Babel-2.8.0.tar.gz) = f9687b36176c146a8ace073197111463d24fca343bb1dbee8b0e37a7f37b68b4cd77ffbe3bf14a20f8f64c701aa860e0b5e6076658a95dbee2556f0688d68d91 From 28a6b4ee2861e165e54602e74e193ffe5b966bf7 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Tue, 28 Jan 2020 12:38:09 +0000 Subject: [PATCH 26/96] - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- babel.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/babel.spec b/babel.spec index 4f6d4b3..8fad83b 100644 --- a/babel.spec +++ b/babel.spec @@ -22,7 +22,7 @@ Name: babel Version: 2.8.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Tools for internationalizing Python applications License: BSD @@ -178,6 +178,9 @@ export TZ=America/New_York %endif %changelog +* Tue Jan 28 2020 Fedora Release Engineering - 2.8.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + * Thu Jan 02 2020 Felix Schwarz - 2.8.0-1 - update to upstream version 2.8.0 From c085291b319a5c68db407d471f1c9a7aa7440ed0 Mon Sep 17 00:00:00 2001 From: Felix Schwarz Date: Tue, 5 May 2020 08:17:40 +0000 Subject: [PATCH 27/96] add patch for compatibility with Python 3.9a6 --- babel-python39a6-compat.patch | 66 +++++++++++++++++++++++++++++++++++ babel.spec | 9 +++-- 2 files changed, 73 insertions(+), 2 deletions(-) create mode 100644 babel-python39a6-compat.patch diff --git a/babel-python39a6-compat.patch b/babel-python39a6-compat.patch new file mode 100644 index 0000000..2679200 --- /dev/null +++ b/babel-python39a6-compat.patch @@ -0,0 +1,66 @@ +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 8fad83b..8456b5d 100644 --- a/babel.spec +++ b/babel.spec @@ -22,12 +22,14 @@ Name: babel Version: 2.8.0 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Tools for internationalizing Python applications License: BSD URL: http://babel.pocoo.org/ Source0: https://files.pythonhosted.org/packages/source/B/%{srcname}/%{srcname}-%{version}.tar.gz +# https://github.com/python-babel/babel/pull/712 +Patch0: babel-python39a6-compat.patch BuildArch: noarch @@ -121,7 +123,7 @@ Documentation for Babel %endif %prep -%autosetup -n %{srcname}-%{version} +%autosetup -p1 -n %{srcname}-%{version} %build %if %{with python2} @@ -178,6 +180,9 @@ export TZ=America/New_York %endif %changelog +* Tue May 05 2020 Felix Schwarz - 2.8.0-3 +- add patch for compatibility with Python 3.9a6 + * Tue Jan 28 2020 Fedora Release Engineering - 2.8.0-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild From 1aeed128940c752238eeca53717916752ff18f53 Mon Sep 17 00:00:00 2001 From: Felix Schwarz Date: Fri, 8 May 2020 22:31:33 +0200 Subject: [PATCH 28/96] use %{pypi_source} --- babel.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/babel.spec b/babel.spec index 8456b5d..be2a063 100644 --- a/babel.spec +++ b/babel.spec @@ -26,8 +26,8 @@ Release: 3%{?dist} Summary: Tools for internationalizing Python applications License: BSD -URL: http://babel.pocoo.org/ -Source0: https://files.pythonhosted.org/packages/source/B/%{srcname}/%{srcname}-%{version}.tar.gz +URL: https://babel.pocoo.org/ +Source0: %{pypi_source} # https://github.com/python-babel/babel/pull/712 Patch0: babel-python39a6-compat.patch From 4085158e55f1199e3642ac57035f88984b7537ea Mon Sep 17 00:00:00 2001 From: Felix Schwarz Date: Fri, 8 May 2020 22:32:32 +0200 Subject: [PATCH 29/96] reenable Python 2 subpackage for Fedora 33+ (rhbz #1737930) Trac still requires Python 2. --- babel.spec | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/babel.spec b/babel.spec index be2a063..b2f4b05 100644 --- a/babel.spec +++ b/babel.spec @@ -6,10 +6,6 @@ # And pytest is at this point not yet ready %bcond_with bootstrap -# Build without Python 2 support from F33 on. -%if !0%{?fedora}%{?rhel} || 0%{?fedora} >= 33 || 0%{?rhel} >= 9 -%bcond_with python2 -%else %bcond_without python2 # We ship python2-pytest only up to F31. %if !0%{?fedora}%{?rhel} || 0%{?fedora} >= 32 || 0%{?rhel} >= 9 @@ -17,12 +13,11 @@ %else %bcond_without python2_pytest %endif -%endif Name: babel Version: 2.8.0 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Tools for internationalizing Python applications License: BSD @@ -180,6 +175,9 @@ export TZ=America/New_York %endif %changelog +* Fri May 08 2020 Felix Schwarz - 2.8.0-4 +- reenable Python 2 subpackage for Fedora 33+ (rhbz #1737930) + * Tue May 05 2020 Felix Schwarz - 2.8.0-3 - add patch for compatibility with Python 3.9a6 From 2c4a7077f509ed27e692ce0e4b62a97fdb347176 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Fri, 22 May 2020 16:17:47 +0200 Subject: [PATCH 30/96] Bootstrap for Python 3.9 --- babel.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/babel.spec b/babel.spec index b2f4b05..7e84633 100644 --- a/babel.spec +++ b/babel.spec @@ -1,3 +1,4 @@ +%global _with_bootstrap 1 %global srcname Babel %global sum Library for internationalizing Python applications @@ -17,7 +18,7 @@ Name: babel Version: 2.8.0 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Tools for internationalizing Python applications License: BSD @@ -175,6 +176,9 @@ export TZ=America/New_York %endif %changelog +* Fri May 22 2020 Miro Hrončok - 2.8.0-5 +- Bootstrap for Python 3.9 + * Fri May 08 2020 Felix Schwarz - 2.8.0-4 - reenable Python 2 subpackage for Fedora 33+ (rhbz #1737930) From e253ce2f2a5a6c15cc221f96c77854cc990b8f1e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Sat, 23 May 2020 09:26:21 +0200 Subject: [PATCH 31/96] Rebuilt for Python 3.9 --- babel.spec | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/babel.spec b/babel.spec index 7e84633..61b9185 100644 --- a/babel.spec +++ b/babel.spec @@ -1,4 +1,3 @@ -%global _with_bootstrap 1 %global srcname Babel %global sum Library for internationalizing Python applications @@ -18,7 +17,7 @@ Name: babel Version: 2.8.0 -Release: 5%{?dist} +Release: 6%{?dist} Summary: Tools for internationalizing Python applications License: BSD @@ -176,6 +175,9 @@ export TZ=America/New_York %endif %changelog +* Sat May 23 2020 Miro Hrončok - 2.8.0-6 +- Rebuilt for Python 3.9 + * Fri May 22 2020 Miro Hrončok - 2.8.0-5 - Bootstrap for Python 3.9 From cec400854373b9ab2ac275fa961a07775a76bc20 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Mon, 27 Jul 2020 12:50:47 +0000 Subject: [PATCH 32/96] - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- babel.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/babel.spec b/babel.spec index 61b9185..a3cb7e2 100644 --- a/babel.spec +++ b/babel.spec @@ -17,7 +17,7 @@ Name: babel Version: 2.8.0 -Release: 6%{?dist} +Release: 7%{?dist} Summary: Tools for internationalizing Python applications License: BSD @@ -175,6 +175,9 @@ export TZ=America/New_York %endif %changelog +* Mon Jul 27 2020 Fedora Release Engineering - 2.8.0-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + * Sat May 23 2020 Miro Hrončok - 2.8.0-6 - Rebuilt for Python 3.9 From 8e02de60cdf8c88b40ecfc1543daf8cf190f5a0c Mon Sep 17 00:00:00 2001 From: Felix Schwarz Date: Mon, 16 Nov 2020 22:00:31 +0100 Subject: [PATCH 33/96] remove support for python2-pytest No supported Fedora release ships python2-pytest anyway so these conditions are not useful anymore. --- babel.spec | 14 -------------- 1 file changed, 14 deletions(-) diff --git a/babel.spec b/babel.spec index a3cb7e2..51e253a 100644 --- a/babel.spec +++ b/babel.spec @@ -7,12 +7,6 @@ %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 @@ -31,11 +25,6 @@ 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 @@ -147,9 +136,6 @@ rm -f "$BUILDDIR/html/.buildinfo" %check export TZ=America/New_York -%if %{with python2} && %{with python2_pytest} -%{__python2} -m pytest -%endif %if !%{with bootstrap} %{__python3} -m pytest %endif From 2c7f3316c2eec70bb0031fb986487faaec3aee0d Mon Sep 17 00:00:00 2001 From: Felix Schwarz Date: Mon, 16 Nov 2020 22:25:48 +0100 Subject: [PATCH 34/96] update to 2.9.0 The test suite only passed after forcing the timezone to UTC. --- .gitignore | 11 ++---- babel-python39a6-compat.patch | 66 ----------------------------------- babel.spec | 11 +++--- sources | 2 +- 4 files changed, 10 insertions(+), 80 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 51e253a..c7b3df1 100644 --- a/babel.spec +++ b/babel.spec @@ -10,15 +10,13 @@ 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 @@ -135,7 +133,7 @@ rm -f "$BUILDDIR/html/.buildinfo" %py3_install %check -export TZ=America/New_York +export TZ=UTC %if !%{with bootstrap} %{__python3} -m pytest %endif @@ -161,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 From b15c1d2f905b23718465f3d9fe7bd3b815b74912 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Tue, 24 Nov 2020 01:01:30 +0100 Subject: [PATCH 35/96] Disable Python 2 build on RHEL 9+ --- babel.spec | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/babel.spec b/babel.spec index c7b3df1..98bcad8 100644 --- a/babel.spec +++ b/babel.spec @@ -6,12 +6,18 @@ # And pytest is at this point not yet ready %bcond_with bootstrap +# There is an exception to ship python2-babel on Fedora, for trac: +# https://pagure.io/fesco/issue/2260 +%if 0%{?fedora} %bcond_without python2 +%else +%bcond_with python2 +%ednif Name: babel Version: 2.9.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Tools for internationalizing Python applications License: BSD @@ -159,6 +165,9 @@ export TZ=UTC %endif %changelog +* Tue Nov 24 2020 Miro Hrončok +- Disable Python 2 build on RHEL 9+ + * Mon Nov 16 22:22:25 CET 2020 Felix Schwarz - 2.9.0-1 - update to 2.9.0 From e4d862678178a538c1daa0b4246524794865c819 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Mon, 30 Nov 2020 16:52:20 +0100 Subject: [PATCH 36/96] Typo --- babel.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/babel.spec b/babel.spec index 98bcad8..ee5d7f0 100644 --- a/babel.spec +++ b/babel.spec @@ -12,7 +12,7 @@ %bcond_without python2 %else %bcond_with python2 -%ednif +%endif Name: babel From 8b0683ee151dd2776159a22588bc2a9d047ef172 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Mon, 21 Dec 2020 16:13:08 +0100 Subject: [PATCH 37/96] Disable Python 2 build entirely --- babel.spec | 59 ++++++------------------------------------------------ 1 file changed, 6 insertions(+), 53 deletions(-) diff --git a/babel.spec b/babel.spec index ee5d7f0..e42631c 100644 --- a/babel.spec +++ b/babel.spec @@ -6,18 +6,9 @@ # And pytest is at this point not yet ready %bcond_with bootstrap -# There is an exception to ship python2-babel on Fedora, for trac: -# https://pagure.io/fesco/issue/2260 -%if 0%{?fedora} -%bcond_without python2 -%else -%bcond_with python2 -%endif - - Name: babel Version: 2.9.0 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Tools for internationalizing Python applications License: BSD @@ -26,10 +17,6 @@ Source0: %{pypi_source} BuildArch: noarch -%if %{with python2} -BuildRequires: python2-devel -BuildRequires: python2-setuptools -%endif BuildRequires: python3-devel BuildRequires: python3-setuptools %if !%{with bootstrap} @@ -58,33 +45,9 @@ Babel is composed of two major parts: and date formatting, etc. -%if %{with python2} -%package -n python2-babel -Summary: %sum - -Requires: python2-setuptools -Requires: python2-pytz - -%{?python_provide:%python_provide python2-babel} - -%description -n python2-babel -Babel is composed of two major parts: - -* tools to build and work with gettext message catalogs - -* a Python interface to the CLDR (Common Locale Data Repository), - providing access to various locale display names, localized number - and date formatting, etc. -%endif - - %package -n python3-babel Summary: %sum -%if %{without python2} -Obsoletes: python2-babel < 2.7.0-6%{?dist} -%endif - Requires: python3-setuptools Requires: python3-pytz @@ -103,7 +66,6 @@ Babel is composed of two major parts: %package doc Summary: Documentation for Babel Provides: python-babel-doc = %{version}-%{release} -Provides: python2-babel-doc = %{version}-%{release} Provides: python3-babel-doc = %{version}-%{release} %description doc @@ -114,9 +76,6 @@ Documentation for Babel %autosetup -p1 -n %{srcname}-%{version} %build -%if %{with python2} -%py2_build -%endif %py3_build BUILDDIR="$PWD/built-docs" @@ -133,9 +92,6 @@ rm -f "$BUILDDIR/html/.buildinfo" %endif %install -%if %{with python2} -%py2_install -%endif %py3_install %check @@ -149,15 +105,9 @@ export TZ=UTC %license LICENSE %{_bindir}/pybabel -%if %{with python2} -%files -n python2-babel -%{python2_sitelib}/Babel-%{version}-py*.egg-info -%{python2_sitelib}/babel -%endif - %files -n python3-babel -%{python3_sitelib}/Babel-%{version}-py*.egg-info -%{python3_sitelib}/babel +%{python3_sitelib}/Babel-%{version}-py*.egg-info/ +%{python3_sitelib}/babel/ %if !%{with bootstrap} %files doc @@ -165,6 +115,9 @@ export TZ=UTC %endif %changelog +* Mon Dec 21 2020 Miro Hrončok - 2.9.0-3 +- Disable Python 2 build entirely + * Tue Nov 24 2020 Miro Hrončok - Disable Python 2 build on RHEL 9+ From 7a6aa9e4c173317e9559fd79759b5547dfb448e7 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Tue, 26 Jan 2021 00:53:06 +0000 Subject: [PATCH 38/96] - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- babel.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/babel.spec b/babel.spec index e42631c..bed034f 100644 --- a/babel.spec +++ b/babel.spec @@ -8,7 +8,7 @@ Name: babel Version: 2.9.0 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Tools for internationalizing Python applications License: BSD @@ -115,6 +115,9 @@ export TZ=UTC %endif %changelog +* Tue Jan 26 2021 Fedora Release Engineering - 2.9.0-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + * Mon Dec 21 2020 Miro Hrončok - 2.9.0-3 - Disable Python 2 build entirely From f2b654c9c9fde12d31c8236b2a26e7f8f85f3342 Mon Sep 17 00:00:00 2001 From: Felix Schwarz Date: Wed, 28 Apr 2021 22:24:45 +0200 Subject: [PATCH 39/96] update to 2.9.1 --- babel.spec | 7 +++++-- sources | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/babel.spec b/babel.spec index bed034f..90436e4 100644 --- a/babel.spec +++ b/babel.spec @@ -7,8 +7,8 @@ %bcond_with bootstrap Name: babel -Version: 2.9.0 -Release: 4%{?dist} +Version: 2.9.1 +Release: 1%{?dist} Summary: Tools for internationalizing Python applications License: BSD @@ -115,6 +115,9 @@ export TZ=UTC %endif %changelog +* Wed Apr 28 2021 Felix Schwarz - 2.9.1-1 +- update to 2.9.1 + * Tue Jan 26 2021 Fedora Release Engineering - 2.9.0-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild diff --git a/sources b/sources index a6ff9c5..bf759d1 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (Babel-2.9.0.tar.gz) = 250d1a19741eb0d1bda9d6b862f2d4779b6c67f10b8e045f450a271a16587e30f26f35ccccfea8ca13bb519582d2ef83569fa4381d0590fb9b61bf3ebf67e5f6 +SHA512 (Babel-2.9.1.tar.gz) = 89a2ce18301b522907bb66ec5453cbcd4c6b2d494d6928c9c62dc07bd8b6983982db571a85e251a1ea413b6f76fbd515f65c67c9bccf5441c62d351a57f2f4d0 From 07de33c08401272e393177d6ea9ef52409b3e2a2 Mon Sep 17 00:00:00 2001 From: Python Maint Date: Wed, 2 Jun 2021 17:09:28 +0200 Subject: [PATCH 40/96] Bootstrap for Python 3.10 --- babel.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/babel.spec b/babel.spec index 90436e4..cad883e 100644 --- a/babel.spec +++ b/babel.spec @@ -1,3 +1,4 @@ +%global _with_bootstrap 1 %global srcname Babel %global sum Library for internationalizing Python applications @@ -8,7 +9,7 @@ Name: babel Version: 2.9.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Tools for internationalizing Python applications License: BSD @@ -115,6 +116,9 @@ export TZ=UTC %endif %changelog +* Wed Jun 02 2021 Python Maint - 2.9.1-2 +- Bootstrap for Python 3.10 + * Wed Apr 28 2021 Felix Schwarz - 2.9.1-1 - update to 2.9.1 From 8eb8b615262ef454f592405312c95f9a7e72495d Mon Sep 17 00:00:00 2001 From: Python Maint Date: Thu, 3 Jun 2021 03:53:12 +0200 Subject: [PATCH 41/96] Rebuilt for Python 3.10 --- babel.spec | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/babel.spec b/babel.spec index cad883e..96a3a18 100644 --- a/babel.spec +++ b/babel.spec @@ -1,4 +1,3 @@ -%global _with_bootstrap 1 %global srcname Babel %global sum Library for internationalizing Python applications @@ -9,7 +8,7 @@ Name: babel Version: 2.9.1 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Tools for internationalizing Python applications License: BSD @@ -116,6 +115,9 @@ export TZ=UTC %endif %changelog +* Thu Jun 03 2021 Python Maint - 2.9.1-3 +- Rebuilt for Python 3.10 + * Wed Jun 02 2021 Python Maint - 2.9.1-2 - Bootstrap for Python 3.10 From 373bc07b551c83a78fae145f0caaf9dae1e6e656 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 21 Jul 2021 13:24:25 +0000 Subject: [PATCH 42/96] - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild Signed-off-by: Fedora Release Engineering From 2c8a60f07fe8e6838e8fdeca7eeea5a044c88686 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 21 Jul 2021 18:20:44 +0000 Subject: [PATCH 43/96] - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- babel.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/babel.spec b/babel.spec index 96a3a18..97fcac8 100644 --- a/babel.spec +++ b/babel.spec @@ -8,7 +8,7 @@ Name: babel Version: 2.9.1 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Tools for internationalizing Python applications License: BSD @@ -115,6 +115,9 @@ export TZ=UTC %endif %changelog +* Wed Jul 21 2021 Fedora Release Engineering - 2.9.1-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + * Thu Jun 03 2021 Python Maint - 2.9.1-3 - Rebuilt for Python 3.10 From ab457651add5378c4c372941f391ddebb406b133 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 19 Jan 2022 22:04:27 +0000 Subject: [PATCH 44/96] - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- babel.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/babel.spec b/babel.spec index 97fcac8..126a587 100644 --- a/babel.spec +++ b/babel.spec @@ -8,7 +8,7 @@ Name: babel Version: 2.9.1 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Tools for internationalizing Python applications License: BSD @@ -115,6 +115,9 @@ export TZ=UTC %endif %changelog +* Wed Jan 19 2022 Fedora Release Engineering - 2.9.1-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + * Wed Jul 21 2021 Fedora Release Engineering - 2.9.1-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild From 64f54fc69df2e7f083e2754f1d801bbc42a60041 Mon Sep 17 00:00:00 2001 From: Felix Schwarz Date: Fri, 22 Apr 2022 21:54:59 +0200 Subject: [PATCH 45/96] update to 2.10.1 --- babel.spec | 11 +++++++---- sources | 2 +- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/babel.spec b/babel.spec index 126a587..5aa36b9 100644 --- a/babel.spec +++ b/babel.spec @@ -7,8 +7,8 @@ %bcond_with bootstrap Name: babel -Version: 2.9.1 -Release: 5%{?dist} +Version: 2.10.1 +Release: 1%{?dist} Summary: Tools for internationalizing Python applications License: BSD @@ -97,11 +97,11 @@ rm -f "$BUILDDIR/html/.buildinfo" %check export TZ=UTC %if !%{with bootstrap} -%{__python3} -m pytest +%pytest %endif %files -%doc CHANGES AUTHORS +%doc CHANGES.rst AUTHORS %license LICENSE %{_bindir}/pybabel @@ -115,6 +115,9 @@ export TZ=UTC %endif %changelog +* Fri Apr 22 2022 Felix Schwarz - 2.10.1-1 +- update to 2.10.1 + * Wed Jan 19 2022 Fedora Release Engineering - 2.9.1-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild diff --git a/sources b/sources index bf759d1..73ddc43 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (Babel-2.9.1.tar.gz) = 89a2ce18301b522907bb66ec5453cbcd4c6b2d494d6928c9c62dc07bd8b6983982db571a85e251a1ea413b6f76fbd515f65c67c9bccf5441c62d351a57f2f4d0 +SHA512 (Babel-2.10.1.tar.gz) = d6f8876bc47d2ad88277f5a9512abb177518b79d4f477cdba11d1cd1af8fb92bfd033c2c05c7a6c32dbd087a28189288f8ac80f9b654027b3e026a06c4ade127 From c78823645496cc3c8cdbd813a520a881547e05b6 Mon Sep 17 00:00:00 2001 From: Nils Philippsen Date: Mon, 16 May 2022 16:59:40 +0200 Subject: [PATCH 46/96] Build and distribute man page for pybabel Resolves: #1611174 Signed-off-by: Nils Philippsen --- babel.spec | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/babel.spec b/babel.spec index 5aa36b9..32b9065 100644 --- a/babel.spec +++ b/babel.spec @@ -8,7 +8,7 @@ Name: babel Version: 2.10.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Tools for internationalizing Python applications License: BSD @@ -20,6 +20,7 @@ BuildArch: noarch BuildRequires: python3-devel BuildRequires: python3-setuptools %if !%{with bootstrap} +BuildRequires: coreutils BuildRequires: python3-pytz BuildRequires: python3-pytest BuildRequires: python3-freezegun @@ -86,7 +87,7 @@ pushd docs make \ SPHINXBUILD=sphinx-build-3 \ BUILDDIR="$BUILDDIR" \ - html + html man popd rm -f "$BUILDDIR/html/.buildinfo" %endif @@ -94,6 +95,10 @@ rm -f "$BUILDDIR/html/.buildinfo" %install %py3_install +%if !%{with bootstrap} +install -D -m 0644 built-docs/man/babel.1 %{buildroot}%{_mandir}/man1/pybabel.1 +%endif + %check export TZ=UTC %if !%{with bootstrap} @@ -105,6 +110,10 @@ export TZ=UTC %license LICENSE %{_bindir}/pybabel +%if !%{with bootstrap} +%{_mandir}/man1/pybabel.1* +%endif + %files -n python3-babel %{python3_sitelib}/Babel-%{version}-py*.egg-info/ %{python3_sitelib}/babel/ @@ -115,6 +124,9 @@ export TZ=UTC %endif %changelog +* Mon May 16 2022 Nils Philippsen - 2.10.1-2 +- Build and distribute man page for pybabel (#1611174) + * Fri Apr 22 2022 Felix Schwarz - 2.10.1-1 - update to 2.10.1 From 6446301f255740fddb08f0cede4c85774b5466dd Mon Sep 17 00:00:00 2001 From: Python Maint Date: Mon, 13 Jun 2022 14:57:26 +0200 Subject: [PATCH 47/96] Bootstrap for Python 3.11 --- babel.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/babel.spec b/babel.spec index 32b9065..41fbe26 100644 --- a/babel.spec +++ b/babel.spec @@ -1,3 +1,4 @@ +%global _with_bootstrap 1 %global srcname Babel %global sum Library for internationalizing Python applications @@ -8,7 +9,7 @@ Name: babel Version: 2.10.1 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Tools for internationalizing Python applications License: BSD @@ -124,6 +125,9 @@ export TZ=UTC %endif %changelog +* Mon Jun 13 2022 Python Maint - 2.10.1-3 +- Bootstrap for Python 3.11 + * Mon May 16 2022 Nils Philippsen - 2.10.1-2 - Build and distribute man page for pybabel (#1611174) From 64fddc56733a6dc40ec78ee4502dc418392fc5ae Mon Sep 17 00:00:00 2001 From: Python Maint Date: Mon, 13 Jun 2022 18:51:37 +0200 Subject: [PATCH 48/96] Rebuilt for Python 3.11 --- babel.spec | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/babel.spec b/babel.spec index 41fbe26..ee0ce56 100644 --- a/babel.spec +++ b/babel.spec @@ -1,4 +1,3 @@ -%global _with_bootstrap 1 %global srcname Babel %global sum Library for internationalizing Python applications @@ -9,7 +8,7 @@ Name: babel Version: 2.10.1 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Tools for internationalizing Python applications License: BSD @@ -125,6 +124,9 @@ export TZ=UTC %endif %changelog +* Mon Jun 13 2022 Python Maint - 2.10.1-4 +- Rebuilt for Python 3.11 + * Mon Jun 13 2022 Python Maint - 2.10.1-3 - Bootstrap for Python 3.11 From c6284b9b39d7d9536544d4d94aebcdb925b652e4 Mon Sep 17 00:00:00 2001 From: Felix Schwarz Date: Mon, 20 Jun 2022 13:51:58 +0200 Subject: [PATCH 49/96] update to 2.10.3 --- babel.spec | 7 +++++-- sources | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/babel.spec b/babel.spec index ee0ce56..04d194a 100644 --- a/babel.spec +++ b/babel.spec @@ -7,8 +7,8 @@ %bcond_with bootstrap Name: babel -Version: 2.10.1 -Release: 4%{?dist} +Version: 2.10.3 +Release: 1%{?dist} Summary: Tools for internationalizing Python applications License: BSD @@ -124,6 +124,9 @@ export TZ=UTC %endif %changelog +* Mon Jun 20 2022 Felix Schwarz - 2.10.3-1 +- update to 2.10.3 + * Mon Jun 13 2022 Python Maint - 2.10.1-4 - Rebuilt for Python 3.11 diff --git a/sources b/sources index 73ddc43..78f773e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (Babel-2.10.1.tar.gz) = d6f8876bc47d2ad88277f5a9512abb177518b79d4f477cdba11d1cd1af8fb92bfd033c2c05c7a6c32dbd087a28189288f8ac80f9b654027b3e026a06c4ade127 +SHA512 (Babel-2.10.3.tar.gz) = 72a5759d2cfa239df56f3d2809b23367b9691e21de92535b30f9b3455d253682f6c18ca919f3fb039deed2663db9276307f6343cbbab56fca96ff1ac9c214fa7 From 1ebbd453eaefc837f37b68a25ec730ccb69b865c Mon Sep 17 00:00:00 2001 From: Felix Schwarz Date: Mon, 20 Jun 2022 22:30:08 +0200 Subject: [PATCH 50/96] backport patch to remove usage of cgi module (rhbz #2083956) --- babel-remove-cgi-deprecation-warning.patch | 75 ++++++++++++++++++++++ babel.spec | 8 ++- 2 files changed, 82 insertions(+), 1 deletion(-) create mode 100644 babel-remove-cgi-deprecation-warning.patch diff --git a/babel-remove-cgi-deprecation-warning.patch b/babel-remove-cgi-deprecation-warning.patch new file mode 100644 index 0000000..8eb5b76 --- /dev/null +++ b/babel-remove-cgi-deprecation-warning.patch @@ -0,0 +1,75 @@ +From 965523b6c61263f48a20f1cbe8862e460c1b4853 Mon Sep 17 00:00:00 2001 +From: Aarni Koskela +Date: Tue, 10 May 2022 15:36:47 +0300 +Subject: [PATCH] Use email.Message for pofile header parsing + +cgi.parse_header is due to be deprecated + +Fixes #873 +--- + babel/messages/catalog.py | 12 +++++++++--- + tests/messages/test_pofile.py | 11 +++++++++++ + 2 files changed, 20 insertions(+), 3 deletions(-) + +diff --git a/babel/messages/catalog.py b/babel/messages/catalog.py +index 564b2c7c..e43a28c0 100644 +--- a/babel/messages/catalog.py ++++ b/babel/messages/catalog.py +@@ -10,7 +10,6 @@ + + import re + +-from cgi import parse_header + from collections import OrderedDict + from datetime import datetime, time as time_ + from difflib import get_close_matches +@@ -225,6 +224,13 @@ class TranslationError(Exception): + # FIRST AUTHOR , YEAR. + #""" + ++def parse_separated_header(value: str): ++ # Adapted from https://peps.python.org/pep-0594/#cgi ++ from email.message import Message ++ m = Message() ++ m['content-type'] = value ++ return dict(m.get_params()) ++ + + class Catalog: + """Representation of a message catalog.""" +@@ -424,11 +430,11 @@ def _set_mime_headers(self, headers): + elif name == 'language-team': + self.language_team = value + elif name == 'content-type': +- mimetype, params = parse_header(value) ++ params = parse_separated_header(value) + if 'charset' in params: + self.charset = params['charset'].lower() + elif name == 'plural-forms': +- _, params = parse_header(' ;' + value) ++ params = parse_separated_header(' ;' + value) + self._num_plurals = int(params.get('nplurals', 2)) + self._plural_expr = params.get('plural', '(n != 1)') + elif name == 'pot-creation-date': +diff --git a/tests/messages/test_pofile.py b/tests/messages/test_pofile.py +index 632efe7b..118960ab 100644 +--- a/tests/messages/test_pofile.py ++++ b/tests/messages/test_pofile.py +@@ -68,6 +68,17 @@ def test_applies_specified_encoding_during_read(self): + catalog = pofile.read_po(buf, locale='de_DE') + self.assertEqual(u'bär', catalog.get('foo').string) + ++ def test_encoding_header_read(self): ++ buf = BytesIO(b'msgid ""\nmsgstr ""\n"Content-Type: text/plain; charset=mac_roman\\n"\n') ++ catalog = pofile.read_po(buf, locale='xx_XX') ++ assert catalog.charset == 'mac_roman' ++ ++ def test_plural_forms_header_parsed(self): ++ buf = BytesIO(b'msgid ""\nmsgstr ""\n"Plural-Forms: nplurals=42; plural=(n % 11);\\n"\n') ++ catalog = pofile.read_po(buf, locale='xx_XX') ++ assert catalog.plural_expr == '(n % 11)' ++ assert catalog.num_plurals == 42 ++ + def test_read_multiline(self): + buf = StringIO(r'''msgid "" + "Here's some text that\n" diff --git a/babel.spec b/babel.spec index 04d194a..ff39f8a 100644 --- a/babel.spec +++ b/babel.spec @@ -8,12 +8,15 @@ Name: babel Version: 2.10.3 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Tools for internationalizing Python applications License: BSD URL: https://babel.pocoo.org/ Source0: %{pypi_source} +# patch present in upstream master (commit 965523b6) but not in +# 2.10.x branch +Patch0: babel-remove-cgi-deprecation-warning.patch BuildArch: noarch @@ -124,6 +127,9 @@ export TZ=UTC %endif %changelog +* Mon Jun 20 2022 Felix Schwarz - 2.10.3-2 +- backport patch to remove usage of cgi module (rhbz #2083956) + * Mon Jun 20 2022 Felix Schwarz - 2.10.3-1 - update to 2.10.3 From eb1685104ef74070aa803f6ca2d08c24f7a554f2 Mon Sep 17 00:00:00 2001 From: Felix Schwarz Date: Mon, 20 Jun 2022 22:31:13 +0200 Subject: [PATCH 51/96] add some more items to .gitignore --- .gitignore | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.gitignore b/.gitignore index 7b7bf09..1180ae8 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,6 @@ /Babel-0.9.*.tar.gz /Babel-1.*.tar.gz /Babel-2.*.tar.gz +/Babel-*/ +/results_babel +/babel-upstream.git From f9732cabc3502f92ee52f906e4ebfc5bcb809de6 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 20 Jul 2022 21:42:22 +0000 Subject: [PATCH 52/96] Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- babel.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/babel.spec b/babel.spec index ff39f8a..b05a6fc 100644 --- a/babel.spec +++ b/babel.spec @@ -8,7 +8,7 @@ Name: babel Version: 2.10.3 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Tools for internationalizing Python applications License: BSD @@ -127,6 +127,9 @@ export TZ=UTC %endif %changelog +* Wed Jul 20 2022 Fedora Release Engineering - 2.10.3-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + * Mon Jun 20 2022 Felix Schwarz - 2.10.3-2 - backport patch to remove usage of cgi module (rhbz #2083956) From 40200005a943df60265ed6ae3d7402c8229efdff Mon Sep 17 00:00:00 2001 From: Felix Schwarz Date: Sun, 1 Jan 2023 12:32:33 +0100 Subject: [PATCH 53/96] update to 2.11.0 --- babel-remove-cgi-deprecation-warning.patch | 75 ---------------------- babel.spec | 10 +-- sources | 2 +- 3 files changed, 6 insertions(+), 81 deletions(-) delete mode 100644 babel-remove-cgi-deprecation-warning.patch diff --git a/babel-remove-cgi-deprecation-warning.patch b/babel-remove-cgi-deprecation-warning.patch deleted file mode 100644 index 8eb5b76..0000000 --- a/babel-remove-cgi-deprecation-warning.patch +++ /dev/null @@ -1,75 +0,0 @@ -From 965523b6c61263f48a20f1cbe8862e460c1b4853 Mon Sep 17 00:00:00 2001 -From: Aarni Koskela -Date: Tue, 10 May 2022 15:36:47 +0300 -Subject: [PATCH] Use email.Message for pofile header parsing - -cgi.parse_header is due to be deprecated - -Fixes #873 ---- - babel/messages/catalog.py | 12 +++++++++--- - tests/messages/test_pofile.py | 11 +++++++++++ - 2 files changed, 20 insertions(+), 3 deletions(-) - -diff --git a/babel/messages/catalog.py b/babel/messages/catalog.py -index 564b2c7c..e43a28c0 100644 ---- a/babel/messages/catalog.py -+++ b/babel/messages/catalog.py -@@ -10,7 +10,6 @@ - - import re - --from cgi import parse_header - from collections import OrderedDict - from datetime import datetime, time as time_ - from difflib import get_close_matches -@@ -225,6 +224,13 @@ class TranslationError(Exception): - # FIRST AUTHOR , YEAR. - #""" - -+def parse_separated_header(value: str): -+ # Adapted from https://peps.python.org/pep-0594/#cgi -+ from email.message import Message -+ m = Message() -+ m['content-type'] = value -+ return dict(m.get_params()) -+ - - class Catalog: - """Representation of a message catalog.""" -@@ -424,11 +430,11 @@ def _set_mime_headers(self, headers): - elif name == 'language-team': - self.language_team = value - elif name == 'content-type': -- mimetype, params = parse_header(value) -+ params = parse_separated_header(value) - if 'charset' in params: - self.charset = params['charset'].lower() - elif name == 'plural-forms': -- _, params = parse_header(' ;' + value) -+ params = parse_separated_header(' ;' + value) - self._num_plurals = int(params.get('nplurals', 2)) - self._plural_expr = params.get('plural', '(n != 1)') - elif name == 'pot-creation-date': -diff --git a/tests/messages/test_pofile.py b/tests/messages/test_pofile.py -index 632efe7b..118960ab 100644 ---- a/tests/messages/test_pofile.py -+++ b/tests/messages/test_pofile.py -@@ -68,6 +68,17 @@ def test_applies_specified_encoding_during_read(self): - catalog = pofile.read_po(buf, locale='de_DE') - self.assertEqual(u'bär', catalog.get('foo').string) - -+ def test_encoding_header_read(self): -+ buf = BytesIO(b'msgid ""\nmsgstr ""\n"Content-Type: text/plain; charset=mac_roman\\n"\n') -+ catalog = pofile.read_po(buf, locale='xx_XX') -+ assert catalog.charset == 'mac_roman' -+ -+ def test_plural_forms_header_parsed(self): -+ buf = BytesIO(b'msgid ""\nmsgstr ""\n"Plural-Forms: nplurals=42; plural=(n % 11);\\n"\n') -+ catalog = pofile.read_po(buf, locale='xx_XX') -+ assert catalog.plural_expr == '(n % 11)' -+ assert catalog.num_plurals == 42 -+ - def test_read_multiline(self): - buf = StringIO(r'''msgid "" - "Here's some text that\n" diff --git a/babel.spec b/babel.spec index b05a6fc..030479c 100644 --- a/babel.spec +++ b/babel.spec @@ -7,16 +7,13 @@ %bcond_with bootstrap Name: babel -Version: 2.10.3 -Release: 3%{?dist} +Version: 2.11.0 +Release: 1%{?dist} Summary: Tools for internationalizing Python applications License: BSD URL: https://babel.pocoo.org/ Source0: %{pypi_source} -# patch present in upstream master (commit 965523b6) but not in -# 2.10.x branch -Patch0: babel-remove-cgi-deprecation-warning.patch BuildArch: noarch @@ -127,6 +124,9 @@ export TZ=UTC %endif %changelog +* Sun Jan 01 2023 Felix Schwarz - 2.11.0-1 +- update to 2.11.0 + * Wed Jul 20 2022 Fedora Release Engineering - 2.10.3-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild diff --git a/sources b/sources index 78f773e..fd5b260 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (Babel-2.10.3.tar.gz) = 72a5759d2cfa239df56f3d2809b23367b9691e21de92535b30f9b3455d253682f6c18ca919f3fb039deed2663db9276307f6343cbbab56fca96ff1ac9c214fa7 +SHA512 (Babel-2.11.0.tar.gz) = 526368dc5e44f2d93c52f2fcb544130eea6c6b7c78325bd56c6d9a6706890a4cd9daa1498d639aab65059801d87977da626e64585083c58c4b328001991eea0b From f1332a6b349dc694a1f7e3b4426075c75ec7b15d Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 18 Jan 2023 22:36:24 +0000 Subject: [PATCH 54/96] Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- babel.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/babel.spec b/babel.spec index 030479c..3334dcc 100644 --- a/babel.spec +++ b/babel.spec @@ -8,7 +8,7 @@ Name: babel Version: 2.11.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Tools for internationalizing Python applications License: BSD @@ -124,6 +124,9 @@ export TZ=UTC %endif %changelog +* Wed Jan 18 2023 Fedora Release Engineering - 2.11.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + * Sun Jan 01 2023 Felix Schwarz - 2.11.0-1 - update to 2.11.0 From 48cd894e04e181f129416cde26ff5378a5d06227 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Tue, 28 Feb 2023 12:05:51 +0100 Subject: [PATCH 55/96] Update to 2.12.0, disable pytz tests in ELN/RHEL --- babel.spec | 24 ++++++++++++++++++++---- sources | 2 +- 2 files changed, 21 insertions(+), 5 deletions(-) diff --git a/babel.spec b/babel.spec index 3334dcc..43485ca 100644 --- a/babel.spec +++ b/babel.spec @@ -6,9 +6,19 @@ # And pytest is at this point not yet ready %bcond_with bootstrap +# Since babel 2.12, the pytz dependency is optional. +# However, pytz is preferred when installed. +# Running tests with pytz is optional as well. +# We don't want to pull pytz into ELN/RHEL just to test integration with it, +# but we don't want to ship babel in Fedora with an untested default, +# so we make the dependency conditional. +# Ideally, the dependency would be conditional on pytz availability in the repo, +# but that's not possible in 2023 yet. +%bcond pytz_tests %{undefined rhel} + Name: babel -Version: 2.11.0 -Release: 2%{?dist} +Version: 2.12.0 +Release: 1%{?dist} Summary: Tools for internationalizing Python applications License: BSD @@ -21,9 +31,12 @@ BuildRequires: python3-devel BuildRequires: python3-setuptools %if !%{with bootstrap} BuildRequires: coreutils -BuildRequires: python3-pytz BuildRequires: python3-pytest BuildRequires: python3-freezegun +%if %{with pytz_tests} +# The pytz tests are skipped when pytz is missing +BuildRequires: python3-pytz +%endif %endif # build the documentation @@ -50,7 +63,6 @@ Babel is composed of two major parts: Summary: %sum Requires: python3-setuptools -Requires: python3-pytz %{?python_provide:%python_provide python3-babel} @@ -124,6 +136,10 @@ export TZ=UTC %endif %changelog +* Tue Feb 28 2023 Miro Hrončok - 2.12.0-1 +- Update to 2.12.0 +- No longer depends on pytz + * Wed Jan 18 2023 Fedora Release Engineering - 2.11.0-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild diff --git a/sources b/sources index fd5b260..c8eed34 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (Babel-2.11.0.tar.gz) = 526368dc5e44f2d93c52f2fcb544130eea6c6b7c78325bd56c6d9a6706890a4cd9daa1498d639aab65059801d87977da626e64585083c58c4b328001991eea0b +SHA512 (Babel-2.12.0.tar.gz) = 202496c8c749423e6848a4e4a5eb959574b235db6512e95fdb94492cdbf7487ed3d673fff8257d01e0ee603e65cd40100ca9094c0f46d0129d8c34d2f4d0ddf5 From d65410ae2b86aeff394096090011ce3672c8ee8c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Tue, 28 Feb 2023 12:08:04 +0100 Subject: [PATCH 56/96] Don't require setuptools babel/messages/{extract,checkers}.py imports from pkg_resources, but the imports are try-excepted with a reasonable fallback. --- babel.spec | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/babel.spec b/babel.spec index 43485ca..29e4c56 100644 --- a/babel.spec +++ b/babel.spec @@ -46,7 +46,6 @@ BuildRequires: make BuildRequires: python3-sphinx %endif Requires: python3-babel -Requires: python3-setuptools %description @@ -62,8 +61,6 @@ Babel is composed of two major parts: %package -n python3-babel Summary: %sum -Requires: python3-setuptools - %{?python_provide:%python_provide python3-babel} %description -n python3-babel @@ -139,6 +136,7 @@ export TZ=UTC * Tue Feb 28 2023 Miro Hrončok - 2.12.0-1 - Update to 2.12.0 - No longer depends on pytz +- No longer depends on setuptools * Wed Jan 18 2023 Fedora Release Engineering - 2.11.0-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild From c525e618521d75dc9b47fb3d4cba3e20d7988d43 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Tue, 28 Feb 2023 16:19:14 +0100 Subject: [PATCH 57/96] Drop some macros that were only defined to be used once or twice --- babel.spec | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/babel.spec b/babel.spec index 29e4c56..ce60459 100644 --- a/babel.spec +++ b/babel.spec @@ -1,6 +1,3 @@ -%global srcname Babel -%global sum Library for internationalizing Python applications - # There is some bootstrapping involved when upgrading Python 3 # First of all we need babel (this package) to use sphinx # And pytest is at this point not yet ready @@ -23,7 +20,7 @@ Summary: Tools for internationalizing Python applications License: BSD URL: https://babel.pocoo.org/ -Source0: %{pypi_source} +Source0: %{pypi_source Babel} BuildArch: noarch @@ -59,7 +56,7 @@ Babel is composed of two major parts: %package -n python3-babel -Summary: %sum +Summary: Library for internationalizing Python applications %{?python_provide:%python_provide python3-babel} @@ -83,7 +80,7 @@ Documentation for Babel %endif %prep -%autosetup -p1 -n %{srcname}-%{version} +%autosetup -p1 -n Babel-%{version} %build %py3_build From 8a82b7740e7bf2a235fea8a2e585aa975955df4f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Tue, 28 Feb 2023 16:20:03 +0100 Subject: [PATCH 58/96] Don't use unneeded and deprecated %python_provide --- babel.spec | 2 -- 1 file changed, 2 deletions(-) diff --git a/babel.spec b/babel.spec index ce60459..1e86576 100644 --- a/babel.spec +++ b/babel.spec @@ -58,8 +58,6 @@ Babel is composed of two major parts: %package -n python3-babel Summary: Library for internationalizing Python applications -%{?python_provide:%python_provide python3-babel} - %description -n python3-babel Babel is composed of two major parts: From 615ddba538b957c85f1d7d7f86660ef0ed1fd60b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Tue, 28 Feb 2023 16:24:30 +0100 Subject: [PATCH 59/96] Use a more understandable %bcond syntax --- babel.spec | 21 +++++++++------------ 1 file changed, 9 insertions(+), 12 deletions(-) diff --git a/babel.spec b/babel.spec index 1e86576..e9e69d3 100644 --- a/babel.spec +++ b/babel.spec @@ -1,7 +1,7 @@ # There is some bootstrapping involved when upgrading Python 3 # First of all we need babel (this package) to use sphinx # And pytest is at this point not yet ready -%bcond_with bootstrap +%bcond bootstrap 0 # Since babel 2.12, the pytz dependency is optional. # However, pytz is preferred when installed. @@ -26,7 +26,8 @@ BuildArch: noarch BuildRequires: python3-devel BuildRequires: python3-setuptools -%if !%{with bootstrap} + +%if %{without bootstrap} BuildRequires: coreutils BuildRequires: python3-pytest BuildRequires: python3-freezegun @@ -34,12 +35,8 @@ BuildRequires: python3-freezegun # The pytz tests are skipped when pytz is missing BuildRequires: python3-pytz %endif -%endif - # build the documentation BuildRequires: make - -%if !%{with bootstrap} BuildRequires: python3-sphinx %endif Requires: python3-babel @@ -67,7 +64,7 @@ Babel is composed of two major parts: providing access to various locale display names, localized number and date formatting, etc. -%if !%{with bootstrap} +%if %{without bootstrap} %package doc Summary: Documentation for Babel Provides: python-babel-doc = %{version}-%{release} @@ -86,7 +83,7 @@ Documentation for Babel BUILDDIR="$PWD/built-docs" rm -rf "$BUILDDIR" -%if !%{with bootstrap} +%if %{without bootstrap} pushd docs make \ SPHINXBUILD=sphinx-build-3 \ @@ -99,13 +96,13 @@ rm -f "$BUILDDIR/html/.buildinfo" %install %py3_install -%if !%{with bootstrap} +%if %{without bootstrap} install -D -m 0644 built-docs/man/babel.1 %{buildroot}%{_mandir}/man1/pybabel.1 %endif %check export TZ=UTC -%if !%{with bootstrap} +%if %{without bootstrap} %pytest %endif @@ -114,7 +111,7 @@ export TZ=UTC %license LICENSE %{_bindir}/pybabel -%if !%{with bootstrap} +%if %{without bootstrap} %{_mandir}/man1/pybabel.1* %endif @@ -122,7 +119,7 @@ export TZ=UTC %{python3_sitelib}/Babel-%{version}-py*.egg-info/ %{python3_sitelib}/babel/ -%if !%{with bootstrap} +%if %{without bootstrap} %files doc %doc built-docs/html/* %endif From 8155f556e3d3b5310fbadc3338a6ec0dacf3f17a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Tue, 28 Feb 2023 16:26:34 +0100 Subject: [PATCH 60/96] Require exact E:V-R of python3-babel --- babel.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/babel.spec b/babel.spec index e9e69d3..d79fd90 100644 --- a/babel.spec +++ b/babel.spec @@ -39,7 +39,7 @@ BuildRequires: python3-pytz BuildRequires: make BuildRequires: python3-sphinx %endif -Requires: python3-babel +Requires: python3-babel = %{?epoch:%{epoch}:}%{version}-%{release} %description From a5277055486429668e934c604152ab9423cbe515 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Tue, 28 Feb 2023 16:32:58 +0100 Subject: [PATCH 61/96] Use %py_provides for the documentation package --- babel.spec | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/babel.spec b/babel.spec index d79fd90..40b4f2a 100644 --- a/babel.spec +++ b/babel.spec @@ -67,8 +67,7 @@ Babel is composed of two major parts: %if %{without bootstrap} %package doc Summary: Documentation for Babel -Provides: python-babel-doc = %{version}-%{release} -Provides: python3-babel-doc = %{version}-%{release} +%py_provides python3-babel-doc %description doc Documentation for Babel From 9233071456c12eb7ee7b6c5b74ccf88a7fc72b88 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Tue, 28 Feb 2023 16:40:24 +0100 Subject: [PATCH 62/96] Use %pyproject RPM macros --- babel.spec | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/babel.spec b/babel.spec index 40b4f2a..c8206c0 100644 --- a/babel.spec +++ b/babel.spec @@ -25,7 +25,6 @@ Source0: %{pypi_source Babel} BuildArch: noarch BuildRequires: python3-devel -BuildRequires: python3-setuptools %if %{without bootstrap} BuildRequires: coreutils @@ -76,8 +75,11 @@ Documentation for Babel %prep %autosetup -p1 -n Babel-%{version} +%generate_buildrequires +%pyproject_buildrequires + %build -%py3_build +%pyproject_wheel BUILDDIR="$PWD/built-docs" rm -rf "$BUILDDIR" @@ -93,7 +95,8 @@ rm -f "$BUILDDIR/html/.buildinfo" %endif %install -%py3_install +%pyproject_install +%pyproject_save_files babel %if %{without bootstrap} install -D -m 0644 built-docs/man/babel.1 %{buildroot}%{_mandir}/man1/pybabel.1 @@ -101,6 +104,7 @@ install -D -m 0644 built-docs/man/babel.1 %{buildroot}%{_mandir}/man1/pybabel.1 %check export TZ=UTC +%pyproject_check_import %if %{without bootstrap} %pytest %endif @@ -114,9 +118,7 @@ export TZ=UTC %{_mandir}/man1/pybabel.1* %endif -%files -n python3-babel -%{python3_sitelib}/Babel-%{version}-py*.egg-info/ -%{python3_sitelib}/babel/ +%files -n python3-babel -f %{pyproject_files} %if %{without bootstrap} %files doc From 16540ca1688d5e85675d4ef3f3f4e5f54fa32e34 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Tue, 28 Feb 2023 16:40:49 +0100 Subject: [PATCH 63/96] Ensure all subpackages either have the LICENSE file or depend on one with it --- babel.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/babel.spec b/babel.spec index c8206c0..42eddff 100644 --- a/babel.spec +++ b/babel.spec @@ -111,7 +111,6 @@ export TZ=UTC %files %doc CHANGES.rst AUTHORS -%license LICENSE %{_bindir}/pybabel %if %{without bootstrap} @@ -122,6 +121,7 @@ export TZ=UTC %if %{without bootstrap} %files doc +%license LICENSE %doc built-docs/html/* %endif From f7c91373731c936fd8e1ff0e99bc8528ed4313c0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Tue, 28 Feb 2023 16:46:14 +0100 Subject: [PATCH 64/96] Add a comment justifying not using %pyproject_buildrequires -t + %tox --- babel.spec | 3 +++ 1 file changed, 3 insertions(+) diff --git a/babel.spec b/babel.spec index 42eddff..5398b65 100644 --- a/babel.spec +++ b/babel.spec @@ -28,6 +28,9 @@ BuildRequires: python3-devel %if %{without bootstrap} BuildRequires: coreutils +# The Python test dependencies are not generated from tox.ini, +# because it would require complex patching to be usable +# and becasue we want to avoid the tox dependency in ELN/RHEL. BuildRequires: python3-pytest BuildRequires: python3-freezegun %if %{with pytz_tests} From e3873b005b83b0057adb061b299f8f3a0a1f8d86 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Tue, 28 Feb 2023 16:47:13 +0100 Subject: [PATCH 65/96] Remove needles source enumeration --- babel.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/babel.spec b/babel.spec index 5398b65..0e480cf 100644 --- a/babel.spec +++ b/babel.spec @@ -20,7 +20,7 @@ Summary: Tools for internationalizing Python applications License: BSD URL: https://babel.pocoo.org/ -Source0: %{pypi_source Babel} +Source: %{pypi_source Babel} BuildArch: noarch From fef6c5e5024eca912ea40618ad5847f304a20251 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Tue, 28 Feb 2023 16:47:54 +0100 Subject: [PATCH 66/96] Update the License tag to SPDX $ askalono identify Babel-2.12.0/LICENSE License: BSD-3-Clause (original text) Score: 1.000 --- babel.spec | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/babel.spec b/babel.spec index 0e480cf..dfb4f7e 100644 --- a/babel.spec +++ b/babel.spec @@ -18,7 +18,7 @@ Version: 2.12.0 Release: 1%{?dist} Summary: Tools for internationalizing Python applications -License: BSD +License: BSD-3-Clause URL: https://babel.pocoo.org/ Source: %{pypi_source Babel} @@ -133,6 +133,7 @@ export TZ=UTC - Update to 2.12.0 - No longer depends on pytz - No longer depends on setuptools +- Update the License tag to SPDX * Wed Jan 18 2023 Fedora Release Engineering - 2.11.0-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild From d30687f37d409de15a5eda2139246387d67c72c5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Wed, 1 Mar 2023 17:49:20 +0100 Subject: [PATCH 67/96] Update to 2.12.1 --- babel.spec | 5 ++++- sources | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/babel.spec b/babel.spec index dfb4f7e..433eba8 100644 --- a/babel.spec +++ b/babel.spec @@ -14,7 +14,7 @@ %bcond pytz_tests %{undefined rhel} Name: babel -Version: 2.12.0 +Version: 2.12.1 Release: 1%{?dist} Summary: Tools for internationalizing Python applications @@ -129,6 +129,9 @@ export TZ=UTC %endif %changelog +* Wed Mar 01 2023 Miro Hrončok - 2.12.1-1 +- Update to 2.12.1 + * Tue Feb 28 2023 Miro Hrončok - 2.12.0-1 - Update to 2.12.0 - No longer depends on pytz diff --git a/sources b/sources index c8eed34..46590d0 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (Babel-2.12.0.tar.gz) = 202496c8c749423e6848a4e4a5eb959574b235db6512e95fdb94492cdbf7487ed3d673fff8257d01e0ee603e65cd40100ca9094c0f46d0129d8c34d2f4d0ddf5 +SHA512 (Babel-2.12.1.tar.gz) = 93c4bf343d99a1f47f43f8b828eb79098cb429bac1034d58b5aa49adff68116e458067f3784d997f34515828a7432fd18f7abbaeee59b47a4ee8ea744908b33b From 1fe2203f3d44ef03e82e215a872d99cc88e7b1b6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Mon, 10 Apr 2023 10:54:41 +0200 Subject: [PATCH 68/96] Fix DST-related test failures --- 998.patch | 43 +++++++++++++++++++++++++++++++++++++++++++ babel.spec | 9 ++++++++- 2 files changed, 51 insertions(+), 1 deletion(-) create mode 100644 998.patch diff --git a/998.patch b/998.patch new file mode 100644 index 0000000..4779f90 --- /dev/null +++ b/998.patch @@ -0,0 +1,43 @@ +From 641f58c9951d9f5746cd63743dd337f1340d7bff Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= +Date: Fri, 7 Apr 2023 14:51:10 +0000 +Subject: [PATCH] Freeze format_time() tests to a specific date to fix test + failures + +Freeze the date when performing the tests for format_time() with +a timezone specified. Since the time object does not specify a date, +the formatter uses the format string specific to the current date. +As a result, if the current DST state is different than when the test +was last updated, it failed. + +This fix covers only regular tests. I have no idea how to do the same +for doctests. + +Issue #988 +--- + tests/test_dates.py | 11 ++++++----- + 1 file changed, 6 insertions(+), 5 deletions(-) + +diff --git a/tests/test_dates.py b/tests/test_dates.py +index b94c710f..3f1fc3fc 100644 +--- a/tests/test_dates.py ++++ b/tests/test_dates.py +@@ -601,12 +601,13 @@ def test_format_time(timezone_getter): + custom = dates.format_time(t, "hh 'o''clock' a, zzzz", tzinfo=eastern, locale='en') + assert custom == "09 o'clock AM, Eastern Daylight Time" + +- t = time(15, 30) +- paris = dates.format_time(t, format='full', tzinfo=paris, locale='fr_FR') +- assert paris == '15:30:00 heure normale d’Europe centrale' ++ with freezegun.freeze_time("2023-01-01"): ++ t = time(15, 30) ++ paris = dates.format_time(t, format='full', tzinfo=paris, locale='fr_FR') ++ assert paris == '15:30:00 heure normale d’Europe centrale' + +- us_east = dates.format_time(t, format='full', tzinfo=eastern, locale='en_US') +- assert us_east == '3:30:00\u202fPM Eastern Standard Time' ++ us_east = dates.format_time(t, format='full', tzinfo=eastern, locale='en_US') ++ assert us_east == '3:30:00\u202fPM Eastern Standard Time' + + + def test_format_skeleton(timezone_getter): diff --git a/babel.spec b/babel.spec index 433eba8..e9f472a 100644 --- a/babel.spec +++ b/babel.spec @@ -15,13 +15,17 @@ Name: babel Version: 2.12.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Tools for internationalizing Python applications License: BSD-3-Clause URL: https://babel.pocoo.org/ Source: %{pypi_source Babel} +# Freeze format_time() tests to a specific date to fix test failures +# Fixes https://bugzilla.redhat.com/2179515 +Patch: https://github.com/python-babel/babel/pull/998.patch + BuildArch: noarch BuildRequires: python3-devel @@ -129,6 +133,9 @@ export TZ=UTC %endif %changelog +* Mon Apr 10 2023 Miro Hrončok - 2.12.1-2 +- Fix DST-related test failures + * Wed Mar 01 2023 Miro Hrončok - 2.12.1-1 - Update to 2.12.1 From b6f41156377ebad6c6cf1da08afa8a6c517dd4d0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Thu, 13 Apr 2023 13:03:00 +0200 Subject: [PATCH 69/96] Deselect doctests failing without pytz, run them with faketime --- babel.spec | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/babel.spec b/babel.spec index e9f472a..cb84780 100644 --- a/babel.spec +++ b/babel.spec @@ -23,7 +23,8 @@ URL: https://babel.pocoo.org/ Source: %{pypi_source Babel} # Freeze format_time() tests to a specific date to fix test failures -# Fixes https://bugzilla.redhat.com/2179515 +# Partially fixes https://bugzilla.redhat.com/2179515 +# 2 doctests are still deselected (as doctests are not part of this fix) Patch: https://github.com/python-babel/babel/pull/998.patch BuildArch: noarch @@ -32,6 +33,7 @@ BuildRequires: python3-devel %if %{without bootstrap} BuildRequires: coreutils +BuildRequires: /usr/bin/faketime # The Python test dependencies are not generated from tox.ini, # because it would require complex patching to be usable # and becasue we want to avoid the tox dependency in ELN/RHEL. @@ -113,7 +115,14 @@ install -D -m 0644 built-docs/man/babel.1 %{buildroot}%{_mandir}/man1/pybabel.1 export TZ=UTC %pyproject_check_import %if %{without bootstrap} -%pytest +# The deselected doctests fail without pytz when run during Eastern Daylight Time +# https://github.com/python-babel/babel/issues/988 +%pytest %{!?pytz_tests:-k "not (babel.dates.format_time or babel.dates.get_timezone_name)"} + +# For good measure, we run the deselected tests during Eastern Standard Time +# The date is more or less in the middle of Eastern Standard Time, the time is arbitrary +%global __pytest faketime '2023-01-09 12:13:14' %__pytest +%pytest -k "babel.dates.format_time or babel.dates.get_timezone_name" %endif %files From d818be73a0b0ff8ca1ee1ecbbd7b2fe8a0d76441 Mon Sep 17 00:00:00 2001 From: Yaakov Selkowitz Date: Sun, 4 Jun 2023 20:09:19 -0400 Subject: [PATCH 70/96] Avoid libfaketime and python-freezegun deps in RHEL builds Both test dependencies, like pytz, are unwanted in RHEL. With TZ=UTC in %check, faketime (which was used to avoid failures in EDT) is no longer needed at all. --- babel.spec | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/babel.spec b/babel.spec index cb84780..29b8c5e 100644 --- a/babel.spec +++ b/babel.spec @@ -11,11 +11,12 @@ # so we make the dependency conditional. # Ideally, the dependency would be conditional on pytz availability in the repo, # but that's not possible in 2023 yet. -%bcond pytz_tests %{undefined rhel} +# Additionally, the date/time tests require freezegun, which is unwanted in RHEL. +%bcond datetime_tests %{undefined rhel} Name: babel Version: 2.12.1 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Tools for internationalizing Python applications License: BSD-3-Clause @@ -33,13 +34,12 @@ BuildRequires: python3-devel %if %{without bootstrap} BuildRequires: coreutils -BuildRequires: /usr/bin/faketime # The Python test dependencies are not generated from tox.ini, # because it would require complex patching to be usable # and becasue we want to avoid the tox dependency in ELN/RHEL. BuildRequires: python3-pytest +%if %{with datetime_tests} BuildRequires: python3-freezegun -%if %{with pytz_tests} # The pytz tests are skipped when pytz is missing BuildRequires: python3-pytz %endif @@ -117,12 +117,10 @@ export TZ=UTC %if %{without bootstrap} # The deselected doctests fail without pytz when run during Eastern Daylight Time # https://github.com/python-babel/babel/issues/988 -%pytest %{!?pytz_tests:-k "not (babel.dates.format_time or babel.dates.get_timezone_name)"} - -# For good measure, we run the deselected tests during Eastern Standard Time -# The date is more or less in the middle of Eastern Standard Time, the time is arbitrary -%global __pytest faketime '2023-01-09 12:13:14' %__pytest -%pytest -k "babel.dates.format_time or babel.dates.get_timezone_name" +# The ignored files use freezegun +%pytest %{!?with_datetime_tests:\ + -k "not (babel.dates.format_time or babel.dates.get_timezone_name)" \ + --ignore tests/test_dates.py --ignore tests/messages/test_frontend.py} %endif %files @@ -142,6 +140,9 @@ export TZ=UTC %endif %changelog +* Mon Jun 05 2023 Yaakov Selkowitz - 2.12.1-3 +- Avoid libfaketime and python-freezegun deps in RHEL builds + * Mon Apr 10 2023 Miro Hrončok - 2.12.1-2 - Fix DST-related test failures From e04c9fc5dc4ba54a71cd51bd2f311d59ab8168f4 Mon Sep 17 00:00:00 2001 From: Python Maint Date: Tue, 13 Jun 2023 20:32:00 +0200 Subject: [PATCH 71/96] Bootstrap for Python 3.12 --- babel.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/babel.spec b/babel.spec index 29b8c5e..b03a8d4 100644 --- a/babel.spec +++ b/babel.spec @@ -1,3 +1,4 @@ +%global _with_bootstrap 1 # There is some bootstrapping involved when upgrading Python 3 # First of all we need babel (this package) to use sphinx # And pytest is at this point not yet ready @@ -16,7 +17,7 @@ Name: babel Version: 2.12.1 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Tools for internationalizing Python applications License: BSD-3-Clause @@ -140,6 +141,9 @@ export TZ=UTC %endif %changelog +* Tue Jun 13 2023 Python Maint - 2.12.1-4 +- Bootstrap for Python 3.12 + * Mon Jun 05 2023 Yaakov Selkowitz - 2.12.1-3 - Avoid libfaketime and python-freezegun deps in RHEL builds From 0f5c60c365a836eb7e62ac8c8c2a09eafb318766 Mon Sep 17 00:00:00 2001 From: Python Maint Date: Fri, 16 Jun 2023 08:21:08 +0200 Subject: [PATCH 72/96] Rebuilt for Python 3.12 --- babel.spec | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/babel.spec b/babel.spec index b03a8d4..b6eebb4 100644 --- a/babel.spec +++ b/babel.spec @@ -1,4 +1,3 @@ -%global _with_bootstrap 1 # There is some bootstrapping involved when upgrading Python 3 # First of all we need babel (this package) to use sphinx # And pytest is at this point not yet ready @@ -17,7 +16,7 @@ Name: babel Version: 2.12.1 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Tools for internationalizing Python applications License: BSD-3-Clause @@ -141,6 +140,9 @@ export TZ=UTC %endif %changelog +* Fri Jun 16 2023 Python Maint - 2.12.1-5 +- Rebuilt for Python 3.12 + * Tue Jun 13 2023 Python Maint - 2.12.1-4 - Bootstrap for Python 3.12 From 1d55f9c163e92f4a591e42df68ff5c7c48fad350 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 19 Jul 2023 14:18:25 +0000 Subject: [PATCH 73/96] Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- babel.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/babel.spec b/babel.spec index b6eebb4..48d644c 100644 --- a/babel.spec +++ b/babel.spec @@ -16,7 +16,7 @@ Name: babel Version: 2.12.1 -Release: 5%{?dist} +Release: 6%{?dist} Summary: Tools for internationalizing Python applications License: BSD-3-Clause @@ -140,6 +140,9 @@ export TZ=UTC %endif %changelog +* Wed Jul 19 2023 Fedora Release Engineering - 2.12.1-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + * Fri Jun 16 2023 Python Maint - 2.12.1-5 - Rebuilt for Python 3.12 From cd7ec00bec554a4bf4b0a9cdfcdab0b6398854c0 Mon Sep 17 00:00:00 2001 From: Petr Viktorin Date: Thu, 21 Sep 2023 13:45:42 +0200 Subject: [PATCH 74/96] Add patch for Python 3.12 compatibility (PEP 701 f-strings) Resolves: RHBZ#2225718 --- 1027.patch | 89 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ babel.spec | 3 ++ 2 files changed, 92 insertions(+) create mode 100644 1027.patch diff --git a/1027.patch b/1027.patch new file mode 100644 index 0000000..2c4bc2a --- /dev/null +++ b/1027.patch @@ -0,0 +1,89 @@ +From be26d03a477a8c7a3919e2ba00121a0f7954bdb5 Mon Sep 17 00:00:00 2001 +From: Petr Viktorin +Date: Thu, 21 Sep 2023 12:45:32 +0200 +Subject: [PATCH] Add F f-string parsing for Python 3.12 (PEP 701) + +Since Python 3.12, f-strings are tokenized and parsed like the rest +of Python's grammar, using the new tokens FSTRING_START, FSTRING_MIDDLE +and FSTRING_END. + +Make the babel message extractor concatenate these three if they're +adjacent to each other. If they're not, that means there are dynamic +substitutions, so the f-string is ignored. +--- + babel/messages/extract.py | 34 ++++++++++++++++++++++++++++++++++ + 1 file changed, 34 insertions(+) + +diff --git a/babel/messages/extract.py b/babel/messages/extract.py +index b6dce6fd..5b67d2b7 100644 +--- a/babel/messages/extract.py ++++ b/babel/messages/extract.py +@@ -33,6 +33,7 @@ + from textwrap import dedent + from tokenize import COMMENT, NAME, OP, STRING, generate_tokens + from typing import TYPE_CHECKING, Any ++import tokenize + + from babel.util import parse_encoding, parse_future_flags, pathmatch + +@@ -89,6 +90,11 @@ def tell(self) -> int: ... + + DEFAULT_MAPPING: list[tuple[str, str]] = [('**.py', 'python')] + ++# New tokens in Python 3.12, or None on older versions ++FSTRING_START = getattr(tokenize, "FSTRING_START", None) ++FSTRING_MIDDLE = getattr(tokenize, "FSTRING_MIDDLE", None) ++FSTRING_END = getattr(tokenize, "FSTRING_END", None) ++ + + def _strip_comment_tags(comments: MutableSequence[str], tags: Iterable[str]): + """Helper function for `extract` that strips comment tags from strings +@@ -497,6 +503,11 @@ def extract_python( + next_line = lambda: fileobj.readline().decode(encoding) + + tokens = generate_tokens(next_line) ++ ++ # Current prefix of a Python 3.12 (PEP 701) f-string, or None if we're not ++ # currently parsing one. ++ current_fstring_start = None ++ + for tok, value, (lineno, _), _, _ in tokens: + if call_stack == -1 and tok == NAME and value in ('def', 'class'): + in_def = True +@@ -558,6 +569,20 @@ def extract_python( + val = _parse_python_string(value, encoding, future_flags) + if val is not None: + buf.append(val) ++ ++ # Python 3.12+, see https://peps.python.org/pep-0701/#new-tokens ++ elif tok == FSTRING_START: ++ current_fstring_start = value ++ elif tok == FSTRING_MIDDLE: ++ if current_fstring_start is not None: ++ current_fstring_start += value ++ elif tok == FSTRING_END: ++ if current_fstring_start is not None: ++ fstring = current_fstring_start + value ++ val = _parse_python_string(fstring, encoding, future_flags) ++ if val is not None: ++ buf.append(val) ++ + elif tok == OP and value == ',': + if buf: + messages.append(''.join(buf)) +@@ -578,6 +603,15 @@ def extract_python( + elif tok == NAME and value in keywords: + funcname = value + ++ if (current_fstring_start is not None ++ and tok not in {FSTRING_START, FSTRING_MIDDLE} ++ ): ++ # In Python 3.12, tokens other than FSTRING_* mean the ++ # f-string is dynamic, so we don't wan't to extract it. ++ # And if it's FSTRING_END, we've already handled it above. ++ # Let's forget that we're in an f-string. ++ current_fstring_start = None ++ + + def _parse_python_string(value: str, encoding: str, future_flags: int) -> str | None: + # Unwrap quotes in a safe manner, maintaining the string's encoding diff --git a/babel.spec b/babel.spec index 48d644c..8f7207f 100644 --- a/babel.spec +++ b/babel.spec @@ -28,6 +28,9 @@ Source: %{pypi_source Babel} # 2 doctests are still deselected (as doctests are not part of this fix) Patch: https://github.com/python-babel/babel/pull/998.patch +# New code for extracting f-strings for Pytohn 3.12 (PEP 701) +Patch: https://github.com/python-babel/babel/pull/1027.patch + BuildArch: noarch BuildRequires: python3-devel From 12e4fe88f386fd42838e366c5132b92a398266ad Mon Sep 17 00:00:00 2001 From: Nils Philippsen Date: Fri, 10 Nov 2023 18:18:55 +0100 Subject: [PATCH 75/96] Update to 2.13.1 Signed-off-by: Nils Philippsen --- 1027.patch | 89 ------------------------------------------------------ 998.patch | 43 -------------------------- babel.spec | 12 ++------ sources | 2 +- 4 files changed, 3 insertions(+), 143 deletions(-) delete mode 100644 1027.patch delete mode 100644 998.patch diff --git a/1027.patch b/1027.patch deleted file mode 100644 index 2c4bc2a..0000000 --- a/1027.patch +++ /dev/null @@ -1,89 +0,0 @@ -From be26d03a477a8c7a3919e2ba00121a0f7954bdb5 Mon Sep 17 00:00:00 2001 -From: Petr Viktorin -Date: Thu, 21 Sep 2023 12:45:32 +0200 -Subject: [PATCH] Add F f-string parsing for Python 3.12 (PEP 701) - -Since Python 3.12, f-strings are tokenized and parsed like the rest -of Python's grammar, using the new tokens FSTRING_START, FSTRING_MIDDLE -and FSTRING_END. - -Make the babel message extractor concatenate these three if they're -adjacent to each other. If they're not, that means there are dynamic -substitutions, so the f-string is ignored. ---- - babel/messages/extract.py | 34 ++++++++++++++++++++++++++++++++++ - 1 file changed, 34 insertions(+) - -diff --git a/babel/messages/extract.py b/babel/messages/extract.py -index b6dce6fd..5b67d2b7 100644 ---- a/babel/messages/extract.py -+++ b/babel/messages/extract.py -@@ -33,6 +33,7 @@ - from textwrap import dedent - from tokenize import COMMENT, NAME, OP, STRING, generate_tokens - from typing import TYPE_CHECKING, Any -+import tokenize - - from babel.util import parse_encoding, parse_future_flags, pathmatch - -@@ -89,6 +90,11 @@ def tell(self) -> int: ... - - DEFAULT_MAPPING: list[tuple[str, str]] = [('**.py', 'python')] - -+# New tokens in Python 3.12, or None on older versions -+FSTRING_START = getattr(tokenize, "FSTRING_START", None) -+FSTRING_MIDDLE = getattr(tokenize, "FSTRING_MIDDLE", None) -+FSTRING_END = getattr(tokenize, "FSTRING_END", None) -+ - - def _strip_comment_tags(comments: MutableSequence[str], tags: Iterable[str]): - """Helper function for `extract` that strips comment tags from strings -@@ -497,6 +503,11 @@ def extract_python( - next_line = lambda: fileobj.readline().decode(encoding) - - tokens = generate_tokens(next_line) -+ -+ # Current prefix of a Python 3.12 (PEP 701) f-string, or None if we're not -+ # currently parsing one. -+ current_fstring_start = None -+ - for tok, value, (lineno, _), _, _ in tokens: - if call_stack == -1 and tok == NAME and value in ('def', 'class'): - in_def = True -@@ -558,6 +569,20 @@ def extract_python( - val = _parse_python_string(value, encoding, future_flags) - if val is not None: - buf.append(val) -+ -+ # Python 3.12+, see https://peps.python.org/pep-0701/#new-tokens -+ elif tok == FSTRING_START: -+ current_fstring_start = value -+ elif tok == FSTRING_MIDDLE: -+ if current_fstring_start is not None: -+ current_fstring_start += value -+ elif tok == FSTRING_END: -+ if current_fstring_start is not None: -+ fstring = current_fstring_start + value -+ val = _parse_python_string(fstring, encoding, future_flags) -+ if val is not None: -+ buf.append(val) -+ - elif tok == OP and value == ',': - if buf: - messages.append(''.join(buf)) -@@ -578,6 +603,15 @@ def extract_python( - elif tok == NAME and value in keywords: - funcname = value - -+ if (current_fstring_start is not None -+ and tok not in {FSTRING_START, FSTRING_MIDDLE} -+ ): -+ # In Python 3.12, tokens other than FSTRING_* mean the -+ # f-string is dynamic, so we don't wan't to extract it. -+ # And if it's FSTRING_END, we've already handled it above. -+ # Let's forget that we're in an f-string. -+ current_fstring_start = None -+ - - def _parse_python_string(value: str, encoding: str, future_flags: int) -> str | None: - # Unwrap quotes in a safe manner, maintaining the string's encoding diff --git a/998.patch b/998.patch deleted file mode 100644 index 4779f90..0000000 --- a/998.patch +++ /dev/null @@ -1,43 +0,0 @@ -From 641f58c9951d9f5746cd63743dd337f1340d7bff Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= -Date: Fri, 7 Apr 2023 14:51:10 +0000 -Subject: [PATCH] Freeze format_time() tests to a specific date to fix test - failures - -Freeze the date when performing the tests for format_time() with -a timezone specified. Since the time object does not specify a date, -the formatter uses the format string specific to the current date. -As a result, if the current DST state is different than when the test -was last updated, it failed. - -This fix covers only regular tests. I have no idea how to do the same -for doctests. - -Issue #988 ---- - tests/test_dates.py | 11 ++++++----- - 1 file changed, 6 insertions(+), 5 deletions(-) - -diff --git a/tests/test_dates.py b/tests/test_dates.py -index b94c710f..3f1fc3fc 100644 ---- a/tests/test_dates.py -+++ b/tests/test_dates.py -@@ -601,12 +601,13 @@ def test_format_time(timezone_getter): - custom = dates.format_time(t, "hh 'o''clock' a, zzzz", tzinfo=eastern, locale='en') - assert custom == "09 o'clock AM, Eastern Daylight Time" - -- t = time(15, 30) -- paris = dates.format_time(t, format='full', tzinfo=paris, locale='fr_FR') -- assert paris == '15:30:00 heure normale d’Europe centrale' -+ with freezegun.freeze_time("2023-01-01"): -+ t = time(15, 30) -+ paris = dates.format_time(t, format='full', tzinfo=paris, locale='fr_FR') -+ assert paris == '15:30:00 heure normale d’Europe centrale' - -- us_east = dates.format_time(t, format='full', tzinfo=eastern, locale='en_US') -- assert us_east == '3:30:00\u202fPM Eastern Standard Time' -+ us_east = dates.format_time(t, format='full', tzinfo=eastern, locale='en_US') -+ assert us_east == '3:30:00\u202fPM Eastern Standard Time' - - - def test_format_skeleton(timezone_getter): diff --git a/babel.spec b/babel.spec index 8f7207f..659272e 100644 --- a/babel.spec +++ b/babel.spec @@ -15,22 +15,14 @@ %bcond datetime_tests %{undefined rhel} Name: babel -Version: 2.12.1 -Release: 6%{?dist} +Version: 2.13.1 +Release: 1%{?dist} Summary: Tools for internationalizing Python applications License: BSD-3-Clause URL: https://babel.pocoo.org/ Source: %{pypi_source Babel} -# Freeze format_time() tests to a specific date to fix test failures -# Partially fixes https://bugzilla.redhat.com/2179515 -# 2 doctests are still deselected (as doctests are not part of this fix) -Patch: https://github.com/python-babel/babel/pull/998.patch - -# New code for extracting f-strings for Pytohn 3.12 (PEP 701) -Patch: https://github.com/python-babel/babel/pull/1027.patch - BuildArch: noarch BuildRequires: python3-devel diff --git a/sources b/sources index 46590d0..82c8952 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (Babel-2.12.1.tar.gz) = 93c4bf343d99a1f47f43f8b828eb79098cb429bac1034d58b5aa49adff68116e458067f3784d997f34515828a7432fd18f7abbaeee59b47a4ee8ea744908b33b +SHA512 (Babel-2.13.1.tar.gz) = c27c76456094927bd43ae46cd3e08fcc729dd810a6092da6c86e863523c10746bb3759e7fc9f5396504ab914743ef013904b63b3aa63338602f23aaf83d42cba From 744617beb6903d772ab4064c44345f4f77add7b4 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 19 Jan 2024 14:05:35 +0000 Subject: [PATCH 76/96] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- babel.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/babel.spec b/babel.spec index 659272e..e416968 100644 --- a/babel.spec +++ b/babel.spec @@ -16,7 +16,7 @@ Name: babel Version: 2.13.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Tools for internationalizing Python applications License: BSD-3-Clause @@ -135,6 +135,9 @@ export TZ=UTC %endif %changelog +* Fri Jan 19 2024 Fedora Release Engineering - 2.13.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Wed Jul 19 2023 Fedora Release Engineering - 2.12.1-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild From 5ba6ca9db8c941948b52a3430574fb73a83e4e7c Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Tue, 23 Jan 2024 00:03:00 +0000 Subject: [PATCH 77/96] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- babel.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/babel.spec b/babel.spec index e416968..4f523fa 100644 --- a/babel.spec +++ b/babel.spec @@ -16,7 +16,7 @@ Name: babel Version: 2.13.1 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Tools for internationalizing Python applications License: BSD-3-Clause @@ -135,6 +135,9 @@ export TZ=UTC %endif %changelog +* Tue Jan 23 2024 Fedora Release Engineering - 2.13.1-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Fri Jan 19 2024 Fedora Release Engineering - 2.13.1-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From 1c572dfac06ba62950b33b7ba6d86ee1a4a37c4a Mon Sep 17 00:00:00 2001 From: Nils Philippsen Date: Fri, 8 Mar 2024 12:21:11 +0100 Subject: [PATCH 78/96] Convert to %autorelease and %autochangelog [skip changelog] --- babel.spec | 356 +---------------------------------------------------- changelog | 352 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 354 insertions(+), 354 deletions(-) create mode 100644 changelog diff --git a/babel.spec b/babel.spec index 4f523fa..3f92f87 100644 --- a/babel.spec +++ b/babel.spec @@ -16,7 +16,7 @@ Name: babel Version: 2.13.1 -Release: 3%{?dist} +Release: %autorelease Summary: Tools for internationalizing Python applications License: BSD-3-Clause @@ -135,356 +135,4 @@ export TZ=UTC %endif %changelog -* Tue Jan 23 2024 Fedora Release Engineering - 2.13.1-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild - -* Fri Jan 19 2024 Fedora Release Engineering - 2.13.1-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild - -* Wed Jul 19 2023 Fedora Release Engineering - 2.12.1-6 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild - -* Fri Jun 16 2023 Python Maint - 2.12.1-5 -- Rebuilt for Python 3.12 - -* Tue Jun 13 2023 Python Maint - 2.12.1-4 -- Bootstrap for Python 3.12 - -* Mon Jun 05 2023 Yaakov Selkowitz - 2.12.1-3 -- Avoid libfaketime and python-freezegun deps in RHEL builds - -* Mon Apr 10 2023 Miro Hrončok - 2.12.1-2 -- Fix DST-related test failures - -* Wed Mar 01 2023 Miro Hrončok - 2.12.1-1 -- Update to 2.12.1 - -* Tue Feb 28 2023 Miro Hrončok - 2.12.0-1 -- Update to 2.12.0 -- No longer depends on pytz -- No longer depends on setuptools -- Update the License tag to SPDX - -* Wed Jan 18 2023 Fedora Release Engineering - 2.11.0-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild - -* Sun Jan 01 2023 Felix Schwarz - 2.11.0-1 -- update to 2.11.0 - -* Wed Jul 20 2022 Fedora Release Engineering - 2.10.3-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild - -* Mon Jun 20 2022 Felix Schwarz - 2.10.3-2 -- backport patch to remove usage of cgi module (rhbz #2083956) - -* Mon Jun 20 2022 Felix Schwarz - 2.10.3-1 -- update to 2.10.3 - -* Mon Jun 13 2022 Python Maint - 2.10.1-4 -- Rebuilt for Python 3.11 - -* Mon Jun 13 2022 Python Maint - 2.10.1-3 -- Bootstrap for Python 3.11 - -* Mon May 16 2022 Nils Philippsen - 2.10.1-2 -- Build and distribute man page for pybabel (#1611174) - -* Fri Apr 22 2022 Felix Schwarz - 2.10.1-1 -- update to 2.10.1 - -* Wed Jan 19 2022 Fedora Release Engineering - 2.9.1-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild - -* Wed Jul 21 2021 Fedora Release Engineering - 2.9.1-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild - -* Thu Jun 03 2021 Python Maint - 2.9.1-3 -- Rebuilt for Python 3.10 - -* Wed Jun 02 2021 Python Maint - 2.9.1-2 -- Bootstrap for Python 3.10 - -* Wed Apr 28 2021 Felix Schwarz - 2.9.1-1 -- update to 2.9.1 - -* Tue Jan 26 2021 Fedora Release Engineering - 2.9.0-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild - -* Mon Dec 21 2020 Miro Hrončok - 2.9.0-3 -- Disable Python 2 build entirely - -* Tue Nov 24 2020 Miro Hrončok -- Disable Python 2 build on RHEL 9+ - -* 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 - -* Sat May 23 2020 Miro Hrončok - 2.8.0-6 -- Rebuilt for Python 3.9 - -* Fri May 22 2020 Miro Hrončok - 2.8.0-5 -- Bootstrap for Python 3.9 - -* Fri May 08 2020 Felix Schwarz - 2.8.0-4 -- reenable Python 2 subpackage for Fedora 33+ (rhbz #1737930) - -* Tue May 05 2020 Felix Schwarz - 2.8.0-3 -- add patch for compatibility with Python 3.9a6 - -* Tue Jan 28 2020 Fedora Release Engineering - 2.8.0-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild - -* Thu Jan 02 2020 Felix Schwarz - 2.8.0-1 -- update to upstream version 2.8.0 - -* Thu Oct 31 2019 Nils Philippsen - 2.7.0-7 -- drop python2-babel only from F33 on as it is needed for trac (for the time - being, #1737930) - -* Thu Oct 31 2019 Nils Philippsen - 2.7.0-6 -- drop python2-babel from F32 on - -* Fri Sep 13 2019 Miro Hrončok - 2.7.0-5 -- Reduce Python 2 build dependencies on Fedora 32 - -* Fri Aug 16 2019 Miro Hrončok - 2.7.0-4 -- Rebuilt for Python 3.8 - -* Thu Aug 15 2019 Miro Hrončok - 2.7.0-3 -- Bootstrap for Python 3.8 - -* Wed Jul 24 2019 Fedora Release Engineering - 2.7.0-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild - -* Mon May 27 2019 Felix Schwarz - 2.7.0-1 -- update to upstream version 2.7.0 - -* Thu Jan 31 2019 Fedora Release Engineering - 2.6.0-6 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild - -* Thu Jul 12 2018 Fedora Release Engineering - 2.6.0-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild - -* Mon Jul 02 2018 Miro Hrončok - 2.6.0-4 -- Rebuilt for Python 3.7 - -* Mon Jul 02 2018 Miro Hrončok - 2.6.0-3 -- Rebuilt for Python 3.7 - -* Fri Jun 29 2018 Felix Schwarz - 2.6.0-2 -- add setting to build without Python 2 support - -* Fri Jun 29 2018 Felix Schwarz - 2.6.0-1 -- update to upstream version 2.6.0 - -* Mon Jun 18 2018 Tomas Orsava - 2.5.1-5 -- Run tests in pytest (as declared in BuildRequires) - -* Sat Jun 16 2018 Miro Hrončok - 2.5.1-4 -- Rebuilt for Python 3.7 - -* Thu Jun 14 2018 Miro Hrončok - 2.5.1-3 -- Bootstrap for Python 3.7 - -* Wed Feb 07 2018 Fedora Release Engineering - 2.5.1-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild - -* Fri Dec 15 2017 Felix Schwarz - 2.5.1-1 -- update to upstream version 2.5.1 - -* Fri Dec 15 2017 Iryna Shcherbina - 2.3.4-7 -- Update Python 2 dependency declarations to new packaging standards - (See https://fedoraproject.org/wiki/FinalizingFedoraSwitchtoPython3) - -* Wed Jul 26 2017 Fedora Release Engineering - 2.3.4-6 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild - -* Fri Feb 10 2017 Fedora Release Engineering - 2.3.4-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild - -* Tue Dec 13 2016 Miro Hrončok - 2.3.4-4 -- Finish bootstrapping for Python 3.6 - -* Tue Dec 13 2016 Miro Hrončok - 2.3.4-3 -- Rebuild for Python 3.6 -- Add "bootstrap" conditions - -* Tue Jul 19 2016 Fedora Release Engineering - 2.3.4-2 -- https://fedoraproject.org/wiki/Changes/Automatic_Provides_for_Python_RPM_Packages - -* Tue May 31 2016 Nils Philippsen -- fix source URL - -* Mon Apr 25 2016 Nils Philippsen - 2.3.4-1 -- version 2.3.4 -- always build Python3 subpackages -- remove obsolete packaging constructs -- update to current Python packaging guidelines -- build docs non-destructively -- tag license file as %%license -- use %%python_provide macro only if present -- update remove-pytz-version patch -- fix build dependencies -- set TZ in %%check - -* Wed Feb 03 2016 Fedora Release Engineering - 1.3-12 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild - -* Tue Nov 10 2015 Fedora Release Engineering - 1.3-11 -- Rebuilt for https://fedoraproject.org/wiki/Changes/python3.5 - -* Fri Nov 6 2015 Toshio Kuratomi - 1.3-10 -- Also make sure that the babel package that has pybabel depends on the correct - packages (python2 packages on F23 or less and python3 packages on F24 and - greater.) - -* Wed Nov 4 2015 Toshio Kuratomi - 1.3-9 -- Install the python3 version of pybabel on Fedora 24+ to match with Fedora's - default python version - -* Wed Jun 17 2015 Fedora Release Engineering - 1.3-8 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild - -* Wed Dec 17 2014 Toshio Kuratomi - 1.3-7 -- Remove pytz version requirement in egginfo as it confuses newer setuptools - -* Mon Jun 30 2014 Toshio Kuratomi - 1.3-6 -- Change python-setuptools-devel BR into python-setuptools - -* Sat Jun 07 2014 Fedora Release Engineering - 1.3-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild - -* Wed May 28 2014 Kalev Lember - 1.3-4 -- Rebuilt for https://fedoraproject.org/wiki/Changes/Python_3.4 - -* Wed Apr 02 2014 Nils Philippsen - 1.3-3 -- fix dependencies (#1083470) - -* Sun Oct 06 2013 Felix Schwarz - 1.3-2 -- enable python3 subpackage - -* Wed Oct 02 2013 Felix Schwarz - 1.3-1 -- update to Babel 1.3 -- disabled %%check as it tries to download the CLDR - -* Sat Aug 03 2013 Fedora Release Engineering - 0.9.6-9 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild - -* Wed Jun 26 2013 Jeffrey C. Ollie - 0.9.6-8 -- split documentation off to a separate subpackage - -* Wed Feb 13 2013 Fedora Release Engineering - 0.9.6-7 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild - -* Thu Oct 18 2012 Nils Philippsen - 0.9.6-6 -- run tests in %%check -- add pytz build requirement for tests - -* Sat Aug 04 2012 David Malcolm - 0.9.6-5 -- rebuild for https://fedoraproject.org/wiki/Features/Python_3.3 - -* Wed Aug 01 2012 Felix Schwarz - 0.9.6-4 -- disable building of non-functional python3 subpackage (#761583) - -* Wed Jul 18 2012 Fedora Release Engineering - 0.9.6-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild - -* Thu Jan 12 2012 Fedora Release Engineering - 0.9.6-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild - -* Tue Jun 07 2011 Nils Philippsen - 0.9.6-1 -- version 0.9.6: - * Backport r493-494: documentation typo fixes. - * Make the CLDR import script work with Python 2.7. - * Fix various typos. - * Fixed Python 2.3 compatibility (ticket #146, #233). - * Sort output of list-locales. - * Make the POT-Creation-Date of the catalog being updated equal to - POT-Creation-Date of the template used to update (ticket #148). - * Use a more explicit error message if no option or argument (command) is - passed to pybabel (ticket #81). - * Keep the PO-Revision-Date if it is not the default value (ticket #148). - * Make --no-wrap work by reworking --width's default and mimic xgettext's - behaviour of always wrapping comments (ticket #145). - * Fixed negative offset handling of Catalog._set_mime_headers (ticket #165). - * Add --project and --version options for commandline (ticket #173). - * Add a __ne__() method to the Local class. - * Explicitly sort instead of using sorted() and don't assume ordering - (Python 2.3 and Jython compatibility). - * Removed ValueError raising for string formatting message checkers if the - string does not contain any string formattings (ticket #150). - * Fix Serbian plural forms (ticket #213). - * Small speed improvement in format_date() (ticket #216). - * Fix number formatting for locales where CLDR specifies alt or draft - items (ticket #217) - * Fix bad check in format_time (ticket #257, reported with patch and tests by - jomae) - * Fix so frontend.CommandLineInterface.run does not accumulate logging - handlers (#227, reported with initial patch by dfraser) - * Fix exception if environment contains an invalid locale setting (#200) -- install python2 rather than python3 executable (#710880) - -* Mon Feb 07 2011 Fedora Release Engineering - 0.9.5-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild - -* Thu Aug 26 2010 Jeffrey C. Ollie - 0.9.5-3 -- Add python3 subpackage - -* Wed Jul 21 2010 David Malcolm - 0.9.5-2 -- Rebuilt for https://fedoraproject.org/wiki/Features/Python_2.7/MassRebuild - -* Wed Apr 7 2010 Jeffrey C. Ollie - 0.9.5-1 -- This release contains a small number of bugfixes over the 0.9.4 -- release. -- -- What's New: -- ----------- -- * Fixed the case where messages containing square brackets would break -- with an unpack error -- * Fuzzy matching regarding plurals should *NOT* be checked against -- len(message.id) because this is always 2, instead, it's should be -- checked against catalog.num_plurals (ticket #212). - -* Fri Jul 24 2009 Fedora Release Engineering - 0.9.4-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild - -* Sat Mar 28 2009 Robert Scheck - 0.9.4-4 -- Added missing requires to python-setuptools for pkg_resources - -* Mon Feb 23 2009 Fedora Release Engineering - 0.9.4-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild - -* Sat Nov 29 2008 Ignacio Vazquez-Abrams - 0.9.4-2 -- Rebuild for Python 2.6 - -* Mon Aug 25 2008 Jeffrey C. Ollie - 0.9.4-1 -- Update to 0.9.4 - -* Thu Jul 10 2008 Jeffrey C. Ollie - 0.9.3-1 -- Update to 0.9.3 - -* Sun Dec 16 2007 Jeffrey C. Ollie - 0.9.1-1 -- Update to 0.9.1 - -* Tue Aug 28 2007 Jeffrey C. Ollie - 0.9-2 -- BR python-setuptools-devel - -* Mon Aug 27 2007 Jeffrey C. Ollie - 0.9-1 -- Update to 0.9 - -* Mon Jul 2 2007 Jeffrey C. Ollie - 0.8.1-1 -- Update to 0.8.1 -- Remove upstreamed patch. - -* Fri Jun 29 2007 Jeffrey C. Ollie - 0.8-3 -- Replace patch with one that actually applies. - -* Fri Jun 29 2007 Jeffrey C. Ollie - 0.8-2 -- Apply upstream patch to rename command line script to "pybabel" - BZ#246208 - -* Thu Jun 21 2007 Jeffrey C. Ollie - 0.8-1 -- First version for Fedora - +%autochangelog diff --git a/changelog b/changelog new file mode 100644 index 0000000..d0fb2ba --- /dev/null +++ b/changelog @@ -0,0 +1,352 @@ +* Tue Jan 23 2024 Fedora Release Engineering - 2.13.1-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Fri Jan 19 2024 Fedora Release Engineering - 2.13.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Wed Jul 19 2023 Fedora Release Engineering - 2.12.1-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + +* Fri Jun 16 2023 Python Maint - 2.12.1-5 +- Rebuilt for Python 3.12 + +* Tue Jun 13 2023 Python Maint - 2.12.1-4 +- Bootstrap for Python 3.12 + +* Mon Jun 05 2023 Yaakov Selkowitz - 2.12.1-3 +- Avoid libfaketime and python-freezegun deps in RHEL builds + +* Mon Apr 10 2023 Miro Hrončok - 2.12.1-2 +- Fix DST-related test failures + +* Wed Mar 01 2023 Miro Hrončok - 2.12.1-1 +- Update to 2.12.1 + +* Tue Feb 28 2023 Miro Hrončok - 2.12.0-1 +- Update to 2.12.0 +- No longer depends on pytz +- No longer depends on setuptools +- Update the License tag to SPDX + +* Wed Jan 18 2023 Fedora Release Engineering - 2.11.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + +* Sun Jan 01 2023 Felix Schwarz - 2.11.0-1 +- update to 2.11.0 + +* Wed Jul 20 2022 Fedora Release Engineering - 2.10.3-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + +* Mon Jun 20 2022 Felix Schwarz - 2.10.3-2 +- backport patch to remove usage of cgi module (rhbz #2083956) + +* Mon Jun 20 2022 Felix Schwarz - 2.10.3-1 +- update to 2.10.3 + +* Mon Jun 13 2022 Python Maint - 2.10.1-4 +- Rebuilt for Python 3.11 + +* Mon Jun 13 2022 Python Maint - 2.10.1-3 +- Bootstrap for Python 3.11 + +* Mon May 16 2022 Nils Philippsen - 2.10.1-2 +- Build and distribute man page for pybabel (#1611174) + +* Fri Apr 22 2022 Felix Schwarz - 2.10.1-1 +- update to 2.10.1 + +* Wed Jan 19 2022 Fedora Release Engineering - 2.9.1-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + +* Wed Jul 21 2021 Fedora Release Engineering - 2.9.1-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + +* Thu Jun 03 2021 Python Maint - 2.9.1-3 +- Rebuilt for Python 3.10 + +* Wed Jun 02 2021 Python Maint - 2.9.1-2 +- Bootstrap for Python 3.10 + +* Wed Apr 28 2021 Felix Schwarz - 2.9.1-1 +- update to 2.9.1 + +* Tue Jan 26 2021 Fedora Release Engineering - 2.9.0-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + +* Mon Dec 21 2020 Miro Hrončok - 2.9.0-3 +- Disable Python 2 build entirely + +* Tue Nov 24 2020 Miro Hrončok +- Disable Python 2 build on RHEL 9+ + +* 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 + +* Sat May 23 2020 Miro Hrončok - 2.8.0-6 +- Rebuilt for Python 3.9 + +* Fri May 22 2020 Miro Hrončok - 2.8.0-5 +- Bootstrap for Python 3.9 + +* Fri May 08 2020 Felix Schwarz - 2.8.0-4 +- reenable Python 2 subpackage for Fedora 33+ (rhbz #1737930) + +* Tue May 05 2020 Felix Schwarz - 2.8.0-3 +- add patch for compatibility with Python 3.9a6 + +* Tue Jan 28 2020 Fedora Release Engineering - 2.8.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + +* Thu Jan 02 2020 Felix Schwarz - 2.8.0-1 +- update to upstream version 2.8.0 + +* Thu Oct 31 2019 Nils Philippsen - 2.7.0-7 +- drop python2-babel only from F33 on as it is needed for trac (for the time + being, #1737930) + +* Thu Oct 31 2019 Nils Philippsen - 2.7.0-6 +- drop python2-babel from F32 on + +* Fri Sep 13 2019 Miro Hrončok - 2.7.0-5 +- Reduce Python 2 build dependencies on Fedora 32 + +* Fri Aug 16 2019 Miro Hrončok - 2.7.0-4 +- Rebuilt for Python 3.8 + +* Thu Aug 15 2019 Miro Hrončok - 2.7.0-3 +- Bootstrap for Python 3.8 + +* Wed Jul 24 2019 Fedora Release Engineering - 2.7.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + +* Mon May 27 2019 Felix Schwarz - 2.7.0-1 +- update to upstream version 2.7.0 + +* Thu Jan 31 2019 Fedora Release Engineering - 2.6.0-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + +* Thu Jul 12 2018 Fedora Release Engineering - 2.6.0-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + +* Mon Jul 02 2018 Miro Hrončok - 2.6.0-4 +- Rebuilt for Python 3.7 + +* Mon Jul 02 2018 Miro Hrončok - 2.6.0-3 +- Rebuilt for Python 3.7 + +* Fri Jun 29 2018 Felix Schwarz - 2.6.0-2 +- add setting to build without Python 2 support + +* Fri Jun 29 2018 Felix Schwarz - 2.6.0-1 +- update to upstream version 2.6.0 + +* Mon Jun 18 2018 Tomas Orsava - 2.5.1-5 +- Run tests in pytest (as declared in BuildRequires) + +* Sat Jun 16 2018 Miro Hrončok - 2.5.1-4 +- Rebuilt for Python 3.7 + +* Thu Jun 14 2018 Miro Hrončok - 2.5.1-3 +- Bootstrap for Python 3.7 + +* Wed Feb 07 2018 Fedora Release Engineering - 2.5.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + +* Fri Dec 15 2017 Felix Schwarz - 2.5.1-1 +- update to upstream version 2.5.1 + +* Fri Dec 15 2017 Iryna Shcherbina - 2.3.4-7 +- Update Python 2 dependency declarations to new packaging standards + (See https://fedoraproject.org/wiki/FinalizingFedoraSwitchtoPython3) + +* Wed Jul 26 2017 Fedora Release Engineering - 2.3.4-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + +* Fri Feb 10 2017 Fedora Release Engineering - 2.3.4-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild + +* Tue Dec 13 2016 Miro Hrončok - 2.3.4-4 +- Finish bootstrapping for Python 3.6 + +* Tue Dec 13 2016 Miro Hrončok - 2.3.4-3 +- Rebuild for Python 3.6 +- Add "bootstrap" conditions + +* Tue Jul 19 2016 Fedora Release Engineering - 2.3.4-2 +- https://fedoraproject.org/wiki/Changes/Automatic_Provides_for_Python_RPM_Packages + +* Tue May 31 2016 Nils Philippsen +- fix source URL + +* Mon Apr 25 2016 Nils Philippsen - 2.3.4-1 +- version 2.3.4 +- always build Python3 subpackages +- remove obsolete packaging constructs +- update to current Python packaging guidelines +- build docs non-destructively +- tag license file as %%license +- use %%python_provide macro only if present +- update remove-pytz-version patch +- fix build dependencies +- set TZ in %%check + +* Wed Feb 03 2016 Fedora Release Engineering - 1.3-12 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild + +* Tue Nov 10 2015 Fedora Release Engineering - 1.3-11 +- Rebuilt for https://fedoraproject.org/wiki/Changes/python3.5 + +* Fri Nov 6 2015 Toshio Kuratomi - 1.3-10 +- Also make sure that the babel package that has pybabel depends on the correct + packages (python2 packages on F23 or less and python3 packages on F24 and + greater.) + +* Wed Nov 4 2015 Toshio Kuratomi - 1.3-9 +- Install the python3 version of pybabel on Fedora 24+ to match with Fedora's + default python version + +* Wed Jun 17 2015 Fedora Release Engineering - 1.3-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild + +* Wed Dec 17 2014 Toshio Kuratomi - 1.3-7 +- Remove pytz version requirement in egginfo as it confuses newer setuptools + +* Mon Jun 30 2014 Toshio Kuratomi - 1.3-6 +- Change python-setuptools-devel BR into python-setuptools + +* Sat Jun 07 2014 Fedora Release Engineering - 1.3-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild + +* Wed May 28 2014 Kalev Lember - 1.3-4 +- Rebuilt for https://fedoraproject.org/wiki/Changes/Python_3.4 + +* Wed Apr 02 2014 Nils Philippsen - 1.3-3 +- fix dependencies (#1083470) + +* Sun Oct 06 2013 Felix Schwarz - 1.3-2 +- enable python3 subpackage + +* Wed Oct 02 2013 Felix Schwarz - 1.3-1 +- update to Babel 1.3 +- disabled %%check as it tries to download the CLDR + +* Sat Aug 03 2013 Fedora Release Engineering - 0.9.6-9 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild + +* Wed Jun 26 2013 Jeffrey C. Ollie - 0.9.6-8 +- split documentation off to a separate subpackage + +* Wed Feb 13 2013 Fedora Release Engineering - 0.9.6-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild + +* Thu Oct 18 2012 Nils Philippsen - 0.9.6-6 +- run tests in %%check +- add pytz build requirement for tests + +* Sat Aug 04 2012 David Malcolm - 0.9.6-5 +- rebuild for https://fedoraproject.org/wiki/Features/Python_3.3 + +* Wed Aug 01 2012 Felix Schwarz - 0.9.6-4 +- disable building of non-functional python3 subpackage (#761583) + +* Wed Jul 18 2012 Fedora Release Engineering - 0.9.6-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild + +* Thu Jan 12 2012 Fedora Release Engineering - 0.9.6-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild + +* Tue Jun 07 2011 Nils Philippsen - 0.9.6-1 +- version 0.9.6: + * Backport r493-494: documentation typo fixes. + * Make the CLDR import script work with Python 2.7. + * Fix various typos. + * Fixed Python 2.3 compatibility (ticket #146, #233). + * Sort output of list-locales. + * Make the POT-Creation-Date of the catalog being updated equal to + POT-Creation-Date of the template used to update (ticket #148). + * Use a more explicit error message if no option or argument (command) is + passed to pybabel (ticket #81). + * Keep the PO-Revision-Date if it is not the default value (ticket #148). + * Make --no-wrap work by reworking --width's default and mimic xgettext's + behaviour of always wrapping comments (ticket #145). + * Fixed negative offset handling of Catalog._set_mime_headers (ticket #165). + * Add --project and --version options for commandline (ticket #173). + * Add a __ne__() method to the Local class. + * Explicitly sort instead of using sorted() and don't assume ordering + (Python 2.3 and Jython compatibility). + * Removed ValueError raising for string formatting message checkers if the + string does not contain any string formattings (ticket #150). + * Fix Serbian plural forms (ticket #213). + * Small speed improvement in format_date() (ticket #216). + * Fix number formatting for locales where CLDR specifies alt or draft + items (ticket #217) + * Fix bad check in format_time (ticket #257, reported with patch and tests by + jomae) + * Fix so frontend.CommandLineInterface.run does not accumulate logging + handlers (#227, reported with initial patch by dfraser) + * Fix exception if environment contains an invalid locale setting (#200) +- install python2 rather than python3 executable (#710880) + +* Mon Feb 07 2011 Fedora Release Engineering - 0.9.5-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild + +* Thu Aug 26 2010 Jeffrey C. Ollie - 0.9.5-3 +- Add python3 subpackage + +* Wed Jul 21 2010 David Malcolm - 0.9.5-2 +- Rebuilt for https://fedoraproject.org/wiki/Features/Python_2.7/MassRebuild + +* Wed Apr 7 2010 Jeffrey C. Ollie - 0.9.5-1 +- This release contains a small number of bugfixes over the 0.9.4 +- release. +- +- What's New: +- ----------- +- * Fixed the case where messages containing square brackets would break +- with an unpack error +- * Fuzzy matching regarding plurals should *NOT* be checked against +- len(message.id) because this is always 2, instead, it's should be +- checked against catalog.num_plurals (ticket #212). + +* Fri Jul 24 2009 Fedora Release Engineering - 0.9.4-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild + +* Sat Mar 28 2009 Robert Scheck - 0.9.4-4 +- Added missing requires to python-setuptools for pkg_resources + +* Mon Feb 23 2009 Fedora Release Engineering - 0.9.4-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild + +* Sat Nov 29 2008 Ignacio Vazquez-Abrams - 0.9.4-2 +- Rebuild for Python 2.6 + +* Mon Aug 25 2008 Jeffrey C. Ollie - 0.9.4-1 +- Update to 0.9.4 + +* Thu Jul 10 2008 Jeffrey C. Ollie - 0.9.3-1 +- Update to 0.9.3 + +* Sun Dec 16 2007 Jeffrey C. Ollie - 0.9.1-1 +- Update to 0.9.1 + +* Tue Aug 28 2007 Jeffrey C. Ollie - 0.9-2 +- BR python-setuptools-devel + +* Mon Aug 27 2007 Jeffrey C. Ollie - 0.9-1 +- Update to 0.9 + +* Mon Jul 2 2007 Jeffrey C. Ollie - 0.8.1-1 +- Update to 0.8.1 +- Remove upstreamed patch. + +* Fri Jun 29 2007 Jeffrey C. Ollie - 0.8-3 +- Replace patch with one that actually applies. + +* Fri Jun 29 2007 Jeffrey C. Ollie - 0.8-2 +- Apply upstream patch to rename command line script to "pybabel" - BZ#246208 + +* Thu Jun 21 2007 Jeffrey C. Ollie - 0.8-1 +- First version for Fedora From 90a9a561c72b6eec0d3b0b9d22073200e4ed465b Mon Sep 17 00:00:00 2001 From: Nils Philippsen Date: Fri, 8 Mar 2024 12:24:34 +0100 Subject: [PATCH 79/96] Update to 2.14.0 Signed-off-by: Nils Philippsen --- babel.spec | 2 +- sources | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/babel.spec b/babel.spec index 3f92f87..5513985 100644 --- a/babel.spec +++ b/babel.spec @@ -15,7 +15,7 @@ %bcond datetime_tests %{undefined rhel} Name: babel -Version: 2.13.1 +Version: 2.14.0 Release: %autorelease Summary: Tools for internationalizing Python applications diff --git a/sources b/sources index 82c8952..595d448 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (Babel-2.13.1.tar.gz) = c27c76456094927bd43ae46cd3e08fcc729dd810a6092da6c86e863523c10746bb3759e7fc9f5396504ab914743ef013904b63b3aa63338602f23aaf83d42cba +SHA512 (Babel-2.14.0.tar.gz) = cfcd93bc5e57e3d23b8fb67f77fdeeb08183cc5ef9a6e044085a090cec3d722cf658e740c639f5a834df11a4cff0dacafdbba435184d77a78d56fc0bb6b62fd2 From 3826743792724b2cfece8c8d531c2926f287064d Mon Sep 17 00:00:00 2001 From: Nils Philippsen Date: Mon, 6 May 2024 17:45:07 +0200 Subject: [PATCH 80/96] Update to 2.15.0 Make the source URL and top directory lower-case, too. Signed-off-by: Nils Philippsen --- .gitignore | 1 + babel.spec | 6 +++--- sources | 2 +- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 1180ae8..3c3b448 100644 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,4 @@ /Babel-*/ /results_babel /babel-upstream.git +/babel-2.15.0.tar.gz diff --git a/babel.spec b/babel.spec index 5513985..03ff769 100644 --- a/babel.spec +++ b/babel.spec @@ -15,13 +15,13 @@ %bcond datetime_tests %{undefined rhel} Name: babel -Version: 2.14.0 +Version: 2.15.0 Release: %autorelease Summary: Tools for internationalizing Python applications License: BSD-3-Clause URL: https://babel.pocoo.org/ -Source: %{pypi_source Babel} +Source: %{pypi_source} BuildArch: noarch @@ -77,7 +77,7 @@ Documentation for Babel %endif %prep -%autosetup -p1 -n Babel-%{version} +%autosetup -p1 -n babel-%{version} %generate_buildrequires %pyproject_buildrequires diff --git a/sources b/sources index 595d448..2bf2d8f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (Babel-2.14.0.tar.gz) = cfcd93bc5e57e3d23b8fb67f77fdeeb08183cc5ef9a6e044085a090cec3d722cf658e740c639f5a834df11a4cff0dacafdbba435184d77a78d56fc0bb6b62fd2 +SHA512 (babel-2.15.0.tar.gz) = 8cff4dbbe84047f7e8b625772036d2a23b6f7dfc36aa15332e581d4331fdac1d0308341294741afc43f3180368a7cc7675f68f28bbf94a621c693a822d4a2028 From d5859636d0e9d59beb11f0881508ac0fa8688c1f Mon Sep 17 00:00:00 2001 From: Python Maint Date: Fri, 7 Jun 2024 08:38:08 +0200 Subject: [PATCH 81/96] Bootstrap for Python 3.13 --- babel.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/babel.spec b/babel.spec index 03ff769..7f80838 100644 --- a/babel.spec +++ b/babel.spec @@ -1,3 +1,4 @@ +%global _with_bootstrap 1 # There is some bootstrapping involved when upgrading Python 3 # First of all we need babel (this package) to use sphinx # And pytest is at this point not yet ready From 52405b554a2e7608e91e556425e22ff307b4eedb Mon Sep 17 00:00:00 2001 From: Python Maint Date: Fri, 7 Jun 2024 20:41:48 +0200 Subject: [PATCH 82/96] Rebuilt for Python 3.13 --- babel.spec | 1 - 1 file changed, 1 deletion(-) diff --git a/babel.spec b/babel.spec index 7f80838..03ff769 100644 --- a/babel.spec +++ b/babel.spec @@ -1,4 +1,3 @@ -%global _with_bootstrap 1 # There is some bootstrapping involved when upgrading Python 3 # First of all we need babel (this package) to use sphinx # And pytest is at this point not yet ready From 20fb132c9213df4dd5e45dc969296e13efce8e05 Mon Sep 17 00:00:00 2001 From: Lukas Zachar Date: Fri, 16 Jul 2021 12:30:11 +0200 Subject: [PATCH 83/96] CI: Import simple smoke test from c9s Cherry-picked from https://gitlab.com/redhat/centos-stream/rpms/babel/-/commit/2b4517848cb76e781b0c65bfd325a7ecf719e7dc --- .fmf/version | 1 + plans.fmf | 4 ++++ tests/smoke.fmf | 7 +++++++ tests/smoke.py | 4 ++++ 4 files changed, 16 insertions(+) create mode 100644 .fmf/version create mode 100644 plans.fmf create mode 100644 tests/smoke.fmf create mode 100644 tests/smoke.py diff --git a/.fmf/version b/.fmf/version new file mode 100644 index 0000000..d00491f --- /dev/null +++ b/.fmf/version @@ -0,0 +1 @@ +1 diff --git a/plans.fmf b/plans.fmf new file mode 100644 index 0000000..e6427de --- /dev/null +++ b/plans.fmf @@ -0,0 +1,4 @@ +discover: + how: fmf +execute: + how: tmt diff --git a/tests/smoke.fmf b/tests/smoke.fmf new file mode 100644 index 0000000..c9d69ca --- /dev/null +++ b/tests/smoke.fmf @@ -0,0 +1,7 @@ +description: | + Runs very simple babel example which should always work +test: python3 smoke.py +framework: shell +require: +- python3 +- python3-babel diff --git a/tests/smoke.py b/tests/smoke.py new file mode 100644 index 0000000..4364761 --- /dev/null +++ b/tests/smoke.py @@ -0,0 +1,4 @@ +from datetime import date +from babel.dates import format_date + +assert format_date(date(2021,3,1), locale='en') == 'Mar 1, 2021' From 2494b11c1d2d3172710b262cb5889459f9e979db Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Tue, 14 May 2024 22:22:09 +0200 Subject: [PATCH 84/96] CI: Run upstream testsuite --- plans.fmf | 1 + tests/testsuite.fmf | 16 ++++++++++++++++ 2 files changed, 17 insertions(+) create mode 100644 tests/testsuite.fmf diff --git a/plans.fmf b/plans.fmf index e6427de..890b3bb 100644 --- a/plans.fmf +++ b/plans.fmf @@ -1,4 +1,5 @@ discover: how: fmf + dist-git-source: true execute: how: tmt diff --git a/tests/testsuite.fmf b/tests/testsuite.fmf new file mode 100644 index 0000000..7229764 --- /dev/null +++ b/tests/testsuite.fmf @@ -0,0 +1,16 @@ +summary: upstream testsuite +require: + - babel + - python3-babel + - python3-pip + - python3-pytest + - python3-setuptools # for test_setuptools_frontend + - python3-dateutil # required by freezegun + - python3-six # required by freezegun + # pytz and freezegun installed from PyPI, not available in RHEL +environment: + TZ: UTC +test: | + pip install pytz==2024.1 freezegun==1.5.1 && + cd $(dirname $TMT_SOURCE_DIR/babel-*/tests) && + pytest -v From 0af2170594a0b664365239bad94796fa4cd4d4ae Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 17 Jul 2024 18:00:21 +0000 Subject: [PATCH 85/96] Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild From ffa8ed04dc7f7c696af430d51daf7e6a35407190 Mon Sep 17 00:00:00 2001 From: Nils Philippsen Date: Mon, 19 Aug 2024 16:56:06 +0200 Subject: [PATCH 86/96] Update to 2.16.0 Signed-off-by: Nils Philippsen --- .gitignore | 1 + babel.spec | 2 +- sources | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 3c3b448..ad87558 100644 --- a/.gitignore +++ b/.gitignore @@ -5,3 +5,4 @@ /results_babel /babel-upstream.git /babel-2.15.0.tar.gz +/babel-2.16.0.tar.gz diff --git a/babel.spec b/babel.spec index 03ff769..ed9e1d6 100644 --- a/babel.spec +++ b/babel.spec @@ -15,7 +15,7 @@ %bcond datetime_tests %{undefined rhel} Name: babel -Version: 2.15.0 +Version: 2.16.0 Release: %autorelease Summary: Tools for internationalizing Python applications diff --git a/sources b/sources index 2bf2d8f..3c0a9de 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (babel-2.15.0.tar.gz) = 8cff4dbbe84047f7e8b625772036d2a23b6f7dfc36aa15332e581d4331fdac1d0308341294741afc43f3180368a7cc7675f68f28bbf94a621c693a822d4a2028 +SHA512 (babel-2.16.0.tar.gz) = c80b52cd38eb2fb34b1d19ef3b6c50c16b129a4137d42eba900e3f77e81a5ad03ca319aa37dbdfd3bb7cbe31adbfa6007413962c348912dc9dca09d55fa4438b From 38e693761d3d8f890714e1c215bf2a24178557ac Mon Sep 17 00:00:00 2001 From: Nils Philippsen Date: Wed, 8 Jan 2025 23:15:08 +0100 Subject: [PATCH 87/96] Fix building with Sphinx 8 (rhbz#2329834) Signed-off-by: Nils Philippsen --- ....py-to-add-compatibility-with-sphinx.patch | 27 +++++++++++++++++++ babel.spec | 3 +++ 2 files changed, 30 insertions(+) create mode 100644 0001-Adjust-docs-conf.py-to-add-compatibility-with-sphinx.patch diff --git a/0001-Adjust-docs-conf.py-to-add-compatibility-with-sphinx.patch b/0001-Adjust-docs-conf.py-to-add-compatibility-with-sphinx.patch new file mode 100644 index 0000000..52d41a3 --- /dev/null +++ b/0001-Adjust-docs-conf.py-to-add-compatibility-with-sphinx.patch @@ -0,0 +1,27 @@ +From 2d34ef5c6681ba7bee8ad7edb2b24702e6aaccb3 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Hrn=C4=8Diar?= +Date: Mon, 9 Dec 2024 13:05:34 +0100 +Subject: [PATCH] Adjust docs/conf.py to add compatibility with sphinx 8 + (#1155) + +Fixes: #1143 +--- + docs/conf.py | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/docs/conf.py b/docs/conf.py +index 08ff9a0..cec8d3b 100644 +--- a/docs/conf.py ++++ b/docs/conf.py +@@ -252,7 +252,7 @@ texinfo_documents = [ + #texinfo_show_urls = 'footnote' + + intersphinx_mapping = { +- 'https://docs.python.org/3/': None, ++ 'python': ('https://docs.python.org/3/', None), + } + + extlinks = { +-- +2.47.1 + diff --git a/babel.spec b/babel.spec index ed9e1d6..2a134db 100644 --- a/babel.spec +++ b/babel.spec @@ -23,6 +23,9 @@ License: BSD-3-Clause URL: https://babel.pocoo.org/ Source: %{pypi_source} +# https://github.com/python-babel/babel/pull/1155 +Patch: 0001-Adjust-docs-conf.py-to-add-compatibility-with-sphinx.patch + BuildArch: noarch BuildRequires: python3-devel From 55e41b67a6350c8f4e59f64bb94c25c4c6f69e1f Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 16 Jan 2025 12:11:23 +0000 Subject: [PATCH 88/96] Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild From 536bf9ad0e4ae45c5bae8a258381ca6b17f0c36a Mon Sep 17 00:00:00 2001 From: Nils Philippsen Date: Tue, 4 Feb 2025 10:16:02 +0100 Subject: [PATCH 89/96] Fix typo [skip changelog] Signed-off-by: Nils Philippsen --- babel.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/babel.spec b/babel.spec index 2a134db..92b02f3 100644 --- a/babel.spec +++ b/babel.spec @@ -34,7 +34,7 @@ BuildRequires: python3-devel BuildRequires: coreutils # The Python test dependencies are not generated from tox.ini, # because it would require complex patching to be usable -# and becasue we want to avoid the tox dependency in ELN/RHEL. +# and because we want to avoid the tox dependency in ELN/RHEL. BuildRequires: python3-pytest %if %{with datetime_tests} BuildRequires: python3-freezegun From 8404007b110b407f858baafc0b93f589b0f8eb41 Mon Sep 17 00:00:00 2001 From: Nils Philippsen Date: Tue, 4 Feb 2025 10:14:53 +0100 Subject: [PATCH 90/96] Update to 2.17.0 Signed-off-by: Nils Philippsen --- .gitignore | 1 + ....py-to-add-compatibility-with-sphinx.patch | 27 ------------------- babel.spec | 5 +--- sources | 2 +- 4 files changed, 3 insertions(+), 32 deletions(-) delete mode 100644 0001-Adjust-docs-conf.py-to-add-compatibility-with-sphinx.patch diff --git a/.gitignore b/.gitignore index ad87558..3f19259 100644 --- a/.gitignore +++ b/.gitignore @@ -6,3 +6,4 @@ /babel-upstream.git /babel-2.15.0.tar.gz /babel-2.16.0.tar.gz +/babel-2.17.0.tar.gz diff --git a/0001-Adjust-docs-conf.py-to-add-compatibility-with-sphinx.patch b/0001-Adjust-docs-conf.py-to-add-compatibility-with-sphinx.patch deleted file mode 100644 index 52d41a3..0000000 --- a/0001-Adjust-docs-conf.py-to-add-compatibility-with-sphinx.patch +++ /dev/null @@ -1,27 +0,0 @@ -From 2d34ef5c6681ba7bee8ad7edb2b24702e6aaccb3 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Hrn=C4=8Diar?= -Date: Mon, 9 Dec 2024 13:05:34 +0100 -Subject: [PATCH] Adjust docs/conf.py to add compatibility with sphinx 8 - (#1155) - -Fixes: #1143 ---- - docs/conf.py | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/docs/conf.py b/docs/conf.py -index 08ff9a0..cec8d3b 100644 ---- a/docs/conf.py -+++ b/docs/conf.py -@@ -252,7 +252,7 @@ texinfo_documents = [ - #texinfo_show_urls = 'footnote' - - intersphinx_mapping = { -- 'https://docs.python.org/3/': None, -+ 'python': ('https://docs.python.org/3/', None), - } - - extlinks = { --- -2.47.1 - diff --git a/babel.spec b/babel.spec index 92b02f3..f34aaf2 100644 --- a/babel.spec +++ b/babel.spec @@ -15,7 +15,7 @@ %bcond datetime_tests %{undefined rhel} Name: babel -Version: 2.16.0 +Version: 2.17.0 Release: %autorelease Summary: Tools for internationalizing Python applications @@ -23,9 +23,6 @@ License: BSD-3-Clause URL: https://babel.pocoo.org/ Source: %{pypi_source} -# https://github.com/python-babel/babel/pull/1155 -Patch: 0001-Adjust-docs-conf.py-to-add-compatibility-with-sphinx.patch - BuildArch: noarch BuildRequires: python3-devel diff --git a/sources b/sources index 3c0a9de..e73b338 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (babel-2.16.0.tar.gz) = c80b52cd38eb2fb34b1d19ef3b6c50c16b129a4137d42eba900e3f77e81a5ad03ca319aa37dbdfd3bb7cbe31adbfa6007413962c348912dc9dca09d55fa4438b +SHA512 (babel-2.17.0.tar.gz) = 978ca79e9ce95ecfcfc8e3c6fe1b9b273088cc166490e64edd59c71f6793472d987ea982a67e8cf9d840b8e25f602639ad45e3a35c1482d39cbf09e0c21071ae From d566fff4f37544ac6cc4f72c6baae28248e1a8f0 Mon Sep 17 00:00:00 2001 From: Python Maint Date: Mon, 2 Jun 2025 20:10:16 +0200 Subject: [PATCH 91/96] Bootstrap for Python 3.14 --- babel.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/babel.spec b/babel.spec index f34aaf2..d040f33 100644 --- a/babel.spec +++ b/babel.spec @@ -1,3 +1,4 @@ +%global _with_bootstrap 1 # There is some bootstrapping involved when upgrading Python 3 # First of all we need babel (this package) to use sphinx # And pytest is at this point not yet ready From 82137b95c67e1f3fbb24ed53902dcd38b1f7dfb3 Mon Sep 17 00:00:00 2001 From: Python Maint Date: Tue, 3 Jun 2025 13:19:21 +0200 Subject: [PATCH 92/96] Rebuilt for Python 3.14 --- babel.spec | 1 - 1 file changed, 1 deletion(-) diff --git a/babel.spec b/babel.spec index d040f33..f34aaf2 100644 --- a/babel.spec +++ b/babel.spec @@ -1,4 +1,3 @@ -%global _with_bootstrap 1 # There is some bootstrapping involved when upgrading Python 3 # First of all we need babel (this package) to use sphinx # And pytest is at this point not yet ready From c03e0f22b8ae219f2a3d4594c551c87309e2b124 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 23 Jul 2025 17:32:39 +0000 Subject: [PATCH 93/96] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild From c44a6cb135efabe6adfbb8cf341ba588d6efb0b3 Mon Sep 17 00:00:00 2001 From: Python Maint Date: Fri, 15 Aug 2025 12:39:22 +0200 Subject: [PATCH 94/96] Rebuilt for Python 3.14.0rc2 bytecode From 5eb0e23cb910ee7767a8fa9b19316be4365c8467 Mon Sep 17 00:00:00 2001 From: Python Maint Date: Fri, 19 Sep 2025 12:08:21 +0200 Subject: [PATCH 95/96] Rebuilt for Python 3.14.0rc3 bytecode From 98e20d5bdc8bec2b47d9e91b5b2123ebc68137af Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 16 Jan 2026 04:14:44 +0000 Subject: [PATCH 96/96] Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild