feat: Upgrade lib-cove-web

Author: jpmckinney

cove_ocds/locale/en/LC_MESSAGES/django.po

@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2024-10-04 16:02+0000\n"
+"POT-Creation-Date: 2024-10-10 00:56+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -23,8 +23,8 @@ msgstr ""
 
 #: cove_ocds/lib/exceptions.py:14 cove_ocds/lib/exceptions.py:34
 #: cove_ocds/lib/exceptions.py:57 cove_ocds/lib/exceptions.py:77
-#: cove_ocds/views.py:93 cove_ocds/views.py:111 cove_ocds/views.py:129
-#: cove_ocds/views.py:248
+#: cove_ocds/views.py:90 cove_ocds/views.py:108 cove_ocds/views.py:126
+#: cove_ocds/views.py:237
 msgid "Try Again"
 msgstr ""
 
@@ -205,12 +205,10 @@ msgid ""
 msgstr ""
 
 #: cove_ocds/templates/cove_ocds/base.html:140
-#, python-format
 msgid ""
-"To preview how the data review tool works, try <a href=\"%(index_url)s?"
-"source_url=https://raw.githubusercontent.com/open-contracting/sample-data/"
-"main/fictional-example/1.1/ocds-213czf-000-00001-02-tender.json\"> loading "
-"some sample data. </a>"
+"To preview how the data review tool works, try loading: <code>https://raw."
+"githubusercontent.com/open-contracting/sample-data/main/fictional-"
+"example/1.1/ocds-213czf-000-00001-02-tender.json</code>"
 msgstr ""
 
 #: cove_ocds/templates/cove_ocds/base.html:153
@@ -1381,39 +1379,39 @@ msgstr ""
 msgid "Column"
 msgstr ""
 
-#: cove_ocds/templatetags/cove_ocds.py:11
+#: cove_ocds/templatetags/cove_ocds.py:13
 msgid ""
 "This array should contain either entirely embedded releases or linked "
 "releases. Embedded releases contain an 'id' whereas linked releases do not. "
 "Your releases contain a mixture."
 msgstr ""
 
-#: cove_ocds/templatetags/cove_ocds.py:17
+#: cove_ocds/templatetags/cove_ocds.py:19
 #, python-format
 msgid "%s is not valid under any of the given schemas"
 msgstr ""
 
-#: cove_ocds/templatetags/cove_ocds.py:20
+#: cove_ocds/templatetags/cove_ocds.py:22
 #, python-format
 msgid "%(instance)s is valid under each of %(reprs)s"
 msgstr ""
 
-#: cove_ocds/templatetags/cove_ocds.py:29
+#: cove_ocds/templatetags/cove_ocds.py:31
 msgid ""
 "Incorrect date format. Dates should use the form YYYY-MM-DDT00:00:00Z. Learn "
 "more about <a href=\"https://standard.open-contracting.org/latest/en/schema/"
 "reference/#date\">dates in OCDS</a>."
 msgstr ""
 
-#: cove_ocds/views.py:52
+#: cove_ocds/views.py:50
 msgid "Sorry, the page you are looking for is not available"
 msgstr ""
 
-#: cove_ocds/views.py:54
+#: cove_ocds/views.py:52
 msgid "Go to Home page"
 msgstr ""
 
-#: cove_ocds/views.py:57
+#: cove_ocds/views.py:55
 #, python-format
 msgid ""
 "The data you were hoping to explore no longer exists.\n"
@@ -1423,12 +1421,12 @@ msgid ""
 "available."
 msgstr ""
 
-#: cove_ocds/views.py:91 cove_ocds/views.py:109 cove_ocds/views.py:127
-#: cove_ocds/views.py:246
+#: cove_ocds/views.py:88 cove_ocds/views.py:106 cove_ocds/views.py:124
+#: cove_ocds/views.py:235
 msgid "Sorry, we can't process that data"
 msgstr ""
 
-#: cove_ocds/views.py:96
+#: cove_ocds/views.py:93
 msgid ""
 "The file that you uploaded doesn't appear to be well formed JSON. OCDS JSON "
 "follows the I-JSON format, which requires UTF-8 encoding. Ensure that your "
@@ -1438,21 +1436,21 @@ msgid ""
 "span> <strong>Error message:</strong> {}"
 msgstr ""
 
-#: cove_ocds/views.py:114
+#: cove_ocds/views.py:111
 msgid ""
 "We think you tried to upload a JSON file, but it is not well formed JSON.\n"
 "\n"
 "<span class=\"glyphicon glyphicon-exclamation-sign\" aria-hidden=\"true\"></"
 "span> <strong>Error message:</strong> {}"
 msgstr ""
 
