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.

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

remove can_register_vac variable #114

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
12 changes: 6 additions & 6 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ jobs:
- checkout
- restore_cache:
keys:
- v2-dependencies-{{ checksum "Pipfile.lock" }}
- v3-dependencies-{{ checksum "Pipfile.lock" }}
- run: &install-pipenv pip install -U pipenv pip --quiet --no-input
- run: pipenv sync --dev
- run: pipenv run pipenv check # before save_cache so an insecure cache is never saved
Expand All @@ -25,7 +25,7 @@ jobs:
when: on_success
paths:
- ~/.local/share/virtualenvs/
key: v2-dependencies-{{ checksum "Pipfile.lock" }}
key: v3-dependencies-{{ checksum "Pipfile.lock" }}

test:
docker:
Expand All @@ -39,7 +39,7 @@ jobs:
# Download and cache dependencies
- restore_cache:
keys:
- v2-dependencies-{{ checksum "Pipfile.lock" }}
- v3-dependencies-{{ checksum "Pipfile.lock" }}
- run: *install-pipenv
- run: pipenv run ruff check .
- run: pipenv run ruff format . --check
Expand Down Expand Up @@ -88,7 +88,7 @@ jobs:
at: ~/repo/
- restore_cache:
keys:
- v2-dependencies-{{ checksum "Pipfile.lock" }}
- v3-dependencies-{{ checksum "Pipfile.lock" }}
- run: *install-pipenv
- run: pip install aws-sam-cli

Expand Down Expand Up @@ -122,7 +122,7 @@ jobs:
# Download and cache dependencies
- restore_cache:
keys:
- v2-dependencies-{{ checksum "Pipfile.lock" }}
- v3-dependencies-{{ checksum "Pipfile.lock" }}
- run: *install-pipenv
- aws-cli/setup
- run:
Expand Down Expand Up @@ -159,7 +159,7 @@ jobs:
# Download and cache dependencies
- restore_cache:
keys:
- v2-dependencies-{{ checksum "Pipfile.lock" }}
- v3-dependencies-{{ checksum "Pipfile.lock" }}
- run: *install-pipenv
- aws-cli/setup
- run:
Expand Down
3 changes: 0 additions & 3 deletions postcode_lookup/template_sorter.py
Original file line number Diff line number Diff line change
Expand Up @@ -148,9 +148,6 @@ def context(self):
context["can_register_postal_vote"] = self.timetable.is_before(
TimetableEvent.POSTAL_VOTE_APPLICATION_DEADLINE
)
context["can_register_vac"] = self.timetable.is_before(
TimetableEvent.VAC_APPLICATION_DEADLINE
)
context["htag_primary"] = "h2"
context["htag_secondary"] = "h3"
if self.response_type == ResponseTypes.MULTIPLE_DATES:
Expand Down
3 changes: 1 addition & 2 deletions tests/test_result.py
Original file line number Diff line number Diff line change
Expand Up @@ -413,8 +413,7 @@ def test_vac_application_deadline(
template_sorter, election_date_template_sorter
):
"""this tests is after vac application deadline.
test that the page shows the vac application advice at the
top of the page and upcoming elections
test that the page shows upcoming elections
and polling station if available next.
assert that registration and postal vote deadline and
candidates are not shown.
Expand Down
Loading