udata 10.1.5.dev34548__py2.py3-none-any.whl → 10.1.5.dev34612__py2.py3-none-any.whl

tasks/__init__.py

@@ -41,21 +41,18 @@ def clean(ctx, node=False, translations=False, all=False):
 
 
 @task
-def update(ctx, migrate=False):
+def update(ctx):
     """Perform a development update"""
     msg = "Update all dependencies"
-    if migrate:
-        msg += " and migrate data"
     header(msg)
     info("Updating Python dependencies")
     with ctx.cd(ROOT):
-        ctx.run("pi3 install -e .")
         ctx.run("pip install -r requirements/develop.pip")
-        info("Updating JavaScript dependencies")
-        ctx.run("npm install")
-        if migrate:
-            info("Migrating database")
-            ctx.run("udata db migrate")
+        for requirement_file in ["install", "test", "develop", "doc", "report"]:
+            ctx.run(
+                f"pip-compile requirements/{requirement_file}.in --output-file=requirements/{requirement_file}.pip --upgrade"
+            )
+    # TODO: Add javascript dependencies update
 
 
 @task

udata/auth/forms.py

@@ -24,17 +24,17 @@ class ExtendedRegisterForm(RegisterForm):
         ],
     )
 
-    def validate(self):
+    def validate(self, **kwargs):
         # no register allowed when read only mode is on
-        if not super().validate() or current_app.config.get("READ_ONLY_MODE"):
+        if not super().validate(**kwargs) or current_app.config.get("READ_ONLY_MODE"):
             return False
 
         return True
 
 
 class ExtendedLoginForm(LoginForm):
-    def validate(self):
-        if not super().validate():
+    def validate(self, **kwargs):
+        if not super().validate(**kwargs):
             return False
 
         if self.user.password_rotation_demanded:
@@ -45,8 +45,8 @@ class ExtendedLoginForm(LoginForm):
 
 
 class ExtendedResetPasswordForm(ResetPasswordForm):
-    def validate(self):
-        if not super().validate():
+    def validate(self, **kwargs):
+        if not super().validate(**kwargs):
             return False
 
         if self.user.password_rotation_demanded:
@@ -65,15 +65,15 @@ class ChangeEmailForm(Form):
     )
     submit = fields.SubmitField(_("Change email"))
 
-    def validate(self):
-        if not super().validate():
+    def validate(self, **kwargs):
+        if not super().validate(**kwargs):
             return False
 
         self.user = current_user
 
         if self.user.email.strip() == self.new_email.data.strip():
             self.new_email.errors.append(
-                "Your new email must be different than your " "previous email"
+                "Your new email must be different than your previous email"
             )
             return False
         return True

udata/commands/serve.py

@@ -18,15 +18,13 @@ log = logging.getLogger(__name__)
     "-r/-nr",
     "--reload/--no-reload",
     default=None,
