Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[#684] Upgrade django config #686

Merged
merged 2 commits into from
Feb 13, 2025
Merged

[#684] Upgrade django config #686

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
88bb33f
:arrow_up: [#684] Bump django-setup-configuration and mozilla-django-…
SilviaAmAm Feb 7, 2025
ac2298c
:memo: [#684] Add django-setup-configuration documentation
SilviaAmAm Feb 7, 2025
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
2 changes: 2 additions & 0 deletions backend/docs/conf.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,8 @@
# "sphinx_tabs.tabs",
# "recommonmark",
# "sphinx_markdown_tables",
"django_setup_configuration.documentation.setup_config_example",
"django_setup_configuration.documentation.setup_config_usage",
]

# Add any paths that contain templates here, relative to this directory.
Expand Down
1 change: 0 additions & 1 deletion backend/docs/developers/index.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,5 +17,4 @@ Content
gherkin-like-tests
vcr-tests
logic
deploying
translations
3 changes: 2 additions & 1 deletion backend/docs/developers/deploying.rst → backend/docs/devops/deploying.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
.. _developers_deploying:
.. _devops_deploying:

=========
Deploying
Expand All @@ -13,3 +13,4 @@ We currently have 2 ways to deploy:

Please see the respective (private) repositories mentioned above for more information on deployment.


7 changes: 7 additions & 0 deletions backend/docs/devops/django-setup-configuration.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
.. _devops_django-setup-configuration:

==========================
Django Setup configuration
==========================

.. setup-config-usage::
16 changes: 16 additions & 0 deletions backend/docs/devops/index.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
.. _devops_index:

====================
DevOps documentation
====================

Here you can find documentation for devopsers.

Content
=======

.. toctree::
:maxdepth: 3

deploying
django-setup-configuration
1 change: 1 addition & 0 deletions backend/docs/index.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,4 +14,5 @@ Documentation
:maxdepth: 3

developers/index
devops/index
manual/index
10 changes: 8 additions & 2 deletions backend/requirements/base.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,7 @@ django-rosetta==0.10.0
# via -r requirements/base.in
django-sendfile2==0.7.1
# via django-privates
django-setup-configuration==0.4.0
django-setup-configuration==0.7.0
# via
# -r requirements/base.in
# mozilla-django-oidc-db
Expand All @@ -145,6 +145,8 @@ djangorestframework-camel-case==1.4.2
# via -r requirements/base.in
djangorestframework-gis==1.0
# via -r requirements/base.in
docutils==0.21.2
# via django-setup-configuration
drf-nested-routers==0.94.1
# via -r requirements/base.in
drf-spectacular==0.27.2
Expand Down Expand Up @@ -177,7 +179,7 @@ maykin-2fa==1.0.2
# via -r requirements/base.in
mozilla-django-oidc==4.0.1
# via mozilla-django-oidc-db
mozilla-django-oidc-db==0.20.0
mozilla-django-oidc-db==0.22.0
# via -r requirements/base.in
orderedmultidict==1.0.1
# via furl
Expand Down Expand Up @@ -243,6 +245,10 @@ rpds-py==0.18.0
# via
# jsonschema
# referencing
ruamel-yaml==0.18.10
# via django-setup-configuration
ruamel-yaml-clib==0.2.12
# via ruamel-yaml
sentry-sdk==2.11.0
# via -r requirements/base.in
six==1.16.0
Expand Down
21 changes: 17 additions & 4 deletions backend/requirements/ci.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -226,7 +226,7 @@ django-sendfile2==0.7.1
# -c requirements/base.txt
# -r requirements/base.txt
# django-privates
django-setup-configuration==0.4.0
django-setup-configuration==0.7.0
# via
# -c requirements/base.txt
# -r requirements/base.txt
Expand Down Expand Up @@ -269,8 +269,11 @@ djangorestframework-gis==1.0
# -r requirements/base.txt
docker==7.1.0
# via -r requirements/test-tools.in
docutils==0.20.1
docutils==0.21.2
# via
# -c requirements/base.txt
# -r requirements/base.txt
# django-setup-configuration
# sphinx
# sphinx-rtd-theme
drf-nested-routers==0.94.1
Expand Down Expand Up @@ -373,7 +376,7 @@ mozilla-django-oidc==4.0.1
# -c requirements/base.txt
# -r requirements/base.txt
# mozilla-django-oidc-db
mozilla-django-oidc-db==0.20.0
mozilla-django-oidc-db==0.22.0
# via
# -c requirements/base.txt
# -r requirements/base.txt
Expand Down Expand Up @@ -549,6 +552,16 @@ rpds-py==0.18.0
# -r requirements/base.txt
# jsonschema
# referencing
ruamel-yaml==0.18.10
# via
# -c requirements/base.txt
# -r requirements/base.txt
# django-setup-configuration
ruamel-yaml-clib==0.2.12
# via
# -c requirements/base.txt
# -r requirements/base.txt
# ruamel-yaml
sentry-sdk==2.11.0
# via
# -c requirements/base.txt
Expand All @@ -569,7 +582,7 @@ sphinx==7.3.7
# -r requirements/test-tools.in
# sphinx-rtd-theme
# sphinxcontrib-jquery
sphinx-rtd-theme==2.0.0
sphinx-rtd-theme==3.0.2
# via -r requirements/test-tools.in
sphinxcontrib-applehelp==1.0.8
# via sphinx
Expand Down
19 changes: 15 additions & 4 deletions backend/requirements/dev.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -264,7 +264,7 @@ django-sendfile2==0.7.1
# -c requirements/ci.txt
# -r requirements/ci.txt
# django-privates
django-setup-configuration==0.4.0
django-setup-configuration==0.7.0
# via
# -c requirements/ci.txt
# -r requirements/ci.txt
Expand Down Expand Up @@ -311,10 +311,11 @@ docker==7.1.0
# via
# -c requirements/ci.txt
# -r requirements/ci.txt
docutils==0.20.1
docutils==0.21.2
# via
# -c requirements/ci.txt
# -r requirements/ci.txt
# django-setup-configuration
# sphinx
# sphinx-rtd-theme
drf-nested-routers==0.94.1
Expand Down Expand Up @@ -457,7 +458,7 @@ mozilla-django-oidc==4.0.1
# -c requirements/ci.txt
# -r requirements/ci.txt
# mozilla-django-oidc-db
mozilla-django-oidc-db==0.20.0
mozilla-django-oidc-db==0.22.0
# via
# -c requirements/ci.txt
# -r requirements/ci.txt
Expand Down Expand Up @@ -687,6 +688,16 @@ rpds-py==0.18.0
# -r requirements/ci.txt
# jsonschema
# referencing
ruamel-yaml==0.18.10
# via
# -c requirements/ci.txt
# -r requirements/ci.txt
# django-setup-configuration
ruamel-yaml-clib==0.2.12
# via
# -c requirements/ci.txt
# -r requirements/ci.txt
# ruamel-yaml
sentry-sdk==2.11.0
# via
# -c requirements/ci.txt
Expand Down Expand Up @@ -719,7 +730,7 @@ sphinx==7.3.7
# -r requirements/dev.in
# sphinx-rtd-theme
# sphinxcontrib-jquery
sphinx-rtd-theme==2.0.0
sphinx-rtd-theme==3.0.2
# via
# -c requirements/ci.txt
# -r requirements/ci.txt
Expand Down