-#: cove_ocds/views.py:130
+#: cove_ocds/views.py:127
 msgid ""
 "OCDS JSON should have an object as the top level, the JSON you supplied does "
 "not."
 msgstr ""
 
-#: cove_ocds/views.py:251
+#: cove_ocds/views.py:240
 msgid ""
 "The table isn't structured correctly. For example, a JSON Pointer "
 "(<code>tender</code>) can't be both a value (<code>tender</code>), a path to "

cove_ocds/locale/es/LC_MESSAGES/django.po

@@ -15,7 +15,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2024-10-04 16:02+0000\n"
+"POT-Creation-Date: 2024-10-10 00:56+0000\n"
 "PO-Revision-Date: 2020-09-08 08:53+0000\n"
 "Last-Translator: James McKinney, 2024\n"
 "Language-Team: Spanish (https://app.transifex.com/open-contracting-"
@@ -33,8 +33,8 @@ msgstr "Versión del esquema no reconocida"
 
 #: cove_ocds/lib/exceptions.py:14 cove_ocds/lib/exceptions.py:34
 #: cove_ocds/lib/exceptions.py:57 cove_ocds/lib/exceptions.py:77
-#: cove_ocds/views.py:93 cove_ocds/views.py:111 cove_ocds/views.py:129
-#: cove_ocds/views.py:248
+#: cove_ocds/views.py:90 cove_ocds/views.py:108 cove_ocds/views.py:126
+#: cove_ocds/views.py:237
 msgid "Try Again"
 msgstr "Inténtelo de nuevo"
 
@@ -262,17 +262,15 @@ msgstr ""
 "discutir sobre la calidad de los datos."
 
 #: cove_ocds/templates/cove_ocds/base.html:140
-#, python-format
 msgid ""
-"To preview how the data review tool works, try <a href=\"%(index_url)s?"
-"source_url=https://raw.githubusercontent.com/open-contracting/sample-data/"
-"main/fictional-example/1.1/ocds-213czf-000-00001-02-tender.json\"> loading "
-"some sample data. </a>"
+"To preview how the data review tool works, try loading: <code>https://raw."
+"githubusercontent.com/open-contracting/sample-data/main/fictional-"
+"example/1.1/ocds-213czf-000-00001-02-tender.json</code>"
 msgstr ""
-"Para ver cómo funciona la herramienta de revisión de datos,  intente <a "
-"href=\"%(index_url)s?source_url=https://raw.githubusercontent.com/open-"
+"Para ver cómo funciona la herramienta de revisión de datos, intente subir "
+"<code>https://raw.githubusercontent.com/open-"
 "contracting/sample-data/main/fictional-example/1.1/ocds-213czf-000-00001-02-"
-"tender.json\"> subir algunos datos de muestra.</a>"
+"tender.json</code>"
 
 #: cove_ocds/templates/cove_ocds/base.html:153
 msgid "Built by"
@@ -1632,7 +1630,7 @@ msgstr "Fila"
 msgid "Column"
 msgstr "Columna"
 
-#: cove_ocds/templatetags/cove_ocds.py:11
+#: cove_ocds/templatetags/cove_ocds.py:13
 msgid ""
 "This array should contain either entirely embedded releases or linked "
 "releases. Embedded releases contain an 'id' whereas linked releases do not. "
@@ -1642,17 +1640,17 @@ msgstr ""
 "vinculadas. Las entregas integradas contienen un \"identificador\", mientras "
 "que las entregas vinculadas no. Estas entregas contienen una mezcla de ambos."
 
-#: cove_ocds/templatetags/cove_ocds.py:17
+#: cove_ocds/templatetags/cove_ocds.py:19
 #, python-format
 msgid "%s is not valid under any of the given schemas"
 msgstr "%s no es válido bajo ninguno de los esquemas dados"
 
-#: cove_ocds/templatetags/cove_ocds.py:20
+#: cove_ocds/templatetags/cove_ocds.py:22
 #, python-format
 msgid "%(instance)s is valid under each of %(reprs)s"
 msgstr "%(instance)s es válido bajo cada uno de %(reprs)s"
 
-#: cove_ocds/templatetags/cove_ocds.py:29
+#: cove_ocds/templatetags/cove_ocds.py:31
 msgid ""
 "Incorrect date format. Dates should use the form YYYY-MM-DDT00:00:00Z. Learn "
 "more about <a href=\"https://standard.open-contracting.org/latest/en/schema/"
