Mike Knee · Mike Knee · Mike Knee · activate-account-bot · Mike Knee · 401ca01c
--- a/.gitlab/webapp.gitlab-ci.yml
+++ b/.gitlab/webapp.gitlab-ci.yml
 include:
  - project: "uis/devops/continuous-delivery/ci-templates"
    file: "/auto-devops/common-pipeline.yml"
-    ref: v3.2.0
+    ref: v5.1.0
  - project: "uis/devops/continuous-delivery/ci-templates"
    file: "/auto-devops/artifact-registry.yml"
-    ref: v3.2.0
+    ref: v5.1.0
  - project: "uis/devops/continuous-delivery/ci-templates"
    file: "/auto-devops/release-it.yml"
-    ref: v3.2.0
+    ref: v5.1.0
  - project: "uis/devops/continuous-delivery/ci-templates"
    file: "/commitlint.yml"
-    ref: v3.2.0
+    ref: v5.1.0

 variables:
  DAST_DISABLED: "1"

--- a/CHANGELOG.md
+++ b/CHANGELOG.md
+# Changelog
+
+## [0.2.0](https://gitlab.developers.cam.ac.uk/uis/devops/iam/activate-account/api/compare/0.1.0...0.2.0) (2024-10-17)
+
+### Features
+
+* update renovate-bot config ([5042acf](https://gitlab.developers.cam.ac.uk/uis/devops/iam/activate-account/api/commit/5042acf5935eda1c58878f4ff9f99724c5330815))
+
+### Bug Fixes
+
+* correct renovate config ([c41f624](https://gitlab.developers.cam.ac.uk/uis/devops/iam/activate-account/api/commit/c41f624b6a09ef93b74cfb64cef5635e45f7c2a1))
--- a/pyproject.toml
+++ b/pyproject.toml
 [tool.poetry]
 name = "activate_account"
-version = "0.1.0"
+version = "0.2.0"
 description = ""
-authors = []
+authors = [ ]
 readme = "README.md"
 package-mode = false

-[[tool.poetry.source]]
-name = "uis-devops"
-url = "https://gitlab.developers.cam.ac.uk/api/v4/groups/5/-/packages/pypi/simple"
-priority = "explicit"
+  [[tool.poetry.source]]
+  name = "uis-devops"
+  url = "https://gitlab.developers.cam.ac.uk/api/v4/groups/5/-/packages/pypi/simple"
+  priority = "explicit"
+
+  [tool.poetry.dependencies]
+  python = "^3.11"
+  django = ">=4.2.0,<4.3.0"
+  django-cors-headers = "^4.1.0"
+  django-crispy-forms = "^2.0"
+  django-filter = "^23.2"
+  django-structlog = "^5.1.0"
+  djangorestframework = "^3.14.0"
+  djangorestframework-camel-case = "^1.4.2"
+  drf-spectacular = "^0.26.3"
+  gunicorn = "^23.0.0"
+  pyyaml = "^6.0"
+  proxyprefix = "^0.1.3"
+  whitenoise = "^6.5.0"
+  setuptools = "^73.0.1"
+  factory-boy = "^3.3.1"
+
+    [tool.poetry.dependencies.externalsettings]
+    version = "^1.0.2"
+    source = "uis-devops"
+
+    [tool.poetry.dependencies.psycopg]
+    extras = [ "binary" ]
+    version = "^3.1.9"
+
+[tool.poetry.group.dev.dependencies]
+better-exceptions = "^0.3.3"
+django-debug-toolbar = "^4.1.0"
+faker = "^18.11.1"
+ipython = "^8.14.0"
+pre-commit = "^3.3.3"
+pytest = "^7.4.0"
+pytest-django = "^4.5.2"
+pytest-docker-tools = "^3.1.3"
+pytest-env = "^0.8.2"
+tox = "4.14.1"
+
+  [tool.poetry.group.dev.dependencies.coverage]
+  extras = [ "toml" ]
+  version = "^7.2.7"

 [tool.poe.tasks.up]
 help = "Start the application in local development mode"
 cmd = "docker compose up --build"
-env = { COMPOSE_PROFILES = "development" }
+
+  [tool.poe.tasks.up.env]
+  COMPOSE_PROFILES = "development"

 [tool.poe.tasks.fix]
 help = "Run pre-commit checks to fix formatting errors"
@@ -27,7 +70,9 @@ cmd = "docker compose run --build --rm tox"
 [tool.poe.tasks.down]
 help = "Stop any running containers"
 cmd = "docker compose down"
-env = { COMPOSE_PROFILES = "development,production,utilities" }
+
+  [tool.poe.tasks.down.env]
+  COMPOSE_PROFILES = "development,production,utilities"

 [tool.poe.tasks.manage]
 help = "Run Django management commands"
@@ -40,22 +85,30 @@ cmd = "docker compose run --build --rm manage init_mock_data"
 [tool.poe.tasks."up:production"]
 help = "Start the application running in the production container"
 cmd = "docker compose up --build"
-env = { COMPOSE_PROFILES = "production" }
+
+  [tool.poe.tasks."up:production".env]
+  COMPOSE_PROFILES = "production"

 [tool.poe.tasks."down:hard"]
 help = "Stop any running containers, remove any dangling containers and remove any persistent data volumes"
 cmd = "docker compose down --remove-orphans --volumes"
-env = { COMPOSE_PROFILES = "development,production,utilities" }
+
+  [tool.poe.tasks."down:hard".env]
+  COMPOSE_PROFILES = "development,production,utilities"

 [tool.poe.tasks."compose:build"]
 help = "Build or rebuild all container images"
 cmd = "docker compose build"
-env = { COMPOSE_PROFILES = "development,production,utilities" }
+
+  [tool.poe.tasks."compose:build".env]
+  COMPOSE_PROFILES = "development,production,utilities"

 [tool.poe.tasks."compose:pull"]
 help = "Pull any upstream container images"
 cmd = "docker compose pull --ignore-buildable --ignore-pull-failures"
-env = { COMPOSE_PROFILES = "development,production,utilities" }
+
+  [tool.poe.tasks."compose:pull".env]
+  COMPOSE_PROFILES = "development,production,utilities"

 [tool.poe.tasks."tox:local"]
 help = "Run the Python test suite via tox using the locally installed Python version"
@@ -66,67 +119,18 @@ help = "Run the Python test suite via pytest using the locally installed Python
 cmd = "pytest"

 [tool.pytest.ini_options]
-# We need to set EXTERNAL_SETTING_DATABASES to some default value but, in the
-# usual case of TEST_USE_EXTERNAL_DATABASE not being set, the actual value is
-# updated by the pytest django fixtures to point to a Postgres instance spun up
-# to run tests.
 env = [
  "DJANGO_SETTINGS_MODULE=activate_account_project.settings.testing",
-  'D:R:EXTERNAL_SETTING_DATABASES={"default":{}}',
+  "D:R:EXTERNAL_SETTING_DATABASES={\"default\":{}}",
  "D:EXTERNAL_SETTING_SECRET_KEY=fake-secret-key",
-  "D:DANGEROUS_DISABLE_HTTPS_REDIRECT=1",
+  "D:DANGEROUS_DISABLE_HTTPS_REDIRECT=1"
 ]
 python_files = "tests.py test_*.py *_tests.py"
 filterwarnings = [
  "ignore:.*pkg_resources.*:DeprecationWarning",
-  "ignore::DeprecationWarning:.*google.*",
+  "ignore::DeprecationWarning:.*google.*"
 ]

-[tool.poetry.dependencies]
-# Dependencies for the web application itself.
-#
-# Add dependencies here via "poetry add {dependency}".
-python = "^3.11"  # This should track the version tested in CI and used by the Docker image.
-django = ">=4.2.0,<4.3.0"
-django-cors-headers = "^4.1.0"
-django-crispy-forms = "^2.0"
-django-filter = "^23.2"
-
-django-structlog = "^5.1.0"
-djangorestframework = "^3.14.0"
-djangorestframework-camel-case = "^1.4.2"
-drf-spectacular = "^0.26.3"
-
-externalsettings = {version = "^1.0.2", source = "uis-devops"}
-gunicorn = "^23.0.0"
-psycopg = {extras = ["binary"], version = "^3.1.9"}
-pyyaml = "^6.0"
-proxyprefix = "^0.1.3"
-whitenoise = "^6.5.0"
-setuptools = "^73.0.1" # Added to resolve ImportError of 'pkg_resources' after Gunicorn update due to CVE-2024-1135.
-factory-boy = "^3.3.1"
-
-[tool.poetry.group.dev.dependencies]
-# Dependencies for running the web application in local development.
-#
-# Add dependencies here via "poetry add -G dev {dependency}".
-better-exceptions = "^0.3.3"
-coverage = {extras = ["toml"], version = "^7.2.7"}
-django-debug-toolbar = "^4.1.0"
-faker = "^18.11.1"
-ipython = "^8.14.0"
-pre-commit = "^3.3.3"
-pytest = "^7.4.0"
-pytest-django = "^4.5.2"
-pytest-docker-tools = "^3.1.3"
-pytest-env = "^0.8.2"
-# Keep this in sync with .gitlab/webapp.gitlab-ci.yml
-tox = "4.14.1"
-
-[build-system]
-requires = ["poetry-core>=1.8.2"]
-build-backend = "poetry.core.masonry.api"
-
 [tool.mypy]
 ignore_missing_imports = true

@@ -134,7 +138,7 @@ ignore_missing_imports = true
 line-length = 99

 [tool.coverage.run]
-omit= [
+omit = [
  ".tox/*",
  "setup.py",
  "manage.py",
@@ -143,8 +147,12 @@ omit= [
  "*/tests/*",
  "*/migrations/*",
  "activate_account_project/settings/*",
-  "activate_account_project/wsgi.py",
+  "activate_account_project/wsgi.py"
 ]

 [tool.isort]
 profile = "black"
+
+[build-system]
+requires = [ "poetry-core>=1.8.2" ]
+build-backend = "poetry.core.masonry.api"
--- a/renovate.json
+++ b/renovate.json
 {
  "$schema": "https://docs.renovatebot.com/renovate-schema.json",
  "extends": [
-    "local>uis/devops/renovate-config"
+    ":semanticCommits",
+    "local>uis/devops/renovate-config:allowOnlyLTSDjango"
  ]
 }