umap-project 2.5.1__tar.gz → 2.6.0b0__tar.gz

{umap_project-2.5.1 → umap_project-2.6.0b0}/.gitignore

@@ -4,13 +4,12 @@ umap/settings/local/*
 docs/_build
 umap/remote_static
 tmp/*
-umap/static/umap/vendors
 site/*
 .pytest_cache/
 node_modules
 umap.conf
-data
-./static
+/data
+/static
 
 ### Python ###
 # Byte-compiled / optimized / DLL files

{umap_project-2.5.1 → umap_project-2.6.0b0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: umap-project
-Version: 2.5.1
+Version: 2.6.0b0
 Summary: Create maps with OpenStreetMap layers in a minute and embed them in your site.
 Author-email: Yohan Boniface <yb@enix.org>
 Maintainer-email: David Larlet <david@larlet.fr>
@@ -19,35 +19,35 @@ Requires-Python: >=3.10
 Requires-Dist: django-agnocomplete==2.2.0
 Requires-Dist: django-environ==0.11.2
 Requires-Dist: django-probes==1.7.0
-Requires-Dist: django==5.0.7
+Requires-Dist: django==5.1
 Requires-Dist: pillow==10.4.0
 Requires-Dist: psycopg==3.2.1
 Requires-Dist: pydantic==2.8.2
 Requires-Dist: rcssmin==1.1.2
 Requires-Dist: requests==2.32.3
 Requires-Dist: rjsmin==1.2.2
-Requires-Dist: social-auth-app-django==5.4.1
+Requires-Dist: social-auth-app-django==5.4.2
 Requires-Dist: social-auth-core==4.5.4
-Requires-Dist: websockets==12.0
+Requires-Dist: websockets==13.0
 Provides-Extra: dev
 Requires-Dist: djlint==1.34.1; extra == 'dev'
 Requires-Dist: hatch==1.12.0; extra == 'dev'
 Requires-Dist: isort==5.13.2; extra == 'dev'
-Requires-Dist: mkdocs-material==9.5.28; extra == 'dev'
+Requires-Dist: mkdocs-material==9.5.33; extra == 'dev'
 Requires-Dist: mkdocs-static-i18n==1.2.3; extra == 'dev'
 Requires-Dist: mkdocs==1.6.0; extra == 'dev'
-Requires-Dist: pymdown-extensions==10.8.1; extra == 'dev'
-Requires-Dist: ruff==0.5.1; extra == 'dev'
+Requires-Dist: pymdown-extensions==10.9; extra == 'dev'
+Requires-Dist: ruff==0.6.2; extra == 'dev'
 Requires-Dist: vermin==1.6.0; extra == 'dev'
 Provides-Extra: docker
 Requires-Dist: uwsgi==2.0.26; extra == 'docker'
 Provides-Extra: test
-Requires-Dist: factory-boy==3.2.1; extra == 'test'
+Requires-Dist: factory-boy==3.3.1; extra == 'test'
 Requires-Dist: playwright>=1.39; extra == 'test'
 Requires-Dist: pytest-django==4.8.0; extra == 'test'
 Requires-Dist: pytest-playwright==0.5.1; extra == 'test'
 Requires-Dist: pytest-xdist<4,>=3.5.0; extra == 'test'
-Requires-Dist: pytest==8.2.2; extra == 'test'
+Requires-Dist: pytest==8.3.2; extra == 'test'
 Description-Content-Type: text/markdown
 
 # uMap project

{umap_project-2.5.1 → umap_project-2.6.0b0}/pyproject.toml

@@ -28,7 +28,7 @@ classifiers = [
   "Programming Language :: Python :: 3.12",
 ]
 dependencies = [
-  "Django==5.0.7",
+  "Django==5.1",
   "django-agnocomplete==2.2.0",
   "django-environ==0.11.2",
   "django-probes==1.7.0",
@@ -39,26 +39,26 @@ dependencies = [
   "rcssmin==1.1.2",
   "rjsmin==1.2.2",
   "social-auth-core==4.5.4",
-  "social-auth-app-django==5.4.1",
-  "websockets==12.0",
+  "social-auth-app-django==5.4.2",
+  "websockets==13.0",
 ]
 
 [project.optional-dependencies]
 dev = [
   "hatch==1.12.0",
-  "ruff==0.5.1",
+  "ruff==0.6.2",
   "djlint==1.34.1",
   "mkdocs==1.6.0",
-  "mkdocs-material==9.5.28",
+  "mkdocs-material==9.5.33",
   "mkdocs-static-i18n==1.2.3",
   "vermin==1.6.0",
-  "pymdown-extensions==10.8.1",
+  "pymdown-extensions==10.9",
   "isort==5.13.2",
 ]
 test = [
-  "factory-boy==3.2.1",
+  "factory-boy==3.3.1",
   "playwright>=1.39",
-  "pytest==8.2.2",
+  "pytest==8.3.2",
   "pytest-django==4.8.0",
   "pytest-playwright==0.5.1",
   "pytest-xdist>=3.5.0,<4",
@@ -70,12 +70,6 @@ docker = [
 [project.scripts]
 umap = "umap.bin:main"
 
-[tool.hatch.build]
-artifacts = [
-  # Required because part of .gitignore (and thus excluded by hatch).
-  "/umap/static/umap/vendors",
-]
-
 [tool.hatch.build.targets.sdist]
 include = [
   "/umap",
@@ -98,3 +92,6 @@ max-line-length = 88
 profile="django"
 indent=2
 format_css=true
+blank_line_after_tag="load,extends"
+line_break_after_multiline_tag=true
+

umap_project-2.6.0b0/umap/__init__.py

@@ -0,0 +1 @@
+VERSION = "2.6.0b0"

{umap_project-2.5.1 → umap_project-2.6.0b0}/umap/admin.py

@@ -1,6 +1,6 @@
 from django.contrib.gis import admin
 
-from .models import DataLayer, Licence, Map, Pictogram, TileLayer
+from .models import DataLayer, Licence, Map, Pictogram, Team, TileLayer
 
 
 class TileLayerAdmin(admin.ModelAdmin):
@@ -26,8 +26,13 @@ class PictogramAdmin(admin.ModelAdmin):
     list_filter = ("category",)
 
 
+class TeamAdmin(admin.ModelAdmin):
+    filter_horizontal = ("users",)
+
+
 admin.site.register(Map, MapAdmin)
 admin.site.register(DataLayer)
 admin.site.register(Pictogram, PictogramAdmin)
 admin.site.register(TileLayer, TileLayerAdmin)
 admin.site.register(Licence)
+admin.site.register(Team, TeamAdmin)

{umap_project-2.5.1 → umap_project-2.6.0b0}/umap/context_processors.py

@@ -5,12 +5,13 @@ from . import VERSION
 
 def settings(request):
     return {
-        "UMAP_FEEDBACK_LINK": djsettings.UMAP_FEEDBACK_LINK,
+        "UMAP_HELP_URL": djsettings.UMAP_HELP_URL,
         "SITE_NAME": djsettings.SITE_NAME,
         "SITE_URL": djsettings.SITE_URL,
         "ENABLE_ACCOUNT_LOGIN": djsettings.ENABLE_ACCOUNT_LOGIN,
         "UMAP_READONLY": djsettings.UMAP_READONLY,
         "UMAP_DEMO_SITE": djsettings.UMAP_DEMO_SITE,
+        "UMAP_HOST_INFOS": djsettings.UMAP_HOST_INFOS,
     }
 
 

{umap_project-2.5.1 → umap_project-2.6.0b0}/umap/decorators.py

@@ -5,7 +5,7 @@ from django.http import HttpResponseForbidden
 from django.shortcuts import get_object_or_404
 from django.urls import reverse_lazy
 
-from .models import Map
+from .models import Map, Team
 from .views import simple_json_response
 
 LOGIN_URL = getattr(settings, "LOGIN_URL", "login")
@@ -35,7 +35,7 @@ def can_edit_map(view_func):
         map_inst = get_object_or_404(Map, pk=kwargs["map_id"])
         user = request.user
         kwargs["map_inst"] = map_inst  # Avoid rerequesting the map in the view
-        if map_inst.edit_status >= map_inst.EDITORS:
+        if map_inst.edit_status >= map_inst.COLLABORATORS:
             can_edit = map_inst.can_edit(user=user, request=request)
             if not can_edit:
                 if map_inst.owner and not user.is_authenticated:
@@ -60,3 +60,14 @@ def can_view_map(view_func):
         return view_func(request, *args, **kwargs)
 
     return wrapper
+
+
+def team_members_only(view_func):
+    @wraps(view_func)
+    def wrapper(request, *args, **kwargs):
+        team = get_object_or_404(Team, pk=kwargs["pk"])
+        if not request.user.is_authenticated or team not in request.user.teams.all():
+            return HttpResponseForbidden()
+        return view_func(request, *args, **kwargs)
+
+    return wrapper

{umap_project-2.5.1 → umap_project-2.6.0b0}/umap/forms.py

@@ -6,7 +6,7 @@ from django.forms.utils import ErrorList
 from django.template.defaultfilters import slugify
 from django.utils.translation import gettext_lazy as _
 
-from .models import DataLayer, Map
+from .models import DataLayer, Map, Team
 
 DEFAULT_LATITUDE = (
     settings.LEAFLET_LATITUDE if hasattr(settings, "LEAFLET_LATITUDE") else 51
@@ -36,7 +36,7 @@ class SendLinkForm(forms.Form):
 class UpdateMapPermissionsForm(forms.ModelForm):
     class Meta:
         model = Map
-        fields = ("edit_status", "editors", "share_status", "owner")
+        fields = ("edit_status", "editors", "share_status", "owner", "team")
 
 
 class AnonymousMapPermissionsForm(forms.ModelForm):
@@ -110,3 +110,27 @@ class UserProfileForm(forms.ModelForm):
     class Meta:
         model = User
         fields = ("username", "first_name", "last_name")
+
+
+class TeamMembersField(forms.ModelMultipleChoiceField):
+    def set_choices(self, choices):
+        iterator = self.iterator(self)
+        # Override queryset so to expose only selected choices:
+        # - we don't want a select with 100000 options
+        # - the select values will be used by the autocomplete widget to display
+        #   already existing members of the team
+        iterator.queryset = choices
+        self.choices = iterator
+
+
+class TeamForm(forms.ModelForm):
+    class Meta:
+        model = Team
+        fields = ["name", "description", "members"]
+
+    def __init__(self, *args, **kwargs):
+        super().__init__(*args, **kwargs)
+        self.fields["members"].set_choices(self.initial["members"])
+        self.fields["members"].widget.attrs["hidden"] = "hidden"
+
+    members = TeamMembersField(queryset=User.objects.all())