diff --git a/nikola/nikola.py b/nikola/nikola.py index 0584b9fc3b..3953150751 100644 --- a/nikola/nikola.py +++ b/nikola/nikola.py @@ -1392,7 +1392,7 @@ def generic_page_renderer(self, lang, post, filters): 'actions': [(self.render_template, [post.template_name, output_name, context])], 'clean': True, - 'uptodate': [config_changed(deps_dict, 'Nikola.generic_post_renderer')], + 'uptodate': [config_changed(deps_dict, 'nikola.Nikola.generic_post_renderer')], } yield utils.apply_filters(task, filters) @@ -1432,7 +1432,7 @@ def generic_post_list_renderer(self, lang, posts, output_name, 'actions': [(self.render_template, [template_name, output_name, context])], 'clean': True, - 'uptodate': [config_changed(deps_context, 'Nikola.generic_post_list_renderer')] + 'uptodate': [config_changed(deps_context, 'nikola.Nikola.generic_post_list_renderer')] } return utils.apply_filters(task, filters) diff --git a/nikola/plugins/task/archive.py b/nikola/plugins/task/archive.py index dda3825c3c..a8716af12a 100644 --- a/nikola/plugins/task/archive.py +++ b/nikola/plugins/task/archive.py @@ -73,7 +73,7 @@ def _prepare_task(self, kw, name, lang, posts, items, template_name, task_cfg = {1: task['uptodate'][0].config, 2: kw, 3: n} if deps_translatable is not None: task_cfg[4] = deps_translatable - task['uptodate'] = [config_changed(task_cfg, 'plugins.task.archive')] + task['uptodate'] = [config_changed(task_cfg, 'nikola.plugins.task.archive')] task['basename'] = self.name return task diff --git a/nikola/plugins/task/bundles.py b/nikola/plugins/task/bundles.py index 6002ed3447..7347df0b42 100644 --- a/nikola/plugins/task/bundles.py +++ b/nikola/plugins/task/bundles.py @@ -107,7 +107,7 @@ def build_bundle(output, inputs): utils.config_changed({ 1: kw, 2: file_dep - }, 'plugins.task.bundles')], + }, 'nikola.plugins.task.bundles')], 'clean': True, } yield utils.apply_filters(task, kw['filters']) diff --git a/nikola/plugins/task/copy_assets.py b/nikola/plugins/task/copy_assets.py index 5b12816272..17064b63ab 100644 --- a/nikola/plugins/task/copy_assets.py +++ b/nikola/plugins/task/copy_assets.py @@ -72,7 +72,7 @@ def gen_tasks(self): if task['name'] in tasks: continue tasks[task['name']] = task - task['uptodate'] = [utils.config_changed(kw, 'plugins.task.copy_assets')] + task['uptodate'] = [utils.config_changed(kw, 'nikola.plugins.task.copy_assets')] task['basename'] = self.name if code_css_input: task['file_dep'] = [code_css_input] @@ -99,7 +99,7 @@ def create_code_css(): 'basename': self.name, 'name': code_css_path, 'targets': [code_css_path], - 'uptodate': [utils.config_changed(kw, 'plugins.task.copy_assets'), testcontents], + 'uptodate': [utils.config_changed(kw, 'nikola.plugins.task.copy_assets'), testcontents], 'actions': [(create_code_css, [])], 'clean': True, } diff --git a/nikola/plugins/task/copy_files.py b/nikola/plugins/task/copy_files.py index be443a1669..802e9b7201 100644 --- a/nikola/plugins/task/copy_files.py +++ b/nikola/plugins/task/copy_files.py @@ -51,5 +51,5 @@ def gen_tasks(self): real_dst = os.path.join(dst, kw['files_folders'][src]) for task in utils.copy_tree(src, real_dst, link_cutoff=dst): task['basename'] = self.name - task['uptodate'] = [utils.config_changed(kw, 'plugins.task.copy_files')] + task['uptodate'] = [utils.config_changed(kw, 'nikola.plugins.task.copy_files')] yield utils.apply_filters(task, filters, skip_ext=['.html']) diff --git a/nikola/plugins/task/galleries.py b/nikola/plugins/task/galleries.py index a8f25b062d..09f8706e6a 100644 --- a/nikola/plugins/task/galleries.py +++ b/nikola/plugins/task/galleries.py @@ -247,7 +247,7 @@ def gen_tasks(self): 'targets': [post.translated_base_path(lang)], 'file_dep': post.fragment_deps(lang), 'actions': [(post.compile, [lang])], - 'uptodate': [utils.config_changed(self.kw, 'plugins.task.galleries__post')] + 'uptodate': [utils.config_changed(self.kw, 'nikola.plugins.task.galleries:post')] } context['post'] = post else: @@ -276,7 +276,7 @@ def gen_tasks(self): 1: self.kw, 2: self.site.config["COMMENTS_IN_GALLERIES"], 3: context, - }, 'plugins.task.galleries__gallery')], + }, 'nikola.plugins.task.galleries:gallery')], }, self.kw['filters']) # RSS for the gallery @@ -304,7 +304,7 @@ def gen_tasks(self): 'clean': True, 'uptodate': [utils.config_changed({ 1: self.kw, - }, 'plugins.task.galleries__rss')], + }, 'nikola.plugins.task.galleries:rss')], }, self.kw['filters']) def find_galleries(self): @@ -364,7 +364,7 @@ def create_galleries(self): 'actions': [(utils.makedirs, (output_gallery,))], 'targets': [output_gallery], 'clean': True, - 'uptodate': [utils.config_changed(self.kw, 'plugins.task.galleries__mkdir')], + 'uptodate': [utils.config_changed(self.kw, 'nikola.plugins.task.galleries:mkdir')], } def parse_index(self, gallery, input_folder, output_folder): @@ -452,7 +452,7 @@ def create_target_images(self, img, input_path): 'clean': True, 'uptodate': [utils.config_changed({ 1: self.kw['thumbnail_size'] - }, 'plugins.task.galleries__resize_thumb')], + }, 'nikola.plugins.task.galleries:resize_thumb')], }, self.kw['filters']) yield utils.apply_filters({ @@ -467,7 +467,7 @@ def create_target_images(self, img, input_path): 'clean': True, 'uptodate': [utils.config_changed({ 1: self.kw['max_image_size'] - }, 'plugins.task.galleries__resize_max')], + }, 'nikola.plugins.task.galleries:resize_max')], }, self.kw['filters']) def remove_excluded_image(self, img, input_folder): @@ -491,7 +491,7 @@ def remove_excluded_image(self, img, input_folder): (utils.remove_file, (thumb_path,)) ], 'clean': True, - 'uptodate': [utils.config_changed(self.kw, 'plugins.task.galleries__clean_thumb')], + 'uptodate': [utils.config_changed(self.kw, 'nikola.plugins.task.galleries:clean_thumb')], }, self.kw['filters']) yield utils.apply_filters({ @@ -501,7 +501,7 @@ def remove_excluded_image(self, img, input_folder): (utils.remove_file, (img_path,)) ], 'clean': True, - 'uptodate': [utils.config_changed(self.kw, 'plugins.task.galleries__clean_file')], + 'uptodate': [utils.config_changed(self.kw, 'nikola.plugins.task.galleries:clean_file')], }, self.kw['filters']) def render_gallery_index( diff --git a/nikola/plugins/task/indexes.py b/nikola/plugins/task/indexes.py index 29fa9ac27a..ffec5705f0 100644 --- a/nikola/plugins/task/indexes.py +++ b/nikola/plugins/task/indexes.py @@ -122,7 +122,7 @@ def gen_tasks(self): kw['filters'], context, ) - task['uptodate'] = task['uptodate'] + [config_changed(kw, 'plugins.task.indexes')] + task['uptodate'] = task['uptodate'] + [config_changed(kw, 'nikola.plugins.task.indexes')] task['basename'] = 'render_indexes' yield task @@ -172,7 +172,7 @@ def gen_tasks(self): template_name, kw['filters'], context) - task['uptodate'] = task['uptodate'] + [config_changed(kw, 'plugins.task.indexes')] + task['uptodate'] = task['uptodate'] + [config_changed(kw, 'nikola.plugins.task.indexes')] task['basename'] = self.name yield task diff --git a/nikola/plugins/task/listings.py b/nikola/plugins/task/listings.py index 09905b3cd8..64dc437d4f 100644 --- a/nikola/plugins/task/listings.py +++ b/nikola/plugins/task/listings.py @@ -206,7 +206,7 @@ def render_listing(in_name, out_name, input_folder, output_folder, folders=[], f 'actions': [(render_listing, [None, out_name, input_folder, output_folder, dirs, files])], # This is necessary to reflect changes in blog title, # sidebar links, etc. - 'uptodate': [utils.config_changed(uptodate2, 'plugins.task.listings__folder')], + 'uptodate': [utils.config_changed(uptodate2, 'nikola.plugins.task.listings:folder')], 'clean': True, }, self.kw["filters"]) for f in files: @@ -229,7 +229,7 @@ def render_listing(in_name, out_name, input_folder, output_folder, folders=[], f 'actions': [(render_listing, [in_name, out_name, input_folder, output_folder])], # This is necessary to reflect changes in blog title, # sidebar links, etc. - 'uptodate': [utils.config_changed(uptodate, 'plugins.task.listings__source')], + 'uptodate': [utils.config_changed(uptodate, 'nikola.plugins.task.listings:source')], 'clean': True, }, self.kw["filters"]) if self.site.config['COPY_SOURCES']: diff --git a/nikola/plugins/task/pages.py b/nikola/plugins/task/pages.py index e057b9e5f5..0828b93aca 100644 --- a/nikola/plugins/task/pages.py +++ b/nikola/plugins/task/pages.py @@ -51,7 +51,7 @@ def gen_tasks(self): continue for task in self.site.generic_page_renderer(lang, post, kw["filters"]): - task['uptodate'] = task['uptodate'] + [config_changed(kw, 'plugins.task.pages')] + task['uptodate'] = task['uptodate'] + [config_changed(kw, 'nikola.plugins.task.pages')] task['basename'] = self.name task['task_dep'] = ['render_posts'] yield task diff --git a/nikola/plugins/task/posts.py b/nikola/plugins/task/posts.py index 00a6774827..1349e0e004 100644 --- a/nikola/plugins/task/posts.py +++ b/nikola/plugins/task/posts.py @@ -71,6 +71,6 @@ def gen_tasks(self): (rest_deps, (post,)), ], 'clean': True, - 'uptodate': [utils.config_changed(deps_dict, 'plugins.task.posts')], + 'uptodate': [utils.config_changed(deps_dict, 'nikola.plugins.task.posts')], } yield task diff --git a/nikola/plugins/task/redirect.py b/nikola/plugins/task/redirect.py index ab40332991..f2f21d59ba 100644 --- a/nikola/plugins/task/redirect.py +++ b/nikola/plugins/task/redirect.py @@ -57,7 +57,7 @@ def gen_tasks(self): 'targets': [src_path], 'actions': [(create_redirect, (src_path, dst))], 'clean': True, - 'uptodate': [utils.config_changed(kw, 'plugins.task.redirect')], + 'uptodate': [utils.config_changed(kw, 'nikola.plugins.task.redirect')], }, kw["filters"]) diff --git a/nikola/plugins/task/robots.py b/nikola/plugins/task/robots.py index 14bd2778f7..a00319a4be 100644 --- a/nikola/plugins/task/robots.py +++ b/nikola/plugins/task/robots.py @@ -74,7 +74,7 @@ def write_robots(): "name": robots_path, "targets": [robots_path], "actions": [(write_robots)], - "uptodate": [utils.config_changed(kw, 'plugins.task.robots')], + "uptodate": [utils.config_changed(kw, 'nikola.plugins.task.robots')], "clean": True, "task_dep": ["sitemap"] }, kw["filters"]) diff --git a/nikola/plugins/task/rss.py b/nikola/plugins/task/rss.py index 5733e21110..225d70e82f 100644 --- a/nikola/plugins/task/rss.py +++ b/nikola/plugins/task/rss.py @@ -94,7 +94,7 @@ def gen_tasks(self): 'task_dep': ['render_posts'], 'clean': True, - 'uptodate': [utils.config_changed(kw, 'plugins.task.rss')], + 'uptodate': [utils.config_changed(kw, 'nikola.plugins.task.rss')], } yield utils.apply_filters(task, kw['filters']) diff --git a/nikola/plugins/task/sources.py b/nikola/plugins/task/sources.py index f0d34b3ac0..cf5adc04c5 100644 --- a/nikola/plugins/task/sources.py +++ b/nikola/plugins/task/sources.py @@ -80,5 +80,5 @@ def gen_tasks(self): 'targets': [output_name], 'actions': [(utils.copy_file, (source, output_name))], 'clean': True, - 'uptodate': [utils.config_changed(kw, 'plugins.task.sources')], + 'uptodate': [utils.config_changed(kw, 'nikola.plugins.task.sources')], } diff --git a/nikola/plugins/task/tags.py b/nikola/plugins/task/tags.py index 4f01b49522..41cd7145e3 100644 --- a/nikola/plugins/task/tags.py +++ b/nikola/plugins/task/tags.py @@ -133,7 +133,7 @@ def write_tag_data(data): 'name': str(output_name) } - task['uptodate'] = [utils.config_changed(tag_cloud_data, 'plugins.task.tags__tagdata')] + task['uptodate'] = [utils.config_changed(tag_cloud_data, 'nikola.plugins.task.tags:tagdata')] task['targets'] = [output_name] task['actions'] = [(write_tag_data, [tag_cloud_data])] task['clean'] = True @@ -180,7 +180,7 @@ def list_tags_page(self, kw): kw['filters'], context, ) - task['uptodate'] = task['uptodate'] + [utils.config_changed(kw, 'plugins.task.tags__page')] + task['uptodate'] = task['uptodate'] + [utils.config_changed(kw, 'nikola.plugins.task.tags:page')] task['basename'] = str(self.name) yield task @@ -243,7 +243,7 @@ def page_name(tagname, i, lang): kw['filters'], context, ) - task['uptodate'] = task['uptodate'] + [utils.config_changed(kw, 'plugins.task.tags__index')] + task['uptodate'] = task['uptodate'] + [utils.config_changed(kw, 'nikola.plugins.task.tags:index')] task['basename'] = str(self.name) yield task @@ -272,7 +272,7 @@ def tag_page_as_list(self, tag, lang, post_list, kw, is_category): kw['filters'], context, ) - task['uptodate'] = task['uptodate'] + [utils.config_changed(kw, 'plugins.task.tags__list')] + task['uptodate'] = task['uptodate'] + [utils.config_changed(kw, 'nikola.plugins.task.tags:list')] task['basename'] = str(self.name) yield task @@ -300,7 +300,7 @@ def tag_rss(self, tag, lang, posts, kw, is_category): output_name, kw["rss_teasers"], kw["rss_plain"], kw['feed_length'], feed_url))], 'clean': True, - 'uptodate': [utils.config_changed(kw, 'plugins.task.tags__rss')], + 'uptodate': [utils.config_changed(kw, 'nikola.plugins.task.tags:rss')], 'task_dep': ['render_posts'], } return utils.apply_filters(task, kw['filters']) diff --git a/nikola/utils.py b/nikola/utils.py index 155b2d1c52..6bb5df9d50 100644 --- a/nikola/utils.py +++ b/nikola/utils.py @@ -494,7 +494,7 @@ def __init__(self, config, identifier=None): super(config_changed, self).__init__(config) self.identifier = '_config_changed' if identifier is not None: - self.identifier += '__' + identifier + self.identifier += ':' + identifier def _calc_digest(self): if isinstance(self.config, str):