diff --git a/pelican-4.8.0.tar.gz b/pelican-4.8.0.tar.gz deleted file mode 100644 index ce4a235..0000000 --- a/pelican-4.8.0.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:e61e6a31abff4354477b211fdaeb14dd0d4df08e2d44a1c64f918f2c09c5e249 -size 1401791 diff --git a/pelican-4.9.1-gh.tar.gz b/pelican-4.9.1-gh.tar.gz new file mode 100644 index 0000000..3084015 --- /dev/null +++ b/pelican-4.9.1-gh.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:6c5f2a15470600d2d8a0955ad48619dd1c8c063fa901d6cde46c9524a2eb974f +size 1374443 diff --git a/python-311.patch b/python-311.patch deleted file mode 100644 index 0095f08..0000000 --- a/python-311.patch +++ /dev/null @@ -1,49 +0,0 @@ -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 3b23d65..b820730 100644 --- a/python-pelican.changes +++ b/python-pelican.changes @@ -1,3 +1,42 @@ +------------------------------------------------------------------- +Sun Nov 26 10:49:06 UTC 2023 - Dirk Müller + +- reference github tarball +- cleanup dependencies + +------------------------------------------------------------------- +Sun Nov 19 16:49:31 UTC 2023 - Benoît Monin + +- update to version 4.9.1: + * Ensure tzdata dependency is installed on Windows +- additional changes from 4.9.0: + * Upgrade code to new minimum supported Python version: 3.8 + * Settings support for pathlib.Path (#2758) + * Various improvements to Simple theme (#2976 & #3234) + * Use Furo as Sphinx documentation theme (#3023) + * Default to 100 articles maximum in feeds (#3127) + * Add period_archives common context variable (#3148) + * Use watchfiles as the file-watching backend (#3151) + * Add GitHub Actions workflow for GitHub Pages (#3189) + * Allow dataclasses in settings (#3204) + * Switch build tool to PDM instead of Setuptools/Poetry (#3220) + * Provide a plugin_enabled Jinja test for themes (#3235) + * Preserve connection order in Blinker (#3238) + * Remove social icons from default notmyidea theme (#3240) + * Remove unreliable WRITE_SELECTED feature (#3243) + * Importer: Report broken embedded video links when importing + from Tumblr (#3177) + * Importer: Remove newline addition when iterating Photo post + types (#3178) + * Importer: Force timestamp conversion in Tumblr importer to be + UTC with offset (#3221) + * Importer: Use tempfile for intermediate HTML file for Pandoc + (#3221) + * Switch linters to Ruff (#3223) +- drop python-311.patch: fixed upstream +- update BuildRequires and Requires to match upstream requirements +- switch build to pdm + ------------------------------------------------------------------- Wed Mar 1 07:17:54 UTC 2023 - Daniel Garcia @@ -444,7 +483,7 @@ Sun Nov 9 16:39:39 UTC 2014 - benoit.monin@gmx.fr ------------------------------------------------------------------- Sat Sep 20 15:02:41 UTC 2014 - benoit.monin@gmx.fr -- add the requires as buildrequires to guarantee they are available +- add the requires as buildrequires to guarantee they are available ------------------------------------------------------------------- Mon Sep 15 19:07:03 UTC 2014 - benoit.monin@gmx.fr diff --git a/python-pelican.spec b/python-pelican.spec index 2eb892d..a67c9f2 100644 --- a/python-pelican.spec +++ b/python-pelican.spec @@ -16,65 +16,64 @@ # -%define skip_python2 1 +%{?sle15_python_module_pythons} Name: python-pelican -Version: 4.8.0 +Version: 4.9.1 Release: 0 Summary: A tool to generate a static blog from reStructuredText or Markdown input files License: AGPL-3.0-only Group: Development/Languages/Python 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} -BuildRequires: %{python_module Sphinx} -BuildRequires: %{python_module Unidecode} -BuildRequires: %{python_module beautifulsoup4} -BuildRequires: %{python_module black} -BuildRequires: %{python_module blinker >= 1.4} -BuildRequires: %{python_module docutils >= 0.16} -BuildRequires: %{python_module feedgenerator >= 1.9} -BuildRequires: %{python_module flake8-import-order} -BuildRequires: %{python_module flake8} -BuildRequires: %{python_module invoke} -BuildRequires: %{python_module isort} -BuildRequires: %{python_module livereload} -BuildRequires: %{python_module lxml} -BuildRequires: %{python_module psutil} -BuildRequires: %{python_module pytest-cov} -BuildRequires: %{python_module pytest-xdist} -BuildRequires: %{python_module pytest} -BuildRequires: %{python_module python-dateutil} -BuildRequires: %{python_module pytz >= 0a} -BuildRequires: %{python_module rich >= 10.1} -BuildRequires: %{python_module setuptools} -BuildRequires: %{python_module sphinx_rtd_theme} -BuildRequires: %{python_module typogrify} +Source: https://github.com/getpelican/pelican/archive/refs/tags/%{version}.tar.gz#/pelican-%{version}-gh.tar.gz +BuildRequires: %{python_module Jinja2 >= 3.1.2} +BuildRequires: %{python_module Pygments >= 2.16.1} +BuildRequires: %{python_module Unidecode >= 1.3.7} +BuildRequires: %{python_module base >= 3.8.1} +BuildRequires: %{python_module blinker >= 1.7.0} +BuildRequires: %{python_module docutils >= 0.20.1} +BuildRequires: %{python_module feedgenerator >= 2.1.0} +BuildRequires: %{python_module ordered-set >= 4.1.0} +BuildRequires: %{python_module pdm} +BuildRequires: %{python_module pip} +BuildRequires: %{python_module python-dateutil >= 2.8.2} +BuildRequires: %{python_module rich >= 13.6.0} +BuildRequires: %{python_module watchfiles >= 0.21.0} BuildRequires: fdupes BuildRequires: git-core BuildRequires: pandoc BuildRequires: python-rpm-macros -Requires: python-Jinja2 >= 2.11 -Requires: python-Pygments -Requires: python-Unidecode -Requires: python-blinker -Requires: python-docutils >= 0.15 -Requires: python-feedgenerator >= 1.9 -Requires: python-python-dateutil -Requires: python-pytz >= 0a -Requires: python-rich >= 10.1 +Requires: python-Jinja2 >= 3.1.2 +Requires: python-Pygments >= 2.16.1 +Requires: python-Unidecode >= 1.3.7 +Requires: python-blinker >= 1.7.0 +Requires: python-docutils >= 0.20.1 +Requires: python-feedgenerator >= 2.1.0 +Requires: python-ordered-set >= 4.1.0 +Requires: python-python-dateutil >= 2.8.2 +Requires: python-rich >= 13.6.0 +Requires: python-watchfiles >= 0.21.0 Requires(post): update-alternatives Requires(postun):update-alternatives Suggests: asciidoc -Suggests: python-Markdown >= 3.1.1 -Suggests: python-typogrify +Suggests: python-Markdown >= 3.5.1 +Suggests: python-typogrify >= 2.0.7 BuildArch: noarch ExcludeArch: %{ix86} +# SECTION test +BuildRequires: %{python_module Markdown >= 3.5.1} +BuildRequires: %{python_module Sphinx >= 7.1.2} +BuildRequires: %{python_module beautifulsoup4 >= 4.12.2} +BuildRequires: %{python_module invoke >= 2.2.0} +BuildRequires: %{python_module livereload >= 2.6.3} +BuildRequires: %{python_module lxml >= 4.9.3} +BuildRequires: %{python_module psutil >= 5.9.6} +BuildRequires: %{python_module pytest >= 7.4.3} +BuildRequires: %{python_module pytest-cov >= 4.1.0} +BuildRequires: %{python_module pytest-sugar >= 0.9.7} +BuildRequires: %{python_module pytest-xdist >= 3.4.0} +BuildRequires: %{python_module tomli >= 2.0.1 if %python_base < 3.11} +BuildRequires: %{python_module typogrify >= 2.0.7} +# /SECTION %python_subpackages %description @@ -107,13 +106,17 @@ sed -i '1d' \ pelican/tools/pelican_themes.py \ pelican/tools/pelican_quickstart.py # remove executable bit, this is not a script -chmod -x pelican/tools/templates/publishconf.py.jinja2 +chmod -x \ + pelican/tools/pelican_import.py \ + pelican/tools/pelican_themes.py \ + pelican/tools/pelican_quickstart.py \ + pelican/tools/templates/publishconf.py.jinja2 %build -%python_build +%pyproject_wheel %install -%python_install +%pyproject_install %python_expand %fdupes %{buildroot}%{$python_sitelib} for p in pelican pelican-import pelican-plugins pelican-quickstart pelican-themes; do @@ -141,6 +144,6 @@ export PYTHONPATH=. %python_alternative %{_bindir}/pelican-quickstart %python_alternative %{_bindir}/pelican-themes %{python_sitelib}/pelican -%{python_sitelib}/pelican-*.egg-info +%{python_sitelib}/pelican-*.dist-info %changelog