Skip to content

Commit

Permalink
Updated tox testing and workflow actions
Browse files Browse the repository at this point in the history
  • Loading branch information
Katherine Domingo committed Feb 2, 2023
1 parent 2ead99a commit 96af09c
Show file tree
Hide file tree
Showing 6 changed files with 26 additions and 13 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@ jobs:
build:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v1
- uses: actions/checkout@v3
- name: Set up Python
uses: actions/setup-python@v1
uses: actions/setup-python@v4
with:
python-version: 3.8
- name: Install dependencies
Expand Down
22 changes: 17 additions & 5 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,10 @@ jobs:
name: lint
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3

- name: Set up Python
uses: actions/setup-python@v2
uses: actions/setup-python@v4
with:
python-version: 3.8

Expand All @@ -33,7 +33,7 @@ jobs:
matrix:
python: ['3.8', '3.10']
django: ['3.2']
wagtail: ['2.15','3.0','4.0','4.1']
wagtail: ['2.15','3.0','4.0','4.1','4.2']
include:
- python: '3.8'
django: '4.0'
Expand All @@ -47,30 +47,42 @@ jobs:
- python: '3.8'
django: '4.0'
wagtail: '4.1'
- python: '3.8'
django: '4.0'
wagtail: '4.2'
- python: '3.10'
django: '4.0'
wagtail: '4.0'
- python: '3.10'
django: '4.0'
wagtail: '4.1'
- python: '3.10'
django: '4.0'
wagtail: '4.2'
- python: '3.8'
django: '4.1'
wagtail: '4.0'
- python: '3.8'
django: '4.1'
wagtail: '4.1'
- python: '3.8'
django: '4.1'
wagtail: '4.2'
- python: '3.10'
django: '4.1'
wagtail: '4.0'
- python: '3.10'
django: '4.1'
wagtail: '4.1'
- python: '3.10'
django: '4.1'
wagtail: '4.2'

steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3

- name: Set up Python
uses: actions/setup-python@v2
uses: actions/setup-python@v4
with:
python-version: ${{ matrix.python }}

Expand Down
2 changes: 1 addition & 1 deletion .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ repos:
- id: black
args: ["wagtailinventory", "setup.py", "--line-length=79"]
exclude: migrations
- repo: https://gitlab.com/pycqa/flake8
- repo: https://github.com/pycqa/flake8
rev: 4.0.1
hooks:
- id: flake8
Expand Down
2 changes: 1 addition & 1 deletion README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ This code has been tested for compatibility with:

* Python 3.8+
* Django 3.2 (LTS), 4.0, 4.1
* Wagtail 2.15 (LTS), 3.0, 4.0, 4.1 (LTS)
* Wagtail 2.15 (LTS), 3.0, 4.0, 4.1 (LTS), 4.2

It should be compatible with all intermediate versions, as well.
If you find that it is not, please `file an issue <https://github.com/cfpb/wagtail-inventory/issues/new>`_.
Expand Down
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

install_requires = [
"tqdm>=4.15.0,<5",
"wagtail>=2.15,<4.2",
"wagtail>=2.15",
]


Expand Down
7 changes: 4 additions & 3 deletions tox.ini
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@
skipsdist=True
envlist=
lint,
python{3.8,3.10}-django{3.2}-wagtail{2.15,3.0,4.0,4.1}
python{3.8,3.10}-django{4.0}-wagtail{3.0,4.0,4.1}
python{3.8,3.10}-django{4.1}-wagtail{4.0,4.1}
python{3.8,3.10}-django{3.2}-wagtail{2.15,3.0,4.0,4.1,4.2}
python{3.8,3.10}-django{4.0}-wagtail{3.0,4.0,4.1,4.2}
python{3.8,3.10}-django{4.1}-wagtail{4.0,4.1,4.2}

[testenv]
install_command=pip install -e ".[testing]" -U {opts} {packages}
Expand All @@ -26,6 +26,7 @@ deps=
wagtail3.0: wagtail>=3.0,<3.1
wagtail4.0: wagtail>=4.0,<4.1
wagtail4.1: wagtail>=4.1,<4.2
wagtail4.2: wagtail>=4.2rc1,<4.3

[testenv:lint]
basepython=python3.8
Expand Down

0 comments on commit 96af09c

Please sign in to comment.