udata 7.0.7.dev28410__py2.py3-none-any.whl → 7.0.7.dev28426__py2.py3-none-any.whl

udata/core/badges/tests/test_commands.py

@@ -2,7 +2,8 @@ import pytest
 
 from tempfile import NamedTemporaryFile
 
-from udata.models import Badge, CERTIFIED, PUBLIC_SERVICE
+from udata.models import Badge
+from udata.core.organization.constants import CERTIFIED, PUBLIC_SERVICE
 from udata.core.organization.factories import OrganizationFactory
 
 

udata/core/dataset/api.py

@@ -57,9 +57,10 @@ from .api_fields import (
 from udata.linkchecker.checker import check_resource
 from udata.core.topic.models import Topic
 from .models import (
-    Dataset, Resource, Checksum, License, UPDATE_FREQUENCIES,
-    CommunityResource, RESOURCE_TYPES, ResourceSchema, get_resource
+    Dataset, Resource, Checksum, License, 
+    CommunityResource, ResourceSchema, get_resource
 )
+from .constants import UPDATE_FREQUENCIES, RESOURCE_TYPES
 from .permissions import DatasetEditPermission, ResourceEditPermission
 from .forms import (
     ResourceForm, DatasetForm, CommunityResourceForm, ResourcesListForm

udata/core/dataset/api_fields.py

@@ -1,20 +1,17 @@
 from udata.api import api, fields, base_reference
 from udata.core.badges.api import badge_fields
 from udata.core.organization.api_fields import org_ref_fields
-from udata.core.organization.models import LOGO_SIZES
+from udata.core.organization.constants import BIGGEST_LOGO_SIZE
 from udata.core.spatial.api_fields import spatial_coverage_fields
 from udata.core.user.api_fields import user_ref_fields
 from udata.core.contact_point.api_fields import contact_point_fields
 
-from .models import (
+from .constants import (
     UPDATE_FREQUENCIES, RESOURCE_FILETYPES, DEFAULT_FREQUENCY,
     CHECKSUM_TYPES, DEFAULT_CHECKSUM_TYPE, DEFAULT_LICENSE, RESOURCE_TYPES
 )
 
 
-BIGGEST_LOGO_SIZE = LOGO_SIZES[0]
-
-
 checksum_fields = api.model('Checksum', {
     'type': fields.String(
         description='The hashing algorithm used to compute the checksum',

udata/core/dataset/apiv2.py

@@ -25,9 +25,8 @@ from .api_fields import (
 )
 from udata.core.spatial.api_fields import geojson
 from udata.core.contact_point.api_fields import contact_point_fields
-from .models import (
-    Dataset, UPDATE_FREQUENCIES, DEFAULT_FREQUENCY, DEFAULT_LICENSE, CommunityResource
-)
+from .models import Dataset, CommunityResource
+from .constants import UPDATE_FREQUENCIES, DEFAULT_FREQUENCY, DEFAULT_LICENSE
 from .api import ResourceMixin
 from .permissions import DatasetEditPermission, ResourceEditPermission
 from .search import DatasetSearch

udata/core/dataset/commands.py

@@ -6,12 +6,16 @@ import requests
 from bson import ObjectId
 
 from udata.commands import cli, success, exit_with_error
-from udata.models import License, DEFAULT_LICENSE, Dataset
+from udata.models import License, Dataset
+from udata.core.dataset.constants import DEFAULT_LICENSE
 from .tasks import send_frequency_reminder
 from . import actions
 
 log = logging.getLogger(__name__)
 
+# Use CKAN license group from opendefinition as default license list
+DEFAULT_LICENSE_FILE = 'http://licenses.opendefinition.org/licenses/groups/ckan.json'  # noqa
+
 FLAGS_MAP = {
     'domain_content': 'domain_content',
     'domain_data': 'domain_data',
@@ -21,10 +25,6 @@ FLAGS_MAP = {
     'is_osi_compliant': 'osi_compliant',
 }
 
-# Use CKAN license group from opendefinition as default license list
-DEFAULT_LICENSE_FILE = 'http://licenses.opendefinition.org/licenses/groups/ckan.json'  # noqa
-
-
 @cli.command()
 @click.argument('source', default=DEFAULT_LICENSE_FILE)
 def licenses(source=DEFAULT_LICENSE_FILE):

udata/core/dataset/constants.py

@@ -0,0 +1,82 @@
+from collections import OrderedDict
+from udata.i18n import lazy_gettext as _
+
+#: Udata frequencies with their labels
+#:
+#: See: http://dublincore.org/groups/collections/frequency/
+UPDATE_FREQUENCIES = OrderedDict([                              # Dublin core equivalent
+    ('unknown', _('Unknown')),                        # N/A
+    ('punctual', _('Punctual')),                      # N/A
+    ('continuous', _('Real time')),                   # freq:continuous
+    ('hourly', _('Hourly')),                          # N/A
+    ('fourTimesADay', _('Four times a day')),         # N/A
+    ('threeTimesADay', _('Three times a day')),       # N/A
+    ('semidaily', _('Semidaily')),                    # N/A
+    ('daily', _('Daily')),                            # freq:daily
+    ('fourTimesAWeek', _('Four times a week')),       # N/A
+    ('threeTimesAWeek', _('Three times a week')),     # freq:threeTimesAWeek
+    ('semiweekly', _('Semiweekly')),                  # freq:semiweekly
+    ('weekly', _('Weekly')),                          # freq:weekly
+    ('biweekly', _('Biweekly')),                      # freq:bimonthly
+    ('threeTimesAMonth', _('Three times a month')),   # freq:threeTimesAMonth
+    ('semimonthly', _('Semimonthly')),                # freq:semimonthly
+    ('monthly', _('Monthly')),                        # freq:monthly
+    ('bimonthly', _('Bimonthly')),                    # freq:bimonthly
+    ('quarterly', _('Quarterly')),                    # freq:quarterly
+    ('threeTimesAYear', _('Three times a year')),     # freq:threeTimesAYear
+    ('semiannual', _('Biannual')),                    # freq:semiannual
+    ('annual', _('Annual')),                          # freq:annual
+    ('biennial', _('Biennial')),                      # freq:biennial
+    ('triennial', _('Triennial')),                    # freq:triennial
+    ('quinquennial', _('Quinquennial')),              # N/A
+    ('irregular', _('Irregular')),                    # freq:irregular
+])
+
+#: Map legacy frequencies to currents
+LEGACY_FREQUENCIES = {
+    'fortnighly': 'biweekly',
+    'biannual': 'semiannual',
+    'realtime': 'continuous',
+}
+
+DEFAULT_FREQUENCY = 'unknown'
+
+DEFAULT_LICENSE = {
+    'id': 'notspecified',
+    'title': "License Not Specified",
+    'flags': ["generic"],
+    'maintainer': None,
+    'url': None,
+    'active': True,
+}
+
+RESOURCE_TYPES = OrderedDict([
+    ('main', _('Main file')),
+    ('documentation', _('Documentation')),
+    ('update', _('Update')),
+    ('api', _('API')),
+    ('code', _('Code repository')),
+    ('other', _('Other')),
+])
+
+RESOURCE_FILETYPE_FILE = 'file'
+RESOURCE_FILETYPES = OrderedDict([
+    (RESOURCE_FILETYPE_FILE, _('Uploaded file')),
+    ('remote', _('Remote file')),
+])
+
+CHECKSUM_TYPES = ('sha1', 'sha2', 'sha256', 'md5', 'crc')
+DEFAULT_CHECKSUM_TYPE = 'sha1'
+
+PIVOTAL_DATA = 'pivotal-data'
+CLOSED_FORMATS = ('pdf', 'doc', 'docx', 'word', 'xls', 'excel', 'xlsx')
+
+# Maximum acceptable Damerau-Levenshtein distance
+# used to guess license
+# (ie. number of allowed character changes)
+MAX_DISTANCE = 2
+
+SCHEMA_CACHE_DURATION = 60 * 5  # In seconds
+
+TITLE_SIZE_LIMIT = 350
+DESCRIPTION_SIZE_LIMIT = 100000

udata/core/dataset/forms.py

@@ -8,6 +8,8 @@ from udata.core.spatial.forms import SpatialCoverageField
 
 from .models import (
     Dataset, Resource, Schema, License, Checksum, CommunityResource,
+)
+from .constants import (
     UPDATE_FREQUENCIES, DEFAULT_FREQUENCY, RESOURCE_FILETYPES, CHECKSUM_TYPES,
     LEGACY_FREQUENCIES, RESOURCE_TYPES, TITLE_SIZE_LIMIT, DESCRIPTION_SIZE_LIMIT,
 )

udata/core/dataset/models.py

@@ -1,7 +1,6 @@
 import logging
 
 from datetime import datetime, timedelta
-from collections import OrderedDict
 from urllib.parse import urlparse
 
 from blinker import signal
@@ -24,101 +23,17 @@ from udata.i18n import lazy_gettext as _
 from udata.utils import get_by, hash_url, to_naive_datetime
 from udata.uris import ValidationError, endpoint_for
 from udata.uris import validate as validate_url
+from .constants import CHECKSUM_TYPES, CLOSED_FORMATS, DEFAULT_LICENSE, LEGACY_FREQUENCIES, MAX_DISTANCE, PIVOTAL_DATA, RESOURCE_FILETYPES, RESOURCE_TYPES, SCHEMA_CACHE_DURATION, UPDATE_FREQUENCIES
 
 from .preview import get_preview_url
 from .exceptions import (
     SchemasCatalogNotFoundException, SchemasCacheUnavailableException
 )
 
-__all__ = (
-    'License', 'Resource', 'Schema', 'Dataset', 'Checksum', 'CommunityResource',
-    'UPDATE_FREQUENCIES', 'LEGACY_FREQUENCIES', 'RESOURCE_FILETYPES',
-    'PIVOTAL_DATA', 'DEFAULT_LICENSE', 'RESOURCE_TYPES',
-    'ResourceSchema'
-)
+__all__ = ('License', 'Resource', 'Schema', 'Dataset', 'Checksum', 'CommunityResource', 'ResourceSchema')
 
 log = logging.getLogger(__name__)
 
-#: Udata frequencies with their labels
-#:
-#: See: http://dublincore.org/groups/collections/frequency/
-UPDATE_FREQUENCIES = OrderedDict([                              # Dublin core equivalent
-    ('unknown', _('Unknown')),                        # N/A
-    ('punctual', _('Punctual')),                      # N/A
-    ('continuous', _('Real time')),                   # freq:continuous
-    ('hourly', _('Hourly')),                          # N/A
-    ('fourTimesADay', _('Four times a day')),         # N/A
-    ('threeTimesADay', _('Three times a day')),       # N/A
-    ('semidaily', _('Semidaily')),                    # N/A
-    ('daily', _('Daily')),                            # freq:daily
-    ('fourTimesAWeek', _('Four times a week')),       # N/A
-    ('threeTimesAWeek', _('Three times a week')),     # freq:threeTimesAWeek
-    ('semiweekly', _('Semiweekly')),                  # freq:semiweekly
-    ('weekly', _('Weekly')),                          # freq:weekly
-    ('biweekly', _('Biweekly')),                      # freq:bimonthly
-    ('threeTimesAMonth', _('Three times a month')),   # freq:threeTimesAMonth
-    ('semimonthly', _('Semimonthly')),                # freq:semimonthly
-    ('monthly', _('Monthly')),                        # freq:monthly
-    ('bimonthly', _('Bimonthly')),                    # freq:bimonthly
-    ('quarterly', _('Quarterly')),                    # freq:quarterly
-    ('threeTimesAYear', _('Three times a year')),     # freq:threeTimesAYear
-    ('semiannual', _('Biannual')),                    # freq:semiannual
-    ('annual', _('Annual')),                          # freq:annual
-    ('biennial', _('Biennial')),                      # freq:biennial
-    ('triennial', _('Triennial')),                    # freq:triennial
-    ('quinquennial', _('Quinquennial')),              # N/A
-    ('irregular', _('Irregular')),                    # freq:irregular
-])
-
-#: Map legacy frequencies to currents
-LEGACY_FREQUENCIES = {
-    'fortnighly': 'biweekly',
-    'biannual': 'semiannual',
-    'realtime': 'continuous',
-}
-
-DEFAULT_FREQUENCY = 'unknown'
-
-DEFAULT_LICENSE = {
-    'id': 'notspecified',
-    'title': "License Not Specified",
-    'flags': ["generic"],
-    'maintainer': None,
-    'url': None,
-    'active': True,
-}
-
-RESOURCE_TYPES = OrderedDict([
-    ('main', _('Main file')),
-    ('documentation', _('Documentation')),
-    ('update', _('Update')),
-    ('api', _('API')),
-    ('code', _('Code repository')),
-    ('other', _('Other')),
-])
-
-RESOURCE_FILETYPE_FILE = 'file'
-RESOURCE_FILETYPES = OrderedDict([
-    (RESOURCE_FILETYPE_FILE, _('Uploaded file')),
-    ('remote', _('Remote file')),
-])
-
-CHECKSUM_TYPES = ('sha1', 'sha2', 'sha256', 'md5', 'crc')
-DEFAULT_CHECKSUM_TYPE = 'sha1'
-
-PIVOTAL_DATA = 'pivotal-data'
-CLOSED_FORMATS = ('pdf', 'doc', 'docx', 'word', 'xls', 'excel', 'xlsx')
-
-# Maximum acceptable Damerau-Levenshtein distance
-# used to guess license
-# (ie. number of allowed character changes)
-MAX_DISTANCE = 2
-
-SCHEMA_CACHE_DURATION = 60 * 5  # In seconds
-
-TITLE_SIZE_LIMIT = 350
-DESCRIPTION_SIZE_LIMIT = 100000
-
 
 def get_json_ld_extra(key, value):
     '''Serialize an extras key, value pair into JSON-LD'''

udata/core/dataset/rdf.py

@@ -28,7 +28,8 @@ from udata.rdf import (
 from udata.utils import get_by, safe_unicode
 from udata.uris import endpoint_for
 
-from .models import Dataset, Resource, Checksum, License, UPDATE_FREQUENCIES
+from .models import Dataset, Resource, Checksum, License
+from .constants import UPDATE_FREQUENCIES
 
 log = logging.getLogger(__name__)
 

udata/core/dataset/search.py

@@ -7,9 +7,8 @@ from udata.search import (
     ModelTermsFilter, BoolFilter, Filter,
     TemporalCoverageFilter
 )
-from udata.core.spatial.models import (
-    admin_levels, ADMIN_LEVEL_MAX
-)
+from udata.core.spatial.models import admin_levels
+from udata.core.spatial.constants import ADMIN_LEVEL_MAX
 from udata.core.dataset.api import DatasetApiParser, DEFAULT_SORTING
 from udata.utils import to_iso_datetime
 

udata/core/dataset/tasks.py

@@ -17,7 +17,8 @@ from udata.models import (Follow, Discussion, Activity, Topic,
                           Organization, Transfer, db)
 from udata.tasks import job
 
-from .models import Dataset, Resource, CommunityResource, UPDATE_FREQUENCIES, Checksum
+from .models import Dataset, Resource, CommunityResource, Checksum
+from .constants import UPDATE_FREQUENCIES
 
 log = get_task_logger(__name__)
 

udata/core/discussions/constants.py

@@ -0,0 +1 @@
+COMMENT_SIZE_LIMIT = 50000

udata/core/discussions/forms.py

@@ -1,7 +1,8 @@
 from udata.forms import ModelForm, Form, fields, validators
 from udata.i18n import lazy_gettext as _
 
-from .models import Discussion, COMMENT_SIZE_LIMIT
+from .models import Discussion
+from .constants import COMMENT_SIZE_LIMIT
 
 __all__ = ('DiscussionCreateForm', 'DiscussionCommentForm')
 

udata/core/discussions/models.py

@@ -5,13 +5,9 @@ from udata.models import db
 from udata.core.spam.models import SpamMixin, spam_protected
 from .signals import (on_new_discussion, on_discussion_closed, on_new_discussion_comment)
 
-
 log = logging.getLogger(__name__)
 
 
-COMMENT_SIZE_LIMIT = 50000
-
-
 class Message(SpamMixin, db.EmbeddedDocument):
     content = db.StringField(required=True)
     posted_on = db.DateTimeField(default=datetime.utcnow, required=True)

udata/core/organization/api.py

@@ -16,7 +16,8 @@ from udata.rdf import (
 from .forms import (
     OrganizationForm, MembershipRequestForm, MembershipRefuseForm, MemberForm
 )
-from .models import Organization, MembershipRequest, Member, ORG_ROLES
+from .models import Organization, MembershipRequest, Member
+from .constants import ORG_ROLES
 from .permissions import (
     EditOrganizationPermission, OrganizationPrivatePermission
 )

udata/core/organization/api_fields.py

@@ -1,10 +1,7 @@
 from udata.api import api, fields, base_reference
 from udata.core.badges.api import badge_fields
 
-from .models import ORG_ROLES, DEFAULT_ROLE, MEMBERSHIP_STATUS, LOGO_SIZES
-
-BIGGEST_LOGO_SIZE = LOGO_SIZES[0]
-
+from .constants import ORG_ROLES, DEFAULT_ROLE, MEMBERSHIP_STATUS, BIGGEST_LOGO_SIZE
 
 org_ref_fields = api.inherit('OrganizationReference', base_reference, {
     'name': fields.String(description='The organization name', readonly=True),

udata/core/organization/constants.py

@@ -0,0 +1,29 @@
+from udata.i18n import lazy_gettext as _
+
+ORG_ROLES = {
+    'admin': _('Administrator'),
+    'editor': _('Editor'),
+}
+DEFAULT_ROLE = 'editor'
+
+
+MEMBERSHIP_STATUS = {
+    'pending': _('Pending'),
+    'accepted': _('Accepted'),
+    'refused': _('Refused'),
+}
+
+LOGO_MAX_SIZE = 500
+LOGO_SIZES = [100, 60, 25]
+BIGGEST_LOGO_SIZE = LOGO_SIZES[0]
+
+PUBLIC_SERVICE = 'public-service'
+CERTIFIED = 'certified'
+ASSOCIATION = 'Association'
+COMPANY = 'Company'
+LOCAL_AUTHORITY = 'Local authority'
+
+TITLE_SIZE_LIMIT = 350
+DESCRIPTION_SIZE_LIMIT = 100000
+
+ORG_BID_SIZE_LIMIT = 14

udata/core/organization/forms.py

@@ -4,10 +4,8 @@ from udata.auth import current_user
 from udata.forms import Form, ModelForm, fields, validators
 from udata.i18n import lazy_gettext as _
 
-from .models import (
-    Organization, MembershipRequest, Member, LOGO_SIZES, ORG_ROLES,
-    TITLE_SIZE_LIMIT, DESCRIPTION_SIZE_LIMIT
-)
+from .models import Organization, MembershipRequest, Member
+from .constants import DESCRIPTION_SIZE_LIMIT, LOGO_SIZES, ORG_ROLES, TITLE_SIZE_LIMIT
 
 __all__ = (
     'OrganizationForm',

udata/core/organization/models.py

@@ -10,42 +10,10 @@ from udata.frontend.markdown import mdstrip
 from udata.models import db, BadgeMixin, WithMetrics
 from udata.i18n import lazy_gettext as _
 from udata.uris import endpoint_for
+from .constants import ASSOCIATION, CERTIFIED, COMPANY, LOCAL_AUTHORITY, LOGO_SIZES, ORG_BID_SIZE_LIMIT, ORG_ROLES, DEFAULT_ROLE, MEMBERSHIP_STATUS, LOGO_MAX_SIZE, PUBLIC_SERVICE
 
 
-__all__ = (
-    'Organization', 'Team', 'Member', 'MembershipRequest',
-    'ORG_ROLES', 'MEMBERSHIP_STATUS', 'PUBLIC_SERVICE', 'CERTIFIED',
-    'ASSOCIATION', 'COMPANY', 'LOCAL_AUTHORITY'
-)
-
-
-ORG_ROLES = {
-    'admin': _('Administrator'),
-    'editor': _('Editor'),
-}
-DEFAULT_ROLE = 'editor'
-
-
-MEMBERSHIP_STATUS = {
-    'pending': _('Pending'),
-    'accepted': _('Accepted'),
-    'refused': _('Refused'),
-}
-
-LOGO_MAX_SIZE = 500
-LOGO_SIZES = [100, 60, 25]
-
-PUBLIC_SERVICE = 'public-service'
-CERTIFIED = 'certified'
-ASSOCIATION = 'Association'
-COMPANY = 'Company'
-LOCAL_AUTHORITY = 'Local authority'
-
-TITLE_SIZE_LIMIT = 350
-DESCRIPTION_SIZE_LIMIT = 100000
-
-ORG_BID_SIZE_LIMIT = 14
-
+__all__ = ('Organization', 'Team', 'Member', 'MembershipRequest')
 
 class Team(db.EmbeddedDocument):
     name = db.StringField(required=True)

udata/core/organization/tasks.py

@@ -7,7 +7,8 @@ from udata.tasks import job, task, get_logger
 
 from udata.core.badges.tasks import notify_new_badge
 
-from .models import Organization, CERTIFIED, PUBLIC_SERVICE, COMPANY, ASSOCIATION, LOCAL_AUTHORITY
+from .models import Organization
+from .constants import CERTIFIED, PUBLIC_SERVICE, COMPANY, ASSOCIATION, LOCAL_AUTHORITY
 
 log = get_logger(__name__)
 

udata/core/post/constants.py

@@ -0,0 +1,9 @@
+from udata.i18n import lazy_gettext as _
+from collections import OrderedDict
+
+IMAGE_SIZES = [400, 100, 50]
+
+BODY_TYPES = OrderedDict([
+    ('markdown', _('Markdown')),
+    ('html', _('HTML')),
+])

udata/core/post/forms.py

@@ -1,7 +1,8 @@
 from udata.forms import ModelForm, fields, validators, widgets
 from udata.i18n import lazy_gettext as _
 
-from .models import Post, IMAGE_SIZES
+from .models import Post
+from .constants import IMAGE_SIZES
 
 
 __all__ = ('PostForm', )

udata/core/post/models.py

@@ -1,23 +1,13 @@
-from collections import OrderedDict
-
 from flask import url_for
 
 from udata.core.storages import images, default_image_basename
 from udata.i18n import lazy_gettext as _
 from udata.models import db
-
+from .constants import BODY_TYPES, IMAGE_SIZES
 
 __all__ = ('Post', )
 
 
-IMAGE_SIZES = [400, 100, 50]
-
-BODY_TYPES = OrderedDict([
-    ('markdown', _('Markdown')),
-    ('html', _('HTML')),
-])
-
-
 class PostQuerySet(db.BaseQuerySet):
     def published(self):
         return self(published__ne=None).order_by('-published')

udata/core/reuse/api.py

@@ -23,7 +23,8 @@ from .api_fields import (
     reuse_topic_fields
 )
 from .forms import ReuseForm
-from .models import Reuse, REUSE_TYPES, REUSE_TOPICS
+from .models import Reuse
+from .constants import REUSE_TYPES, REUSE_TOPICS
 from .permissions import ReuseEditPermission
 
 

udata/core/reuse/api_fields.py

@@ -5,7 +5,7 @@ from udata.core.dataset.api_fields import dataset_fields
 from udata.core.organization.api_fields import org_ref_fields
 from udata.core.user.api_fields import user_ref_fields
 
-from .models import REUSE_TOPICS, REUSE_TYPES, IMAGE_SIZES
+from .constants import REUSE_TOPICS, REUSE_TYPES, IMAGE_SIZES
 
 BIGGEST_IMAGE_SIZE = IMAGE_SIZES[0]
 

udata/core/reuse/constants.py

@@ -0,0 +1,37 @@
+from udata.i18n import lazy_gettext as _
+
+REUSE_TYPES = {
+    'api': _('API'),
+    'application': _('Application'),
+    'idea': _('Idea'),
+    'news_article': _('News Article'),
+    'paper': _('Paper'),
+    'post': _('Post'),
+    'visualization': _('Visualization'),
+    'hardware': _('Connected device'),
+}
+
+REUSE_TOPICS = {
+    'health': _('Health'),
+    'transport_and_mobility': _('Transport and mobility'),
+    'housing_and_development': _('Housing and development'),
+    'food_and_agriculture': _('Food and agriculture'),
+    'culture_and_recreation': _('Culture and recreation'),
+    'economy_and_business': _('Economy and business'),
+    'environment_and_energy': _('Environment and energy'),
+    'work_and_training': _('Work and training'),
+    'politics_and_public_life': _('Politics and public life'),
+    'safety_and_security': _('Safety and security'),
+    'education_and_research': _('Education and research'),
+    'society_and_demography': _('Society and demography'),
+    'law_and_justice': _('Law and justice'),
+    'open_data_tools': _('Open data tools'),
+    'others': _('Others'),
+}
+
+
+IMAGE_SIZES = [500, 100, 50, 25]
+IMAGE_MAX_SIZE = 800
+
+TITLE_SIZE_LIMIT = 350
+DESCRIPTION_SIZE_LIMIT = 100000

udata/core/reuse/factories.py

@@ -6,7 +6,8 @@ from udata.core.dataset.factories import DatasetFactory
 from udata.factories import ModelFactory
 from udata.utils import faker
 
-from .models import Reuse, REUSE_TYPES, REUSE_TOPICS
+from .models import Reuse
+from .constants import REUSE_TYPES, REUSE_TOPICS
 
 
 class ReuseFactory(ModelFactory):

udata/core/reuse/forms.py

@@ -1,8 +1,9 @@
 from udata.forms import ModelForm, fields, validators
 from udata.i18n import lazy_gettext as _
-from udata.models import Reuse, REUSE_TYPES, REUSE_TOPICS
+from udata.models import Reuse
+from udata.core.reuse.constants import REUSE_TYPES, REUSE_TOPICS
 
-from .models import IMAGE_SIZES, TITLE_SIZE_LIMIT, DESCRIPTION_SIZE_LIMIT
+from .constants import IMAGE_SIZES, TITLE_SIZE_LIMIT, DESCRIPTION_SIZE_LIMIT
 
 __all__ = ('ReuseForm', )
 

udata/core/reuse/models.py

@@ -8,45 +8,9 @@ from udata.i18n import lazy_gettext as _
 from udata.models import db, BadgeMixin, WithMetrics
 from udata.utils import hash_url
 from udata.uris import endpoint_for
+from .constants import IMAGE_MAX_SIZE, IMAGE_SIZES, REUSE_TOPICS, REUSE_TYPES
 
-__all__ = ('Reuse', 'REUSE_TYPES', 'REUSE_TOPICS')
-
-
-REUSE_TYPES = {
-    'api': _('API'),
-    'application': _('Application'),
-    'idea': _('Idea'),
-    'news_article': _('News Article'),
-    'paper': _('Paper'),
-    'post': _('Post'),
-    'visualization': _('Visualization'),
-    'hardware': _('Connected device'),
-}
-
-REUSE_TOPICS = {
-    'health': _('Health'),
-    'transport_and_mobility': _('Transport and mobility'),
-    'housing_and_development': _('Housing and development'),
-    'food_and_agriculture': _('Food and agriculture'),
-    'culture_and_recreation': _('Culture and recreation'),
-    'economy_and_business': _('Economy and business'),
-    'environment_and_energy': _('Environment and energy'),
-    'work_and_training': _('Work and training'),
-    'politics_and_public_life': _('Politics and public life'),
-    'safety_and_security': _('Safety and security'),
-    'education_and_research': _('Education and research'),
-    'society_and_demography': _('Society and demography'),
-    'law_and_justice': _('Law and justice'),
-    'open_data_tools': _('Open data tools'),
-    'others': _('Others'),
-}
-
-
-IMAGE_SIZES = [500, 100, 50, 25]
-IMAGE_MAX_SIZE = 800
-
-TITLE_SIZE_LIMIT = 350
-DESCRIPTION_SIZE_LIMIT = 100000
+__all__ = ('Reuse',)
 
 
 class ReuseQuerySet(db.OwnedQuerySet):

udata/core/spam/api.py

@@ -4,7 +4,7 @@ from udata.api import api, API
 from udata.auth import admin_permission
 from udata.core.discussions.models import Discussion
 from udata.core.spam.fields import potential_spam_fields
-from udata.core.spam.models import POTENTIAL_SPAM
+from udata.core.spam.constants import POTENTIAL_SPAM
 from udata.utils import id_or_404
 
 

udata/core/spam/constants.py

@@ -0,0 +1,5 @@
+NOT_CHECKED = 'not_checked'
+POTENTIAL_SPAM = 'potential_spam'
+NO_SPAM = 'no_spam'
+
+SPAM_STATUS_CHOICES = [NOT_CHECKED, POTENTIAL_SPAM, NO_SPAM]

udata/core/spam/fields.py

@@ -1,5 +1,5 @@
 from udata.api import api, fields
-from .models import SPAM_STATUS_CHOICES
+from .constants import SPAM_STATUS_CHOICES
 
 spam_fields = api.model('Spam', {
     'status': fields.String(description='Status', enum=SPAM_STATUS_CHOICES, readonly=True),

udata/core/spam/models.py

@@ -5,11 +5,7 @@ from udata.models import db
 from .signals import on_new_potential_spam
 from mongoengine import signals
 
-NOT_CHECKED = 'not_checked'
-POTENTIAL_SPAM = 'potential_spam'
-NO_SPAM = 'no_spam'
-
-SPAM_STATUS_CHOICES = [NOT_CHECKED, POTENTIAL_SPAM, NO_SPAM]
+from .constants import NO_SPAM, POTENTIAL_SPAM, SPAM_STATUS_CHOICES, NOT_CHECKED
 
 
 class SpamInfo(db.EmbeddedDocument):

udata/core/spam/tests/test_spam.py

@@ -1,10 +1,10 @@
 import logging
 import pytest
 from udata.tests import TestCase
-from udata.tests.helpers import assert_not_emit
 from udata.models import db
 
-from ..models import POTENTIAL_SPAM, SpamMixin
+from ..models import SpamMixin
+from ..constants import POTENTIAL_SPAM
 
 
 log = logging.getLogger(__name__)

udata/core/spatial/constants.py

@@ -0,0 +1,9 @@
+from udata.i18n import L_
+
+BASE_GRANULARITIES = [
+    ('poi', L_('POI')),
+    ('other', L_('Other')),
+]
+
+ADMIN_LEVEL_MIN = 1
+ADMIN_LEVEL_MAX = 110

udata/core/spatial/models.py

@@ -4,25 +4,14 @@ from werkzeug.utils import cached_property
 
 from udata.app import cache
 from udata.uris import endpoint_for
-from udata.i18n import _, L_, get_locale, language
+from udata.i18n import _, get_locale, language
 from udata.models import db
 
 from . import geoids
+from .constants import ADMIN_LEVEL_MIN, ADMIN_LEVEL_MAX, BASE_GRANULARITIES
 
 
-__all__ = (
-    'GeoLevel', 'GeoZone', 'SpatialCoverage', 'BASE_GRANULARITIES',
-    'spatial_granularities',
-)
-
-
-BASE_GRANULARITIES = [
-    ('poi', L_('POI')),
-    ('other', L_('Other')),
-]
-
-ADMIN_LEVEL_MIN = 1
-ADMIN_LEVEL_MAX = 110
+__all__ = ('GeoLevel', 'GeoZone', 'SpatialCoverage', 'spatial_granularities')
 
 
 class GeoLevel(db.Document):

udata/core/user/api_fields.py

@@ -1,9 +1,7 @@
 from udata.auth.helpers import current_user_is_admin_or_self
 from udata.api import api, fields, base_reference
 
-from .models import AVATAR_SIZES
-
-BIGGEST_AVATAR_SIZE = AVATAR_SIZES[0]
+from .constants import BIGGEST_AVATAR_SIZE
 
 
 user_ref_fields = api.inherit('UserReference', base_reference, {

udata/core/user/constants.py

@@ -0,0 +1,2 @@
+AVATAR_SIZES = [500, 200, 100, 32, 25]
+BIGGEST_AVATAR_SIZE = AVATAR_SIZES[0]

udata/core/user/forms.py

@@ -2,7 +2,7 @@ from udata.forms import ModelForm, fields, validators
 from udata.i18n import lazy_gettext as _
 from udata.models import User
 
-from .models import AVATAR_SIZES
+from .constants import AVATAR_SIZES
 
 
 __all__ = ('UserProfileForm', 'UserProfileAdminForm')

udata/core/user/models.py

@@ -19,10 +19,10 @@ from udata.i18n import lazy_gettext as _
 from udata.models import db, WithMetrics, Follow
 from udata.core.discussions.models import Discussion
 from udata.core.storages import avatars, default_image_basename
+from .constants import AVATAR_SIZES
 
 __all__ = ('User', 'Role', 'datastore')
 
-AVATAR_SIZES = [500, 200, 100, 32, 25]
 
 
 # TODO: use simple text for role

udata/tests/api/test_datasets_api.py

@@ -25,9 +25,8 @@ from udata.core.spatial.factories import SpatialCoverageFactory
 from udata.core.topic.factories import TopicFactory
 from udata.core.user.factories import AdminFactory, UserFactory
 from udata.i18n import gettext as _
-from udata.models import (LEGACY_FREQUENCIES, RESOURCE_TYPES,
-                          UPDATE_FREQUENCIES, CommunityResource, Dataset,
-                          Follow, Member, db)
+from udata.models import CommunityResource, Dataset, Follow, Member, db
+from udata.core.dataset.constants import LEGACY_FREQUENCIES, RESOURCE_TYPES, UPDATE_FREQUENCIES
 from udata.tags import MAX_TAG_LENGTH, MIN_TAG_LENGTH
 from udata.tests.features.territories import create_geozones_fixtures
 from udata.tests.helpers import assert200, assert404, assert204

udata/tests/api/test_reuses_api.py

@@ -10,7 +10,8 @@ from udata.core.user.factories import AdminFactory
 from udata.core.reuse.factories import ReuseFactory
 from udata.core.organization.factories import OrganizationFactory
 from udata.core.user.factories import UserFactory
-from udata.models import Reuse, Follow, Member, REUSE_TOPICS, REUSE_TYPES
+from udata.models import Reuse, Follow, Member
+from udata.core.reuse.constants import REUSE_TOPICS, REUSE_TYPES
 from udata.utils import faker
 
 from udata.tests.helpers import (

udata/tests/dataset/test_dataset_model.py

@@ -3,12 +3,11 @@ from datetime import datetime, timedelta
 import pytest
 import requests
 from flask import current_app
-from mongoengine import post_save, ValidationError
+from mongoengine import post_save
 
 from udata.app import cache
-from udata.models import (
-    db, Dataset, License, LEGACY_FREQUENCIES, ResourceSchema, UPDATE_FREQUENCIES, Schema, FieldValidationError
-)
+from udata.models import db, Dataset, License, ResourceSchema, Schema
+from udata.core.dataset.constants import LEGACY_FREQUENCIES, UPDATE_FREQUENCIES
 from udata.core.dataset.models import HarvestDatasetMetadata, HarvestResourceMetadata
 from udata.core.dataset.factories import (
     ResourceFactory, DatasetFactory, CommunityResourceFactory, LicenseFactory, ResourceSchemaMockData

udata/tests/site/test_site_metrics.py

@@ -4,7 +4,8 @@ from udata.core.dataset.factories import DatasetFactory, HiddenDatasetFactory, O
 from udata.core.reuse.factories import VisibleReuseFactory
 from udata.harvest.tests.factories import HarvestSourceFactory
 from udata.core.site.factories import SiteFactory
-from udata.models import Badge, PUBLIC_SERVICE
+from udata.models import Badge
+from udata.core.organization.constants import PUBLIC_SERVICE
 
 
 @pytest.mark.usefixtures('clean_db')

{udata-7.0.7.dev28410.dist-info → udata-7.0.7.dev28426.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: udata
-Version: 7.0.7.dev28410
+Version: 7.0.7.dev28426
 Summary: Open data portal
 Home-page: https://github.com/opendatateam/udata
 Author: Opendata Team
@@ -139,6 +139,7 @@ It is collectively taken care of by members of the
 ## Current (in progress)
 
 - Topic: add filters in API [#3007](https://github.com/opendatateam/udata/pull/3007)
+- Move constants outside `models.py` files to `constants.py` [#3001](https://github.com/opendatateam/udata/pull/3001)
 
 ## 7.0.6 (2024-03-29)
 

{udata-7.0.7.dev28410.dist-info → udata-7.0.7.dev28426.dist-info}/RECORD

@@ -67,7 +67,7 @@ udata/core/badges/permissions.py,sha256=5jFKFG4OlVp0pL0xSa7AGO0Ttn0QMsy9xEY2jTfK
 udata/core/badges/signals.py,sha256=T12kgKO1lmIbdXlKnRmedYRnJzC2PZIMkrtcA1U2mNo,237
 udata/core/badges/tasks.py,sha256=LA1Sd0B0uUa6OANqmx0t-kDNK99uGePwwtilsdj9Evw,431
 udata/core/badges/tests/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-udata/core/badges/tests/test_commands.py,sha256=yodBaD426tkGAc-HTAWl2v2wzwQ6WNoa-V6VtLdJk1Q,1319
+udata/core/badges/tests/test_commands.py,sha256=BcfB0eo8ICCF5E0Z2ryu0pmp6istFZEt56mZkJMQTPo,1364
 udata/core/badges/tests/test_model.py,sha256=vM0j4mf0oj7tYGb9OkTK6wOx2uct8vj3C-7pM0jdn78,4929
 udata/core/contact_point/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 udata/core/contact_point/api.py,sha256=PyurW-Je4iRJlagyvDOkIhp_xINHqghNIiHjtqQTL0I,1918
@@ -78,29 +78,31 @@ udata/core/contact_point/models.py,sha256=sazF_oCe-Vdm-EQdQ6TfcHqmt11rKo36FT88ZX
 udata/core/dataset/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 udata/core/dataset/actions.py,sha256=3pzBg_qOR-w7fwPpTOKUHXWC9lkjALbOn1UQFmmT-s0,1199
 udata/core/dataset/activities.py,sha256=qQnHNL0hOB1IGtQl7JsnVOiUsWT0gm-pts9uDyR3bvU,1536
-udata/core/dataset/api.py,sha256=UD9O_S3vO1kmrJzbcKuO88lcW8CYR2D66JLeYMUHjWk,28727
-udata/core/dataset/api_fields.py,sha256=u26bdsTwnSLkLpXcF068QwqeN69PvXuUtvvt1PUDnTE,14358
-udata/core/dataset/apiv2.py,sha256=3vz7t-T_2HXmqBKPxLYGoVHn8m95ikMEd8J8gfVUmLI,15737
-udata/core/dataset/commands.py,sha256=UO769j5PBjLNRDgy5pBEZVRgwuTBBhbwkhwmx4CEgdo,3673
+udata/core/dataset/api.py,sha256=2vs6wbIhc1fN4mCZ88nK7kM5oQ9CZ5OwQXrSwc57Z8I,28750
+udata/core/dataset/api_fields.py,sha256=6gSj6GP_PNQtsIcbLDMjC56GPNOtlm3IL_OlNGRIG2E,14335
+udata/core/dataset/apiv2.py,sha256=XzEwtmC53Mw0mq8NEMCD2cN52pCmrUkPu0adUj4wGyw,15751
+udata/core/dataset/commands.py,sha256=dbK7gMYH4G6pOPiYtmL3yomzg5MGqTaG97_UM9Smu_k,3712
+udata/core/dataset/constants.py,sha256=Twml-I5mGiIdTkiDV1D4bXqi_TcNhcEc-QFxorUKHM4,3138
 udata/core/dataset/csv.py,sha256=d6JMuvlov_vR7EN10rJa6Q03Il0PfbzMTHQIud5H8qg,3240
 udata/core/dataset/events.py,sha256=DI71VfRc1eDTtgWQ3TJx5gtUw2MO0O_CVLCKLq0OIF0,3207
 udata/core/dataset/exceptions.py,sha256=uI_NvZRZMr_MtYQBYdLD8tk-BIUeDDfMMcrWwqV7mi8,494
 udata/core/dataset/factories.py,sha256=_sAW0FeEPC5bIKVCnjxnWmKBNU5jRss1AjVaQaMi8Lo,2737
-udata/core/dataset/forms.py,sha256=auVYxLrPMdtvf2uhgEpJviHiQOSfLpBJdpZ3dXwcjNs,6154
-udata/core/dataset/models.py,sha256=T9dBPoeex6ohQqPcDKxwAb6GhqGN0rED7Vjw6MLDz2s,39461
+udata/core/dataset/forms.py,sha256=kICGBzoTal_ipXw9DqhnOWKQK8x7scQI9mEe0JGMt9g,6181
+udata/core/dataset/models.py,sha256=E_n4E6f7_XUzovHs9KonwhO3cDUKjgenH_01_j_gsUk,36425
 udata/core/dataset/permissions.py,sha256=3F2J7le3_rEYNhh88o3hSRWHAAt01_yHJM6RPmvCrRo,1090
 udata/core/dataset/preview.py,sha256=puPKT3fBD7ezAcT6owh0JK1_rGNDFZOqgT223qGn3LY,2597
-udata/core/dataset/rdf.py,sha256=pwYQLzpWXAZWThOMVx70pusTb7SzLgk7wh_9-ldPFAY,22808
-udata/core/dataset/search.py,sha256=GAdXBI8RhBXPUxd9Mp-44QB-Evwk5Be5XZZJ64T8bQQ,5282
+udata/core/dataset/rdf.py,sha256=oQqVpDvDCQKsfp5LKlIXACxLg89LpA2ydbkICxZCvT0,22830
+udata/core/dataset/search.py,sha256=Ca23ljX7TZiKZKiAZQIH5xwS2tjXQcTDzieAJd-E22c,5314
 udata/core/dataset/signals.py,sha256=TK6dfrOUitZZkGGOh6XmhYqYvIjzZpI70JTLV4k-JRM,161
-udata/core/dataset/tasks.py,sha256=VB1sQ6Fwbax46IRLGyZUDPGgGOWBYrzAlKzV3npDCyM,8412
+udata/core/dataset/tasks.py,sha256=UYdm_O9hA0yo7cCNQFvZE9pGzUshkc3Wr4Gpel2aupU,8434
 udata/core/discussions/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 udata/core/discussions/actions.py,sha256=l8FaRpNdnwq5M7IYA9lh1qhhTlk2XOnYkgt0dLJpowU,789
 udata/core/discussions/api.py,sha256=YlLxVA3GFcek8Q9Qb-R8KbNza2Ia3a9zNTU9PGewims,8554
+udata/core/discussions/constants.py,sha256=nbZgXESpg0TykIGPxW8xUtHtk7TwQoyOL0Ky4U4B7c8,27
 udata/core/discussions/factories.py,sha256=NQd_tD0Izrm67uO5HuuClmluteACrRd9PHrb2IkQ0P0,350
-udata/core/discussions/forms.py,sha256=PJ1z_q2erqG3aoRrbITKeUeuHcUO-iiL1pp7WU2lnb8,806
+udata/core/discussions/forms.py,sha256=daDc8vPDhaXjiEyniugiRC6pyv6OsflgIyO-KoAn6i8,828
 udata/core/discussions/metrics.py,sha256=qtgyDhM1aPgh8bGU-h-962EKR3J44imC155JVi6jvJI,362
-udata/core/discussions/models.py,sha256=MTnUgcQgcX1K7GscYMvWdiS7EcTUbFljxM0QGoPNfUE,3391
+udata/core/discussions/models.py,sha256=zU4EldaJtE-9pGlabetIlOFF_y3Kag2GxpNtwmk4jQ4,3361
 udata/core/discussions/notifications.py,sha256=1lsu8WyyOL4bdt0lx6IW5wTxmQ5gS_7FoncN53g3ToQ,927
 udata/core/discussions/permissions.py,sha256=q3tXNuNmuXCvZhKyudROcwXF53l-IeDR3pfKSh_hIL0,636
 udata/core/discussions/signals.py,sha256=zjuF-TiFwu9U_RcgZtHB2Z3W4oBx5hVZy6CCAl5Ekug,543
@@ -125,39 +127,42 @@ udata/core/metrics/signals.py,sha256=Xs_k-9lWzsoZU5Joli-41FNgvIVvbAejkjSFB6DHxh0
 udata/core/metrics/tasks.py,sha256=Z7La3-zPB5j6qJoPKr_MgjNZhqscZCmNLPa711ZBkdY,797
 udata/core/organization/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 udata/core/organization/activities.py,sha256=fOBujmduVoTxJph2C6Z4qHeQHOaJT9IsZooEDCWC4BA,1140
-udata/core/organization/api.py,sha256=dqXecBhVMvLb2xUcqno25oX1DwBDKg2qxjItDlvEtNQ,17429
-udata/core/organization/api_fields.py,sha256=x1UXdRnwNzJ4veyJJc-S5MxbnoArAM7rrUn1OIZXo7E,5426
+udata/core/organization/api.py,sha256=kqcjsus3Mnso5dxnMACYIDWhSuXBTCVgYctFa7rhgT8,17451
+udata/core/organization/api_fields.py,sha256=5NEePyZ515DqpDVHf1HWQJhUXsb8H74LVywlAC5_I44,5400
 udata/core/organization/apiv2.py,sha256=VAU_y9Zz-VhBgS-LWVbGOEZdSt3b44nZd5bzTV2wU8g,3206
 udata/core/organization/commands.py,sha256=FaSYxyWfQDR5tWvrAXmwcF2VMREOC13XTK8DD4vp_sY,1623
+udata/core/organization/constants.py,sha256=XGVnItrJTG0hcVKRK5sPmx44KHC9r_EKtj_y0MmBt0o,563
 udata/core/organization/csv.py,sha256=x0afMfhWYvx_karwuw5jXqBhMbzkrsiEuAq1wTVurZI,1491
 udata/core/organization/factories.py,sha256=5BABVcDhEChRhJsDfCDm8WyJG4l9j3H1_OFZa3VtlVs,646
-udata/core/organization/forms.py,sha256=SLREg-Sfza7uQcFEOqfUBhCbP2U8Ek2gWX2xe5EUWpA,3540
+udata/core/organization/forms.py,sha256=JXXv4tQGbIbICti7RXLVZdnc6VujATmLhDrHIsFxBME,3550
 udata/core/organization/metrics.py,sha256=nQiRscXRgpuzpfg5nNE6-kyJqk36KdRXKD_G5MmiJok,750
-udata/core/organization/models.py,sha256=gmsAtJQerGQZ6fNG3klDIe7NHL_LC31SOP3Itq6aP8Q,8750
+udata/core/organization/models.py,sha256=Y7iFRQY6m87nKZNUMK9qsZJXZ6xzA6t2q_YxAm8K7Dg,8315
 udata/core/organization/notifications.py,sha256=j-2LIHZ5y5QuVietWAWOrAqf4v1HMCtSDZ0w7V-z_1c,763
 udata/core/organization/permissions.py,sha256=cNIPiPgXVW2hvKqbuKHA_62tX2xaT8jiVJ3BEfnsHn0,1299
 udata/core/organization/rdf.py,sha256=ZSoxyZDj_5g6hv7lbTIy6bIW3xwvQy27rWNgJwtZ6LE,1762
 udata/core/organization/search.py,sha256=8DdHqKv6jmLibfts667BoUjc0YrmnM8V4lBJnyRIaE0,2127
 udata/core/organization/signals.py,sha256=dm2fVzwX3TZV_c5qDx61glcWKgb7TSx2JaaMfBG0Q6o,488
-udata/core/organization/tasks.py,sha256=feZoRSGH9zSny3g6BsihPqhnn9kPC041UgP0lsr8L4E,5766
+udata/core/organization/tasks.py,sha256=UKW1dDNUxuLPPwruayYujJJTcgfPx7PFfqW6i9wQxYE,5788
 udata/core/post/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 udata/core/post/api.py,sha256=eH9dw8u7_Tx6FP19Dvv91nyRGHSWKPR1pTzSkVXIeA4,5369
+udata/core/post/constants.py,sha256=ibocNUJ1s1mw88QCrKz8n1DSkOBnWuSqo7Y5-Yd75kg,196
 udata/core/post/factories.py,sha256=0aXYbf11Rl0KJyntNE0LjPaUnpvr4YqvqdTPfvGlyvM,619
-udata/core/post/forms.py,sha256=PKnuCHxjuDLwSZjYO2oxFhEPQ-9BA3UusIxNlYb8p7M,946
-udata/core/post/models.py,sha256=bfdvXreSaeUHBiy1RrDr6_a3L_PtwdjOwIIxexrZUpE,2021
+udata/core/post/forms.py,sha256=ff1efEcFkPRVMWA9YtvCAx0Msy69I7P34WgZsh_jK1E,968
+udata/core/post/models.py,sha256=7OyMCIiQzj2OXsYdQon1_HOyiA06nXj1VAqbNVf5EK4,1910
 udata/core/post/permissions.py,sha256=uofU0TehhOGYyUoRXf3wuy816_D3xwMmaJbDvV336sw,83
 udata/core/post/tests/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 udata/core/post/tests/test_api.py,sha256=LSJQQDUtUVdpwZNpnJaX3yNQYyjkjTTyO7mHnR5DR_I,3948
 udata/core/reuse/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 udata/core/reuse/activities.py,sha256=rdl_CR3RJPBMonsHYmPnPVDvCYozNdXN2H1ILrTItNQ,1417
-udata/core/reuse/api.py,sha256=PUDfEKJD6MrNBQwu5q39ikIXs0mYKkzjI_-CBq9lHFc,10187
-udata/core/reuse/api_fields.py,sha256=tBzRduvfuqM0_t_9uMoCmPnzQp0MLDEozh01tBcwdl0,4865
+udata/core/reuse/api.py,sha256=5z5tH7debD_rMmineB-fQ-lNKpZySA5u7TL7dd5hlag,10209
+udata/core/reuse/api_fields.py,sha256=NF0bSKWepyNzzKtG2MibflZrqNwf1FPtNqjpbTSAONY,4868
 udata/core/reuse/apiv2.py,sha256=Op4f6pSMdUuLcCwNadojJfHfU6UYohrzSxlJbRn3wHc,824
+udata/core/reuse/constants.py,sha256=pbCR1xX9v4tdewlOx8bgNmy1-5V9OXIbpNjJivnQ--A,1215
 udata/core/reuse/csv.py,sha256=k-syWGC7hJnqfaOtPRFFn8P8skCDcrnMWNWbJ3fUyXo,727
-udata/core/reuse/factories.py,sha256=JsV7arI2IteRpI6C2OpB4JnahhO5wHtQW1xFZG1UO4k,840
-udata/core/reuse/forms.py,sha256=cRkN7fUbR7issmkSDU0tTcvHXvPFsyCFol69q__nPl8,1764
+udata/core/reuse/factories.py,sha256=lTABDzgyxDhgTQhjsJb54B0TtTyu2uXlcN_1fU29G_8,862
+udata/core/reuse/forms.py,sha256=UI3dYNgx9r9QxN-f2voxIXE_Dsx7lpLxuOsmc0VtXj4,1805
 udata/core/reuse/metrics.py,sha256=uh0CxErJ8OxrQvajCSfKvQRbhB9rXKzTZ1AhyEMQvP0,161
-udata/core/reuse/models.py,sha256=JbqN9J7pN1DSBjYrF0m2iWZh8PTKoeCAl3-i5dhU5PU,6988
+udata/core/reuse/models.py,sha256=qBbvgxPiLhgizpJ5XVFCixWjRub3NY_sg3WsQehTZZ0,5861
 udata/core/reuse/permissions.py,sha256=-7lq32HuhIswR-yGv3Mp02cuEdG0YNam4VB2OnZZVEs,560
 udata/core/reuse/search.py,sha256=I3FX-9YP_cEqw5GFwFv2iqLZExeaQXsak13RMSCN7t8,2886
 udata/core/reuse/signals.py,sha256=2vv668u8miJ9t6H-FwRgXcWwsYMQem3oLNXp36rKtno,155
@@ -169,20 +174,22 @@ udata/core/site/forms.py,sha256=lPnxm0MDhK7_ORzPgJLcCAPMj59hDrJ80gwRSW-jtIo,469
 udata/core/site/models.py,sha256=96IZHtPaMio7VMNCdP1Km_SL1GlMErwBuDqgUXfzKVY,5981
 udata/core/site/rdf.py,sha256=ONKksnuZTFH9Hdd6BE42a1769zJynna68rG-M30PAZQ,1858
 udata/core/spam/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-udata/core/spam/api.py,sha256=ehYtb6Dei1eZYcGbWhpSUDphZ7TMRZDjl4Zv-snZ5cA,1671
-udata/core/spam/fields.py,sha256=tzS2PSJrV0ebmp3X2Y0GUwUL8EVd0NtuUTTWq3Af-sM,307
-udata/core/spam/models.py,sha256=FQ7W36yJhQZa-uOxggJj8HtNuNxM4uW_8M1xW_u6uTQ,8032
+udata/core/spam/api.py,sha256=8tVRPorw56kxgN64kme5nLkUfh8Gai9QyqT8aNQn9Xo,1674
+udata/core/spam/constants.py,sha256=M-wvYlcFnpUDortccIKFHWZ45vbNuMPWSvqKm2itn4w,143
+udata/core/spam/fields.py,sha256=ppazY9bGnz7mujmDndbxG3pPG_1HDUJCbIufxyD1UNQ,310
+udata/core/spam/models.py,sha256=u07LqZbxyeGq68UVtpZzEM9ihqOp52jIX8oJwuVGK5Q,7969
 udata/core/spam/signals.py,sha256=4VVLyC2I39LFAot4P56nHzY0xumjMBDz_N0Ff_kgBd0,159
 udata/core/spam/tests/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-udata/core/spam/tests/test_spam.py,sha256=IuSRVoVCLBjJuoCXnPZx8XjtRyt5q2LrSBtIp8Hovg4,702
+udata/core/spam/tests/test_spam.py,sha256=CBXXnyKMlMFBpFLzSVL6yG8nZ8lV9RAElxWe4XFVdGA,677
 udata/core/spatial/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 udata/core/spatial/api.py,sha256=tlApg3JpqbO6CwEwp1LzZ1hyPQreVEgF3H5yrcAPE74,5848
 udata/core/spatial/api_fields.py,sha256=ymGK3FyE2KNlASOU5GiPgZGeBjjOqnOyCOcRCbuw3D8,2629
 udata/core/spatial/commands.py,sha256=qdJ4mUg3NUTrGx6L5MKPh1usvxmeCn8xMCZNGKyjWYE,6914
+udata/core/spatial/constants.py,sha256=u_4OwAAVYqT0VX6nw_Hc4wIRUPcYww19EFJcnWuMZNo,146
 udata/core/spatial/factories.py,sha256=GxUU8nRtSoGPw2m3Q-al0PYps2oSnlqC-bM7Eeu14rk,3288
 udata/core/spatial/forms.py,sha256=tXlYKge5Rc8L8pOjfUo1-9howgVJZDAh7q8xTIlbBww,3218
 udata/core/spatial/geoids.py,sha256=UqCto4dtQYPXOxyG7sx_0npzM6yvId40ngw3eAlmioQ,1159
-udata/core/spatial/models.py,sha256=WA1jXgw6LYU_5uRrB8WXDIYYFZl4mzbRnJ5_VMkobRA,5105
+udata/core/spatial/models.py,sha256=SSCnNtk7xyRx7n2v118rn4aD5aUvwvNbxlzk0XUCl6Y,5022
 udata/core/spatial/translations.py,sha256=7BjZAMPObm1fwM5U_wnrlpcG-1FtMoS6Z5E3h3Y3sog,533
 udata/core/spatial/tests/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 udata/core/spatial/tests/test_api.py,sha256=BySPgLpHvWs3vBIX2_7vJkuqfrFBIsTHtdg6PXOsE_U,10171
@@ -211,12 +218,13 @@ udata/core/topic/permissions.py,sha256=RtFPPlxuU_Bv7ip6LDO4AoPrKFnIOEs9cCMXaSSmE
 udata/core/user/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 udata/core/user/activities.py,sha256=AMRbYgum8uJXAS3L-ddQN-xKtKRvsmesDZ0ItBY_jS0,2799
 udata/core/user/api.py,sha256=QQmTsUfm_RB698xkRPSSZduGPtvMM1WKGzupdUICFw4,12738
-udata/core/user/api_fields.py,sha256=1wIRNnux_MsaJnIAAJW79fIhoOZLc2YDRqfd_SDB-Ls,5081
+udata/core/user/api_fields.py,sha256=aWw-vaLy5KqE8vr6HtWzoAbzHI8aoi9BV-m-oY7FJfo,5052
 udata/core/user/commands.py,sha256=DlNBFaojhhPHH4kZazp0NMwYWnzPZXBba_vqH-cfR1U,3156
+udata/core/user/constants.py,sha256=aTluhTR2RGZ_cdG7-mkEoT5Ndbg8BNUwwzCOld0aLMY,77
 udata/core/user/factories.py,sha256=JiY-AghapelwhAVAExiUEHS1odyIu4PppWuhtZnkjBY,790
-udata/core/user/forms.py,sha256=3VmR3GE9gJQltMTWErh5YfAdw1NmEtSBnnR1oLi0K1Q,989
+udata/core/user/forms.py,sha256=XKhZFiXtTp_o0J4feLI2RQAjsmrf2CsyRQJ8n_gFVVg,992
 udata/core/user/metrics.py,sha256=sHw76gkprLp0oKWJf1uQqShBbgC43lZm7A5OSCuueAw,895
-udata/core/user/models.py,sha256=THwBeGHqADTDyuP6Ym5UKzD8vxRlvcH16YmkC6cvzeg,9506
+udata/core/user/models.py,sha256=VTIdPE4yROvcIUFpEd6GH0IA_v36pACWqFo3i1Ko-YM,9503
 udata/core/user/permissions.py,sha256=unBqNHcTAFYpN_kn0FTDLOYMPyWVeOvW7TQyeJkUI-M,436
 udata/core/user/rdf.py,sha256=pE0ISNBgQ3AnbtuzCE91XQmi5Cq_S0cMehbaqZFww7Q,867
 udata/core/user/tasks.py,sha256=drBhjauaydPcZb7y4ton6PhlXd5rmmZe5EbPWCzELkA,317
@@ -571,12 +579,12 @@ udata/tests/api/__init__.py,sha256=Tz_WigHLDlnJNKOKzEAnJswkKiLtHlIpCE54-wgocgM,9
 udata/tests/api/test_auth_api.py,sha256=3Zhn2A29poZIcCJ_R9_-LkR3xOFUTw1aTquiZVXQ2F0,20306
 udata/tests/api/test_base_api.py,sha256=DRX5nuFIj51GFmMIAxUzoW1yiq1apNgr1vS4U4agzeg,2319
 udata/tests/api/test_contact_points.py,sha256=MJm8B06iaUqIZCqxll3NViFwUCxwqZZ4u9e9s1h8MgU,1056
-udata/tests/api/test_datasets_api.py,sha256=Wdy0HfWKVtMBhMA9OJVs3WXOpmVi_dKlx1-OoekKNw0,81204
+udata/tests/api/test_datasets_api.py,sha256=X4Mp4HZJ6CNkmsl49piIHY4ZpZZht18faC3ReoqakGc,81190
 udata/tests/api/test_fields.py,sha256=OW85Z5MES5HeWOpapeem8OvR1cIcrqW-xMWpdZO4LZ8,1033
 udata/tests/api/test_follow_api.py,sha256=0h54P_Dfbo07u6tg0Rbai1WWgWb19ZLN2HGv4oLCWfg,3383
 udata/tests/api/test_me_api.py,sha256=8OthqVYQKZrFoGuJ7zAvoLJx1IclPNzPdD5Tnzmh3rM,14163
 udata/tests/api/test_organizations_api.py,sha256=HxeTqP14wlWGaQt4fpQljuRy98HWnmL1QelcxbJDmV0,32704
-udata/tests/api/test_reuses_api.py,sha256=gQ-o4JXK2S6z2yW13-i8e81pCdr9j2yyM1KinPbkc5g,16971
+udata/tests/api/test_reuses_api.py,sha256=GSoZ6SBRdMg6o0xKSQWtCSfvzqz_vZxERU567Rq1_GY,17009
 udata/tests/api/test_swagger.py,sha256=tLg452rCD5Q0AgFXOVZKMM6jGiWwC5diX5PxbdYni0o,760
 udata/tests/api/test_tags_api.py,sha256=xSIx_x5gqKz6BJCXKEsTqA_CR4BF1nG5NxEyfp9dy0o,2579
 udata/tests/api/test_topics_api.py,sha256=RItjoO7g2o2BZ34cOHJvPoSus_jIe-AYHFrX_iaHQ4o,9322
@@ -596,7 +604,7 @@ udata/tests/dataset/test_csv_adapter.py,sha256=2r5z4FuqG9pWgUyfDUw8afQYK5nIKE8XX
 udata/tests/dataset/test_dataset_actions.py,sha256=4_0F_TCSCfHpzqDt659c8hG4GpkWjVtmT4bAPgmE4B8,723
 udata/tests/dataset/test_dataset_commands.py,sha256=TAgVdimIcBVmcSNKXKXbhmCGYRo8Keh_InBNiS6UlkM,802
 udata/tests/dataset/test_dataset_events.py,sha256=zt6F4j_vOBfMxDW6vBVQ5PGwr0d4s6LGw0cGkt9BlvI,2835
-udata/tests/dataset/test_dataset_model.py,sha256=m-LtxaxNlXwNxtG_yoBYZ3lu6DdOR82ms4TDlK1a5KY,29776
+udata/tests/dataset/test_dataset_model.py,sha256=Mgq_qFh7pY8QFDke9HWezXTO6dqjd8qoRI8i01Qan-o,29769
 udata/tests/dataset/test_dataset_rdf.py,sha256=0lyHiP9eZdIHUkvgQQ6Dw_LMaXX2SHTxiJdLIorizaw,29389
 udata/tests/dataset/test_dataset_tasks.py,sha256=BN5qcvq6753WcpPOZd7vL1iIEW36ZBZrb2Lszb4eWEM,2283
 udata/tests/dataset/test_resource_preview.py,sha256=q1C9W9dO3nLWaR3-hpUOPYW17hCmQ3raty9Bl4FX3hg,3947
@@ -639,7 +647,7 @@ udata/tests/search/test_query.py,sha256=wtgC4rkaxe8vIaWOcANZ1yFFkEKTdNHj2yiTaYI-
 udata/tests/search/test_results.py,sha256=yjeqxNKVbjMxxvUsZb7csfU3wsV_YNjBDnfYRw5QN-s,1998
 udata/tests/site/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 udata/tests/site/test_site_api.py,sha256=XIjRH-iiwKdwmX145bQflxOatfIChi5RLikIMwJSbjQ,2276
-udata/tests/site/test_site_metrics.py,sha256=z0_kLpV5SNUBgvR5y3T_uv1m2xD9aBDdQc6tjI6ARXw,2218
+udata/tests/site/test_site_metrics.py,sha256=Sn9dQORwe-fvoyA7ZAnF63Cq5CwUGq1myH8Xe0EtfDA,2263
 udata/tests/site/test_site_model.py,sha256=nAx9JjEKdfjdw1Kj5Rs7P5FEePoATtCuOYPiSXEnVD0,1313
 udata/tests/site/test_site_rdf.py,sha256=M360uq2A6hl1WhmyRmRjvzuSqz_YFIUQNPR4vqWnYnE,9687
 udata/tests/user/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -664,9 +672,9 @@ udata/translations/pt/LC_MESSAGES/udata.mo,sha256=zCVMB-a4-mLM1jNyYMk58rgVRaVIwQ
 udata/translations/pt/LC_MESSAGES/udata.po,sha256=avfWczvlLBKSohyB55-4TLmUGMU_Rze4XmAo4OTk2v0,43513
 udata/translations/sr/LC_MESSAGES/udata.mo,sha256=ScuqdpaV4y1ZIpBAEfxeaKdzkyGZL0mJmKMoG6w0iRQ,28553
 udata/translations/sr/LC_MESSAGES/udata.po,sha256=QpgEXh1eHjztPa7oNLXd_sds1DC95A-STTtZyTE4m-E,50093
-udata-7.0.7.dev28410.dist-info/LICENSE,sha256=V8j_M8nAz8PvAOZQocyRDX7keai8UJ9skgmnwqETmdY,34520
-udata-7.0.7.dev28410.dist-info/METADATA,sha256=7NK8ToqaPXg_f86QirGUcBqziTraRBZ8oWQLcYmStyE,120234
-udata-7.0.7.dev28410.dist-info/WHEEL,sha256=-G_t0oGuE7UD0DrSpVZnq1hHMBV9DD2XkS5v7XpmTnk,110
-udata-7.0.7.dev28410.dist-info/entry_points.txt,sha256=3SKiqVy4HUqxf6iWspgMqH8d88Htk6KoLbG1BU-UddQ,451
-udata-7.0.7.dev28410.dist-info/top_level.txt,sha256=39OCg-VWFWOq4gCKnjKNu-s3OwFlZIu_dVH8Gl6ndHw,12
-udata-7.0.7.dev28410.dist-info/RECORD,,
+udata-7.0.7.dev28426.dist-info/LICENSE,sha256=V8j_M8nAz8PvAOZQocyRDX7keai8UJ9skgmnwqETmdY,34520
+udata-7.0.7.dev28426.dist-info/METADATA,sha256=jM0zNhnCckMsaLktRWBASo3c0izdaCtWWjM0tSAqCbc,120352
+udata-7.0.7.dev28426.dist-info/WHEEL,sha256=-G_t0oGuE7UD0DrSpVZnq1hHMBV9DD2XkS5v7XpmTnk,110
+udata-7.0.7.dev28426.dist-info/entry_points.txt,sha256=3SKiqVy4HUqxf6iWspgMqH8d88Htk6KoLbG1BU-UddQ,451
+udata-7.0.7.dev28426.dist-info/top_level.txt,sha256=39OCg-VWFWOq4gCKnjKNu-s3OwFlZIu_dVH8Gl6ndHw,12
+udata-7.0.7.dev28426.dist-info/RECORD,,