From 9a327372640648e62292292bf2972bddd96cfc07 Mon Sep 17 00:00:00 2001 From: Wesley Barroso Lopes Date: Wed, 28 Feb 2024 12:17:41 -0300 Subject: [PATCH 1/5] Update Firefox to 102.6.0esr --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index ca0375e..943b19d 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -30,7 +30,7 @@ jobs: # Firefox - uses: browser-actions/setup-firefox@latest with: - firefox-version: '89.0' + firefox-version: '102.6.0esr' - run: firefox --version # python install From a52d2b85260b13b12545454cac58098e84cd8066 Mon Sep 17 00:00:00 2001 From: Wesley Barroso Lopes Date: Mon, 4 Mar 2024 18:36:13 -0300 Subject: [PATCH 2/5] Drop support to Python 3.7 --- .github/workflows/ci.yml | 2 +- CHANGES.rst | 3 ++- setup.py | 1 - 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 943b19d..3fc34e4 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -6,7 +6,7 @@ jobs: strategy: fail-fast: false matrix: - python-version: [3.8, 3.7] + python-version: [3.8] plone-version: [5.2] steps: diff --git a/CHANGES.rst b/CHANGES.rst index 0d674ee..3f4c3c5 100644 --- a/CHANGES.rst +++ b/CHANGES.rst @@ -4,7 +4,8 @@ Changelog 2.0.2 (unreleased) ------------------ -- Nothing changed yet. +- Drop support to Python 3.7. + [wesleybl] 2.0.1 (2021-09-16) diff --git a/setup.py b/setup.py index 7c625ba..db75e1e 100644 --- a/setup.py +++ b/setup.py @@ -28,7 +28,6 @@ 'Operating System :: OS Independent', 'Programming Language :: JavaScript', 'Programming Language :: Python', - 'Programming Language :: Python :: 3.7', 'Programming Language :: Python :: 3.8', 'Topic :: Software Development :: Libraries :: Python Modules', 'Topic :: Software Development :: Widget Sets', From 461704eaf6b404d03bcaa16168fb21b5584467f7 Mon Sep 17 00:00:00 2001 From: Wesley Barroso Lopes Date: Mon, 4 Mar 2024 18:38:35 -0300 Subject: [PATCH 3/5] Bump version 3.0.0 --- CHANGES.rst | 2 +- setup.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/CHANGES.rst b/CHANGES.rst index 3f4c3c5..6ec25ff 100644 --- a/CHANGES.rst +++ b/CHANGES.rst @@ -1,7 +1,7 @@ Changelog ========= -2.0.2 (unreleased) +3.0.0 (unreleased) ------------------ - Drop support to Python 3.7. diff --git a/setup.py b/setup.py index db75e1e..fbf9663 100644 --- a/setup.py +++ b/setup.py @@ -4,7 +4,7 @@ from setuptools import setup -version = '2.0.2.dev0' +version = '3.0.0.dev0' long_description = '\n\n'.join([ open('README.rst').read(), From 9eab39117ae5c09078b2847e018e7a3684f0c997 Mon Sep 17 00:00:00 2001 From: Wesley Barroso Lopes Date: Wed, 6 Mar 2024 11:41:09 -0300 Subject: [PATCH 4/5] Remove update make target kitconcept.buildout hasn't been updated in a long time. --- Makefile | 8 -------- 1 file changed, 8 deletions(-) diff --git a/Makefile b/Makefile index fa3daac..b4de552 100644 --- a/Makefile +++ b/Makefile @@ -20,14 +20,6 @@ all: .installed.cfg help: ## This help message @grep -E '^[a-zA-Z_-]+:.*?## .*$$' $(MAKEFILE_LIST) | sort | awk 'BEGIN {FS = ":.*?## "}; {printf "\033[36m%-30s\033[0m %s\n", $$1, $$2}' -.PHONY: Update Makefile and Buildout -update: ## Update Make and Buildout - wget -O Makefile https://raw.githubusercontent.com/kitconcept/buildout/5.2/Makefile - wget -O requirements.txt https://raw.githubusercontent.com/kitconcept/buildout/5.2/requirements.txt - wget -O plone-5.2.x.cfg https://raw.githubusercontent.com/kitconcept/buildout/5.2/plone-5.2.x.cfg - wget -O ci.cfg https://raw.githubusercontent.com/kitconcept/buildout/5.2/ci.cfg - wget -O versions.cfg https://raw.githubusercontent.com/kitconcept/buildout/5.2/versions.cfg - .installed.cfg: bin/buildout *.cfg bin/buildout From afeed24ea4159b72dedc46db620a23302cc51c29 Mon Sep 17 00:00:00 2001 From: Wesley Barroso Lopes Date: Wed, 6 Mar 2024 11:45:53 -0300 Subject: [PATCH 5/5] Use Plone 5.2.14 in tests --- plone-5.2.x.cfg | 17 +-------------- requirements-5.2.txt | 1 + requirements.txt | 5 +---- versions.cfg | 52 -------------------------------------------- 4 files changed, 3 insertions(+), 72 deletions(-) create mode 100644 requirements-5.2.txt delete mode 100644 versions.cfg diff --git a/plone-5.2.x.cfg b/plone-5.2.x.cfg index 3ca915f..dbc7af7 100644 --- a/plone-5.2.x.cfg +++ b/plone-5.2.x.cfg @@ -1,19 +1,4 @@ [buildout] extends = - https://dist.plone.org/release/5.2.5/versions.cfg + https://dist.plone.org/release/5.2.14/versions.cfg base.cfg -find-links += https://dist.plone.org/thirdparty/ -versions=versions - -[versions] -black = 21.7b0 - -# Error: The requirement ('virtualenv>=20.0.35') is not allowed by your [versions] constraint (20.0.26) -virtualenv = 20.0.35 - -# Error: The requirement ('importlib-metadata>=1') is not allowed by your [versions] constraint (0.23) -importlib-metadata = 2.0.0 - -# cffi 1.14.3 fails on apple m1 -# cffi 1.14.4 fails with "ModuleNotFoundError: No module named '_cffi_backend'" -cffi = 1.14.6 diff --git a/requirements-5.2.txt b/requirements-5.2.txt new file mode 100644 index 0000000..37660fa --- /dev/null +++ b/requirements-5.2.txt @@ -0,0 +1 @@ +-r https://dist.plone.org/release/5.2.14/requirements.txt diff --git a/requirements.txt b/requirements.txt index 8466fed..05fc900 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,4 +1 @@ -# Keep this file in sync with: https://github.com/kitconcept/buildout/edit/master/requirements.txt -setuptools==42.0.2 -zc.buildout==2.13.3 -wheel +-r requirements-5.2.txt diff --git a/versions.cfg b/versions.cfg deleted file mode 100644 index ef8e703..0000000 --- a/versions.cfg +++ /dev/null @@ -1,52 +0,0 @@ -[versions] -# Buildout -setuptools = -zc.buildout = -zc.recipe.egg = 2.0.3 - -# fixes Getting distribution for 'configparser'. assert newdist is not None # newloc above is missing our dist?! -configparser = 3.5.3 - -# fixes Error: The requirement ('Pygments>=2.5.1') is not allowed by your [versions] constraint (2.2.0) -Pygments = 2.5.1 - -# plone.recipe.varnish -plone.recipe.varnish = 1.3 - -# Code-analysis -plone.recipe.codeanalysis = 3.0.1 -coverage = 3.7.1 -pep8 = 1.7.1 -flake8 = 3.5.0 -flake8-coding = 1.3.2 -pycodestyle = 2.3.1 - -# Release -zest.releaser = 6.17.0 -twine = 1.11.0 -towncrier = 19.2.0 -zestreleaser.towncrier = 1.1.0 -docutils = 0.16 - -# Sphinx -Sphinx = 1.6.5 -Pygments = 2.5.1 -sphinxcontrib-httpexample = 0.7.0 -sphinxcontrib-httpdomain = 1.5.0 -sphinx-rtd-theme = 0.2.4 -Jinja2 = 2.10 -Babel = 2.5.1 - -# plone.rest(api) specific pins - -# cffi 1.14.3 fails on apple m1 -cffi = 1.14.4 - -[versions:python27] -PyJWT = 1.7.1 -pyroma = 2.6.1 -more-itertools = 5.0.0 -pyrsistent = 0.15.7 -Click = 7.1.2 -httpie = 1.0.3 -check-manifest = 0.41