umap-project 2.6.2__tar.gz → 2.7.0__tar.gz

{umap_project-2.6.2 → umap_project-2.7.0}/.gitignore

@@ -10,6 +10,7 @@ node_modules
 umap.conf
 /data
 /static
+package-lock.json
 
 ### Python ###
 # Byte-compiled / optimized / DLL files

{umap_project-2.6.2 → umap_project-2.7.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: umap-project
-Version: 2.6.2
+Version: 2.7.0
 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,39 @@ 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.1.1
-Requires-Dist: pillow==10.4.0
-Requires-Dist: psycopg==3.2.1
-Requires-Dist: pydantic==2.9.1
-Requires-Dist: rcssmin==1.1.2
+Requires-Dist: django==5.1.2
+Requires-Dist: pillow==11.0.0
+Requires-Dist: psycopg==3.2.3
+Requires-Dist: rcssmin==1.1.3
 Requires-Dist: requests==2.32.3
-Requires-Dist: rjsmin==1.2.2
+Requires-Dist: rjsmin==1.2.3
 Requires-Dist: social-auth-app-django==5.4.2
 Requires-Dist: social-auth-core==4.5.4
-Requires-Dist: websockets==13.0.1
 Provides-Extra: dev
 Requires-Dist: djlint==1.35.2; extra == 'dev'
-Requires-Dist: hatch==1.12.0; extra == 'dev'
+Requires-Dist: hatch==1.13.0; extra == 'dev'
 Requires-Dist: isort==5.13.2; extra == 'dev'
-Requires-Dist: mkdocs-material==9.5.34; extra == 'dev'
+Requires-Dist: mkdocs-material==9.5.42; extra == 'dev'
 Requires-Dist: mkdocs-static-i18n==1.2.3; extra == 'dev'
 Requires-Dist: mkdocs==1.6.1; extra == 'dev'
-Requires-Dist: pymdown-extensions==10.9; extra == 'dev'
-Requires-Dist: ruff==0.6.4; extra == 'dev'
+Requires-Dist: pymdown-extensions==10.11.2; extra == 'dev'
+Requires-Dist: ruff==0.7.0; extra == 'dev'
 Requires-Dist: vermin==1.6.0; extra == 'dev'
 Provides-Extra: docker
-Requires-Dist: uwsgi==2.0.26; extra == 'docker'
+Requires-Dist: uwsgi==2.0.27; extra == 'docker'
+Provides-Extra: sync
+Requires-Dist: channels==4.1.0; extra == 'sync'
+Requires-Dist: daphne==4.1.2; extra == 'sync'
+Requires-Dist: pydantic==2.9.2; extra == 'sync'
+Requires-Dist: websockets==13.1; extra == 'sync'
 Provides-Extra: test
 Requires-Dist: factory-boy==3.3.1; extra == 'test'
 Requires-Dist: playwright>=1.39; extra == 'test'
 Requires-Dist: pytest-django==4.9.0; extra == 'test'
 Requires-Dist: pytest-playwright==0.5.2; extra == 'test'
+Requires-Dist: pytest-rerunfailures==14.0; extra == 'test'
 Requires-Dist: pytest-xdist<4,>=3.5.0; extra == 'test'
-Requires-Dist: pytest==8.3.2; extra == 'test'
+Requires-Dist: pytest==8.3.3; extra == 'test'
 Description-Content-Type: text/markdown
 
 # uMap project

{umap_project-2.6.2 → umap_project-2.7.0}/pyproject.toml

@@ -28,43 +28,48 @@ classifiers = [
   "Programming Language :: Python :: 3.12",
 ]
 dependencies = [
-  "Django==5.1.1",
+  "Django==5.1.2",
   "django-agnocomplete==2.2.0",
   "django-environ==0.11.2",
   "django-probes==1.7.0",
-  "Pillow==10.4.0",
-  "psycopg==3.2.1",
-  "pydantic==2.9.1",
+  "Pillow==11.0.0",
+  "psycopg==3.2.3",
   "requests==2.32.3",
-  "rcssmin==1.1.2",
-  "rjsmin==1.2.2",
+  "rcssmin==1.1.3",
+  "rjsmin==1.2.3",
   "social-auth-core==4.5.4",
   "social-auth-app-django==5.4.2",
-  "websockets==13.0.1",
 ]
 
 [project.optional-dependencies]
 dev = [
-  "hatch==1.12.0",
-  "ruff==0.6.4",
+  "hatch==1.13.0",
+  "ruff==0.7.0",
   "djlint==1.35.2",
   "mkdocs==1.6.1",
-  "mkdocs-material==9.5.34",
+  "mkdocs-material==9.5.42",
   "mkdocs-static-i18n==1.2.3",
   "vermin==1.6.0",
-  "pymdown-extensions==10.9",
+  "pymdown-extensions==10.11.2",
   "isort==5.13.2",
 ]
 test = [
   "factory-boy==3.3.1",
   "playwright>=1.39",
-  "pytest==8.3.2",
+  "pytest==8.3.3",
   "pytest-django==4.9.0",
   "pytest-playwright==0.5.2",
+  "pytest-rerunfailures==14.0",
   "pytest-xdist>=3.5.0,<4",
 ]
 docker = [
-  "uwsgi==2.0.26",
+  "uwsgi==2.0.27",
+]
+sync = [
+  "channels==4.1.0",
+  "daphne==4.1.2",
+  "pydantic==2.9.2",
+  "websockets==13.1",
 ]
 
 [project.scripts]

umap_project-2.7.0/umap/__init__.py

@@ -0,0 +1 @@
+VERSION = "2.7.0"

umap_project-2.7.0/umap/admin.py

@@ -0,0 +1,101 @@
+import csv
+from datetime import datetime
+
+from django.contrib.auth.admin import UserAdmin as UserAdminBase
+from django.contrib.auth.models import User
+from django.contrib.gis import admin
+from django.http import HttpResponse
+from django.utils.translation import gettext_lazy as _
+
+from .models import DataLayer, Licence, Map, Pictogram, Team, TileLayer
+
+
+class CSVExportMixin:
+    actions = ["as_csv"]
+
+    @admin.action(description=_("CSV Export"))
+    def as_csv(self, request, queryset):
+        modelname = queryset.model.__name__.lower()
+        filename = f"umap_{modelname}_{datetime.now().isoformat()}.csv"
+        response = HttpResponse(
+            content_type="text/csv",
+            headers={"Content-Disposition": f'attachment; filename="{filename}"'},
+        )
+
+        def get_cell(user, field):
+            if hasattr(self, field):
+                return getattr(self, field)(user)
+            return getattr(user, field)
+
+        writer = csv.writer(response)
+        writer.writerow(self.csv_fields)
+        for user in queryset:
+            writer.writerow(get_cell(user, field) for field in self.csv_fields)
+        return response
+
+
+class TileLayerAdmin(admin.ModelAdmin):
+    list_display = (
+        "name",
+        "rank",
+    )
+    list_editable = ("rank",)
+
+
+class MapAdmin(CSVExportMixin, admin.GISModelAdmin):
+    search_fields = ("name",)
+    autocomplete_fields = ("owner", "editors")
+    list_filter = ("share_status",)
+    csv_fields = (
+        "pk",
+        "name",
+        "center",
+        "zoom",
+        "created_at",
+        "modified_at",
+        "edit_status",
+        "share_status",
+        "owner_id",
+        "team_id",
+    )
+
+
+class PictogramAdmin(admin.ModelAdmin):
+    list_display = (
+        "name",
+        "category",
+    )
+    list_editable = ("category",)
+    list_filter = ("category",)
+
+
+class TeamAdmin(admin.ModelAdmin):
+    filter_horizontal = ("users",)
+
+
+class UserAdmin(CSVExportMixin, UserAdminBase):
+    csv_fields = [
+        "pk",
+        "username",
+        "email",
+        "first_name",
+        "last_name",
+        "last_login",
+        "date_joined",
+        "maps_count",
+    ]
+    list_display = list(UserAdminBase.list_display) + ["maps_count"]
+
+    def maps_count(self, obj):
+        # owner maps + maps as editor
+        return obj.owned_maps.count() + obj.map_set.count()
+
+
+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)
+admin.site.unregister(User)
+admin.site.register(User, UserAdmin)

umap_project-2.7.0/umap/asgi.py

@@ -0,0 +1,15 @@
+import os
+
+from channels.routing import ProtocolTypeRouter
+from django.core.asgi import get_asgi_application
+
+os.environ.setdefault("DJANGO_SETTINGS_MODULE", "umap.settings")
+# Initialize Django ASGI application early to ensure the AppRegistry
+# is populated before importing code that may import ORM models.
+django_asgi_app = get_asgi_application()
+
+application = ProtocolTypeRouter(
+    {
+        "http": django_asgi_app,
+    }
+)

{umap_project-2.6.2 → umap_project-2.7.0}/umap/context_processors.py

@@ -12,6 +12,7 @@ def settings(request):
         "UMAP_READONLY": djsettings.UMAP_READONLY,
         "UMAP_DEMO_SITE": djsettings.UMAP_DEMO_SITE,
         "UMAP_HOST_INFOS": djsettings.UMAP_HOST_INFOS,
+        "UMAP_ALLOW_EDIT_PROFILE": djsettings.UMAP_ALLOW_EDIT_PROFILE,
     }