Merge main + resolve conflicts

Author: CuriousLearner

.github/workflows/ci.yml

@@ -12,10 +12,10 @@ jobs:
       - run: pipx install "poetry>=1.1.12,<2"
       - uses: actions/setup-python@v5
         with:
-          python-version: "3.12"
-          cache: 'poetry'
+          python-version: "3.13"
+          cache: "poetry"
       - run: pip install tox
-      - run: tox -e lint,py312-dj50
+      - run: tox -e lint,py313-dj51
   test_compatibility:
     needs: test
     runs-on: ubuntu-latest
@@ -26,16 +26,16 @@ jobs:
           # Test with all supported Django versions, for all compatible Python versions.
           # See https://docs.djangoproject.com/en/dev/faq/install/#what-python-version-can-i-use-with-django for the official matrix.
           # Additionally test on Django’s main branch with the most recent Python version.
-          - python: "3.8"
-            toxenv: py38-dj32,py38-dj42
           - python: "3.9"
-            toxenv: py39-dj32,py39-dj42
+            toxenv: py39-dj42
           - python: "3.10"
-            toxenv: py310-dj32,py310-dj42,py310-dj50,py310-djmain
+            toxenv: py310-dj42,py310-dj51,py310-dj52
           - python: "3.11"
-            toxenv: py311-dj42,py311-dj50,py311-djmain
+            toxenv: py311-dj42,py311-dj51,py311-dj52
           - python: "3.12"
-            toxenv: py312-dj42,py312-djmain
+            toxenv: py312-dj42,py312-dj52
+          - python: "3.13"
+            toxenv: py313-dj42,py313-dj52,py312-djmain
     steps:
       - uses: actions/checkout@v4
       - run: pipx install "poetry>=1.1.12,<2"
@@ -54,7 +54,7 @@ jobs:
       - uses: actions/checkout@v4
       - uses: actions/setup-node@v4
         with:
-          node-version-file: '.nvmrc'
+          node-version-file: ".nvmrc"
       - id: node-cache
         uses: actions/cache@v3
         with:
@@ -68,7 +68,7 @@ jobs:
       - uses: actions/setup-python@v5
         with:
           python-version-file: pyproject.toml
-          cache: 'poetry'
+          cache: "poetry"
       - run: poetry install
       - run: poetry run django-admin runserver --settings=tests.settings.production --pythonpath=. &
       # Docs website build.

CHANGELOG.md

@@ -1,5 +1,27 @@
 # Changelog
 
+## [Unreleased]
+
+## [1.3.0](https://github.com/torchbox/django-pattern-library/releases/tag/v1.3.0) - 2024-12-11
+
+### Added
+
+- Add support for Django 5.1 ([#251](https://github.com/torchbox/django-pattern-library/pull/251))
+
+### Removed
+
+- Drop support for Python 3.8 ([#251](https://github.com/torchbox/django-pattern-library/pull/251))
+- Drop support for Django 4.1 ([#242](https://github.com/torchbox/django-pattern-library/pull/242))
+
+### Documentation
+
+- Note requirement for `.md` extension for pattern documentation files ([#248](https://github.com/torchbox/django-pattern-library/pull/248))
+- Mention complementary package django-viewcomponent, and django-lookbook as an alternative. ([#250](https://github.com/torchbox/django-pattern-library/pull/250))
+
+### Maintenance
+
+- Test with Python 3.12 ([#242](https://github.com/torchbox/django-pattern-library/pull/242))
+
 ## [1.2.0](https://github.com/torchbox/django-pattern-library/releases/tag/v1.2.0) - 2024-01-16
 
 ### Added

docs/community/related-projects.md

@@ -9,13 +9,15 @@ Here are other projects that are related to django-pattern-library, and may be r
 - [django-component-tags](https://github.com/syse-i/django-component-tags) – Create advanced HTML components using Django Tags.
 - [slippers](https://github.com/mixxorz/slippers) – Reusable components for Django, without writing a single line of Python.
 - (Jinja only, incompatible but interesting) [JinjaX](https://jinjax.scaletti.dev/) – Write server-side components as single Jinja template files. Use them as HTML tags without doing any importing.
+- [django-viewcomponent](https://github.com/rails-inspire-django/django-viewcomponent) - Build reusable components in Django, inspired by Rails ViewComponent, the components built by django-viewcomponent can be used in both Django template or Python code.
 
 ## Alternatives
 
 - [Storybook](https://storybook.js.org/), and in particular [Storybook for Server](https://github.com/storybookjs/storybook/tree/master/app/server) – Storybook integration with server-rendered UI components.
 - [Pattern Lab](http://patternlab.io/) – PHP or Node pattern library, from which this project is heavily inspired.
 - [Astrum](http://astrum.nodividestudio.com/) – Similar to Pattern Lab, Node based.
 - [rikki-patterns](https://github.com/springload/rikki-patterns) – Experimental Django-friendly pattern library generator, for Jinja2 and Nunjucks templates
+- [django-lookbook](https://github.com/rails-inspire-django/django-lookbook) - Empower your Django development with this pluggable app for creating a robust component library. Includes preview system, documentation engine, and parameter editor for building modular UI effortlessly.
 
 
 ## Pattern libraries based on Django

docs/getting-started.md

@@ -17,8 +17,8 @@ poetry add --dev django-pattern-library
 
 We support:
 
-- Django 3.2, 4.0, 4.1 (experimental), 4.2 (experimental)
-- Python 3.7, 3.8, 3.9, 3.10, 3.11 (experimental)
+- Django 4.2, 5.0, 5.1
+- Python 3.9, 3.10, 3.11, 3.12
 - Django Templates only, no Jinja support
 - Modern “evergreen” desktop and mobile browsers
 

docs/guides/usage-tips.md

@@ -10,7 +10,8 @@ You may also consider using the [`render_patterns` command](../reference/api.md#
 
 ## Document your patterns
 
-Patterns support defining a custom `name` in YAML, as well as rendering fully-fledged documentation in Markdown. Create a file next to the template to document it:
+Patterns support defining a custom `name` in YAML, as well as rendering fully-fledged documentation in Markdown. Create a file next to the template to document it, ensuring the filename has a `.md` extension (e.g., `call_to_action.md`):
+
 
 ```markdown
 This template can be used in different places. In streamfield block