Updated to uv, fixed ruff issues, updated github actions & docker

fritzbrand · fritzbrand · commit a02dc92d63d5 · 2025-03-26T12:51:43.000+02:00
diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml
@@ -29,29 +29,27 @@ jobs:
         run: sudo apt-get install gettext
       - uses: actions/setup-python@v5
         with:
-          python-version: 3.9
-      - uses: abatilo/actions-poetry@v3  
+          python-version: '3.10'
+      - uses: astral-sh/setup-uv@v3
       - name: Install dependencies
         id: install-deps
         run: |
-          poetry install
+          uv sync --dev
       - name: Check formatting
         # Lints/tests should always run, even if other lints/tests have failed.
         if: success() || failure() && steps.install-deps.outcome == 'success'
         run: |
-          poetry run ruff format --check 
+          uv run ruff format --check
       - name: Lint
         if: success() || failure() && steps.install-deps.outcome == 'success'
         run: |
-          poetry run ruff check
+          uv run ruff check
       - name: Run migrations
         if: success() || failure() && steps.install-deps.outcome == 'success'
         run: |
-          poetry run ./manage.py makemigrations registrations changes\
-           eventstore --dry-run | grep 'No changes detected' || (echo 'There\
-           are changes which require migrations.' && exit 1)
+          uv run ./manage.py makemigrations --dry-run | grep 'No changes detected' || (echo 'There are changes which require migrations.' && exit 1)
       - name: Run tests
         if: success() || failure() && steps.install-deps.outcome == 'success'
         run: |
-          poetry run pytest -vv
+          uv run pytest -vv
 
diff --git a/Dockerfile b/Dockerfile
@@ -1,12 +1,10 @@
-FROM ghcr.io/praekeltfoundation/docker-django-bootstrap-nw:py3.9-bullseye
+FROM ghcr.io/praekeltfoundation/docker-django-bootstrap-nw:py3.10-bullseye
 
 ENV DJANGO_SETTINGS_MODULE "ndoh_hub.settings"
 
 COPY . /app
 
-RUN pip install poetry
-RUN poetry config virtualenvs.create false \
-    && poetry install --no-dev --no-interaction --no-ansi --no-cache
+RUN pip install -e .
     
 RUN apt-get-install.sh gettext; \
     django-admin compilemessages; \
diff --git a/eventstore/tasks.py b/eventstore/tasks.py
@@ -812,7 +812,7 @@ def get_inbound_intent(text):
 )
 def label_whatsapp_message(label, message_id):
     headers = {
-        "Authorization": "Bearer {}".format(settings.TURN_TOKEN),
+        "Authorization": f"Bearer {settings.TURN_TOKEN}",
         "content-type": "application/json",
         "Accept": "application/vnd.v1+json",
     }
diff --git a/ndoh_hub/testsettings.py b/ndoh_hub/testsettings.py
@@ -1,7 +1,7 @@
-from ndoh_hub.settings import *  # noqa: F403 # flake8: noqa
+from ndoh_hub.settings import *  # noqa: F403
 
 # SECURITY WARNING: keep the secret key used in production secret!
-SECRET_KEY = "TESTSEKRET"  # noqa - Ok to use hardcoded secrets in tests
+SECRET_KEY = "TESTSEKRET"
 
 # SECURITY WARNING: don't run with debug turned on in production!
 DEBUG = True
diff --git a/pyproject.toml b/pyproject.toml
@@ -1,67 +1,77 @@
-[tool.poetry]
+[project]
 name = "ndoh-hub"
 version = "0.10.25"
 description = "NDOH Registration and Change service for MomConnect and NurseConnect"
-authors = ["Fritz Brand <fritz@reachdigitalhealth.org>"]
-repository = "https://github.com/praekeltfoundation/ndoh-hub"
-license = "BSD"
+authors = [
+    {name = "Reach Digital Health", email = "dev@reachdigitalhealth.org"},
+]
+license = {text = "BSD"}
 readme = "README.md"
