Compare commits

..

No commits in common. "30d9e43cd488c15ee5616a3c7905ab7b3b2d175b" and "e33fc787aba1723390631bf36095328d6e750bc4" have entirely different histories.

10 changed files with 8 additions and 27 deletions

View file

@ -1,5 +1,5 @@
# Force rtfd to use a recent version of mkdocs
mkdocs==1.6.1
pymdown-extensions==10.12
mkdocs-material==9.5.47
mkdocs-material==9.5.44
mkdocs-static-i18n==1.2.3

View file

@ -1,7 +0,0 @@
# Helm
To deploy using helm:
helm install <my-release> oci://registry-1.docker.io/umap/umap
Helm chart is pushed here: https://hub.docker.com/repository/docker/umap/umap/tags

View file

@ -1,5 +1,5 @@
# Force rtfd to use a recent version of mkdocs
mkdocs==1.6.1
pymdown-extensions==10.12
mkdocs-material==9.5.47
mkdocs-material==9.5.44
mkdocs-static-i18n==1.2.3

View file

@ -44,10 +44,10 @@ dependencies = [
[project.optional-dependencies]
dev = [
"hatch==1.13.0",
"ruff==0.8.1",
"ruff==0.7.4",
"djlint==1.36.1",
"mkdocs==1.6.1",
"mkdocs-material==9.5.47",
"mkdocs-material==9.5.44",
"mkdocs-static-i18n==1.2.3",
"vermin==1.6.0",
"pymdown-extensions==10.12",

View file

@ -65,9 +65,7 @@ body.login header {
.login-grid .login-openstreetmap-oauth2 {
background-image: url("./openstreetmap.png");
}
.login-grid .login-keycloak {
background-image: url("./keycloak.png");
}
/* **************************** */
/* home */

Binary file not shown.

Before

Width:  |  Height:  |  Size: 16 KiB

View file

@ -1,7 +1,6 @@
import copy
import json
import uuid
from pathlib import Path
import factory
from django.contrib.auth import get_user_model
@ -42,7 +41,7 @@ class LicenceFactory(factory.django.DjangoModelFactory):
class TileLayerFactory(factory.django.DjangoModelFactory):
name = "Test zoom layer"
url_template = "https://{s}.test.org/osmfr/{z}/{x}/{y}.png"
url_template = "http://{s}.test.org/{z}/{x}/{y}.png"
attribution = "Test layer attribution"
class Meta:
@ -153,8 +152,3 @@ def login_required(response):
redirect_url = reverse("login")
assert j["login_required"] == redirect_url
return True
def mock_tiles(route):
path = Path(__file__).parent / "fixtures/empty_tile.png"
route.fulfill(path=path)

Binary file not shown.

Before

Width:  |  Height:  |  Size: 103 B

View file

@ -6,8 +6,6 @@ from pathlib import Path
import pytest
from playwright.sync_api import expect
from ..base import mock_tiles
@pytest.fixture(scope="session")
def browser_context_args(browser_context_args):
@ -25,7 +23,7 @@ def set_timeout(context):
@pytest.fixture(autouse=True)
def mock_osm_tiles(page):
if not bool(os.environ.get("PWDEBUG", False)):
page.route("*/**/osmfr/**", mock_tiles)
page.route("*/**/osmfr/**", lambda route: route.fulfill())
@pytest.fixture

View file

@ -1,4 +1,5 @@
import json
import os
import platform
import re
from pathlib import Path
@ -9,7 +10,6 @@ from playwright.sync_api import expect
from umap.models import DataLayer
from ..base import mock_tiles
from .helpers import save_and_get_json
pytestmark = pytest.mark.django_db
@ -72,8 +72,6 @@ def test_umap_import_from_file(live_server, tilelayer, page):
def test_umap_import_from_textarea(live_server, tilelayer, page, settings):
page.route("https://tile.openstreetmap.fr/hot/**", mock_tiles)
settings.UMAP_ALLOW_ANONYMOUS = True
page.goto(f"{live_server.url}/map/new/")
page.get_by_role("button", name="Open browser").click()