Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package python-pelican for openSUSE:Factory checked in at 2021-10-26 20:13:44 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/python-pelican (Old) and /work/SRC/openSUSE:Factory/.python-pelican.new.1890 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "python-pelican" Tue Oct 26 20:13:44 2021 rev:17 rq:927351 version:4.7.1 Changes: -------- --- /work/SRC/openSUSE:Factory/python-pelican/python-pelican.changes 2021-10-23 00:52:24.233159176 +0200 +++ /work/SRC/openSUSE:Factory/.python-pelican.new.1890/python-pelican.changes 2021-10-26 20:14:24.710032565 +0200 @@ -1,0 +2,11 @@ +Sun Oct 24 18:30:43 UTC 2021 - Sebastien CHAVAUX <[email protected]> + +- Update to version 4.7.1: + * Extend rich logging to server component (#2927) + * Fix an issue where metadata flagged to be discarded was being cached (#2926) + * Adjust suffix in server to allow redirection when needed (#2931) + * Add MIME types for web fonts (#2929) + * Distribute sample data used to run tests (#2935) + * Add Python 3.10 to test matrix + +------------------------------------------------------------------- Old: ---- pelican-4.7.0.tar.gz New: ---- pelican-4.7.1.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-pelican.spec ++++++ --- /var/tmp/diff_new_pack.gPeoHM/_old 2021-10-26 20:14:25.362032909 +0200 +++ /var/tmp/diff_new_pack.gPeoHM/_new 2021-10-26 20:14:25.366032912 +0200 @@ -19,7 +19,7 @@ %define skip_python2 1 %{?!python_module:%define python_module() python-%{**} python3-%{**}} Name: python-pelican -Version: 4.7.0 +Version: 4.7.1 Release: 0 Summary: A tool to generate a static blog from reStructuredText or Markdown input files License: AGPL-3.0-only ++++++ pelican-4.7.0.tar.gz -> pelican-4.7.1.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pelican-4.7.0/.github/workflows/main.yml new/pelican-4.7.1/.github/workflows/main.yml --- old/pelican-4.7.0/.github/workflows/main.yml 2021-10-01 16:10:26.000000000 +0200 +++ new/pelican-4.7.1/.github/workflows/main.yml 2021-10-12 16:45:30.000000000 +0200 @@ -16,17 +16,19 @@ matrix: config: - os: ubuntu - python: 3.6 + python: "3.6" - os: ubuntu - python: 3.7 + python: "3.7" - os: ubuntu - python: 3.8 + python: "3.8" - os: ubuntu - python: 3.9 + python: "3.9" + - os: ubuntu + python: "3.10" - os: macos - python: 3.7 + python: "3.7" - os: windows - python: 3.7 + python: "3.7" steps: - uses: actions/checkout@v2 @@ -86,7 +88,7 @@ - name: Setup Python uses: actions/setup-python@v2 with: - python-version: 3.7 + python-version: "3.7" - name: Set pip cache (Linux) uses: actions/cache@v2 if: startsWith(runner.os, 'Linux') @@ -110,7 +112,7 @@ - name: Setup Python uses: actions/setup-python@v2 with: - python-version: 3.7 + python-version: "3.7" - name: Set pip cache (Linux) uses: actions/cache@v2 if: startsWith(runner.os, 'Linux') @@ -136,7 +138,7 @@ - name: Setup Python uses: actions/setup-python@v2 with: - python-version: 3.7 + python-version: "3.7" - name: Check release id: check_release run: | diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pelican-4.7.0/MANIFEST.in new/pelican-4.7.1/MANIFEST.in --- old/pelican-4.7.0/MANIFEST.in 2021-10-01 16:10:26.000000000 +0200 +++ new/pelican-4.7.1/MANIFEST.in 2021-10-12 16:45:30.000000000 +0200 @@ -1,3 +1,6 @@ include *.rst recursive-include pelican *.html *.css *png *.rst *.markdown *.md *.mkd *.xml *.py *.jinja2 include LICENSE THANKS docs/changelog.rst pyproject.toml +graft samples +global-exclude __pycache__ +global-exclude *.py[co] \ No newline at end of file diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pelican-4.7.0/THANKS new/pelican-4.7.1/THANKS --- old/pelican-4.7.0/THANKS 2021-10-01 16:10:26.000000000 +0200 +++ new/pelican-4.7.1/THANKS 2021-10-12 16:45:30.000000000 +0200 @@ -1,9 +1,9 @@ -Pelican is a project originally created by Alexis M??taireau -<https://blog.notmyidea.org/> and subsequently maintained by Justin Mayer -<https://justinmayer.com/>, but there are a large number of people that have -contributed or implemented key features over time. We do our best to keep this -list up-to-date, but you can also have a look at the nice contributor graphs -produced by GitHub: https://github.com/getpelican/pelican/graphs/contributors +Pelican is a project led by Justin Mayer <https://justinmayer.com/> +and originally created by Alexis M??taireau <https://blog.notmyidea.org/>, but +there are a large number of people that have contributed or implemented key +features over time. We do our best to keep this list up-to-date, but you can +also have a look at the nice contributor graphs produced by GitHub: +https://github.com/getpelican/pelican/graphs/contributors If you want to contribute, check the documentation section about how to do so: <https://docs.getpelican.com/en/latest/contribute.html> @@ -26,6 +26,7 @@ asselinpaul Axel Haustant Ben Rosser (TC01) +Ben Sturmfels Beno??t HERVIER Bernhard Scheirle Borgar @@ -64,6 +65,7 @@ Florian Jacob Florian Preinstorfer F??lix Delval +Frederik Ring Freeculture George V. Reilly Guillaume @@ -77,6 +79,7 @@ Ivan Dyedov James King James Rowe +Jason K. Moore jawher Jered Boxman Jerome @@ -87,6 +90,7 @@ John Mastro Jo??kull So??lberg Au??unsson Jomel Imperio +Jonas Borges Joseph Reagle Joshua Adelman Julian Berman @@ -96,6 +100,7 @@ Kyle Fuller Laureline Guerin Leonard Huang +Leonardo Giordani Leroy Jiang Lucas Cimon Marcel Hellkamp @@ -113,8 +118,11 @@ Michael Yanovich Mike Yumatov Mikhail Korobov +Mirek D??ugosz m-r-r mviera +Nam Nguyen +NianQing Yao Nico Di Rocco Nicolas Duhamel Nicolas Perriault @@ -124,6 +132,8 @@ Pavel Puchkin Perry Roper Peter Desmet +Peter Sabaini +Petr Viktorin Philippe Pepiot Rachid Belaid Randall Degges @@ -133,6 +143,7 @@ renhbo Richard Duivenvoorde Rogdham +Romain Porte Roman Skvazh Ronny Pfannschmidt Rory McCann @@ -153,8 +164,10 @@ Thanos Lefteris Thomas Thurman Tobias +Tom Adler Tomi Pievil??inen Trae Blain +Tristan Miller Tshepang Lekhonkhobe Valentin-Costel H??loiu Vlad Niculae diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pelican-4.7.0/docs/changelog.rst new/pelican-4.7.1/docs/changelog.rst --- old/pelican-4.7.0/docs/changelog.rst 2021-10-01 16:10:26.000000000 +0200 +++ new/pelican-4.7.1/docs/changelog.rst 2021-10-12 16:45:30.000000000 +0200 @@ -1,6 +1,16 @@ Release history ############### +4.7.1 - 2021-10-12 +================== + +* Extend rich logging to server component `(#2927) <https://github.com/getpelican/pelican/pull/2927>`_ +* Fix an issue where metadata flagged to be discarded was being cached `(#2926) <https://github.com/getpelican/pelican/pull/2926>`_ +* Adjust suffix in server to allow redirection when needed `(#2931) <https://github.com/getpelican/pelican/pull/2931>`_ +* Add MIME types for web fonts `(#2929) <https://github.com/getpelican/pelican/pull/2929>`_ +* Distribute sample data used to run tests `(#2935) <https://github.com/getpelican/pelican/pull/2935>`_ +* Add Python 3.10 to test matrix + 4.7.0 - 2021-10-01 ================== diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pelican-4.7.0/docs/index.rst new/pelican-4.7.1/docs/index.rst --- old/pelican-4.7.0/docs/index.rst 2021-10-01 16:10:26.000000000 +0200 +++ new/pelican-4.7.1/docs/index.rst 2021-10-12 16:45:30.000000000 +0200 @@ -61,8 +61,8 @@ content publish settings - themes plugins + themes pelican-themes importer faq diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pelican-4.7.0/docs/themes.rst new/pelican-4.7.1/docs/themes.rst --- old/pelican-4.7.0/docs/themes.rst 2021-10-01 16:10:26.000000000 +0200 +++ new/pelican-4.7.1/docs/themes.rst 2021-10-12 16:45:30.000000000 +0200 @@ -1,7 +1,17 @@ .. _theming-pelican: -Creating themes -############### +Themes +###### + +There is a community-managed repository of `Pelican Themes`_ for people to share +and use. + +Please note that while we do our best to review and merge theme contributions, +they are submitted by the Pelican community and thus may have varying levels of +support and interoperability. + +Creating Themes +~~~~~~~~~~~~~~~ To generate its HTML output, Pelican uses the `Jinja <https://palletsprojects.com/p/jinja/>`_ templating engine due to its flexibility and @@ -50,7 +60,7 @@ .. _templates-variables: -Templates and variables +Templates and Variables ======================= The idea is to use a simple syntax that you can embed into your HTML pages. @@ -61,7 +71,7 @@ as they are in all-caps. You can access them directly. -Common variables +Common Variables ---------------- All of these settings will be available to all templates. @@ -571,3 +581,8 @@ """""""" You can download this example theme :download:`here <_static/theme-basic.zip>`. + + +.. Links + +.. _`Pelican Themes`: https://github.com/getpelican/pelican-themes diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pelican-4.7.0/pelican/__init__.py new/pelican-4.7.1/pelican/__init__.py --- old/pelican-4.7.0/pelican/__init__.py 2021-10-01 16:10:26.000000000 +0200 +++ new/pelican-4.7.1/pelican/__init__.py 2021-10-12 16:45:30.000000000 +0200 @@ -476,6 +476,10 @@ def listen(server, port, output, excqueue=None): + # set logging level to at least "INFO" (so we can see the server requests) + if logger.level < logging.INFO: + logger.setLevel(logging.INFO) + RootedHTTPServer.allow_reuse_address = True try: httpd = RootedHTTPServer( @@ -487,8 +491,8 @@ return try: - print("\nServing site at: http://{}:{} - Tap CTRL-C to stop".format( - server, port)) + console.print("Serving site at: http://{}:{} - Tap CTRL-C to stop".format( + server, port)) httpd.serve_forever() except Exception as e: if excqueue is not None: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pelican-4.7.0/pelican/readers.py new/pelican-4.7.1/pelican/readers.py --- old/pelican-4.7.0/pelican/readers.py 2021-10-01 16:10:26.000000000 +0200 +++ new/pelican-4.7.1/pelican/readers.py 2021-10-12 16:45:30.000000000 +0200 @@ -571,8 +571,9 @@ content, reader_metadata = self.get_cached_data(path, (None, None)) if content is None: content, reader_metadata = reader.read(path) + reader_metadata = _filter_discardable_metadata(reader_metadata) self.cache_data(path, (content, reader_metadata)) - metadata.update(_filter_discardable_metadata(reader_metadata)) + metadata.update(reader_metadata) if content: # find images with empty alt diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pelican-4.7.0/pelican/server.py new/pelican-4.7.1/pelican/server.py --- old/pelican-4.7.0/pelican/server.py 2021-10-01 16:10:26.000000000 +0200 +++ new/pelican-4.7.1/pelican/server.py 2021-10-12 16:45:30.000000000 +0200 @@ -12,6 +12,7 @@ except ImportError: magic_from_file = None +from pelican.log import console # noqa: F401 from pelican.log import init as init_logging logger = logging.getLogger(__name__) @@ -42,6 +43,18 @@ class ComplexHTTPRequestHandler(server.SimpleHTTPRequestHandler): SUFFIXES = ['.html', '/index.html', '/', ''] + extensions_map = { + **server.SimpleHTTPRequestHandler.extensions_map, + ** { + # web fonts + ".oft": "font/oft", + ".sfnt": "font/sfnt", + ".ttf": "font/ttf", + ".woff": "font/woff", + ".woff2": "font/woff2", + }, + } + def translate_path(self, path): # abandon query parameters path = path.split('?', 1)[0] @@ -75,10 +88,15 @@ def get_path_that_exists(self, original_path): # Try to strip trailing slash + trailing_slash = original_path.endswith('/') original_path = original_path.rstrip('/') # Try to detect file by applying various suffixes tries = [] for suffix in self.SUFFIXES: + if not trailing_slash and suffix == '/': + # if original request does not have trailing slash, skip the '/' suffix + # so that base class can redirect if needed + continue path = original_path + suffix if os.path.exists(self.translate_path(path)): return path @@ -99,6 +117,9 @@ return mimetype + def log_message(self, format, *args): + logger.info(format, *args) + class RootedHTTPServer(server.HTTPServer): def __init__(self, base_path, *args, **kwargs): diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pelican-4.7.0/pelican/tests/content/article_with_markdown_and_empty_tags.md new/pelican-4.7.1/pelican/tests/content/article_with_markdown_and_empty_tags.md --- old/pelican-4.7.0/pelican/tests/content/article_with_markdown_and_empty_tags.md 1970-01-01 01:00:00.000000000 +0100 +++ new/pelican-4.7.1/pelican/tests/content/article_with_markdown_and_empty_tags.md 2021-10-12 16:45:30.000000000 +0200 @@ -0,0 +1,4 @@ +Title: Article with markdown and empty tags +Tags: + +This is some content. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pelican-4.7.0/pelican/tests/test_generators.py new/pelican-4.7.1/pelican/tests/test_generators.py --- old/pelican-4.7.0/pelican/tests/test_generators.py 2021-10-01 16:10:26.000000000 +0200 +++ new/pelican-4.7.1/pelican/tests/test_generators.py 2021-10-12 16:45:30.000000000 +0200 @@ -265,6 +265,8 @@ ['This is a super article !', 'published', 'yeah', 'article'], ['This is a super article !', 'published', 'Default', 'article'], ['Article with an inline SVG', 'published', 'Default', 'article'], + ['Article with markdown and empty tags', 'published', 'Default', + 'article'], ['This is an article with category !', 'published', 'yeah', 'article'], ['This is an article with multiple authors!', 'published', @@ -569,6 +571,7 @@ 'Article title', 'Article with Nonconformant HTML meta tags', 'Article with an inline SVG', + 'Article with markdown and empty tags', 'Article with markdown and nested summary metadata', 'Article with markdown and summary metadata multi', 'Article with markdown and summary metadata single', diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pelican-4.7.0/pelican/tests/test_pelican.py new/pelican-4.7.1/pelican/tests/test_pelican.py --- old/pelican-4.7.0/pelican/tests/test_pelican.py 2021-10-01 16:10:26.000000000 +0200 +++ new/pelican-4.7.1/pelican/tests/test_pelican.py 2021-10-12 16:45:30.000000000 +0200 @@ -56,9 +56,8 @@ def assertDirsEqual(self, left_path, right_path): out, err = subprocess.Popen( - ['git', 'diff', '--no-ext-diff', '--exit-code', + ['git', '--no-pager', 'diff', '--no-ext-diff', '--exit-code', '-w', left_path, right_path], - env={'PAGER': ''}, stdout=subprocess.PIPE, stderr=subprocess.PIPE ).communicate() diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pelican-4.7.0/pelican/tests/test_readers.py new/pelican-4.7.1/pelican/tests/test_readers.py --- old/pelican-4.7.0/pelican/tests/test_readers.py 2021-10-01 16:10:26.000000000 +0200 +++ new/pelican-4.7.1/pelican/tests/test_readers.py 2021-10-12 16:45:30.000000000 +0200 @@ -18,6 +18,7 @@ def read_file(self, path, **kwargs): # Isolate from future API changes to readers.read_file + r = readers.Readers(settings=get_settings(**kwargs)) return r.read_file(base_path=CONTENT_PATH, path=path) @@ -795,6 +796,23 @@ self.assertEqual(page.content, expected) self.assertEqual(page.title, expected_title) + def test_metadata_has_no_discarded_data(self): + md_filename = 'article_with_markdown_and_empty_tags.md' + + r = readers.Readers(cache_name='cache', settings=get_settings( + CACHE_CONTENT=True)) + page = r.read_file(base_path=CONTENT_PATH, path=md_filename) + + __, cached_metadata = r.get_cached_data( + _path(md_filename), (None, None)) + + expected = { + 'title': 'Article with markdown and empty tags' + } + self.assertEqual(cached_metadata, expected) + self.assertNotIn('tags', page.metadata) + self.assertDictHasSubset(page.metadata, expected) + class HTMLReaderTest(ReaderTest): def test_article_with_comments(self): diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pelican-4.7.0/pelican/tests/test_server.py new/pelican-4.7.1/pelican/tests/test_server.py --- old/pelican-4.7.0/pelican/tests/test_server.py 2021-10-01 16:10:26.000000000 +0200 +++ new/pelican-4.7.1/pelican/tests/test_server.py 2021-10-12 16:45:30.000000000 +0200 @@ -43,14 +43,18 @@ os.mkdir(os.path.join(self.temp_output, 'baz')) for suffix in ['', '/']: + # foo.html has precedence over foo/index.html path = handler.get_path_that_exists('foo' + suffix) self.assertEqual(path, 'foo.html') + # folder with index.html should return folder/index.html path = handler.get_path_that_exists('bar' + suffix) self.assertEqual(path, 'bar/index.html') + # folder without index.html should return same as input path = handler.get_path_that_exists('baz' + suffix) - self.assertEqual(path, 'baz/') + self.assertEqual(path, 'baz' + suffix) + # not existing path should return None path = handler.get_path_that_exists('quux' + suffix) self.assertIsNone(path) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pelican-4.7.0/pelican/tools/pelican_quickstart.py new/pelican-4.7.1/pelican/tools/pelican_quickstart.py --- old/pelican-4.7.0/pelican/tools/pelican_quickstart.py 2021-10-01 16:10:26.000000000 +0200 +++ new/pelican-4.7.1/pelican/tools/pelican_quickstart.py 2021-10-12 16:45:30.000000000 +0200 @@ -17,7 +17,7 @@ import tzlocal _DEFAULT_TIMEZONE = tzlocal.get_localzone().zone except ImportError: - _DEFAULT_TIMEZONE = 'Europe/Paris' + _DEFAULT_TIMEZONE = 'Europe/Rome' from pelican import __version__ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pelican-4.7.0/pelican/tools/templates/Makefile.jinja2 new/pelican-4.7.1/pelican/tools/templates/Makefile.jinja2 --- old/pelican-4.7.0/pelican/tools/templates/Makefile.jinja2 2021-10-01 16:10:26.000000000 +0200 +++ new/pelican-4.7.1/pelican/tools/templates/Makefile.jinja2 2021-10-12 16:45:30.000000000 +0200 @@ -72,6 +72,7 @@ @echo ' make devserver-global regenerate and serve on 0.0.0.0 ' {% if ssh %} @echo ' make ssh_upload upload the web site via SSH ' + @echo ' make sftp_upload upload the web site via SFTP ' @echo ' make rsync_upload upload the web site via rsync+ssh ' {% endif %} {% if dropbox %} @@ -124,6 +125,9 @@ ssh_upload: publish scp -P $(SSH_PORT) -r "$(OUTPUTDIR)"/* "$(SSH_USER)@$(SSH_HOST):$(SSH_TARGET_DIR)" +sftp_upload: publish + printf 'put -r $(OUTPUTDIR)/*' | sftp $(SSH_USER)@$(SSH_HOST):$(SSH_TARGET_DIR) + {% set upload = upload + ["rsync_upload"] %} rsync_upload: publish rsync -e "ssh -p $(SSH_PORT)" -P -rvzc --include tags --cvs-exclude --delete "$(OUTPUTDIR)"/ "$(SSH_USER)@$(SSH_HOST):$(SSH_TARGET_DIR)" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pelican-4.7.0/pelican/tools/templates/pelicanconf.py.jinja2 new/pelican-4.7.1/pelican/tools/templates/pelicanconf.py.jinja2 --- old/pelican-4.7.0/pelican/tools/templates/pelicanconf.py.jinja2 2021-10-01 16:10:26.000000000 +0200 +++ new/pelican-4.7.1/pelican/tools/templates/pelicanconf.py.jinja2 2021-10-12 16:45:30.000000000 +0200 @@ -1,6 +1,3 @@ -#!/usr/bin/env python -# -*- coding: utf-8 -*- # - AUTHOR = {{author}} SITENAME = {{sitename}} SITEURL = '' diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pelican-4.7.0/pelican/tools/templates/publishconf.py.jinja2 new/pelican-4.7.1/pelican/tools/templates/publishconf.py.jinja2 --- old/pelican-4.7.0/pelican/tools/templates/publishconf.py.jinja2 2021-10-01 16:10:26.000000000 +0200 +++ new/pelican-4.7.1/pelican/tools/templates/publishconf.py.jinja2 2021-10-12 16:45:30.000000000 +0200 @@ -1,6 +1,3 @@ -#!/usr/bin/env python -# -*- coding: utf-8 -*- # - # This file is only used if you use `make publish` or # explicitly specify it as your config file. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pelican-4.7.0/pyproject.toml new/pelican-4.7.1/pyproject.toml --- old/pelican-4.7.0/pyproject.toml 2021-10-01 16:10:26.000000000 +0200 +++ new/pelican-4.7.1/pyproject.toml 2021-10-12 16:45:30.000000000 +0200 @@ -1,6 +1,6 @@ [tool.poetry] name = "pelican" -version = "4.7.0" +version = "4.7.1" description = "Static site generator supporting Markdown and reStructuredText" authors = ["Justin Mayer <[email protected]>"] license = "AGPLv3" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pelican-4.7.0/setup.py new/pelican-4.7.1/setup.py --- old/pelican-4.7.0/setup.py 2021-10-01 16:10:26.000000000 +0200 +++ new/pelican-4.7.1/setup.py 2021-10-12 16:45:30.000000000 +0200 @@ -6,7 +6,7 @@ from setuptools import find_packages, setup -version = "4.7.0" +version = "4.7.1" requires = ['feedgenerator >= 1.9', 'jinja2 >= 2.7', 'pygments', 'docutils>=0.15', 'pytz >= 0a', 'blinker', 'unidecode', @@ -69,6 +69,8 @@ 'Programming Language :: Python :: 3.6', 'Programming Language :: Python :: 3.7', 'Programming Language :: Python :: 3.8', + 'Programming Language :: Python :: 3.9', + 'Programming Language :: Python :: 3.10', 'Programming Language :: Python :: Implementation :: CPython', 'Topic :: Internet :: WWW/HTTP', 'Topic :: Software Development :: Libraries :: Python Modules', diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pelican-4.7.0/tasks.py new/pelican-4.7.1/tasks.py --- old/pelican-4.7.0/tasks.py 2021-10-01 16:10:26.000000000 +0200 +++ new/pelican-4.7.1/tasks.py 2021-10-12 16:45:30.000000000 +0200 @@ -8,6 +8,7 @@ PKG_PATH = Path(PKG_NAME) DOCS_PORT = os.environ.get("DOCS_PORT", 8000) BIN_DIR = "bin" if os.name != "nt" else "Scripts" +PTY = True if os.name != "nt" else False ACTIVE_VENV = os.environ.get("VIRTUAL_ENV", None) VENV_HOME = Path(os.environ.get("WORKON_HOME", "~/virtualenvs")) VENV_PATH = Path(ACTIVE_VENV) if ACTIVE_VENV else (VENV_HOME / PKG_NAME) @@ -16,15 +17,13 @@ TOOLS = ["poetry", "pre-commit", "psutil"] POETRY = which("poetry") if which("poetry") else (VENV_BIN / "poetry") -PRECOMMIT = ( - which("pre-commit") if which("pre-commit") else (VENV_BIN / "pre-commit") -) +PRECOMMIT = which("pre-commit") if which("pre-commit") else (VENV_BIN / "pre-commit") @task def docbuild(c): """Build documentation""" - c.run(f"{VENV_BIN}/sphinx-build -W docs docs/_build") + c.run(f"{VENV_BIN}/sphinx-build -W docs docs/_build", pty=PTY) @task(docbuild) @@ -42,7 +41,6 @@ @task def tests(c): """Run the test suite""" - PTY = True if os.name != "nt" else False c.run(f"{VENV_BIN}/pytest", pty=PTY) @@ -54,7 +52,7 @@ check_flag = "--check" if diff: diff_flag = "--diff" - c.run(f"{VENV_BIN}/black {check_flag} {diff_flag} {PKG_PATH} tasks.py") + c.run(f"{VENV_BIN}/black {check_flag} {diff_flag} {PKG_PATH} tasks.py", pty=PTY) @task @@ -64,14 +62,12 @@ check_flag = "-c" if diff: diff_flag = "--diff" - c.run( - f"{VENV_BIN}/isort {check_flag} {diff_flag} ." - ) + c.run(f"{VENV_BIN}/isort {check_flag} {diff_flag} .", pty=PTY) @task def flake8(c): - c.run(f"git diff HEAD | {VENV_BIN}/flake8 --diff --max-line-length=88") + c.run(f"git diff HEAD | {VENV_BIN}/flake8 --diff --max-line-length=88", pty=PTY) @task @@ -84,20 +80,20 @@ """Install tools in the virtual environment if not already on PATH""" for tool in TOOLS: if not which(tool): - c.run(f"{VENV_BIN}/python -m pip install {tool}") + c.run(f"{VENV_BIN}/python -m pip install {tool}", pty=PTY) @task def precommit(c): """Install pre-commit hooks to .git/hooks/pre-commit""" - c.run(f"{PRECOMMIT} install") + c.run(f"{PRECOMMIT} install", pty=PTY) @task def setup(c): - c.run(f"{VENV_BIN}/python -m pip install -U pip") + c.run(f"{VENV_BIN}/python -m pip install -U pip", pty=PTY) tools(c) - c.run(f"{POETRY} install") + c.run(f"{POETRY} install", pty=PTY) precommit(c) @@ -105,11 +101,17 @@ def update_functional_tests(c): """Update the generated functional test output""" c.run( - f"bash -c 'LC_ALL=en_US.utf8 pelican -o {PKG_PATH}/tests/output/custom/ -s samples/pelican.conf.py samples/content/'" + f"bash -c 'LC_ALL=en_US.utf8 pelican -o {PKG_PATH}/tests/output/custom/ \ + -s samples/pelican.conf.py samples/content/'", + pty=PTY, ) c.run( - f"bash -c 'LC_ALL=fr_FR.utf8 pelican -o {PKG_PATH}/tests/output/custom_locale/ -s samples/pelican.conf_FR.py samples/content/'" + f"bash -c 'LC_ALL=fr_FR.utf8 pelican -o {PKG_PATH}/tests/output/custom_locale/ \ + -s samples/pelican.conf_FR.py samples/content/'", + pty=PTY, ) c.run( - f"bash -c 'LC_ALL=en_US.utf8 pelican -o {PKG_PATH}/tests/output/basic/ samples/content/'" + f"bash -c 'LC_ALL=en_US.utf8 pelican -o \ + {PKG_PATH}/tests/output/basic/ samples/content/'", + pty=PTY, ) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pelican-4.7.0/tox.ini new/pelican-4.7.1/tox.ini --- old/pelican-4.7.0/tox.ini 2021-10-01 16:10:26.000000000 +0200 +++ new/pelican-4.7.1/tox.ini 2021-10-12 16:45:30.000000000 +0200 @@ -1,5 +1,5 @@ [tox] -envlist = py{3.6,3.7,3.8,3.9},docs,flake8 +envlist = py{3.6,3.7,3.8,3.9,3.10},docs,flake8 [testenv] basepython = @@ -7,6 +7,7 @@ py3.7: python3.7 py3.8: python3.8 py3.9: python3.9 + py3.10: python3.10 passenv = * usedevelop=True deps =
