udata 9.1.4__py2.py3-none-any.whl → 9.1.4.dev30973__py2.py3-none-any.whl

udata/tests/apiv2/test_datasets.py

@@ -83,7 +83,7 @@ class DatasetResourceAPIV2Test(APITestCase):
         assert data["total"] == len(resources)
         assert data["page"] == 1
         assert data["page_size"] == DEFAULT_PAGE_SIZE
-        assert data["next_page"] is None
+        assert data["next_page"] == None
         assert data["previous_page"] is None
 
     def test_get_missing_param(self):
@@ -97,7 +97,7 @@ class DatasetResourceAPIV2Test(APITestCase):
         assert data["total"] == len(resources)
         assert data["page"] == 1
         assert data["page_size"] == DEFAULT_PAGE_SIZE
-        assert data["next_page"] is None
+        assert data["next_page"] == None
         assert data["previous_page"] is None
 
     def test_get_next_page(self):
@@ -129,7 +129,7 @@ class DatasetResourceAPIV2Test(APITestCase):
         assert data["total"] == len(resources)
         assert data["page"] == 2
         assert data["page_size"] == DEFAULT_PAGE_SIZE
-        assert data["next_page"] is None
+        assert data["next_page"] == None
         assert data["previous_page"] == url_for(
             "apiv2.resources",
             dataset=dataset.id,
@@ -196,7 +196,7 @@ class DatasetResourceAPIV2Test(APITestCase):
         assert data["total"] == nb_resources__of_specific_type
         assert data["page"] == 2
         assert data["page_size"] == DEFAULT_PAGE_SIZE
-        assert data["next_page"] is None
+        assert data["next_page"] == None
         assert data["previous_page"] == url_for(
             "apiv2.resources",
             dataset=dataset.id,

udata/tests/dataset/test_dataset_events.py

@@ -15,29 +15,6 @@ from udata.tests.helpers import assert_emit
 @pytest.mark.usefixtures("enable_resource_event")
 class DatasetEventsTest:
     @patch("requests.post")
-    @pytest.mark.options(RESOURCES_ANALYSER_API_KEY=None)
-    def test_publish_message_resource_created_no_api_key(self, mock_req):
-        dataset = DatasetFactory()
-        resource = ResourceFactory()
-        expected_signals = (Dataset.on_resource_added,)
-
-        with assert_emit(*expected_signals):
-            dataset.add_resource(resource)
-
-        expected_value = {
-            "resource_id": str(resource.id),
-            "dataset_id": str(dataset.id),
-            "document": serialize_resource_for_event(resource),
-        }
-
-        mock_req.assert_called_with(
-            f"{current_app.config['RESOURCES_ANALYSER_URI']}/api/resource/created/",
-            json=expected_value,
-            headers={},  # No RESOURCES_ANALYSER_API_KEY, no headers.
-        )
-
-    @patch("requests.post")
-    @pytest.mark.options(RESOURCES_ANALYSER_API_KEY="foobar-api-key")
     def test_publish_message_resource_created(self, mock_req):
         dataset = DatasetFactory()
         resource = ResourceFactory()
@@ -55,11 +32,9 @@ class DatasetEventsTest:
         mock_req.assert_called_with(
             f"{current_app.config['RESOURCES_ANALYSER_URI']}/api/resource/created/",
             json=expected_value,
-            headers={"Authorization": "Bearer foobar-api-key"},
         )
 
     @patch("requests.post")
-    @pytest.mark.options(RESOURCES_ANALYSER_API_KEY="foobar-api-key")
     def test_publish_message_resource_modified(self, mock_req):
         resource = ResourceFactory(schema=Schema(url="http://localhost/my-schema"))
         dataset = DatasetFactory(resources=[resource])
@@ -79,7 +54,6 @@ class DatasetEventsTest:
         mock_req.assert_called_with(
             f"{current_app.config['RESOURCES_ANALYSER_URI']}/api/resource/updated/",
             json=expected_value,
-            headers={"Authorization": "Bearer foobar-api-key"},
         )
 
         # Mocking requests call doesn't call the JSON encoder
@@ -88,7 +62,6 @@ class DatasetEventsTest:
         complexjson.dumps(expected_value)
 
     @patch("requests.post")
-    @pytest.mark.options(RESOURCES_ANALYSER_API_KEY="foobar-api-key")
     def test_publish_message_resource_removed(self, mock_req):
         resource = ResourceFactory()
         dataset = DatasetFactory(resources=[resource])
@@ -106,5 +79,4 @@ class DatasetEventsTest:
         mock_req.assert_called_with(
             f"{current_app.config['RESOURCES_ANALYSER_URI']}/api/resource/deleted/",
             json=expected_value,
-            headers={"Authorization": "Bearer foobar-api-key"},
         )

udata/tests/dataset/test_dataset_model.py

@@ -301,15 +301,15 @@ class DatasetModelTest:
 
     def test_dataset_without_private(self):
         dataset = DatasetFactory()
-        assert dataset.private is False
+        assert dataset.private == False
 
         dataset.private = None
         dataset.save()
-        assert dataset.private is False
+        assert dataset.private == False
 
         dataset.private = True
         dataset.save()
-        assert dataset.private is True
+        assert dataset.private == True
 
 
 class ResourceModelTest:

udata/tests/frontend/__init__.py

@@ -1,6 +1,8 @@
 import json
 import re
 
+import pytest
+
 from udata.tests import DBTestMixin, TestCase, WebTestMixin
 
 

udata/tests/frontend/test_auth.py

@@ -11,6 +11,7 @@ class AuthTest(FrontTestCase):
 
     def test_change_mail(self):
         user = self.login(AdminFactory())
+        url = url_for("security.change_email")
 
         new_email = "test@test.com"
 

udata/tests/organization/test_csv_adapter.py

@@ -1,6 +1,8 @@
 import pytest
 
+from udata.core.dataset.csv import DatasetCsvAdapter, ResourcesCsvAdapter
 from udata.core.dataset.factories import DatasetFactory, ResourceFactory
+from udata.core.dataset.models import Dataset
 from udata.core.organization.csv import OrganizationCsvAdapter
 from udata.core.organization.factories import OrganizationFactory
 from udata.core.organization.models import Organization

udata/tests/organization/test_notifications.py

@@ -17,11 +17,11 @@ class OrganizationNotificationsTest:
         members = [Member(user=editor, role="editor"), Member(user=admin, role="admin")]
         org = OrganizationFactory(members=members, requests=[request])
 
-        assert len(membership_request_notifications(applicant)) == 0
-        assert len(membership_request_notifications(editor)) == 0
+        assert len(membership_request_notifications(applicant)) is 0
+        assert len(membership_request_notifications(editor)) is 0
 
         notifications = membership_request_notifications(admin)
-        assert len(notifications) == 1
+        assert len(notifications) is 1
         dt, details = notifications[0]
         assert_equal_dates(dt, request.created)
         assert details["id"] == request.id

udata/tests/organization/test_organization_rdf.py

@@ -4,8 +4,6 @@ from rdflib.namespace import FOAF, RDF, RDFS
 from rdflib.resource import Resource as RdfResource
 
 from udata import api
-from udata.core.dataservices.factories import DataserviceFactory
-from udata.core.dataservices.models import Dataservice
 from udata.core.dataset.factories import DatasetFactory
 from udata.core.dataset.models import Dataset
 from udata.core.organization.factories import OrganizationFactory
@@ -57,8 +55,7 @@ class OrganizationToRdfTest(DBTestMixin, TestCase):
         uri = url_for("api.organization_rdf", org=origin_org.id, _external=True)
 
         datasets = DatasetFactory.create_batch(3, organization=origin_org)
-        dataservices = DataserviceFactory.create_batch(3, organization=origin_org)
-        catalog = build_org_catalog(origin_org, datasets, dataservices)
+        catalog = build_org_catalog(origin_org, datasets)
 
         graph = catalog.graph
 
@@ -72,7 +69,6 @@ class OrganizationToRdfTest(DBTestMixin, TestCase):
         self.assertEqual(str(catalog.identifier), uri)
 
         self.assertEqual(len(list(catalog.objects(DCAT.dataset))), len(datasets))
-        self.assertEqual(len(list(catalog.objects(DCAT.dataservice))), len(dataservices))
 
         org = catalog.value(DCT.publisher)
         self.assertEqual(org.value(RDF.type).identifier, FOAF.Organization)
@@ -84,8 +80,6 @@ class OrganizationToRdfTest(DBTestMixin, TestCase):
         graph = catalog.graph
         graph_datasets = graph.subjects(RDF.type, DCAT.Dataset)
         self.assertEqual(len(list(graph_datasets)), len(datasets))
-        graph_dataservices = graph.subjects(RDF.type, DCAT.DataService)
-        self.assertEqual(len(list(graph_dataservices)), len(dataservices))
 
     def test_catalog_pagination(self):
         origin_org = OrganizationFactory()
@@ -108,23 +102,11 @@ class OrganizationToRdfTest(DBTestMixin, TestCase):
             page_size=page_size,
             _external=True,
         )
-        # First create a dataset and it's associated dataservice, which should be listed
-        # last, and thus on the second page.
-        extra_dataset = DatasetFactory.create(organization=origin_org)
-        _extra_dataservice = DataserviceFactory.create(
-            datasets=[extra_dataset], organization=origin_org
-        )
-
-        # Create `total` datasets that should be listed on the first page up to `page_size`
         DatasetFactory.create_batch(total, organization=origin_org)
-        # And all the dataservices with no datasets, which will all be listed on the first page.
-        # See DataserviceQuerySet.filter_by_dataset_pagination.
-        DataserviceFactory.create_batch(total, organization=origin_org)
 
         # First page
         datasets = Dataset.objects.paginate(1, page_size)
-        dataservices = Dataservice.objects.filter_by_dataset_pagination(datasets, 1)
-        catalog = build_org_catalog(origin_org, datasets, dataservices, format="json")
+        catalog = build_org_catalog(origin_org, datasets, format="json")
         graph = catalog.graph
 
         self.assertIsInstance(catalog, RdfResource)
@@ -133,12 +115,9 @@ class OrganizationToRdfTest(DBTestMixin, TestCase):
         self.assertIn(DCAT.Catalog, types)
         self.assertIn(HYDRA.Collection, types)
 
-        self.assertEqual(catalog.value(HYDRA.totalItems), Literal(total + 1))
+        self.assertEqual(catalog.value(HYDRA.totalItems), Literal(total))
 
         self.assertEqual(len(list(catalog.objects(DCAT.dataset))), page_size)
-        # All dataservices that are not linked to a dataset are listed in the first page.
-        # See DataserviceQuerySet.filter_by_dataset_pagination.
-        self.assertEqual(len(list(catalog.objects(DCAT.dataservice))), total)
 
         paginations = list(graph.subjects(RDF.type, HYDRA.PartialCollectionView))
         self.assertEqual(len(paginations), 1)
@@ -151,8 +130,7 @@ class OrganizationToRdfTest(DBTestMixin, TestCase):
 
         # Second page
         datasets = Dataset.objects.paginate(2, page_size)
-        dataservices = Dataservice.objects.filter_by_dataset_pagination(datasets, 2)
-        catalog = build_org_catalog(origin_org, datasets, dataservices, format="json")
+        catalog = build_org_catalog(origin_org, datasets, format="json")
         graph = catalog.graph
 
         self.assertIsInstance(catalog, RdfResource)
@@ -161,12 +139,9 @@ class OrganizationToRdfTest(DBTestMixin, TestCase):
         self.assertIn(DCAT.Catalog, types)
         self.assertIn(HYDRA.Collection, types)
 
-        self.assertEqual(catalog.value(HYDRA.totalItems), Literal(total + 1))
+        self.assertEqual(catalog.value(HYDRA.totalItems), Literal(total))
 
-        # 5 datasets total, 3 on the first page, 2 on the second.
-        self.assertEqual(len(list(catalog.objects(DCAT.dataset))), 2)
-        # 1 extra_dataservice, listed on the same page as its associated extra_dataset.
-        self.assertEqual(len(list(catalog.objects(DCAT.dataservice))), 1)
+        self.assertEqual(len(list(catalog.objects(DCAT.dataset))), 1)
 
         paginations = list(graph.subjects(RDF.type, HYDRA.PartialCollectionView))
         self.assertEqual(len(paginations), 1)

udata/tests/reuse/test_reuse_model.py

@@ -1,3 +1,4 @@
+import re
 from datetime import datetime
 
 from udata.core.dataset import tasks as dataset_tasks

udata/tests/site/test_site_rdf.py

@@ -254,7 +254,9 @@ class SiteRdfViewsTest:
         dataset_b = DatasetFactory.create()
         dataset_c = DatasetFactory.create()
 
-        DataserviceFactory.create(datasets=[dataset_a.id], harvest=HarvestMetadataFactory())
+        dataservice_a = DataserviceFactory.create(
+            datasets=[dataset_a.id], harvest=HarvestMetadataFactory()
+        )
         dataservice_b = DataserviceFactory.create(datasets=[dataset_b.id])
         dataservice_x = DataserviceFactory.create(datasets=[dataset_a.id, dataset_c.id])
         dataservice_y = DataserviceFactory.create(datasets=[])

udata/tests/test_cors.py

@@ -1,8 +1,11 @@
 from datetime import datetime
 
+import pytest
 from flask import url_for
 
 from udata.core.dataset.factories import DatasetFactory
+from udata.core.topic.factories import TopicFactory
+from udata.search import reindex
 from udata.tests.api import APITestCase
 from udata.tests.helpers import assert_status
 

udata/tests/test_owned.py

@@ -161,8 +161,8 @@ class OwnedQuerysetTest(DBTestMixin, TestCase):
         result = Owned.objects.owned_by(org, user)
 
         self.assertEqual(len(result), 2)
-        for owned_ in result:
-            self.assertIn(owned_, owneds)
+        for owned in result:
+            self.assertIn(owned, owneds)
 
-        for owned_ in excluded:
-            self.assertNotIn(owned_, result)
+        for owned in excluded:
+            self.assertNotIn(owned, result)

udata/tests/test_routing.py

@@ -273,7 +273,7 @@ class SlugAsSLugFieldWithFollowTest(AsSlugMixin):
         assert404(client.get(second_url))
         assert404(client.get(last_url))
 
-        assert SlugFollow.objects.count() == 0
+        assert SlugFollow.objects.count() is 0
 
 
 @pytest.mark.usefixtures("clean_db")

udata/tests/test_tags.py

@@ -38,7 +38,7 @@ class TagsTests:
         rows = list(reader)
 
         assert header == ["name", "datasets", "reuses", "total"]
-        assert len(rows) == 3
+        assert len(rows) is 3
         assert rows[0] == ["both", "15", "10", "25"]
         assert rows[1] == ["datasets-only", "15", "0", "15"]
         assert rows[2] == ["reuses-only", "0", "10", "10"]

udata/tests/test_transfer.py

@@ -13,7 +13,8 @@ from udata.core.user.metrics import (
 from udata.features.transfer.actions import accept_transfer, request_transfer
 from udata.features.transfer.factories import TransferFactory
 from udata.features.transfer.notifications import transfer_request_notifications
-from udata.models import Member
+from udata.models import Dataset, Member
+from udata.tests.helpers import assert_emit
 from udata.utils import faker
 
 pytestmark = pytest.mark.usefixtures("clean_db")

udata/tests/workers/test_jobs_commands.py

@@ -101,7 +101,7 @@ class JobsCommandsTest:
         ]
         result = cli("job scheduled")
 
-        filtered = [line for line in result.output.splitlines() if "Tip" not in line]
+        filtered = [l for l in result.output.splitlines() if "Tip" not in l]
         assert len(filtered) == len(tasks)
 
         assert "not-scheduled" not in result.output

udata/utils.py

@@ -18,8 +18,6 @@ from faker.providers import BaseProvider
 from faker.providers.lorem.la import Provider as LoremProvider
 from flask import abort
 
-from udata import tags
-
 
 def get_by(lst, field, value):
     """Find an object in a list given a field value"""
@@ -279,16 +277,6 @@ PROVIDERS.remove("faker.providers.lorem")
 faker = Faker("fr_FR")  # Use a unicode/utf-8 based locale
 
 
-def tag() -> str:
-    fake_tag: str = faker.word()
-    while len(fake_tag) < tags.MIN_TAG_LENGTH:
-        fake_tag = faker.word()
-    return fake_tag
-
-
-faker.tag = tag
-
-
 def faker_provider(provider):
     faker.add_provider(provider)
     factory.Faker.add_provider(provider)

{udata-9.1.4.dist-info → udata-9.1.4.dev30973.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: udata
-Version: 9.1.4
+Version: 9.1.4.dev30973
 Summary: Open data portal
 Home-page: https://github.com/opendatateam/udata
 Author: Opendata Team
@@ -138,20 +138,9 @@ It is collectively taken care of by members of the
 
 # Changelog
 
-## 9.1.4 (2024-08-26)
-
-- Fix many linting issues reported by ruff [#3118](https://github.com/opendatateam/udata/pull/3118)
-- Import the dataservice's organization from the fixtures [#3121](https://github.com/opendatateam/udata/pull/3121)
-- Convert reuse to new API system [#3066](https://github.com/opendatateam/udata/pull/3066)
-- Fix circular import error [#3128](https://github.com/opendatateam/udata/pull/3128)
-- Add an option to specify the port when using `inv serve` [#3123](https://github.com/opendatateam/udata/pull/3123)
-- Add a new `related_to` filter parameter to the activities API endpoint [#3127](https://github.com/opendatateam/udata/pull/3127)
-- Properly import the `Discussion.closed_by` from the fixtures [#3125](https://github.com/opendatateam/udata/pull/3125)
-- Send an API token to Hydra when publishing resource events [#3130](https://github.com/opendatateam/udata/pull/3130)
-- Add `last_login_at` to org members API [#3133](https://github.com/opendatateam/udata/pull/3133)
-- Always add Vary even for non CORS requests [#3132](https://github.com/opendatateam/udata/pull/3132)
-- Add acronym in organization csv catalog [#3134](https://github.com/opendatateam/udata/pull/3134)
-- Limit the number of user suggestions [#3131](https://github.com/opendatateam/udata/pull/3131)
+## Current (in progress)
+
+- Nothing yet
 
 ## 9.1.3 (2024-08-01)
 
@@ -161,7 +150,6 @@ It is collectively taken care of by members of the
 - Update to the version v2.0.0 of udata-fixtures (with the dataservices)
 - Add type hints [#3111](https://github.com/opendatateam/udata/pull/3111)
 - Make sure requests v2.32.3 is used everywhere consistently [#3116](https://github.com/opendatateam/udata/pull/3116)
-- Expose a dataservice in its organization's catalog, and expose a dataservice's catalog [#3122](https://github.com/opendatateam/udata/pull/3122)
 
 ## 9.1.2 (2024-07-29)