diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 6193409..8d38803 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -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 }} @@ -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 diff --git a/tests/requirements/dj32_cms40.txt b/tests/requirements/dj32_cms40.txt new file mode 100644 index 0000000..80e163e --- /dev/null +++ b/tests/requirements/dj32_cms40.txt @@ -0,0 +1,4 @@ +-r requirements_base.txt + +Django>=3.2,<4 + diff --git a/tests/requirements/dj42_cms40.txt b/tests/requirements/dj42_cms40.txt new file mode 100644 index 0000000..9107cb2 --- /dev/null +++ b/tests/requirements/dj42_cms40.txt @@ -0,0 +1,4 @@ +-r requirements_base.txt + +Django>=4.2,<5 + diff --git a/tests/requirements/requirements_base.txt b/tests/requirements/requirements_base.txt new file mode 100644 index 0000000..4ad6077 --- /dev/null +++ b/tests/requirements/requirements_base.txt @@ -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 \ No newline at end of file diff --git a/tox.ini b/tox.ini index 460a976..6cc20bc 100644 --- a/tox.ini +++ b/tox.ini @@ -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_*