From 604f9ff8f27d39332a467e037467c1d5a273bb68 Mon Sep 17 00:00:00 2001 From: Tobias Schmidl Date: Tue, 15 Oct 2024 09:01:15 +0200 Subject: [PATCH 1/4] another bugfix, as article.tags is no longer valid --- activitypub.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/activitypub.py b/activitypub.py index ed0145d..9205535 100644 --- a/activitypub.py +++ b/activitypub.py @@ -106,7 +106,7 @@ def ap_article(generator: pelican.ArticlesGenerator, writer: pelican.writers.Wri path = os.path.join(writer.output_path, 'activitypub/tags', t.slug) articles = [] for article in generator.articles: - if t.name not in article.tags: + if t.name not in article.metadata['tags']: continue articles.append( os.path.join(generator.settings['SITEURL'], 'activitypub/posts', article.slug) @@ -126,7 +126,7 @@ def ap_article(generator: pelican.ArticlesGenerator, writer: pelican.writers.Wri aurl = os.path.join(generator.settings['SITEURL'], 'activitypub/posts', article.slug) apath = os.path.join(writer.output_path, 'activitypub/posts', article.slug) tags = [] - for tag in article.tags: + for tag in article.metadata.get('tags', []): tags.append({ 'type': 'Hashtag', 'name': '#' + tag.slug, From 64fc417a4c8a3c99cef124ba4a03443faf4e7920 Mon Sep 17 00:00:00 2001 From: Tobias Schmidl Date: Tue, 15 Oct 2024 09:35:07 +0200 Subject: [PATCH 2/4] moved the *.py files to pelican/plugins/activitypub we want them to install in the pelican package in other projects --- __init__.py => pelican/plugins/activitypub/__init__.py | 0 activitypub.py => pelican/plugins/activitypub/activitypub.py | 2 +- pyproject.toml | 5 ++++- 3 files changed, 5 insertions(+), 2 deletions(-) rename __init__.py => pelican/plugins/activitypub/__init__.py (100%) rename activitypub.py => pelican/plugins/activitypub/activitypub.py (99%) diff --git a/__init__.py b/pelican/plugins/activitypub/__init__.py similarity index 100% rename from __init__.py rename to pelican/plugins/activitypub/__init__.py diff --git a/activitypub.py b/pelican/plugins/activitypub/activitypub.py similarity index 99% rename from activitypub.py rename to pelican/plugins/activitypub/activitypub.py index 9205535..01ed1fb 100644 --- a/activitypub.py +++ b/pelican/plugins/activitypub/activitypub.py @@ -12,7 +12,7 @@ from pelican import signals log = logging.getLogger(__name__) -__version__ = '0.1.1' +__version__ = '0.1.2' pagination = 25 diff --git a/pyproject.toml b/pyproject.toml index 531672d..685d567 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -4,7 +4,7 @@ [project] name = "pelican-plugin-activitypub" -version = "0.1.1" +dynamic = ["version"] description = "Pelican plugin implementing Activitypub" authors = [{name = "s3lph", email = "s3lph@kabelsalat.ch"}, {name = "Tobias Schmidl", email = "tobias@schmidl.dev"}] license = { text = "MIT" } @@ -37,3 +37,6 @@ Tracker = "https://git.kabelsalat.ch/s3lph/pelican-plugin-activitypub/issues" [build-system] requires = ["setuptools >= 61.0"] build-backend = "setuptools.build_meta" + +[tool.setuptools.dynamic] +version = {attr = "pelican.plugins.activitypub.activitypub.__version__"} From 21207918bba1f8efdbf918e57ab3cc6d44b360fa Mon Sep 17 00:00:00 2001 From: Tobias Schmidl Date: Tue, 15 Oct 2024 09:01:15 +0200 Subject: [PATCH 3/4] another bugfix, as article.tags is no longer valid --- activitypub.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/activitypub.py b/activitypub.py index ed0145d..c104a94 100644 --- a/activitypub.py +++ b/activitypub.py @@ -106,7 +106,7 @@ def ap_article(generator: pelican.ArticlesGenerator, writer: pelican.writers.Wri path = os.path.join(writer.output_path, 'activitypub/tags', t.slug) articles = [] for article in generator.articles: - if t.name not in article.tags: + if t.name not in article.metadata.get('tags', []): continue articles.append( os.path.join(generator.settings['SITEURL'], 'activitypub/posts', article.slug) @@ -126,7 +126,7 @@ def ap_article(generator: pelican.ArticlesGenerator, writer: pelican.writers.Wri aurl = os.path.join(generator.settings['SITEURL'], 'activitypub/posts', article.slug) apath = os.path.join(writer.output_path, 'activitypub/posts', article.slug) tags = [] - for tag in article.tags: + for tag in article.metadata.get('tags', []): tags.append({ 'type': 'Hashtag', 'name': '#' + tag.slug, From 803abfaf974dd02a442d92aaecf9769459d0fb3e Mon Sep 17 00:00:00 2001 From: Tobias Schmidl Date: Tue, 15 Oct 2024 09:35:07 +0200 Subject: [PATCH 4/4] moved the *.py files to pelican/plugins/activitypub we want them to install in the pelican package in other projects --- __init__.py => pelican/plugins/activitypub/__init__.py | 0 activitypub.py => pelican/plugins/activitypub/activitypub.py | 2 +- pyproject.toml | 5 ++++- 3 files changed, 5 insertions(+), 2 deletions(-) rename __init__.py => pelican/plugins/activitypub/__init__.py (100%) rename activitypub.py => pelican/plugins/activitypub/activitypub.py (99%) diff --git a/__init__.py b/pelican/plugins/activitypub/__init__.py similarity index 100% rename from __init__.py rename to pelican/plugins/activitypub/__init__.py diff --git a/activitypub.py b/pelican/plugins/activitypub/activitypub.py similarity index 99% rename from activitypub.py rename to pelican/plugins/activitypub/activitypub.py index c104a94..ea76717 100644 --- a/activitypub.py +++ b/pelican/plugins/activitypub/activitypub.py @@ -12,7 +12,7 @@ from pelican import signals log = logging.getLogger(__name__) -__version__ = '0.1.1' +__version__ = '0.1.2' pagination = 25 diff --git a/pyproject.toml b/pyproject.toml index 531672d..685d567 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -4,7 +4,7 @@ [project] name = "pelican-plugin-activitypub" -version = "0.1.1" +dynamic = ["version"] description = "Pelican plugin implementing Activitypub" authors = [{name = "s3lph", email = "s3lph@kabelsalat.ch"}, {name = "Tobias Schmidl", email = "tobias@schmidl.dev"}] license = { text = "MIT" } @@ -37,3 +37,6 @@ Tracker = "https://git.kabelsalat.ch/s3lph/pelican-plugin-activitypub/issues" [build-system] requires = ["setuptools >= 61.0"] build-backend = "setuptools.build_meta" + +[tool.setuptools.dynamic] +version = {attr = "pelican.plugins.activitypub.activitypub.__version__"}