Skip to content

Commit

Permalink
Merge pull request #519 from plone/gforcada-patch-1
Browse files Browse the repository at this point in the history
Update GHA
  • Loading branch information
gforcada committed Oct 14, 2023
2 parents 629e016 + 67c8d25 commit e6c274f
Show file tree
Hide file tree
Showing 6 changed files with 18 additions and 18 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/black.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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') }}
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/docs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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') }}
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/isort.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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') }}
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/plone_python.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,15 +16,15 @@ 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@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
Expand Down
2 changes: 2 additions & 0 deletions news/1.internal
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
Update GHA
[gforcada]
8 changes: 3 additions & 5 deletions tox.ini
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -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


Expand All @@ -40,7 +39,6 @@ commands =

setenv =
BUILDOUT_FILE=test_plone-60.cfg
plone52: BUILDOUT_FILE=test_plone-52.cfg

deps =
pdbpp
Expand Down

0 comments on commit e6c274f

Please sign in to comment.