igs-slm 0.1.5b0__tar.gz → 0.1.5b1__tar.gz

{igs_slm-0.1.5b0 → igs_slm-0.1.5b1}/.gitignore

@@ -163,3 +163,4 @@ test.db
 node_modules
 package-lock.json
 package.json
+CLAUDE.md

{igs_slm-0.1.5b0 → igs_slm-0.1.5b1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: igs-slm
-Version: 0.1.5b0
+Version: 0.1.5b1
 Summary: IGS Site Log Manager
 Project-URL: Homepage, https://igs-slm.readthedocs.io
 Project-URL: Documentation, https://igs-slm.readthedocs.io

{igs_slm-0.1.5b0 → igs_slm-0.1.5b1}/SECURITY.md

@@ -22,8 +22,10 @@ The SLM depends on a large stack of upstream software. Not just Django and Pytho
 
 If we exempt the vulnerability the reason will be noted in the [policy file](https://github.com/International-GNSS-Service/SLM/blob/main/.safety-policy.yml).
 
+## Publishing Releases
+
+All releases will have verified tag on github. As of 0.1.5b0 we use [PyPI Trusted Publishing](https://docs.pypi.org/trusted-publishers/) to issue all releases.
 
 ## Reporting a Vulnerability
 
-If you think you have found a vulnerability, and even if you are not sure, please report it to us in private by going to Security -> Advisories -> New Draft Security Advisory or alternatively, email us at cb@igs.org
-We will review it and get back to you. Please refrain from public discussions of the issue.
+If you think you have found a vulnerability, and even if you are not sure, please [report it to us in private](https://github.com/International-GNSS-Service/SLM/security/advisories/new) or alternatively, email us at cb@igs.org. We will review it and get back to you. Please refrain from public discussions of the issue.

{igs_slm-0.1.5b0 → igs_slm-0.1.5b1}/doc/source/changelog.rst

@@ -6,8 +6,14 @@
 Change Log
 ==========
 
-v0.1.5b (2024-07-15)
-====================
+v0.1.5b1 (2024-07-15)
+=====================
+
+* Beta Bug Fix
+* Fixed `SLM_INCLUDE url inclusion is not working to spec <https://github.com/International-GNSS-Service/SLM/issues/152>`_
+
+v0.1.5b0 (2024-07-15)
+=====================
 
 * Beta Increment
 * Implemented `Allow environment variables to override specific default settings. <https://github.com/International-GNSS-Service/SLM/issues/150>`_

{igs_slm-0.1.5b0 → igs_slm-0.1.5b1}/doc/source/installation.rst

@@ -149,7 +149,7 @@ itself yet though.
 
     .. code:: bash
 
-      ?> uvx slm-startproject --help
+      ?> uvx --from igs-slm --prerelease slm-startproject --help
 
   .. tab:: pip
 

{igs_slm-0.1.5b0 → igs_slm-0.1.5b1}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "igs-slm"
-version = "0.1.5b0"
+version = "0.1.5b1"
 description = "IGS Site Log Manager"
 requires-python = ">=3.8,<4.0"
 authors = [

{igs_slm-0.1.5b0 → igs_slm-0.1.5b1}/src/slm/__init__.py

@@ -15,7 +15,7 @@ r"""
 
 """
 
-VERSION = (0, 1, "5b0")
+VERSION = (0, 1, "5b1")
 
 __title__ = "IGS/Site Log Manager"
 __version__ = ".".join(str(i) for i in VERSION)

igs_slm-0.1.5b1/src/slm/bin/templates/{{ project_dir }}/src/sites/{{ site }}/urls.py

@@ -0,0 +1,15 @@
+"""
+You can make direct modifications to the URLs built by the slm here if needed.
+
+Your extension app will already be included at the root path because it sets:
+
+    SLM_INCLUDE = True.
+"""
+
+from slm.settings.urls import urlpatterns
+from django.urls import path, include
+
+
+urlpatterns.extend([
+    # add other app URLs here
+])

{igs_slm-0.1.5b0 → igs_slm-0.1.5b1}/src/slm/bin/templates/{{ project_dir }}/src/{{ extension_app }}/urls.py

@@ -6,5 +6,6 @@ from django.urls import path
 
 app_name = "{{ extension_app }}"
 
+SLM_INCLUDE = True
 
 urlpatterns = []

{igs_slm-0.1.5b0 → igs_slm-0.1.5b1}/src/slm/map/templates/slm/map.html

@@ -366,7 +366,7 @@
         //slm.addColumnFiltering( stationTable );
     </script>
     {% else %}
-    {% trans "To enable maps, create a MapBox account and configure the api key in the admin:" %} <a href="https://mapbox.com">mapbox.com</a>
+    {% trans "To enable maps, create a MapBox account and " %}<a href="{% url 'admin:slm_map_mapsettings_change' 1 %}">{% trans "configure the api key in the admin:" %}</a> <a href="https://mapbox.com">mapbox.com</a>
     {% endif %}
 </div>
 {% endblock %}

{igs_slm-0.1.5b0 → igs_slm-0.1.5b1}/src/slm/settings/slm.py

@@ -178,13 +178,6 @@ set_default(
     },
 )
 
-# slm provides an implementation of urls.py that will load this list into
-# url patterns. This should be a list of 2-tuples where the first tuple is the
-# path stem mount point for the included apps' URLs and the second element is
-# the string that will be passed to django.urls.include
-SLM_URL_MOUNTS = []
-
-
 # control the domain used to generate absolute links to the SLM log document
 # attachments including images and files. Any standalone artifacts produced by
 # the slm that include links to files served by the SLM will use this domain

{igs_slm-0.1.5b0 → igs_slm-0.1.5b1}/src/slm/settings/urls.py

@@ -38,16 +38,6 @@ APIS dictionary. For example the slm.map app extends the public API like so:
         }
     }
 
-Other third party apps may be included at customizable mount points by
-providing a settings.SLM_URL_MOUNTS list. For example to include your app at
-the myapp path you might do this:
-
-.. code-block: python
-
-    SLM_URL_MOUNTS = [
-        ('myapp/', 'myapp.urls')
-    ]
-
 """
 
 from importlib import import_module
@@ -80,7 +70,11 @@ def bring_in_urls(urlpatterns):
 
     for app in reversed(settings.INSTALLED_APPS):
         try:
-            url_module = import_module(f"{app}.urls")
+            url_module_str = f"{app}.urls"
+            url_module = import_module(url_module_str)
+            slm_include = getattr(url_module, "SLM_INCLUDE", False)
+            if not slm_include:
+                continue
             api = getattr(url_module, "APIS", None)
             if api:
                 for api, endpoints in api.items():
@@ -95,6 +89,7 @@ def bring_in_urls(urlpatterns):
                                 endpoint[0] if len(endpoint) < 3 else endpoint[2]
                             ),
                         )
+            urlpatterns.insert(0, path("", include(url_module_str)))
 
         except ImportError:
             if app in {"slm", "slm.map", "network_map", "igs_ext"}:

{igs_slm-0.1.5b0 → igs_slm-0.1.5b1}/src/slm/static/slm/js/enums.js

@@ -201,12 +201,12 @@ class SiteFileUploadStatus {
 }
 class SiteLogFormat {
 	
-	static LEGACY = new SiteLogFormat(1, "LEGACY", "Legacy (ASCII)", "text/plain", "bi bi-file-text", "log", ["text", "txt", "legacy"]);
-	static GEODESY_ML = new SiteLogFormat(2, "GEODESY_ML", "GeodesyML", "application/xml", "bi bi-filetype-xml", "xml", ["xml"]);
-	static JSON = new SiteLogFormat(3, "JSON", "JSON", "application/json", "bi bi-filetype-json", "json", ["json", "js"]);
-	static ASCII_9CHAR = new SiteLogFormat(4, "ASCII_9CHAR", "ASCII (9-Char)", "text/plain", "bi bi-file-text", "log", ["text", "txt", "9char"]);
+	static LEGACY = new SiteLogFormat(1, "LEGACY", "Legacy (ASCII)", "text/plain", "bi bi-file-text", "log", ["text", "txt", "legacy"], ["txt", "sitelog"]);
+	static GEODESY_ML = new SiteLogFormat(2, "GEODESY_ML", "GeodesyML", "application/xml", "bi bi-filetype-xml", "xml", ["xml"], ["gml"]);
+	static JSON = new SiteLogFormat(3, "JSON", "JSON", "application/json", "bi bi-filetype-json", "json", ["json", "js"], ["js"]);
+	static ASCII_9CHAR = new SiteLogFormat(4, "ASCII_9CHAR", "ASCII (9-Char)", "text/plain", "bi bi-file-text", "log", ["text", "txt", "9char"], ["txt", "sitelog"]);
 	
-	constructor (value, name, label, mimetype, icon, ext, alts) {
+	constructor (value, name, label, mimetype, icon, ext, alts, alt_exts) {
 		this.value = value;
 		this.name = name;
 		this.label = label;
@@ -214,6 +214,7 @@ class SiteLogFormat {
 		this.icon = icon;
 		this.ext = ext;
 		this.alts = alts;
+		this.alt_exts = alt_exts;
 	}
 	
 	static ciCompare(a, b) {