-    help="Enable or disable the reloader.  By default the reloader "
-    "is active if debug is enabled.",
+    help="Enable or disable the reloader.  By default the reloader is active if debug is enabled.",
 )
 @click.option(
     "-d/-nd",
     "--debugger/--no-debugger",
     default=None,
-    help="Enable or disable the debugger.  By default the debugger "
-    "is active if debug is enabled.",
+    help="Enable or disable the debugger.  By default the debugger is active if debug is enabled.",
 )
 @click.option(
     "--eager-loading/--lazy-loader",

udata/core/badges/fields.py

@@ -4,7 +4,7 @@ badge_fields = api.model(
     "Badge",
     {
         "kind": fields.String(
-            description=("Kind of badge (certified, etc), " "specific to each model"), required=True
+            description=("Kind of badge (certified, etc), specific to each model"), required=True
         ),
     },
 )

udata/core/dataset/models.py

@@ -5,6 +5,7 @@ from pydoc import locate
 from typing import Self
 from urllib.parse import urlparse
 
+import Levenshtein
 import requests
 from blinker import signal
 from dateutil.parser import parse as parse_dt
@@ -13,7 +14,6 @@ from mongoengine import DynamicEmbeddedDocument
 from mongoengine import ValidationError as MongoEngineValidationError
 from mongoengine.fields import DateTimeField
 from mongoengine.signals import post_save, pre_init, pre_save
-from stringdist import rdlevenshtein
 from werkzeug.utils import cached_property
 
 from udata.api_fields import field
@@ -281,7 +281,9 @@ class License(db.Document):
 
         if license is None:
             # Try to single match `slug` with a low Damerau-Levenshtein distance
-            computed = ((license_, rdlevenshtein(license_.slug, slug)) for license_ in cls.objects)
+            computed = (
+                (license_, Levenshtein.distance(license_.slug, slug)) for license_ in cls.objects
+            )
             candidates = [license_ for license_, d in computed if d <= MAX_DISTANCE]
             # If there is more that one match, we cannot determinate
             # which one is closer to safely choose between candidates
@@ -291,7 +293,8 @@ class License(db.Document):
         if license is None:
             # Try to match `title` with a low Damerau-Levenshtein distance
             computed = (
-                (license_, rdlevenshtein(license_.title.lower(), text)) for license_ in cls.objects
+                (license_, Levenshtein.distance(license_.title.lower(), text))
+                for license_ in cls.objects
             )
             candidates = [license_ for license_, d in computed if d <= MAX_DISTANCE]
             # If there is more that one match, we cannot determinate
@@ -302,7 +305,7 @@ class License(db.Document):
         if license is None:
             # Try to single match `alternate_titles` with a low Damerau-Levenshtein distance
             computed = (
-                (license_, rdlevenshtein(cls.slug.slugify(title_), slug))
+                (license_, Levenshtein.distance(cls.slug.slugify(title_), slug))
                 for license_ in cls.objects
                 for title_ in license_.alternate_titles
             )

udata/core/discussions/api.py

@@ -129,7 +129,7 @@ class DiscussionAPI(API):
     @api.doc("comment_discussion")
     @api.expect(comment_discussion_fields)
     @api.response(
-        403, "Not allowed to close this discussion " "OR can't add comments on a closed discussion"
+        403, "Not allowed to close this discussion OR can't add comments on a closed discussion"
     )
     @api.marshal_with(discussion_fields)
     def post(self, id):

udata/core/spatial/models.py

@@ -170,9 +170,7 @@ class SpatialCoverage(db.EmbeddedDocument):
         return [zone for zone in self.zones if zone.handled_level]
 
     def clean(self):
-        if "geom" in self._get_changed_fields():
-            if self.zones:
-                raise db.ValidationError("The spatial coverage already has a Geozone")
-        if "zones" in self._get_changed_fields():
-            if self.geom:
-                raise db.ValidationError("The spatial coverage already has a Geometry")
+        if self.zones and self.geom:
+            raise db.ValidationError(
+                "The spatial coverage cannot contains a Geozone and a Geometry"
+            )

udata/forms/fields.py

@@ -363,11 +363,11 @@ class SelectField(FieldHelper, fields.SelectField):
 
     def iter_choices(self):
         localized_choices = [
-            (value, self.localize_label(label), selected)
-            for value, label, selected in super(SelectField, self).iter_choices()
+            (value, self.localize_label(label), selected, render_kw)
+            for value, label, selected, render_kw in super(SelectField, self).iter_choices()
         ]
-        for value, label, selected in sorted(localized_choices, key=lambda c: c[1]):
-            yield (value, label, selected)
+        for value, label, selected, render_kw in sorted(localized_choices, key=lambda c: c[1]):
+            yield (value, label, selected, render_kw)
 
     @property
     def choices(self):
@@ -390,11 +390,11 @@ class SelectMultipleField(FieldHelper, fields.SelectMultipleField):
 
     def iter_choices(self):
         localized_choices = [
-            (value, self._(label) if label else "", selected)
-            for value, label, selected in super(SelectMultipleField, self).iter_choices()
+            (value, self._(label) if label else "", selected, render_kw)
+            for value, label, selected, render_kw in super(SelectMultipleField, self).iter_choices()
         ]
-        for value, label, selected in sorted(localized_choices, key=lambda c: c[1]):
-            yield (value, label, selected)
+        for value, label, selected, render_kw in sorted(localized_choices, key=lambda c: c[1]):
+            yield (value, label, selected, render_kw)
 
 
 class TagField(Field):

udata/frontend/markdown.py

@@ -5,6 +5,7 @@ from urllib.parse import urlparse
 import bleach
 import html2text
 import mistune
+from bleach.css_sanitizer import CSSSanitizer
 from bleach.linkifier import LinkifyFilter
 from flask import Markup, current_app, request
 from jinja2.filters import do_striptags, do_truncate
@@ -55,11 +56,6 @@ def nofollow_callback(attrs, new=False):
         return attrs
 
 
-class Renderer(mistune.Renderer):
-    def table(self, header, body):
-        return ("<table>\n<thead>\n%s</thead>\n" "<tbody>\n%s</tbody>\n</table>\n") % (header, body)
-
-
 class UdataCleaner(bleach.Cleaner):
     def __init__(self, source_tooltip=False) -> None:
         callbacks = [nofollow_callback]
@@ -67,9 +63,11 @@ class UdataCleaner(bleach.Cleaner):
             callbacks.append(source_tooltip_callback)
 
         super().__init__(
-            tags=current_app.config["MD_ALLOWED_TAGS"],
+            tags=set(current_app.config["MD_ALLOWED_TAGS"]),
             attributes=current_app.config["MD_ALLOWED_ATTRIBUTES"],
-            styles=current_app.config["MD_ALLOWED_STYLES"],
+            css_sanitizer=CSSSanitizer(
+                allowed_css_properties=current_app.config["MD_ALLOWED_STYLES"]
+            ),
             protocols=current_app.config["MD_ALLOWED_PROTOCOLS"],
             strip_comments=False,
             filters=[
@@ -83,8 +81,9 @@ class UDataMarkdown(object):
 
     def __init__(self, app):
         app.jinja_env.filters.setdefault("markdown", self.__call__)
-        renderer = Renderer(escape=False, hard_wrap=True)
-        self.markdown = mistune.Markdown(renderer=renderer)
+        self.markdown = mistune.create_markdown(
+            escape=False, hard_wrap=True, plugins=["table", "strikethrough"]
+        )
 
     def __call__(self, stream, source_tooltip=False, wrap=True):
         if not stream:

udata/harvest/tests/test_base_backend.py

@@ -207,7 +207,7 @@ class BaseBackendTest:
 
         dataset = Dataset.objects.first()
 
-        assert dataset.last_modified_internal == last_modified
+        assert_equal_dates(dataset.last_modified_internal, last_modified)
         assert_equal_dates(dataset.harvest.last_update, datetime.utcnow())
 
     def test_dont_overwrite_last_modified_even_if_set_to_same(self, mocker):
@@ -222,7 +222,7 @@ class BaseBackendTest:
 
         dataset = Dataset.objects.first()
 
-        assert dataset.last_modified_internal == last_modified
+        assert_equal_dates(dataset.last_modified_internal, last_modified)
         assert_equal_dates(dataset.harvest.last_update, datetime.utcnow())
 
     def test_autoarchive(self, app):

udata/harvest/tests/test_dcat_backend.py

@@ -512,7 +512,7 @@ class DcatBackendTest:
 
         dataset = Dataset.objects.get(harvest__dct_identifier="1")
         # test html abstract description support
-        assert dataset.description == "# h1 title\n\n## h2 title\n\n **and bold text**"
+        assert dataset.description == "# h1 title\n\n## h2 title\n\n**and bold text**"
         # test DCAT periodoftime
         assert dataset.temporal_coverage is not None
         assert dataset.temporal_coverage.start == date(2016, 1, 1)

udata/harvest/tests/test_filters.py

@@ -62,7 +62,7 @@ class FiltersTest:
         hashes = {
             "md5": "bd8668597bfba2d1843441d7199bea65",
             "sha1": "f2f0249827f501286b4713683e526d541d2cc7e2",
-            "sha256": ("c4373e1d81eb44882bf9ff539d0e5f" "faf03a114abf9306591117d781966268f9"),
+            "sha256": ("c4373e1d81eb44882bf9ff539d0e5ffaf03a114abf9306591117d781966268f9"),
         }
 
         for type, value in hashes.items():

udata/i18n.py

@@ -134,7 +134,7 @@ def check_config(cfg):
     default_language = cfg["DEFAULT_LANGUAGE"]
     if default_language not in cfg.get("LANGUAGES", []):
         raise ConfigError(
-            "You are using a DEFAULT_LANGUAGE {0} not defined " "into LANGUAGES".format(
+            "You are using a DEFAULT_LANGUAGE {0} not defined into LANGUAGES".format(
                 default_language
             )
         )

udata/mongo/taglist_field.py

@@ -35,7 +35,7 @@ class TagListField(ListField):
             if not tags.MIN_TAG_LENGTH <= len(tag) <= tags.MAX_TAG_LENGTH:
                 self.error(
                     _(
-                        'Tag "%(tag)s" must be between %(min)d ' "and %(max)d characters long.",
+                        'Tag "%(tag)s" must be between %(min)d and %(max)d characters long.',
                         min=tags.MIN_TAG_LENGTH,
                         max=tags.MAX_TAG_LENGTH,
                         tag=tag,