From bfb7c617e0d2c7063abaf936751bc8a9bb28dfaa39b245978bb65e89242bbbe1 Mon Sep 17 00:00:00 2001 From: Daniel Garcia Date: Wed, 1 Mar 2023 07:18:33 +0000 Subject: [PATCH] - Add python-311.patch to support python 3.11 gh#getpelican/pelican#3055 OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-pelican?expand=0&rev=45 --- python-311.patch | 49 ++++++++++++++++++++++++++++++++++++++++++ python-pelican.changes | 6 ++++++ python-pelican.spec | 5 +++-- 3 files changed, 58 insertions(+), 2 deletions(-) create mode 100644 python-311.patch diff --git a/python-311.patch b/python-311.patch new file mode 100644 index 0000000..0095f08 --- /dev/null +++ b/python-311.patch @@ -0,0 +1,49 @@ +From 3937028c00344dc82798750e5f13a8a1aea890d4 Mon Sep 17 00:00:00 2001 +From: Deniz Turgut +Date: Wed, 26 Oct 2022 23:27:06 +0300 +Subject: [PATCH 2/2] update unit test to avoid using deprecated + locale.getdefaultlocale() + +--- + pelican/tests/test_settings.py | 16 ++++++++-------- + 1 file changed, 8 insertions(+), 8 deletions(-) + +Index: pelican-4.8.0/pelican/tests/test_settings.py +=================================================================== +--- pelican-4.8.0.orig/pelican/tests/test_settings.py ++++ pelican-4.8.0/pelican/tests/test_settings.py +@@ -2,7 +2,6 @@ import copy + import locale + import os + from os.path import abspath, dirname, join +-from sys import platform + + + from pelican.settings import (DEFAULT_CONFIG, DEFAULT_THEME, +@@ -136,18 +135,19 @@ class TestSettingsConfiguration(unittest + settings['ARTICLE_DIR'] + settings['PAGE_DIR'] + +- # locale.getdefaultlocale() is broken on Windows +- # See: https://bugs.python.org/issue37945 +- @unittest.skipIf(platform == 'win32', "Doesn't work on Windows") + def test_default_encoding(self): +- # Test that the default locale is set if not specified in settings ++ # Test that the user locale is set if not specified in settings + +- # Reset locale to Python's default locale + locale.setlocale(locale.LC_ALL, 'C') +- self.assertEqual(self.settings['LOCALE'], DEFAULT_CONFIG['LOCALE']) ++ # empty string = user system locale ++ self.assertEqual(self.settings['LOCALE'], ['']) + + configure_settings(self.settings) +- self.assertEqual(locale.getlocale(), locale.getdefaultlocale()) ++ lc_time = locale.getlocale(locale.LC_TIME) # should be set to user locale ++ ++ # explicitly set locale to user pref and test ++ locale.setlocale(locale.LC_TIME, '') ++ self.assertEqual(lc_time, locale.getlocale(locale.LC_TIME)) + + def test_invalid_settings_throw_exception(self): + # Test that the path name is valid diff --git a/python-pelican.changes b/python-pelican.changes index 0e1be56..3b23d65 100644 --- a/python-pelican.changes +++ b/python-pelican.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Wed Mar 1 07:17:54 UTC 2023 - Daniel Garcia + +- Add python-311.patch to support python 3.11 + gh#getpelican/pelican#3055 + ------------------------------------------------------------------- Fri Jul 15 12:36:30 UTC 2022 - BenoƮt Monin diff --git a/python-pelican.spec b/python-pelican.spec index 962948d..2eb892d 100644 --- a/python-pelican.spec +++ b/python-pelican.spec @@ -1,7 +1,7 @@ # # spec file for package python-pelican # -# Copyright (c) 2022 SUSE LLC +# Copyright (c) 2023 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,7 +17,6 @@ %define skip_python2 1 -%{?!python_module:%define python_module() python-%{**} python3-%{**}} Name: python-pelican Version: 4.8.0 Release: 0 @@ -28,6 +27,8 @@ URL: https://getpelican.com/ # Use the source instead of the pypi release for the tests # Source: https://github.com/getpelican/pelican/archive/%%{version}.tar.gz Source: pelican-%{version}.tar.gz +# PATCH-FIX-UPSTREAM python-311.patch gh#getpelican/pelican#3055 +Patch0: python-311.patch BuildRequires: %{python_module Jinja2 >= 2.11} BuildRequires: %{python_module Markdown >= 3.1.1} BuildRequires: %{python_module Pygments}