Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 8 additions & 4 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
@@ -1,19 +1,23 @@
name: CI

on: [push]
on:
push:
branches:
- trunk
pull_request:

jobs:
build:
runs-on: ubuntu-latest
strategy:
max-parallel: 5
matrix:
python-version: [3.6, 3.7, 3.8, 3.9]
python-version: [3.8, 3.9, "3.10", "3.11"]

steps:
- uses: actions/checkout@v1
- uses: actions/checkout@v3
- name: Set up Python ${{ matrix.python-version }}
uses: actions/setup-python@v2
uses: actions/setup-python@v4
with:
python-version: ${{ matrix.python-version }}
- name: Install dependencies
Expand Down
9 changes: 5 additions & 4 deletions docs/install.rst
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,14 @@
Installation guide
==================

The |release| release of django-soapbox supports Django 2.2 and
3.0 on the following Python versions:
The |release| release of django-soapbox supports Django 3.2, 4.1 and
4.2 on the following Python versions:

* Django 2.2 supports Python 3.5, 3.6, 3.7, and 3.8.
* Django 3.2 supports Python 3.8, 3.9, and 3.10.

* Django 3.0 supports Python 3.6, 3.7, and 3.8.
* Django 4.1 supports Python 3.8, 3.9, 3.10 and 3.11.

* Django 4.2 supports Python 3.8, 3.9, 3.10 and 3.11.

Normal installation
-------------------
Expand Down
2 changes: 2 additions & 0 deletions runtests.py
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,8 @@
},
}
],
"SECRET_KEY": "secret",
"DEFAULT_AUTO_FIELD": "django.db.models.BigAutoField",
}


Expand Down
15 changes: 8 additions & 7 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -21,19 +21,20 @@
"Development Status :: 5 - Production/Stable",
"Environment :: Web Environment",
"Framework :: Django",
"Framework :: Django :: 2.2",
"Framework :: Django :: 3.0",
"Framework :: Django :: 3.2",
"Framework :: Django :: 4.1",
"Framework :: Django :: 4.2",
"Intended Audience :: Developers",
"License :: OSI Approved :: BSD License",
"Operating System :: OS Independent",
"Programming Language :: Python",
"Programming Language :: Python :: 3",
"Programming Language :: Python :: 3.5",
"Programming Language :: Python :: 3.6",
"Programming Language :: Python :: 3.7",
"Programming Language :: Python :: 3.8",
"Programming Language :: Python :: 3.9",
"Programming Language :: Python :: 3.10",
"Programming Language :: Python :: 3.11",
"Topic :: Utilities",
],
python_requires=">=3.5",
install_requires=["Django>=2.2"],
python_requires=">=3.8",
install_requires=["Django>=3.2"],
)
6 changes: 3 additions & 3 deletions src/soapbox/models.py
Original file line number Diff line number Diff line change
Expand Up @@ -58,17 +58,17 @@ class Message(models.Model):

message = models.TextField()
is_global = models.BooleanField(
default=False, help_text=u"If checked, this message will display on all pages."
default=False, help_text="If checked, this message will display on all pages."
)
is_active = models.BooleanField(
default=True, help_text=u"Only active messages will be displayed."
default=True, help_text="Only active messages will be displayed."
)
url = models.CharField(
"URL",
max_length=255,
blank=True,
null=True,
help_text=u"Message will be displayed on any URL which matches this.",
help_text="Message will be displayed on any URL which matches this.",
)

objects = MessageManager()
Expand Down
15 changes: 8 additions & 7 deletions tox.ini
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,8 @@
# Environment matrix.
[tox]
envlist =
py{36,37,38,39}-django{22,30,31}
py{38,39,310}-django{32,41,42}
py{311}-django{41,42}
black
check-description
check-manifest
Expand All @@ -35,10 +36,10 @@ envlist =
# Configuration for running on GitHub Actions via tox-gh-actions.
[gh-actions]
python =
3.6: py36
3.7: py37
3.8: py38
3.9: py39, black, check-description, check-manifest, docs, flake8, isort, spelling
3.9: py39
3.10: py310
3.11: py311, black, check-description, check-manifest, docs, flake8, isort, spelling


# The base test environment -- runs the unit test suite with coverage.
Expand Down Expand Up @@ -77,9 +78,9 @@ commands =
coverage report -m
deps =
coverage
django22: Django>=2.2,<3.0
django30: Django>=3.0,<3.1
django31: Django>=3.1,<3.2
django32: Django>=3.2,<4.0
django41: Django>=4.1,<4.2
django42: Django>=4.2,<4.3


# Documentation checks.
Expand Down