Merge pull request #55 from DemocracyClub/party-lists

Support party lists

.circleci/config.yml

@@ -47,8 +47,8 @@ jobs:
           command: |
             sudo `pipenv --venv`/bin/playwright install-deps
       - run: pipenv run playwright install
-      - run: pipenv run black-check
       - run: pipenv run ruff
+      - run: pipenv run ruff-format
       - run: pipenv run pytest --cov-report= --cov=postcode_lookup --junitxml=test-reports/junit.xml
       - codecov/upload:
           file: /home/circleci/repo/test-reports/junit.xml

.pre-commit-config.yaml

@@ -1,24 +1,21 @@
 repos:
 -   repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: v2.3.0
+    rev: v4.5.0
     hooks:
     -   id: end-of-file-fixer
     -   id: debug-statements
     -   id: trailing-whitespace
     -   id: check-merge-conflict
     -   id: check-json
--   repo: https://github.com/psf/black
-    rev: 22.10.0
-    hooks:
-    -   id: black
 - repo: https://github.com/charliermarsh/ruff-pre-commit
   # Ruff version.
-  rev: 'v0.0.245'
+  rev: 'v0.3.4'
   hooks:
     - id: ruff
       args: [--fix, --exit-non-zero-on-fix, --extend-exclude, TCH]
+    - id: ruff-format
 -   repo: https://github.com/awslabs/cfn-python-lint
-    rev: v0.83.3 # The version of cfn-lint to use
+    rev: v0.86.1 # The version of cfn-lint to use
     hooks:
     -   id: cfn-python-lint
         files: template.yaml$

Pipfile

@@ -13,18 +13,18 @@ dc-response-builder = {file = "https://github.com/DemocracyClub/dc_response_buil
 dateparser = "==1.1.7"
 sentry-sdk = {extras = ["starlette"], version = "*"}
 urllib3 = "<2"
+ruff = "*"
 
 [dev-packages]
 uvicorn = "*"
-black = "*"
 pytest = "*"
 respx = "*"
 aws-sam-cli = "*"
 ipdb = "*"
 beautifulsoup4 = "*"
-pydantic = {extras = ["email"], version = "*"}
+pydantic = {extras = ["email"], version = "==2.6.4"}
 pydantic-factories = "*"
-ruff = "*"
+ruff = "0.3.4"
 pytest-cov = "*"
 coverage = {extras = ["toml"], version = "*"}
 pytest-asyncio = "*"
@@ -35,8 +35,7 @@ pre-commit = "*"
 python_version = "3.10"
 
 [scripts]
-black = "black ."
-black-check = "black --check ."
 pytest = "pytest"
-ruff = "ruff --diff postcode_lookup lib/template_generator"
+ruff = "ruff check"
+ruff-format = "ruff format ."
 build_templates = "python lib/template_generator/generate_base_template.py"

postcode_lookup/dc_api_client.py

@@ -7,12 +7,10 @@
 from response_builder.v1.sandbox import SANDBOX_BASE_URL, SANDBOX_POSTCODES
 
 
-class InvalidPostcodeException(Exception):
-    ...
+class InvalidPostcodeException(Exception): ...
 
 
-class InvalidUPRNException(Exception):
-    ...
+class InvalidUPRNException(Exception): ...
 
 
 def valid_postcode(postcode: str):
@@ -70,12 +68,10 @@ def _get(self, endpoint, params=None):
         return req
 
     @abstractmethod
-    def get_postcode(self, postcode: str) -> dict:
-        ...
+    def get_postcode(self, postcode: str) -> dict: ...
 
     @abstractmethod
-    def get_uprn(self, uprn: str) -> dict:
-        ...
+    def get_uprn(self, uprn: str) -> dict: ...
 
 
 class LiveAPIBackend(BaseAPIClient):

postcode_lookup/templates/includes/ballot_model.html

@@ -13,25 +13,38 @@
         {% endif %}
     {% endif %}
 {% else %}
-    <p>This election takes place on <time datetime=&quot;{{ ballot.poll_open_date }}&quot;>{{ ballot.poll_open_date.strftime('%-d %B %Y') }}</time>. <a href=&quot;/i-am-a/voter/types-elections&quot;>Find out more about voting in this election</a></p>
+    <p>This election takes place on <time datetime=&quot;{{ ballot.poll_open_date }}&quot;>{{ ballot.poll_open_date.strftime('%-d %B %Y') }}</time>.
+        <a href=&quot;/i-am-a/voter/types-elections&quot;>Find out more about voting in this election</a>.</p>
 {% endif %}
 
 
 {% if ballot.candidates_verified %}
     {% if not ballot.cancelled or ballot.metadata.cancelled_election.title == "Uncontested election" %}
-        <ul class=&quot;u-list-reset ballot&quot;>
-            {% for candidate in ballot.candidates %}
-                <li class=&quot;ballot__candidate&quot;>
-                    {{ candidate.person.name }}
-                    {% if ballot.metadata.cancelled_election.title == "Uncontested election" %}
-                        (elected unopposed)
-                    {% endif %}
-                    <br>
-                    {{ candidate.party.party_name }}
-                </li>
-            {% endfor %}
-        </ul>
-        <p>Visit <a href=&quot;https://whocanivotefor.co.uk/elections/{{ postcode }}&quot; target=&quot;_blank&quot; rel=&quot;noopener&quot; class=&quot;o-external-link&quot;>Who Can I Vote For <span class=&quot;visually-hidden&quot;>(Opens in new window)</span></a> to find out more about your candidates</p>
+        {% if ballot.voting_system.uses_party_lists %}
+            <ul class=&quot;u-list-reset ballot&quot;>
+                {% for party_name, candidates in ballot.candidates|groupby('party.party_name')|sort %}
+                    <li>{{ party_name }} ({{ candidates|length }} candidates)</li>
+                {% endfor %}
+            </ul>
+        {% else %}
+            <ul class=&quot;u-list-reset ballot&quot;>
+                {% for candidate in ballot.candidates %}
+                    <li class=&quot;ballot__candidate&quot;>
+                        {{ candidate.person.name }}
+                        {% if ballot.metadata.cancelled_election.title == "Uncontested election" %}
+                            (elected unopposed)
+                        {% endif %}
+                        <br>
+                        {{ candidate.party.party_name }}
+                    </li>
+                {% endfor %}
+            </ul>
+        {% endif %}
+
+        <p>Visit <a href=&quot;https://whocanivotefor.co.uk/elections/{{ postcode }}&quot; target=&quot;_blank&quot;
+                    rel=&quot;noopener&quot; class=&quot;o-external-link&quot;>Who Can I Vote For <span
+                class=&quot;visually-hidden&quot;>(Opens in new window)</span></a> to find out more about your
+            candidates</p>
     {% endif %}
 
 

pyproject.toml

@@ -1,10 +1,7 @@
-[tool.black]
-line-length = 80
-
 [tool.ruff]
 line-length = 80
-ignore = ["E501"]
-extend-select = [
+lint.ignore = ["E501"]
+lint.extend-select = [
     "I",
     "C4",
     "SIM",