Fix typo in minimum Poetry version and move demo app pattern library to /

Author: Ben Dickinson

.github/workflows/ci.yml

@@ -81,12 +81,12 @@ jobs:
  # Docs website build.
  - run: poetry run mkdocs build --strict
  # Demo website build.
- - run: wget --mirror --page-requisites --no-parent --no-verbose http://localhost:8000/django-pattern-library/demo/pattern-library/
+ - run: wget --mirror --page-requisites --no-parent --no-verbose http://localhost:8000/django-pattern-library/demo/
  - run: mv localhost:8000/django-pattern-library/demo site
  # Demo render_patterns.
  - run: poetry run django-admin render_patterns --settings=tests.settings.production --pythonpath=. --wrap-fragments --output=site/dpl-rendered-patterns
  # Package build, incl. publishing an experimental pre-release via GitHub Pages for builds on `main`.
- - run: cat pyproject.toml| awk '{sub(/^version = .+/,"version = \"0.0.0.dev\"")}1' > pyproject.toml.tmp && mv pyproject.toml.tmp pyproject.toml
+ - run: cat pyproject.toml | awk '{sub(/^version = .+/,"version = \"0.0.0.dev\"")}1' > pyproject.toml.tmp && mv pyproject.toml.tmp pyproject.toml
  - run: poetry build
  - run: mv dist site
  - uses: actions/upload-artifact@v2

CHANGELOG.md

