From f36be80af5deacd379a93fa2d64e88517858741a Mon Sep 17 00:00:00 2001 From: Gil Forcada Codinachs Date: Sat, 14 Oct 2023 12:57:39 +0200 Subject: [PATCH 1/4] chore(gha): update versions There is a warning that the are about to be deprecated. --- .github/workflows/black.yml | 6 +++--- .github/workflows/docs.yml | 6 +++--- .github/workflows/isort.yml | 6 +++--- .github/workflows/plone_python.yml | 4 ++-- 4 files changed, 11 insertions(+), 11 deletions(-) diff --git a/.github/workflows/black.yml b/.github/workflows/black.yml index 420028cc..fc5371c7 100644 --- a/.github/workflows/black.yml +++ b/.github/workflows/black.yml @@ -10,11 +10,11 @@ jobs: steps: # git checkout - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 # python setup - name: Set up Python ${{ matrix.python-version }} - uses: actions/setup-python@v1 + uses: actions/setup-python@v4 with: python-version: ${{ matrix.python-version }} - name: Install dependencies @@ -23,7 +23,7 @@ jobs: pip install tox tox-gh-actions # python cache - - uses: actions/cache@v1 + - uses: actions/cache@v3 with: path: ~/.cache/pip key: ${{ runner.os }}-pip-${{ hashFiles('**/requirements.txt') }} diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml index 93fc39fc..1cad5df7 100644 --- a/.github/workflows/docs.yml +++ b/.github/workflows/docs.yml @@ -10,11 +10,11 @@ jobs: steps: # git checkout - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 # python setup - name: Set up Python ${{ matrix.python-version }} - uses: actions/setup-python@v1 + uses: actions/setup-python@v4 with: python-version: ${{ matrix.python-version }} - name: Install dependencies @@ -23,7 +23,7 @@ jobs: pip install tox tox-gh-actions # python cache - - uses: actions/cache@v1 + - uses: actions/cache@v3 with: path: ~/.cache/pip key: ${{ runner.os }}-pip-${{ hashFiles('**/requirements.txt') }} diff --git a/.github/workflows/isort.yml b/.github/workflows/isort.yml index c6f499fc..3176e03f 100644 --- a/.github/workflows/isort.yml +++ b/.github/workflows/isort.yml @@ -10,11 +10,11 @@ jobs: steps: # git checkout - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 # python setup - name: Set up Python ${{ matrix.python-version }} - uses: actions/setup-python@v1 + uses: actions/setup-python@v4 with: python-version: ${{ matrix.python-version }} - name: Install dependencies @@ -23,7 +23,7 @@ jobs: pip install tox tox-gh-actions # python cache - - uses: actions/cache@v1 + - uses: actions/cache@v3 with: path: ~/.cache/pip key: ${{ runner.os }}-pip-${{ hashFiles('**/requirements.txt') }} diff --git a/.github/workflows/plone_python.yml b/.github/workflows/plone_python.yml index 86771fec..efa78c69 100644 --- a/.github/workflows/plone_python.yml +++ b/.github/workflows/plone_python.yml @@ -20,11 +20,11 @@ jobs: plone-version: ["5.2", "6.0"] steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Install system libraries run: sudo apt-get install libxml2-dev libxslt1-dev libjpeg-dev - name: Set up Python ${{ matrix.python-version }} - uses: actions/setup-python@v2 + uses: actions/setup-python@v4 with: python-version: ${{ matrix.python-version }} - name: Install dependencies From 8d34f95512b06d25474f4cb12b0bc369b0b1ac87 Mon Sep 17 00:00:00 2001 From: Gil Forcada Codinachs Date: Sat, 14 Oct 2023 12:18:49 +0200 Subject: [PATCH 2/4] fix(gha): adjust Plone/python versions - remove Plone 5.2 - remove Python 3.7 - add Python 3.10 and 3.11 --- .github/workflows/plone_python.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/plone_python.yml b/.github/workflows/plone_python.yml index efa78c69..9b1948b9 100644 --- a/.github/workflows/plone_python.yml +++ b/.github/workflows/plone_python.yml @@ -16,8 +16,8 @@ jobs: strategy: fail-fast: false matrix: - python-version: ["3.7", "3.8", "3.9"] - plone-version: ["5.2", "6.0"] + python-version: ["3.8", "3.9", "3.10", "3.11"] + plone-version: ["6.0"] steps: - uses: actions/checkout@v4 From b15af98535422fcfb1c9711597079cc77cc12273 Mon Sep 17 00:00:00 2001 From: Gil Forcada Codinachs Date: Sat, 14 Oct 2023 12:49:14 +0200 Subject: [PATCH 3/4] fix: adjust tox.ini as well --- tox.ini | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/tox.ini b/tox.ini index 7f4d12ee..4ec548d9 100644 --- a/tox.ini +++ b/tox.ini @@ -1,7 +1,6 @@ [tox] envlist = - py{37,38,39}-plone{52} - py{38,39}-plone{60} + py{38,39,310,311}-plone{60} # towncrier # black-enforce black-check @@ -17,13 +16,13 @@ skip_missing_interpreters = True [gh-actions] python = - 3.7: py37 3.8: py38 3.9: py39 + 3.10: py310 + 3.11: py311 [gh-actions:env] PLONE = - 52: plone52 60: plone60 @@ -40,7 +39,6 @@ commands = setenv = BUILDOUT_FILE=test_plone-60.cfg - plone52: BUILDOUT_FILE=test_plone-52.cfg deps = pdbpp From 67c8d25ff3f2b14f4a6796054b9928e43b290c3d Mon Sep 17 00:00:00 2001 From: Gil Forcada Codinachs Date: Sat, 14 Oct 2023 12:23:59 +0200 Subject: [PATCH 4/4] Create 1.internal --- news/1.internal | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 news/1.internal diff --git a/news/1.internal b/news/1.internal new file mode 100644 index 00000000..4af1df1b --- /dev/null +++ b/news/1.internal @@ -0,0 +1,2 @@ +Update GHA +[gforcada]