diff --git a/.travis.yml b/.travis.yml index 2f310328..93a7ab54 100644 --- a/.travis.yml +++ b/.travis.yml @@ -8,8 +8,9 @@ before_install: - sudo locale-gen fr_FR.UTF-8 tr_TR.UTF-8 install: - if [[ $TRAVIS_PYTHON_VERSION == '2.7' ]]; then ln -s /usr/share/asciidoc/asciidocapi.py ~/virtualenv/python2.7/lib/python2.7/site-packages/; fi - - pip install mock nose nose-cov Markdown typogrify-web - pip install . + - pip install -r dev_requirements.txt + - pip install nose-cov script: nosetests -sv --with-coverage --cover-package=pelican pelican after_success: # Report coverage results to coveralls.io diff --git a/docs/plugins.rst b/docs/plugins.rst index 5a4bca22..b38e036f 100644 --- a/docs/plugins.rst +++ b/docs/plugins.rst @@ -78,6 +78,8 @@ article_generator_preread article_generator invoked befor article_generator_init article_generator invoked in the ArticlesGenerator.__init__ article_generator_finalized article_generator invoked at the end of ArticlesGenerator.generate_context article_generator_write_article article_generator, content invoked before writing each article, the article is passed as content +article_writer_finalized article_generator, writer invoked after all articles and related pages have been written, but before + the article generator is closed. get_generators generators invoked in Pelican.get_generator_classes, can return a Generator, or several generator in a tuple or in a list. diff --git a/pelican/__init__.py b/pelican/__init__.py index 118a9ad9..47260551 100644 --- a/pelican/__init__.py +++ b/pelican/__init__.py @@ -312,6 +312,9 @@ def main(): pelican.ignore_files), 'settings': file_watcher(args.settings)} + for static_path in settings.get("STATIC_PATHS", []): + watchers[static_path] = folder_watcher(static_path, [''], pelican.ignore_files) + try: if args.autoreload: print(' --- AutoReload Mode: Monitoring `content`, `theme` and' diff --git a/pelican/generators.py b/pelican/generators.py index b7612fa2..09541191 100644 --- a/pelican/generators.py +++ b/pelican/generators.py @@ -482,6 +482,7 @@ class ArticlesGenerator(Generator): def generate_output(self, writer): self.generate_feeds(writer) self.generate_pages(writer) + signals.article_writer_finalized.send(self, writer=writer) class PagesGenerator(Generator): diff --git a/pelican/signals.py b/pelican/signals.py index 8fc1d7eb..812dfbac 100644 --- a/pelican/signals.py +++ b/pelican/signals.py @@ -19,6 +19,7 @@ generator_init = signal('generator_init') article_generator_init = signal('article_generator_init') article_generator_finalized = signal('article_generator_finalized') article_generator_write_article = signal('article_generator_write_article') +article_writer_finalized = signal('article_writer_finalized') page_generator_init = signal('page_generator_init') page_generator_finalized = signal('page_generator_finalized') diff --git a/pelican/tests/test_contents.py b/pelican/tests/test_contents.py index 5a9ff581..448f73eb 100644 --- a/pelican/tests/test_contents.py +++ b/pelican/tests/test_contents.py @@ -1,11 +1,11 @@ # -*- coding: utf-8 -*- -from __future__ import unicode_literals +from __future__ import unicode_literals, absolute_import import six from datetime import datetime from sys import platform -from .support import unittest, get_settings +from pelican.tests.support import unittest, get_settings from pelican.contents import Page, Article, URLWrapper from pelican.settings import DEFAULT_CONFIG diff --git a/pelican/tests/test_utils.py b/pelican/tests/test_utils.py index 0642926e..a8de7216 100644 --- a/pelican/tests/test_utils.py +++ b/pelican/tests/test_utils.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -from __future__ import unicode_literals, print_function +from __future__ import unicode_literals, print_function, absolute_import import logging import shutil import os @@ -15,7 +15,7 @@ from pelican.generators import TemplatePagesGenerator from pelican.writers import Writer from pelican.settings import read_settings from pelican import utils -from .support import get_article, LoggedTestCase, locale_available, unittest +from pelican.tests.support import get_article, LoggedTestCase, locale_available, unittest class TestUtils(LoggedTestCase): diff --git a/pelican/themes/simple/templates/base.html b/pelican/themes/simple/templates/base.html index 7973d774..bde7983b 100644 --- a/pelican/themes/simple/templates/base.html +++ b/pelican/themes/simple/templates/base.html @@ -33,7 +33,7 @@