Repo consistency

.github/workflows/ci.yaml

@@ -15,22 +15,24 @@ jobs:
         ports:
           - 6379:6379
     steps:
-      - uses: actions/checkout@v2
-      - uses: actions/setup-python@v2
+      - uses: actions/checkout@v4
+      - uses: actions/setup-python@v5
         with:
-          python-version: 3.9.15
-      - uses: abatilo/[email protected]
-        with:
-          poetry-version: 1.4.2
+          python-version: 3.9
+      - uses: abatilo/actions-poetry@v3
       - name: Install dependancies
         run: |
           poetry install
+      - 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 
       - name: Lint
+        if: success() || failure() && steps.install-deps.outcome == 'success'
         run: |
-          poetry run black --check .
-          poetry run isort -c .
-          poetry run mypy .
-          poetry run flake8
-      - name: Test
+          poetry run ruff check 
+      - name: Run tests
+        if: success() || failure() && steps.install-deps.outcome == 'success'
         run: |
-          poetry run pytest
+          poetry run pytest -vv          

README.md

@@ -18,10 +18,8 @@ poetry run python vaccine/worker.py
 
 To run autoformatting and linting, run
 ```bash
-poetry run black .
-poetry run isort .
-poetry run mypy .
-poetry run flake8
+poetry run ruff check
+poetry run ruff format
 ```
 
 To run the tests, run

mqr/baseline_ussd.py

@@ -43,7 +43,7 @@ class Application(MidlineApplication):
 
     async def state_start(self):
         msisdn = normalise_phonenumber(self.inbound.from_addr)
-        urn = f"whatsapp:{msisdn.lstrip(' + ')}"
+        urn = f"whatsapp:{msisdn.removeprefix('+')}"
 
         sms_mqr_contact = False
 
@@ -593,7 +593,7 @@ async def state_submit_data(self):
 
     async def state_update_rapidpro_contact(self):
         msisdn = normalise_phonenumber(self.inbound.from_addr)
-        urn = f"whatsapp:{msisdn.lstrip(' + ')}"
+        urn = f"whatsapp:{msisdn.removeprefix('+')}"
 
         async with get_rapidpro() as session:
             for i in range(3):

mqr/midline_ussd.py

@@ -30,7 +30,7 @@ async def process_message(self, message):
         if message.session_event == Message.SESSION_EVENT.CLOSE:
             self.user.session_id = None
             msisdn = normalise_phonenumber(self.user.addr)
-            urn = f"whatsapp:{msisdn.lstrip(' + ')}"
+            urn = f"whatsapp:{msisdn.removeprefix('+')}"
 
             async with get_rapidpro() as session:
                 for i in range(3):
@@ -523,7 +523,7 @@ async def state_likelihood_of_following_schedule(self):
 
     async def state_update_rapidpro_contact_midline(self):
         msisdn = normalise_phonenumber(self.inbound.from_addr)
-        urn = f"whatsapp:{msisdn.lstrip(' + ')}"
+        urn = f"whatsapp:{msisdn.removeprefix('+')}"
 
         async with get_rapidpro() as session:
             for i in range(3):

mqr/tests/test_baseline_ussd.py

@@ -39,10 +39,9 @@ async def rapidpro_mock():
     @app.route("/api/v2/contacts.json", methods=["GET"])
     def get_contact(request):
         tstate.requests.append(request)
-        if tstate.errormax:
-            if tstate.errors < tstate.errormax:
-                tstate.errors += 1
-                return response.json({}, status=500)
+        if tstate.errormax and tstate.errors < tstate.errormax:
+            tstate.errors += 1
+            return response.json({}, status=500)
 
         contacts = []
         urn = request.args.get("urn")
@@ -71,7 +70,7 @@ def start_flow(request):
     async with run_sanic(app) as server:
         url = config.RAPIDPRO_URL
         config.RAPIDPRO_URL = f"http://{server.host}:{server.port}"
-        config.RAPIDPRO_TOKEN = "testtoken"
+        config.RAPIDPRO_TOKEN = "testtoken"  # noqa: S105 - Fake password/token for test purposes
         server.tstate = tstate
         yield server
         config.RAPIDPRO_URL = url
@@ -88,19 +87,20 @@ async def eventstore_mock():
     @app.route("/api/v1/mqrbaselinesurvey/", methods=["POST"])
     def valid_baseline_survey(request):
         tstate.requests.append(request)
-        if tstate.errormax:
-            if tstate.errors < tstate.errormax:
-                tstate.errors += 1
-                return response.json({}, status=500)
+        if tstate.errormax and tstate.errors < tstate.errormax:
+            tstate.errors += 1
+            return response.json({}, status=500)
         return response.json({})
 
     @app.route("/api/v1/mqrbaselinesurvey/27820001003/", methods=["GET"])
     def get_baseline_survey_not_found(request):
         tstate.requests.append(request)
-        if tstate.not_found_errormax:
-            if tstate.not_found_errors < tstate.not_found_errormax:
-                tstate.not_found_errors += 1
-                return response.json({}, status=500)
+        if (
+            tstate.not_found_errormax
+            and tstate.not_found_errors < tstate.not_found_errormax
+        ):
+            tstate.not_found_errors += 1
+            return response.json({}, status=500)
         return response.json({"detail": "Not found."}, status=404)
 
     @app.route("/api/v1/mqrbaselinesurvey/27820001004/", methods=["GET"])

mqr/tests/test_midline_ussd.py

@@ -28,7 +28,7 @@ def start_flow(request):
     async with run_sanic(app) as server:
         url = config.RAPIDPRO_URL
         config.RAPIDPRO_URL = f"http://{server.host}:{server.port}"
-        config.RAPIDPRO_TOKEN = "testtoken"
+        config.RAPIDPRO_TOKEN = "testtoken"  # noqa: S105 - Fake password/token for test purposes
         server.tstate = tstate
         yield server
         config.RAPIDPRO_URL = url