diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 6919c176..080556c8 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -12,11 +12,16 @@ jobs: python-version: ["3.11", "3.10", "3.9"] django: [42, 41, 32] cms: [311, 39] + continue-on-error: [false] exclude: - django: 41 cms: 39 - django: 42 cms: 39 + - django: 32 + cms: 311 + - django: 42 + cms: 311 steps: - uses: actions/checkout@v3 - name: Set up Python ${{ matrix.python-version }} diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index d24df8c4..297de8d1 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -26,11 +26,11 @@ repos: hooks: - id: black - repo: https://github.com/charliermarsh/ruff-pre-commit - rev: 'v0.0.262' + rev: 'v0.0.265' hooks: - id: ruff - repo: https://github.com/asottile/pyupgrade - rev: v3.3.2 + rev: v3.4.0 hooks: - id: pyupgrade args: diff --git a/.readthedocs.yml b/.readthedocs.yml index 239f5cc4..0086f8a5 100644 --- a/.readthedocs.yml +++ b/.readthedocs.yml @@ -1,5 +1,10 @@ version: 2 +build: + os: ubuntu-22.04 + tools: + python: "3.10" + sphinx: configuration: docs/conf.py fail_on_warning: false @@ -9,7 +14,6 @@ formats: - pdf python: - version: 3.8 install: - requirements: requirements-test.txt - method: pip diff --git a/setup.cfg b/setup.cfg index 5a70b049..7aa28f16 100644 --- a/setup.cfg +++ b/setup.cfg @@ -65,6 +65,7 @@ djangocms_blog = *.html *.png *.gif *js *jpg *jpeg *svg *py *mo *po taggit-helpers = django-taggit-helpers docs = django<5.0 + sphinx>2,<5 [sdist] formats = zip diff --git a/tox.ini b/tox.ini index d1b19fac..96f93332 100644 --- a/tox.ini +++ b/tox.ini @@ -26,8 +26,8 @@ deps = django42: django-mptt>=0.9 django42: django-filer>=2.0 django42: django-appdata>=0.3.2 - cms39: https://github.com/divio/django-cms/archive/release/3.9.x.zip - cms311: https://github.com/divio/django-cms/archive/release/3.11.x.zip + 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 channels[daphne]~=4.0.0 django-knocker~=0.5.1 channels-redis