+requires-python = ">=3.10,<4.0"
+dependencies = [
+    "Django>=4.2.15",
+    "djangorestframework>=3.15.2",
+    "coreapi>=2.3.3",
+    "Markdown>=3.1.1",
+    "dj-database-url>=1.2.0",
+    "django-environ>=0.10.0",
+    "psycopg2-binary>=2.8.6",
+    "raven>=6.9.0",
+    "django-filter>=2.4.0",
+    "celery>=5.2.3",
+    "six>=1.11.0",
+    "requests>=2.32.0",
+    "demands>=3.0.0",
+    "structlog>=18.2.0",
+    "phonenumberslite>=8.9.15",
+    "django-simple-history>=3.3.0",
+    "openpyxl>=2.5.9",
+    "django-prometheus>=2.2.0",
+    "rapidpro-python==2.6.1", #V2.7.0 removed the V1 API support, which we use
+    "pycountry>=19.8.18",
+    "attrs>=24.2.0",
+    "iso6709>=0.1.5",
+    "redis>=4.5.4",
+    "django-redis>=5.2.0",
+    "celery_batches>=0.7",
+    "python-dateutil>=2.8.2",
+]
+
+[project.urls]
+repository = "http://github.com/praekeltfoundation/ndoh-hub"
 
+[build-system]
+requires = ["hatchling"]
+build-backend = "hatchling.build"
+
+[tool.hatch.build.targets.wheel]
 packages = [
-    { include = "aaq" },
-    { include = "changes" },
-    { include = "eventstore" },
-    { include = "registrations" },
+  "aaq",
+  "changes",
+  "eventstore",
+  "registrations",
 ]
 
-[tool.poetry.dependencies]
-python = "^3.9"
-Django = "^4.2.15"
-djangorestframework = "^3.15.2"
-coreapi = "^2.3.3"
-Markdown = "^3.1.1"
-dj-database-url = "^1.2.0"
-django-environ = "^0.10.0"
-psycopg2-binary = "^2.8.6"
-raven = "^6.9.0"
-django-filter = "^2.4.0"
-celery = "^5.2.3"
-six = "^1.11.0"
-requests = "^2.32.0"
-demands = "^3.0.0"
-structlog = "^18.2.0"
-phonenumberslite = "^8.9.15"
-django-simple-history = "^3.3.0"
-openpyxl = "^2.5.9"
-django-prometheus = "^2.2.0"
-rapidpro-python = "2.6.1" #V2.7.0 removed the V1 API support, which we use
-pycountry = "^19.8.18"
-attrs = "^24.2.0"
-iso6709 = "^0.1.5"
-redis = "^4.5.4"
-django-redis = "^5.2.0"
-celery_batches = "^0.7"
-python-dateutil = "^2.8.2"
-
-[tool.poetry.group.dev.dependencies]
-ruff = "^0.6.9"
-pytest = "^7.2.1"
-pytest-cov = "^4.0.0"
-pytest-django = "^4.5.2"
-pytest-asyncio = "^0.21.0"
-responses = "^0.23.1"
-pre-commit = "^3.2.0"
-freezegun = "^1.2.2"
+[dependency-groups]
+dev = [
+    "ruff>=0.6.9",
+    "pytest>=7.2.1",
+    "pytest-cov>=4.0.0",
+    "pytest-django>=4.5.2",
+    "pytest-asyncio>=0.21.0",
+    "responses>=0.23.1",
+    "pre-commit>=3.2.0",
+    "freezegun>=1.2.2",
+]
 
-[build-system]
-requires = ["poetry-core"]
-build-backend = "poetry.core.masonry.api"
+[tool.pytest.ini_options]
+filterwarnings = ['ignore::DeprecationWarning',]
+python_files = "test*.py"
+addopts = "--verbose --ds=config.settings.test"
 
 [tool.ruff]
 extend-exclude = [
     "*/migrations/*.py",
-    "docs/conf.py",
-
 ]
 
 [tool.ruff.lint]
