diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index 4f5bfb54..e8a34817 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -3,13 +3,13 @@ on: [push, pull_request] jobs: build: - runs-on: ubuntu-22.04 + runs-on: ubuntu-24.04 steps: - uses: actions/checkout@v2 - name: Setup python uses: actions/setup-python@v2 with: - python-version: 3.8 + python-version: 3.12 architecture: x64 - run: pip install -r requirements_dev.txt - run: flake8 diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index f8ff1893..93af0217 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -3,7 +3,7 @@ on: [push, pull_request] jobs: build: - runs-on: ubuntu-22.04 + runs-on: ubuntu-24.04 env: DATA_SUBMISSION_ENABLED: "true" REGISTRY_PUBLISHERS_URL: ${{secrets.REGISTRY_PUBLISHERS_URL}} @@ -12,7 +12,7 @@ jobs: strategy: matrix: # Python 3.8 is used by the live cove and datastore servers - python-version: [ '3.8'] + python-version: [ '3.12'] steps: - uses: actions/checkout@v2 - name: Setup python diff --git a/cove/cove_360/api.py b/cove/cove_360/api.py index 3b645619..71f3528c 100644 --- a/cove/cove_360/api.py +++ b/cove/cove_360/api.py @@ -7,7 +7,7 @@ class ResultsApiView(View): def get(self, *args, **kwargs): - results = get_object_or_404(SuppliedDataStatus, supplied_data=kwargs["id"]) + results = get_object_or_404(SuppliedDataStatus, supplied_data=kwargs["pk"]) return JsonResponse( { diff --git a/cove/cove_360/templates/additional_codelist_values.html b/cove/cove_360/templates/additional_codelist_values.html index cf73cbb9..119ce088 100644 --- a/cove/cove_360/templates/additional_codelist_values.html +++ b/cove/cove_360/templates/additional_codelist_values.html @@ -1,5 +1,6 @@ {% load i18n %} {% load cove_tags %} +{% load cove_360_tags %} diff --git a/cove/cove_360/templates/cove_360/additional_codelist_values.html b/cove/cove_360/templates/cove_360/additional_codelist_values.html index 8ae13df2..895cae20 100644 --- a/cove/cove_360/templates/cove_360/additional_codelist_values.html +++ b/cove/cove_360/templates/cove_360/additional_codelist_values.html @@ -1,5 +1,6 @@ {% load i18n %} {% load cove_tags %} +{% load cove_360_tags %}
diff --git a/cove/cove_360/templates/cove_360/additional_fields_table.html b/cove/cove_360/templates/cove_360/additional_fields_table.html index cbcd55da..e86f0419 100644 --- a/cove/cove_360/templates/cove_360/additional_fields_table.html +++ b/cove/cove_360/templates/cove_360/additional_fields_table.html @@ -1,5 +1,6 @@ {% load i18n %} {% load cove_tags %} +{% load cove_360_tags %}
diff --git a/cove/cove_360/templates/cove_360/additional_fields_table_all.html b/cove/cove_360/templates/cove_360/additional_fields_table_all.html index afb2b2e6..99eb6457 100644 --- a/cove/cove_360/templates/cove_360/additional_fields_table_all.html +++ b/cove/cove_360/templates/cove_360/additional_fields_table_all.html @@ -1,5 +1,6 @@ {% load i18n %} {% load cove_tags %} +{% load cove_360_tags %}
{% trans 'Field' %} {% trans 'Path to Field' %} {% trans 'Usage Count' %}
diff --git a/cove/cove_360/templates/cove_360/base.html b/cove/cove_360/templates/cove_360/base.html index 326278cf..24d08430 100644 --- a/cove/cove_360/templates/cove_360/base.html +++ b/cove/cove_360/templates/cove_360/base.html @@ -27,7 +27,7 @@ - Noticed the new look? Read our blog to learn more about what's changed TODO link + Noticed the new look? Read our blog to learn more about what's changed {# End temp for launch #} diff --git a/cove/cove_360/templates/cove_360/components/explore/accuracy.html b/cove/cove_360/templates/cove_360/components/explore/accuracy.html index 29f1e4f9..1fa2ed4a 100644 --- a/cove/cove_360/templates/cove_360/components/explore/accuracy.html +++ b/cove/cove_360/templates/cove_360/components/explore/accuracy.html @@ -1,6 +1,7 @@ {% load i18n %} {% load humanize %} {% load cove_tags %} +{% load cove_360_tags %}

Accuracy

diff --git a/cove/cove_360/templates/cove_360/components/explore/additional_fields.html b/cove/cove_360/templates/cove_360/components/explore/additional_fields.html index 6c238762..f8bf8a67 100644 --- a/cove/cove_360/templates/cove_360/components/explore/additional_fields.html +++ b/cove/cove_360/templates/cove_360/components/explore/additional_fields.html @@ -1,6 +1,7 @@ {% load i18n %} {% load humanize %} {% load cove_tags %} +{% load cove_360_tags %}

{% blocktrans count n_additional_fields=additional_fields_count %} Additional fields{% plural %} Additional fields{% endblocktrans %}

@@ -21,4 +22,4 @@

{% cove_360_modal_errors className="additional-checks-"|concat:forloop.counter modalTitle=msg errorList=spreadsheet_location file_type=file_type full_table=False %} {% endif %} {% endwith %} -{% endfor %} \ No newline at end of file +{% endfor %} diff --git a/cove/cove_360/templates/cove_360/components/explore/summary.html b/cove/cove_360/templates/cove_360/components/explore/summary.html index 0e286815..76dfb361 100644 --- a/cove/cove_360/templates/cove_360/components/explore/summary.html +++ b/cove/cove_360/templates/cove_360/components/explore/summary.html @@ -1,6 +1,7 @@ {% load i18n %} {% load humanize %} {% load cove_tags %} +{% load cove_360_tags %}

{% trans "Summary" %}

diff --git a/cove/cove_360/templates/cove_360/components/explore/usefulness.html b/cove/cove_360/templates/cove_360/components/explore/usefulness.html index 94c76288..6f0a935b 100644 --- a/cove/cove_360/templates/cove_360/components/explore/usefulness.html +++ b/cove/cove_360/templates/cove_360/components/explore/usefulness.html @@ -1,6 +1,7 @@ {% load i18n %} {% load humanize %} {% load cove_tags %} +{% load cove_360_tags %}

Usefulness Opportunities

diff --git a/cove/cove_360/templates/cove_360/components/explore/validity.html b/cove/cove_360/templates/cove_360/components/explore/validity.html index fcb92bae..d1b3c284 100644 --- a/cove/cove_360/templates/cove_360/components/explore/validity.html +++ b/cove/cove_360/templates/cove_360/components/explore/validity.html @@ -1,6 +1,7 @@ {% load i18n %} {% load humanize %} {% load cove_tags %} +{% load cove_360_tags %}

Validity checks {% if validation_and_closed_codelist_errors_count > 0 %} @@ -72,4 +73,4 @@

Other

Other validation errors.

{% include "cove_360/validation_table.html" %} {% endif %} - {% endwith %} \ No newline at end of file + {% endwith %} diff --git a/cove/cove_360/templates/cove_360/components/explore_checking.html b/cove/cove_360/templates/cove_360/components/explore_checking.html index c2f73144..6b376f79 100644 --- a/cove/cove_360/templates/cove_360/components/explore_checking.html +++ b/cove/cove_360/templates/cove_360/components/explore_checking.html @@ -1,4 +1,7 @@ -{% load i18n %} {% load humanize %} {% load cove_tags %} +{% load i18n %} +{% load humanize %} +{% load cove_tags %} +{% load cove_360_tags %} {% trans 'Converted from Original' as converted %} {% trans 'Original' as original %} @@ -182,4 +185,4 @@

\ No newline at end of file + diff --git a/cove/cove_360/templates/cove_360/explore_advanced.html b/cove/cove_360/templates/cove_360/explore_advanced.html index afc299c1..4fbfd458 100644 --- a/cove/cove_360/templates/cove_360/explore_advanced.html +++ b/cove/cove_360/templates/cove_360/explore_advanced.html @@ -1,6 +1,7 @@ {% extends 'cove_360/base.html' %} {% load humanize %} {% load cove_tags %} +{% load cove_360_tags %} {% block content %} diff --git a/cove/cove_360/templates/cove_360/modal_errors.html b/cove/cove_360/templates/cove_360/modal_errors.html index 0a322183..a609727d 100644 --- a/cove/cove_360/templates/cove_360/modal_errors.html +++ b/cove/cove_360/templates/cove_360/modal_errors.html @@ -1,5 +1,6 @@ {% load i18n %} {% load cove_tags %} +{% load cove_360_tags %}