From 71d8ae73f54512c91598384da2fd559b8d136a8f Mon Sep 17 00:00:00 2001 From: Gwyn Ciesla Date: Jun 25 2020 18:26:22 +0000 Subject: 4.2.0 --- diff --git a/.gitignore b/.gitignore index 256a95a..5ce0035 100644 --- a/.gitignore +++ b/.gitignore @@ -6,3 +6,4 @@ /pelican-3.7.0.tar.gz /pelican-3.7.1.tar.gz /pelican-4.0.1.tar.gz +/pelican-4.2.0.tar.gz diff --git a/pelican-3.7.0-fix-changelog.patch b/pelican-3.7.0-fix-changelog.patch deleted file mode 100644 index 5c9548d..0000000 --- a/pelican-3.7.0-fix-changelog.patch +++ /dev/null @@ -1,24 +0,0 @@ -From 01d536d7c9ddd6e1090d69b5f4445e37d4019d40 Mon Sep 17 00:00:00 2001 -From: Justin Mayer -Date: Sat, 31 Dec 2016 15:10:46 -0800 -Subject: [PATCH] Replace m-dash with semi-colon in changelog - -Stop-gap measure to address: -https://github.com/getpelican/pelican/commit/e3ab685a26b3dd2d198319b625d380c4f80afbf7#commitcomment-20333961 ---- - docs/changelog.rst | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/docs/changelog.rst b/docs/changelog.rst -index 3186835..1956e47 100644 ---- a/docs/changelog.rst -+++ b/docs/changelog.rst -@@ -14,7 +14,7 @@ Next release - ```` for modifications - * Simplify Atom feed ID generation and support URL fragments - * Produce category feeds with category-specific titles --* RSS feeds now default to summary instead of full content — -+* RSS feeds now default to summary instead of full content; - set ``RSS_FEED_SUMMARY_ONLY = False`` to revert to previous behavior - * Replace ``MD_EXTENSIONS`` with ``MARKDOWN`` setting - * Replace ``JINJA_EXTENSIONS`` with more-robust ``JINJA_ENVIRONMENT`` setting diff --git a/python-pelican-test-fixes.patch b/python-pelican-test-fixes.patch deleted file mode 100644 index 6248383..0000000 --- a/python-pelican-test-fixes.patch +++ /dev/null @@ -1,86 +0,0 @@ -diff -up pelican/tests/test_contents.py.bak pelican/tests/test_contents.py ---- pelican/tests/test_contents.py.bak 2014-02-05 12:22:17.023268309 +0100 -+++ pelican/tests/test_contents.py 2014-02-05 12:22:29.919254413 +0100 -@@ -111,44 +111,6 @@ class TestPage(unittest.TestCase): - page.settings = get_settings(PAGE_SAVE_AS='{directory}/{slug}') - self.assertEqual(page.save_as, 'test-dir/foo-bar') - -- def test_datetime(self): -- # If DATETIME is set to a tuple, it should be used to override LOCALE -- dt = datetime(2015, 9, 13) -- -- page_kwargs = self._copy_page_kwargs() -- -- # set its date to dt -- page_kwargs['metadata']['date'] = dt -- page = Page(**page_kwargs) -- -- self.assertEqual(page.locale_date, -- dt.strftime(DEFAULT_CONFIG['DEFAULT_DATE_FORMAT'])) -- -- page_kwargs['settings'] = get_settings() -- -- # I doubt this can work on all platforms ... -- if platform == "win32": -- locale = 'jpn' -- else: -- locale = 'ja_JP.utf8' -- page_kwargs['settings']['DATE_FORMATS'] = {'jp': (locale, -- '%Y-%m-%d(%a)')} -- page_kwargs['metadata']['lang'] = 'jp' -- -- import locale as locale_module -- try: -- page = Page(**page_kwargs) -- self.assertEqual(page.locale_date, '2015-09-13(\u65e5)') -- except locale_module.Error: -- # The constructor of ``Page`` will try to set the locale to -- # ``ja_JP.utf8``. But this attempt will failed when there is no -- # such locale in the system. You can see which locales there are -- # in your system with ``locale -a`` command. -- # -- # Until we find some other method to test this functionality, we -- # will simply skip this test. -- unittest.skip("There is no locale %s in this system." % locale) -- - def test_template(self): - # Pages default to page, metadata overwrites - default_page = Page(**self.page_kwargs) -diff -up pelican/tests/test_pelican.py.bak pelican/tests/test_pelican.py ---- pelican/tests/test_pelican.py.bak 2013-09-24 21:57:07.000000000 +0200 -+++ pelican/tests/test_pelican.py 2014-02-05 12:21:43.063305060 +0100 -@@ -52,18 +52,6 @@ class TestPelican(LoggedTestCase): - locale.setlocale(locale.LC_ALL, self.old_locale) - super(TestPelican, self).tearDown() - -- def assertFilesEqual(self, diff): -- msg = ("some generated files differ from the expected functional " -- "tests output.\n" -- "This is probably because the HTML generated files " -- "changed. If these changes are normal, please refer " -- "to docs/contribute.rst to update the expected " -- "output of the functional tests.") -- -- self.assertEqual(diff['left_only'], [], msg=msg) -- self.assertEqual(diff['right_only'], [], msg=msg) -- self.assertEqual(diff['diff_files'], [], msg=msg) -- - def test_basic_generation_works(self): - # when running pelican without settings, it should pick up the default - # ones and generate correct output without raising any exception -@@ -75,7 +63,6 @@ class TestPelican(LoggedTestCase): - pelican = Pelican(settings=settings) - mute(True)(pelican.run)() - dcmp = dircmp(self.temp_path, os.path.join(OUTPUT_PATH, 'basic')) -- self.assertFilesEqual(recursiveDiff(dcmp)) - self.assertLogCountEqual( - count=4, - msg="Unable to find.*skipping url replacement", -@@ -91,7 +78,6 @@ class TestPelican(LoggedTestCase): - pelican = Pelican(settings=settings) - mute(True)(pelican.run)() - dcmp = dircmp(self.temp_path, os.path.join(OUTPUT_PATH, 'custom')) -- self.assertFilesEqual(recursiveDiff(dcmp)) - - def test_theme_static_paths_copy(self): - # the same thing with a specified set of settings should work diff --git a/python-pelican.spec b/python-pelican.spec index e6ababc..6fdf09b 100644 --- a/python-pelican.spec +++ b/python-pelican.spec @@ -1,7 +1,7 @@ %global pypi_name pelican Name: python-%{pypi_name} -Version: 4.0.1 -Release: 7%{?dist} +Version: 4.2.0 +Release: 1%{?dist} Summary: A tool to generate a static blog from reStructuredText or Markdown input files License: AGPLv3 @@ -126,6 +126,9 @@ ln -s ./pelican-themes %{buildroot}/%{_bindir}/pelican-themes-3 %changelog +* Thu Jun 25 2020 Gwyn Ciesla - 4.2.0-1 +- 4.2.0 + * Tue May 26 2020 Miro Hrončok - 4.0.1-7 - Rebuilt for Python 3.9 diff --git a/sources b/sources index ca07fbd..7782508 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (pelican-4.0.1.tar.gz) = 26f91046124bb92de6fa31d17ab89f743cf9408c15b9b259875e2378342133313368418da083d1d4abc5de0537806a9dede327719c8fcf89d135805c47618a4a +SHA512 (pelican-4.2.0.tar.gz) = 9c9f41306739acc4c6c6a7ddf50d955d958af7be1da197b42859b95405b18ab5b597fee4f9aabdf98cd508204558bff9c4f0c11bf4e5367b16e32568682a21e6