@@ -1662,15 +1660,15 @@ msgstr ""
 "DDT00:00:00Z. Lea más sobre <a href=\"https://standard.open-contracting.org/"
 "latest/es/schema/reference/#date\"> fechas en OCDS</a>"
 
-#: cove_ocds/views.py:52
+#: cove_ocds/views.py:50
 msgid "Sorry, the page you are looking for is not available"
 msgstr "Lo sentimos, la página que está buscando no está disponible"
 
-#: cove_ocds/views.py:54
+#: cove_ocds/views.py:52
 msgid "Go to Home page"
 msgstr "Ir a la Página de Inicio"
 
-#: cove_ocds/views.py:57
+#: cove_ocds/views.py:55
 #, python-format
 msgid ""
 "The data you were hoping to explore no longer exists.\n"
@@ -1686,12 +1684,12 @@ msgstr ""
 "automáticamente después de %s días, y por lo tanto el análisis de esos datos "
 "ya no está disponible."
 
-#: cove_ocds/views.py:91 cove_ocds/views.py:109 cove_ocds/views.py:127
-#: cove_ocds/views.py:246
+#: cove_ocds/views.py:88 cove_ocds/views.py:106 cove_ocds/views.py:124
+#: cove_ocds/views.py:235
 msgid "Sorry, we can't process that data"
 msgstr "Lo sentimos, no podemos procesar esos datos"
 
-#: cove_ocds/views.py:96
+#: cove_ocds/views.py:93
 msgid ""
 "The file that you uploaded doesn't appear to be well formed JSON. OCDS JSON "
 "follows the I-JSON format, which requires UTF-8 encoding. Ensure that your "
@@ -1708,7 +1706,7 @@ msgstr ""
 "<span class=\"glyphicon glyphicon-exclamation-sign\" aria-hidden=\"true\"></"
 "span> <strong>Mensaje del error:</strong> {}"
 
-#: cove_ocds/views.py:114
+#: cove_ocds/views.py:111
 msgid ""
 "We think you tried to upload a JSON file, but it is not well formed JSON.\n"
 "\n"
@@ -1721,15 +1719,15 @@ msgstr ""
 "<span class=\"glyphicon glyphicon-exclamation-sign\" aria-hidden=\"true\"></"
 "span> <strong>Mensaje del error:</strong> {}"
 
-#: cove_ocds/views.py:130
+#: cove_ocds/views.py:127
 msgid ""
 "OCDS JSON should have an object as the top level, the JSON you supplied does "
 "not."
 msgstr ""
 "OCDS JSON debe ser un objeto al nivel más alto pero el JSON que usted ha "
 "aportado no lo es."
 
-#: cove_ocds/views.py:251
+#: cove_ocds/views.py:240
 msgid ""
 "The table isn't structured correctly. For example, a JSON Pointer "
 "(<code>tender</code>) can't be both a value (<code>tender</code>), a path to "

cove_ocds/templates/cove_ocds/base.html

@@ -137,7 +137,7 @@ <h1 class="heading-in-panel"> <small> {% blocktrans %}Using the data review tool
         <p> {% blocktrans %}The application works with both <a href="https://standard.open-contracting.org/latest/en/primer/releases_and_records/">'release' and 'record'</a> OCDS documents that conform to the <a href="https://standard.open-contracting.org/">Open Data Contracting Standard</a> {%endblocktrans%} </p>
         <p> {% blocktrans %}If your data passes basic structural checks, the tool will then present a report on data quality, and information about the contents of your file. It will also offer alternative copies of the data for download. {%endblocktrans%} </p>
         <p> {% blocktrans %}Data is stored for {{ delete_files_after_days }} days at a randomly generated URL. You can share this link with others to support discussion of data quality.  {%endblocktrans%} </p>
-        <p> {% blocktrans %}To preview how the data review tool works, try <a href="{{ index_url }}?source_url=https://raw.githubusercontent.com/open-contracting/sample-data/main/fictional-example/1.1/ocds-213czf-000-00001-02-tender.json"> loading some sample data. </a>{% endblocktrans%} </p>
+        <p> {% blocktrans %}To preview how the data review tool works, try loading: <code>https://raw.githubusercontent.com/open-contracting/sample-data/main/fictional-example/1.1/ocds-213czf-000-00001-02-tender.json</code>{% endblocktrans%}</p>
       </div>
     </div>
   </div>

requirements.txt

@@ -74,7 +74,7 @@ libcove==0.32.1
     #   libcoveweb
 libcoveocds==0.16.0
     # via -r requirements.in
-libcoveweb==0.30.4
+libcoveweb==0.30.5
     # via -r requirements.in
 lxml==4.9.1
     # via flattentool

