Skip to content
Merged
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
10 changes: 5 additions & 5 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,21 +16,21 @@ jobs:
with:
poetry-version: '1.1.4'
- run: pip install tox
- run: tox -e lint,py39-dj31
- run: tox -e lint,py39-dj32
test_compatibility:
needs: test
runs-on: ubuntu-latest
strategy:
matrix:
include:
- python: "3.6"
toxenv: py36-dj22,py36-dj30,py36-dj31
toxenv: py36-dj22,py36-dj30,py36-dj31,py36-dj32
- python: "3.7"
toxenv: py37-dj22,py37-dj30,py37-dj31
toxenv: py37-dj22,py37-dj30,py37-dj31,py37-dj32
- python: "3.8"
toxenv: py38-dj22,py38-dj30,py38-dj31
toxenv: py38-dj22,py38-dj30,py38-dj31,py38-dj32,py38-djmain
- python: "3.9"
toxenv: py39-dj22,py39-dj30,py39-dj31
toxenv: py39-dj22,py39-dj30,py39-dj31,py39-dj32,py39-djmain
steps:
- uses: actions/checkout@v2
- uses: actions/setup-python@v2
Expand Down
5 changes: 4 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,14 @@

## [Unreleased]

### Added

- We now officially support Django 3.2, and tentatively Django 4.0

### Fixed

- Update tox config to account for Django's primary branch rename.


## [0.3.0] - 2020-11-02

We have a new documentation website! Check out [torchbox.github.io/django-pattern-library](https://torchbox.github.io/django-pattern-library/).
Expand Down
2 changes: 1 addition & 1 deletion docs/getting-started.md
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ poetry add --dev django-pattern-library

We support:

- Django 2.2.x, 3.0.x, 3.1.x, 3.2.x (experimental)
- Django 2.2.x, 3.0.x, 3.1.x, 3.2.x, 4.0.x (experimental)
- Python 3.6, 3.7, 3.8, 3.9
- Django Templates only, no Jinja support

Expand Down
8 changes: 4 additions & 4 deletions pattern_library/urls.py
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
from django.conf.urls import url
from django.urls import re_path

from pattern_library import get_pattern_template_suffix, views

app_name = 'pattern_library'
urlpatterns = [
# UI
url(r'^$', views.IndexView.as_view(), name='index'),
url(
re_path(r'^$', views.IndexView.as_view(), name='index'),
re_path(
r'^pattern/(?P<pattern_template_name>[\w./-]+%s)$' % (
get_pattern_template_suffix()
),
Expand All @@ -15,7 +15,7 @@
),

# iframe rendering
url(
re_path(
r'^render-pattern/(?P<pattern_template_name>[\w./-]+%s)$' % (
get_pattern_template_suffix()
),
Expand Down
1 change: 1 addition & 0 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ classifiers = [
"Framework :: Django :: 2.2",
"Framework :: Django :: 3.0",
"Framework :: Django :: 3.1",
"Framework :: Django :: 3.2",
]
packages = [
{ include = "pattern_library" },
Expand Down
6 changes: 3 additions & 3 deletions tests/urls.py
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
from django.conf import settings
from django.conf.urls import include, url
from django.urls import include, path

from pattern_library import urls as pattern_library_urls

if settings.GITHUB_PAGES_EXPORT:
urlpatterns = [
url(r'^django-pattern-library/demo/pattern-library/', include(pattern_library_urls)),
path('django-pattern-library/demo/pattern-library/', include(pattern_library_urls)),
]
else:
urlpatterns = [
url(r'^pattern-library/', include(pattern_library_urls)),
path('pattern-library/', include(pattern_library_urls)),
]
3 changes: 2 additions & 1 deletion tox.ini
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[tox]
envlist = py{36,37,38,39}-dj{22,30,31,main}, lint
envlist = py{36,37,38,39}-dj{22,30,31,32,main}, lint
skipsdist = true

[testenv]
Expand All @@ -14,6 +14,7 @@ deps =
dj22: Django>=2.2,<2.3
dj30: Django>=3.0,<3.1
dj31: Django>=3.1,<3.2
dj32: Django>=3.2,<3.3
djmain: https://github.com/django/django/archive/main.zip

[testenv:lint]
Expand Down