@@ -8,6 +8,11 @@
 - Support for Python 3.10 ([#163](https://github.com/torchbox/django-pattern-library/pull/163)).
 - VS Code devcontainer for development [#178](https://github.com/torchbox/django-pattern-library/pull/178)
 
+### Changed
+
+- Change Poetry version to be `>=1.1.12,<2` in Docker development setup (prevents `JSONDecodeError` issue under Python 3.10) [#178](https://github.com/torchbox/django-pattern-library/pull/178)
+- Move demo/test app pattern-library from `/pattern-library/` to `/` [#178](https://github.com/torchbox/django-pattern-library/pull/178)
+
 ### Removed
 
 - We no longer support Python 3.6, as it has reached its end of life ([#163](https://github.com/torchbox/django-pattern-library/pull/163).
@@ -30,7 +35,7 @@ This addresses the following limitations of the pattern library:
 - [#113 Django form fields not well supported](https://github.com/torchbox/django-pattern-library/issues/113)
 - [#135 Competing tag/context config for image provides inconsistent result](https://github.com/torchbox/django-pattern-library/issues/135)
 
-View the [documentation](https://torchbox.github.io/django-pattern-library/guides/defining-template-context/#modifying-template-contexts-with-python), as well as demos leveraging the new capability: [forms](https://torchbox.github.io/django-pattern-library/demo/pattern-library/pattern/patterns/pages/forms/example_form.html) (see [forms and fields recipe](https://torchbox.github.io/django-pattern-library/recipes/forms-and-fields/)), and [pagination](https://torchbox.github.io/django-pattern-library/demo/pattern-library/pattern/patterns/pages/search/search.html) (see [pagination recipe](https://torchbox.github.io/django-pattern-library/recipes/pagination/)).
+View the [documentation](https://torchbox.github.io/django-pattern-library/guides/defining-template-context/#modifying-template-contexts-with-python), as well as demos leveraging the new capability: [forms](https://torchbox.github.io/django-pattern-library/demo/pattern/patterns/pages/forms/example_form.html) (see [forms and fields recipe](https://torchbox.github.io/django-pattern-library/recipes/forms-and-fields/)), and [pagination](https://torchbox.github.io/django-pattern-library/demo/pattern/patterns/pages/search/search.html) (see [pagination recipe](https://torchbox.github.io/django-pattern-library/recipes/pagination/)).
 
 ## [0.4.0](https://github.com/torchbox/django-pattern-library/releases/tag/v0.4.0) - 2021-05-20
 

CONTRIBUTING.md

@@ -41,7 +41,7 @@ docker-compose up
 docker-compose exec web django-admin runserver 0.0.0.0:8000
 ```
 
-Once the server is started, the pattern library will be available at `http://localhost:8000/pattern-library/`.
+Once the server is started, the pattern library will be available at `http://localhost:8000/`.
 
 ### Run locally with Poetry
 

Dockerfile

@@ -3,8 +3,8 @@ FROM python:3.10
 WORKDIR /app
 
 RUN useradd --create-home dpl && \
- pip install "poetry>=1.1.2,<2" && \
-  poetry config virtualenvs.create false
+ pip install "poetry>=1.1.12,<2" && \
+e poetry config virtualenvs.create false
 
 COPY pyproject.toml ./
 RUN poetry install --no-root

README.md

@@ -2,7 +2,7 @@
 
 [![PyPI](https://img.shields.io/pypi/v/django-pattern-library.svg)](https://pypi.org/project/django-pattern-library/) [![PyPI downloads](https://img.shields.io/pypi/dm/django-pattern-library.svg)](https://pypi.org/project/django-pattern-library/) [![Build status](https://github.com/torchbox/django-pattern-library/workflows/CI/badge.svg)](https://github.com/torchbox/django-pattern-library/actions) [![Total alerts](https://img.shields.io/lgtm/alerts/g/torchbox/django-pattern-library.svg?logo=lgtm&logoWidth=18)](https://lgtm.com/projects/g/torchbox/django-pattern-library/alerts/)
 
-> UI pattern libraries for Django templates. Try our [online demo](https://torchbox.github.io/django-pattern-library/demo/pattern-library/).
+> UI pattern libraries for Django templates. Try our [online demo](https://torchbox.github.io/django-pattern-library/demo/).
 
 ![Screenshot of the pattern library UI, with navigation, pattern rendering, and configuration](https://raw.githubusercontent.com/torchbox/django-pattern-library/main/.github/pattern-library-screenshot.webp)
 
@@ -31,8 +31,8 @@ Learn more by watching our presentation – [Reusable UI components: A journey f
 
 The pattern library is dependent on Django for rendering – but also supports exporting as a static site if needed. Try out our online demo:
 
-- For a component, [accordion.html](https://torchbox.github.io/django-pattern-library/demo/pattern-library/pattern/patterns/molecules/accordion/accordion.html)
-- For a page-level template, [person_page.html](https://torchbox.github.io/django-pattern-library/demo/pattern-library/pattern/patterns/pages/people/person_page.html)
+- For a component, [accordion.html](https://torchbox.github.io/django-pattern-library/demo/pattern/patterns/molecules/accordion/accordion.html)
+- For a page-level template, [person_page.html](https://torchbox.github.io/django-pattern-library/demo/pattern/patterns/pages/people/person_page.html)
 
 ## Documentation
 

docs/getting-started.md

@@ -1,6 +1,6 @@
 # Getting started
 
-> If you just want to see django-pattern-library up and running, have a look at our [online demo](https://torchbox.github.io/django-pattern-library/demo/pattern-library/pattern/patterns/molecules/accordion/accordion.html).
+> If you just want to see django-pattern-library up and running, have a look at our [online demo](https://torchbox.github.io/django-pattern-library/demo/pattern/patterns/molecules/accordion/accordion.html).
 
 ## Installation
 

docs/index.md

@@ -29,8 +29,8 @@ Pattern libraries will change your workflow for the better:
 
 The pattern library is dependent on Django for rendering – but also supports exporting as a static site if needed. Try out our online demo:
 
-- For a component, [accordion.html](https://torchbox.github.io/django-pattern-library/demo/pattern-library/pattern/patterns/molecules/accordion/accordion.html)
-- For a page-level template, [person_page.html](https://torchbox.github.io/django-pattern-library/demo/pattern-library/pattern/patterns/pages/people/person_page.html)
+- For a component, [accordion.html](https://torchbox.github.io/django-pattern-library/demo/pattern/patterns/molecules/accordion/accordion.html)
+- For a page-level template, [person_page.html](https://torchbox.github.io/django-pattern-library/demo/pattern/patterns/pages/people/person_page.html)
 
 ## Why this exists
 

mkdocs.yml

@@ -58,4 +58,4 @@ nav:
  - 'Related projects': 'community/related-projects.md'
  - 'Code of conduct': 'community/code-of-conduct.md'
  - 'Security policy': 'community/security-policy.md'
- - 'Online demo': '/django-pattern-library/demo/pattern-library/'
+ - 'Online demo': '/django-pattern-library/demo/'

tests/urls.py

@@ -5,9 +5,9 @@
 
 if settings.GITHUB_PAGES_EXPORT:
  urlpatterns = [
- path('django-pattern-library/demo/pattern-library/', include(pattern_library_urls)),
+ path('django-pattern-library/demo/', include(pattern_library_urls)),
  ]
 else:
  urlpatterns = [
- path('pattern-library/', include(pattern_library_urls)),
+ path('', include(pattern_library_urls)),
  ]