@@ -84,32 +94,96 @@ ignore = [
     "E501",  # TODO: Something about these long lines.
     "S113",  # TODO: Add request timeouts.
     "PTH118", # TODO: Switch to pathlib
-    "PTH100", # TODO: 'os.path.abspath()' should be replaced by 'Path.resolve()' maybe use pathlib?
-    "PTH120", # TODO: 'os.path.dirname()' should be replaced by 'Path.parent' maybe use pathlib?
+    "PTH100", # TODO: Switch to pathlib
+    "PTH120", # TODO: Switch to pathlib
+    "RUF012", # We usually want immutable instance attributes
     "PTH123", # TODO: 'open()' should be replaced by 'Path.open()' maybe use pathlib?
     # Ignores below this line needs to be checked out by someone with more knowledge of the project
     "S501", #TODO: Probable use of 'requests' call with 'verify=False' disabling SSL certificate checks
     "SIM115", # TODO: Use a context manager for opening files - FWB: Tried fixing these, but ran into errors on tests
     "S101", # TODO: Use of 'assert' detected - FWB: Looks like this is only used in migration files
     "S608", # TODO: Possible SQL injection vector through string-based query construction
     "RUF012", # We usually want immutable instance attributes
- 
 ]
 
-# Do not add S106 or S105 global ignores.  Rather use inline ignores (noqa) 
 [tool.ruff.lint.per-file-ignores]
 "**/tests/**" = [
-    "S101",  # It's okay to use 'assert' in tests.
+    "S101",  # It's okay to use `assert` in tests.
 ]
 
 # TODO: Move this somewhere sensible?
 "**/tests.py" = [
-    "S101",  # It's okay to use 'assert' in tests.
+    "S101",  # It's okay to use `assert` in tests.
 ]
 
 "**/config/settings/{test,dev}.py" = [
     "S104",  # It's okay to bind to all interfaces in tests
     "F405", # Its okay to import * in settings
     "S105", # Its okay to have hardcoded secrets in test config
+]
+"ndoh_hub/testsettings.py" = [
+    "S105", # Its okay to have hardcoded secrets in test config
+]
+
+
+
+# [build-system]
+# requires = ["poetry-core"]
+# build-backend = "poetry.core.masonry.api"
+
+# [tool.ruff]
+# extend-exclude = [
+#     "*/migrations/*.py",
+#     "docs/conf.py",
+
+# ]
+
+# [tool.ruff.lint]
+# select = [
+#     "E", "F", "W", # pycodestyle + pyflakes == flake8 - mccabe
+#     "I",           # isort
+#     "UP",          # pyupgrade
+#     "S",           # flake8-bandit
+#     "B",           # flake8-bugbear
+#     "C4",          # flake8-comprehensions
+#     # "DJ",          # flake8-django
+#     "PIE",         # flake8-pie
+#     # "PT",          # flake8-pytest-style
+#     "SIM",         # flake8-simplify
+#     "PTH",         # flake8-use-pathlib
+#     "RUF",         # ruff-specific rules
+# ]
+
+# ignore = [
+#     "E501",  # TODO: Something about these long lines.
+#     "S113",  # TODO: Add request timeouts.
+#     "PTH118", # TODO: Switch to pathlib
+#     "PTH100", # TODO: 'os.path.abspath()' should be replaced by 'Path.resolve()' maybe use pathlib?
+#     "PTH120", # TODO: 'os.path.dirname()' should be replaced by 'Path.parent' maybe use pathlib?
+#     "PTH123", # TODO: 'open()' should be replaced by 'Path.open()' maybe use pathlib?
+#     # Ignores below this line needs to be checked out by someone with more knowledge of the project
+#     "S501", #TODO: Probable use of 'requests' call with 'verify=False' disabling SSL certificate checks
+#     "SIM115", # TODO: Use a context manager for opening files - FWB: Tried fixing these, but ran into errors on tests
+#     "S101", # TODO: Use of 'assert' detected - FWB: Looks like this is only used in migration files
+#     "S608", # TODO: Possible SQL injection vector through string-based query construction
+#     "RUF012", # We usually want immutable instance attributes
+ 
+# ]
+
+# # Do not add S106 or S105 global ignores.  Rather use inline ignores (noqa) 
+# [tool.ruff.lint.per-file-ignores]
+# "**/tests/**" = [
+#     "S101",  # It's okay to use 'assert' in tests.
+# ]
+
+# # TODO: Move this somewhere sensible?
+# "**/tests.py" = [
+#     "S101",  # It's okay to use 'assert' in tests.
+# ]
+
+# "**/config/settings/{test,dev}.py" = [
+#     "S104",  # It's okay to bind to all interfaces in tests
+#     "F405", # Its okay to import * in settings
+#     "S105", # Its okay to have hardcoded secrets in test config
     
