From b70d8a6eda0e55442557e8d7b01751fb269ea657 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89rico=20Andrei?= Date: Tue, 12 Nov 2024 10:21:33 -0300 Subject: [PATCH 1/2] Support Plone 5.2. (Implements #77) --- .github/workflows/meta.yml | 4 ++-- Makefile | 6 +----- news/77.feature | 1 + setup.py | 9 +++------ 4 files changed, 7 insertions(+), 13 deletions(-) create mode 100644 news/77.feature diff --git a/.github/workflows/meta.yml b/.github/workflows/meta.yml index c9db54b..8363835 100644 --- a/.github/workflows/meta.yml +++ b/.github/workflows/meta.yml @@ -5,11 +5,11 @@ name: Meta on: push: branches: - - master + - 0.x - main pull_request: branches: - - master + - 0.x - main workflow_dispatch: diff --git a/Makefile b/Makefile index 6cb3598..db23c53 100644 --- a/Makefile +++ b/Makefile @@ -15,11 +15,7 @@ GREEN=`tput setaf 2` RESET=`tput sgr0` YELLOW=`tput setaf 3` -# Set distributions still in development -DISTRIBUTIONS="blog" -ALLOWED_DISTRIBUTIONS="blog" - -PLONE6=6.0-latest +PLONE6=5.2-latest # Python checks PYTHON?=python3 diff --git a/news/77.feature b/news/77.feature new file mode 100644 index 0000000..fbf6625 --- /dev/null +++ b/news/77.feature @@ -0,0 +1 @@ +Support Plone 5.2 [@ericof] diff --git a/setup.py b/setup.py index 46324ab..d7c9b2f 100644 --- a/setup.py +++ b/setup.py @@ -1,4 +1,5 @@ """Installer for the collective.blog package.""" + from pathlib import Path from setuptools import find_packages from setuptools import setup @@ -22,13 +23,9 @@ "Environment :: Web Environment", "Framework :: Plone", "Framework :: Plone :: Addon", - "Framework :: Plone :: Distribution", - "Framework :: Plone :: 6.0", + "Framework :: Plone :: 5.2", "Programming Language :: Python", "Programming Language :: Python :: 3.8", - "Programming Language :: Python :: 3.9", - "Programming Language :: Python :: 3.10", - "Programming Language :: Python :: 3.11", "Operating System :: OS Independent", "License :: OSI Approved :: GNU General Public License v2 (GPLv2)", ], @@ -69,6 +66,6 @@ [z3c.autoinclude.plugin] target = plone [console_scripts] - update_locale = collective.blog.locales.update:update_locale + update_blog_locale = collective.blog.locales.update:update_locale """, ) From 085c74deb113c9031cf02e92efeb4d30e41abaf7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89rico=20Andrei?= Date: Tue, 12 Nov 2024 12:39:27 -0300 Subject: [PATCH 2/2] Remove unused .gitkeep files --- src/collective/blog/profiles/default/registry/.gitkeep | 0 src/collective/blog/profiles/default/types/.gitkeep | 0 2 files changed, 0 insertions(+), 0 deletions(-) delete mode 100644 src/collective/blog/profiles/default/registry/.gitkeep delete mode 100644 src/collective/blog/profiles/default/types/.gitkeep diff --git a/src/collective/blog/profiles/default/registry/.gitkeep b/src/collective/blog/profiles/default/registry/.gitkeep deleted file mode 100644 index e69de29..0000000 diff --git a/src/collective/blog/profiles/default/types/.gitkeep b/src/collective/blog/profiles/default/types/.gitkeep deleted file mode 100644 index e69de29..0000000