Skip to content

Commit 5220d47

Browse files
committed
Update tox / rtfd setup
1 parent ace55db commit 5220d47

File tree

5 files changed

+21
-6
lines changed

5 files changed

+21
-6
lines changed

.github/workflows/test.yml

+10
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,16 @@ jobs:
1212
python-version: ["3.11", "3.10", "3.9"]
1313
django: [42, 41, 32]
1414
cms: [311, 39]
15+
continue-on-error: [false]
1516
exclude:
1617
- django: 41
1718
cms: 39
1819
- django: 42
1920
cms: 39
21+
- django: 32
22+
cms: 311
23+
- django: 42
24+
cms: 311
2025
steps:
2126
- uses: actions/checkout@v3
2227
- name: Set up Python ${{ matrix.python-version }}
@@ -57,3 +62,8 @@ jobs:
5762
flags: unittests
5863
files: ./coverage.xml
5964
fail_ci_if_error: false
65+
services:
66+
redis:
67+
image: redis
68+
ports:
69+
- 6379:6379

.pre-commit-config.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -26,11 +26,11 @@ repos:
2626
hooks:
2727
- id: black
2828
- repo: https://github.com/charliermarsh/ruff-pre-commit
29-
rev: 'v0.0.262'
29+
rev: 'v0.0.265'
3030
hooks:
3131
- id: ruff
3232
- repo: https://github.com/asottile/pyupgrade
33-
rev: v3.3.2
33+
rev: v3.4.0
3434
hooks:
3535
- id: pyupgrade
3636
args:

.readthedocs.yml

+5-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,10 @@
11
version: 2
22

3+
build:
4+
os: ubuntu-22.04
5+
tools:
6+
python: "3.10"
7+
38
sphinx:
49
configuration: docs/conf.py
510
fail_on_warning: false
@@ -9,7 +14,6 @@ formats:
914
- pdf
1015

1116
python:
12-
version: 3.8
1317
install:
1418
- requirements: requirements-test.txt
1519
- method: pip

setup.cfg

+1
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,7 @@ djangocms_blog = *.html *.png *.gif *js *jpg *jpeg *svg *py *mo *po
6565
taggit-helpers = django-taggit-helpers
6666
docs =
6767
django<5.0
68+
sphinx>2,<5
6869

6970
[sdist]
7071
formats = zip

tox.ini

+3-3
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ envlist =
99
pypi-description
1010
towncrier
1111
py{311,310,39}-django{42,41}-cms{311}
12-
py{311,310,39}-django{32}-cms{311,39}
12+
py{311,310,39}-django{32}-cms{39}
1313

1414
[testenv]
1515
commands = {env:COMMAND:python} cms_helper.py djangocms_blog test {posargs}
@@ -26,8 +26,8 @@ deps =
2626
django42: django-mptt>=0.9
2727
django42: django-filer>=2.0
2828
django42: django-appdata>=0.3.2
29-
cms39: https://github.com/divio/django-cms/archive/release/3.9.x.zip
30-
cms311: https://github.com/divio/django-cms/archive/release/3.11.x.zip
29+
cms39: https://github.com/django-cms/django-cms/archive/release/3.9.x.zip
30+
cms311: https://github.com/yakky/django-cms/archive/release/3.11.x.zip
3131
channels[daphne]~=4.0.0
3232
django-knocker~=0.5.1
3333
channels-redis

0 commit comments

Comments
 (0)