-]
+# ]
diff --git a/scripts/migrate_to_rapidpro/collect_sms_content.py b/scripts/migrate_to_rapidpro/collect_sms_content.py
@@ -1,11 +1,10 @@
 import json
 from collections import defaultdict
-from typing import Tuple
 from uuid import uuid4
 
 import psycopg2
 
-PREBIRTH: Tuple[Tuple[str, str, Tuple[int, ...], int], ...] = (
+PREBIRTH: tuple[tuple[str, str, tuple[int, ...], int], ...] = (
     ("pmtct_prebirth.patient.1", "PMTCT 1 SMS", (0,), 5),
     ("pmtct_prebirth.patient.2", "PMTCT 2 SMS", (0, 3), 30),
     ("pmtct_prebirth.patient.3", "PMTCT 3 SMS", (0, 2, 4), 35),
@@ -17,24 +16,24 @@
     ("momconnect_prebirth.hw_full.6", "Prebirth 6 SMS", (0, 1, 2, 3, 4, 5, 6), 39),
 )
 
-POSTBIRTH: Tuple[Tuple[str, str, Tuple[int, ...], int], ...] = (
+POSTBIRTH: tuple[tuple[str, str, tuple[int, ...], int], ...] = (
     ("momconnect_postbirth.hw_full.1", "Postbirth SMS", (0, 3), 0),
     ("momconnect_postbirth.hw_full.2", "Postbirth SMS", (0,), 15),
     ("pmtct_postbirth.patient.1", "PMTCT Postbirth SMS", (0, 3), 0),
     ("pmtct_postbirth.patient.2", "PMTCT Postbirth SMS", (0,), 2),
 )
 
-LOSS: Tuple[Tuple[str, str, Tuple[int, ...]], ...] = (
+LOSS: tuple[tuple[str, str, tuple[int, ...]], ...] = (
     ("loss_babyloss.patient.1", "Babyloss SMS", (0, 3)),
     ("loss_stillbirth.patient.1", "Stillbirth SMS", (0,)),
     ("loss_miscarriage.patient.1", "Miscarriage SMS", (0, 3)),
 )
 
-PUBLIC: Tuple[Tuple[str, str, Tuple[int, ...]], ...] = (
+PUBLIC: tuple[tuple[str, str, tuple[int, ...]], ...] = (
     ("momconnect_prebirth.patient.1", "Public SMS", (0, 3)),
 )
 
-POPI: Tuple[str, str] = ("popi.hw_full.1", "POPI SMS")
+POPI: tuple[str, str] = ("popi.hw_full.1", "POPI SMS")
 
 
 def create_campaign(name: str, group: str) -> dict:
diff --git a/scripts/migrate_to_turn/compare_contacts.py b/scripts/migrate_to_turn/compare_contacts.py
@@ -35,7 +35,7 @@ def get_turn_contact(wa_id):
         "Accept": "application/vnd.v1+json",
     }
     response = requests.get(
-        urljoin(TURN_URL, "/v1/contacts/{}/profile".format(wa_id)),
+        urljoin(TURN_URL, f"/v1/contacts/{wa_id}/profile"),
         headers=headers,
     )
     contact = response.json()["fields"]
@@ -53,7 +53,7 @@ def compare_contacts():
         turn_data = get_turn_contact(wa_id)
 
         row = {"wa_id": wa_id}
-        for rapidpro_field in FIELD_MAPPING.keys():
+        for rapidpro_field in FIELD_MAPPING:
             row[f"RP {rapidpro_field}"] = rapidpro_data[rapidpro_field]
             row[f"TURN {rapidpro_field}"] = turn_data[rapidpro_field]
 
diff --git a/uv.lock b/uv.lock

Original file line number	Diff line number	Diff line change
`@@ -812,7 +812,7 @@ def get_inbound_intent(text):`
`812`	`812`	`)`
`813`	`813`	`def label_whatsapp_message(label, message_id):`
`814`	`814`	`headers = {`
`815`		`- "Authorization": "Bearer {}".format(settings.TURN_TOKEN),`
	`815`	`+ "Authorization": f"Bearer {settings.TURN_TOKEN}",`
`816`	`816`	`"content-type": "application/json",`
`817`	`817`	`"Accept": "application/vnd.v1+json",`
`818`	`818`	`}`