Skip to content

Commit

Permalink
fix: update workflow files
Browse files Browse the repository at this point in the history
  • Loading branch information
Josh Yu committed Mar 20, 2024
1 parent 55dbdac commit bc504b2
Show file tree
Hide file tree
Showing 5 changed files with 51 additions and 23 deletions.
30 changes: 18 additions & 12 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,19 +9,23 @@ jobs:
continue-on-error: ${{ matrix.continue-on-error }}
strategy:
matrix:
python-version: ["3.11", "3.10", "3.9"]
django: [42, 41, 32]
cms: [4, 311, 39]
python-version: ["3.8", "3.9", "3.10"]
django: [32, 42]
cms: [40]
requirements-file: [
dj32_cms40.txt,
dj42_cms40.txt,
]
continue-on-error: [true]
exclude:
- django: 41
cms: 39
- django: 42
cms: 39
- django: 41
cms: 4
- django: 42
cms: 4
# exclude:
# - django: 41
# cms: 39
# - django: 42
# cms: 39
# - django: 41
# cms: 4
# - django: 42
# cms: 4
steps:
- uses: actions/checkout@v3
- name: Set up Python ${{ matrix.python-version }}
Expand All @@ -44,6 +48,8 @@ jobs:
${{ runner.os }}-tox-${{ format('{{py{0}-django{1}-cms{2}}}', matrix.python-version, matrix.django, matrix.cms) }}-
- name: Install dependencies
run: |
python setup.py install
pip install -r tests/requirements/dj{{matrix.django}}_cms{{matrix.cms}}.txt
sudo apt-get install gettext
python -m pip install --upgrade pip setuptools tox>4
- name: Test with tox
Expand Down
4 changes: 4 additions & 0 deletions tests/requirements/dj32_cms40.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
-r requirements_base.txt

Django>=3.2,<4

4 changes: 4 additions & 0 deletions tests/requirements/dj42_cms40.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
-r requirements_base.txt

Django>=4.2,<5

7 changes: 7 additions & 0 deletions tests/requirements/requirements_base.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
-e .[docs]
coverage>5
coveralls>2
mock>=1.0.1
django-app-helper>=2.0.0

https://github.com/django-cms/django-cms/tarball/release/4.0.1.x#egg=django-cms
29 changes: 18 additions & 11 deletions tox.ini
Original file line number Diff line number Diff line change
Expand Up @@ -8,21 +8,28 @@ envlist =
ruff
pypi-description
towncrier
py{311,310,39}-django{42}-cms{4}
py{311,310,39}-django{42,41}-cms{311}
py{311,310,39}-django{32}-cms{311,39}
; py{311,310,39}-django{42}-cms{4}
; py{311,310,39}-django{42,41}-cms{311}
; py{311,310,39}-django{32}-cms{311,39}
py{39, 310, 311}-django{32,42}-cms{40}

[testenv]
commands = {env:COMMAND:python} cms_helper.py djangocms_page_sitemap test {posargs}
deps =
django32: Django~=3.2.0
django41: Django~=4.1.0
django42: Django~=4.2.0
cms39: https://github.com/django-cms/django-cms/archive/release/3.9.x.zip
cms311: https://github.com/yakky/django-cms/archive/release/3.11.x.zip
cms4: https://github.com/django-cms/django-cms/archive/release/4.1.x.zip
cms4: https://github.com/django-cms/djangocms-versioning/archive/refs/heads/master.zip
-r{toxinidir}/requirements-test.txt
-r{toxinidir}/tests/requirements/requirements_base.txt
django32: -r{toxinidir}/tests/requirements/dj32_cms40.txt
django42: -r{toxinidir}/tests/requirements/dj42_cms40.txt
; django41: Django~=4.1.0
;django42: Django~=4.2.0
; cms39: https://github.com/django-cms/django-cms/archive/release/3.9.x.zip
; cms311:https://github.com/yakky/django-cms/archive/release/3.11.x.zip
;cms41: https://github.com/django-cms/django-cms/archive/release/4.1.x.zip
;cms41:https://github.com/django-cms/djangocms-versioning/archive/refs/heads/master.zip
;-r{toxinidir}/requirements-test.txt
basepython=
py38: python3.8
py39: python3.9
py310: python3.10
passenv =
COMMAND
PYTEST_*
Expand Down

0 comments on commit bc504b2

Please sign in to comment.