requirements_dev.txt

@@ -123,7 +123,7 @@ libcove==0.32.1
     #   libcoveweb
 libcoveocds==0.16.0
     # via -r requirements.txt
-libcoveweb==0.30.4
+libcoveweb==0.30.5
     # via -r requirements.txt
 libsass==0.20.1
     # via -r requirements_dev.in

tests/conftest.py

@@ -44,15 +44,16 @@ def server_url(live_server):
 @pytest.fixture()
 def url_input_browser(request, server_url, browser, httpserver):
     def _url_input_browser(source_filename, *, output_source_url=False):
-        with open(os.path.join("tests", "fixtures", source_filename), "rb") as fp:
-            httpserver.serve_content(fp.read())
-        if "CUSTOM_SERVER_URL" in os.environ:
-            # Use urls pointing to GitHub if we have a custom (probably non local) server URL
+        if source_filename.startswith("http"):
+            source_url = source_filename
+        elif "CUSTOM_SERVER_URL" in os.environ:
             source_url = (
-                "https://raw.githubusercontent.com/open-contracting/cove-ocds/main/tests/fixtures/" + source_filename
+                f"https://raw.githubusercontent.com/open-contracting/cove-ocds/main/tests/fixtures/{source_filename}"
             )
         else:
-            source_url = httpserver.url + "/" + source_filename
+            with open(os.path.join("tests", "fixtures", source_filename), "rb") as fp:
+                httpserver.serve_content(fp.read())
+            source_url = f"{httpserver.url}/{source_filename}"
 
         browser.get(server_url)
         time.sleep(0.5)

tests/test_functional.py

@@ -467,9 +467,7 @@ def test_url_input(
         conversion_successful,
     )
 
-    selected_examples = ["tenders_releases_2_releases_invalid.json"]
-
-    if source_filename in selected_examples:
+    if source_filename == "tenders_releases_2_releases_invalid.json":
         # refresh page to now check if tests still work after caching some data
         browser.get(browser.current_url)
         check_url_input_result_page(
@@ -481,16 +479,6 @@ def test_url_input(
             not_expected_text,
             conversion_successful,
         )
-        browser.get(server_url + "?source_url=" + source_url)
-        check_url_input_result_page(
-            server_url,
-            browser,
-            httpserver,
-            source_filename,
-            expected_text,
-            not_expected_text,
-            conversion_successful,
-        )
 
 
 def check_url_input_result_page(
@@ -658,7 +646,7 @@ def test_extension_validation_error_messages(url_input_browser):
 
 
 @pytest.mark.parametrize("flatten_or_unflatten", ["flatten", "unflatten"])
-def test_flattentool_warnings(server_url, browser, httpserver, monkeypatch, flatten_or_unflatten):
+def test_flattentool_warnings(server_url, url_input_browser, httpserver, monkeypatch, flatten_or_unflatten):
     # If we're testing a remove server then we can't run this test as we can't
     # set up the mocks
     if "CUSTOM_SERVER_URL" in os.environ:
@@ -681,23 +669,22 @@ def mockunflatten(input_name, output_name, *args, **kwargs):
             fp.write("{}")
 
     def mockflatten(input_name, output_name, *args, **kwargs):
-        with open(output_name + ".xlsx", "w") as fp:
+        with open(f"{output_name}.xlsx", "w") as fp:
             fp.write("{}")
 
     mocks = {"flatten": mockflatten, "unflatten": mockunflatten}
     monkeypatch.setattr(flattentool, flatten_or_unflatten, mocks[flatten_or_unflatten])
 
-    with open(os.path.join("tests", "fixtures", source_filename), "rb") as fp:
-        httpserver.serve_content(fp.read())
     if "CUSTOM_SERVER_URL" in os.environ:
-        # Use urls pointing to GitHub if we have a custom (probably non local) server URL
         source_url = (
-            "https://raw.githubusercontent.com/open-contracting/cove-ocds/main/tests/fixtures/" + source_filename
+            f"https://raw.githubusercontent.com/open-contracting/cove-ocds/main/tests/fixtures/{source_filename}"
         )
     else:
-        source_url = httpserver.url + "/" + source_filename
+        with open(os.path.join("tests", "fixtures", source_filename), "rb") as fp:
+            httpserver.serve_content(fp.read())
+        source_url = f"{httpserver.url}/{source_filename}"
 
-    browser.get(server_url + "?source_url=" + source_url)
+    browser = url_input_browser(source_url)
 
     if source_filename.endswith(".json"):
         browser.find_element(By.NAME, "flatten").click()