arthexis 0.1.3__tar.gz → 0.1.5__tar.gz

{arthexis-0.1.3 → arthexis-0.1.5}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: arthexis
-Version: 0.1.3
+Version: 0.1.5
 Summary: Django-based MESH system
 Author-email: "Rafael J. Guillén-Osorio" <tecnologia@gelectriic.com>
 License-Expression: MIT
@@ -118,7 +118,7 @@ Arthexis Constellation is a narrative-driven Django-based suite that centralizes
 - Single codebase with special features per role
 
 ## Support
-You may contact us at tecnologia at gelectriic dot com or visit our web page https://www.gelectriic.com/ for professional services and commercial support.
+You may contact us at tecnologia at gelectriic dot com or visit our [web page](https://www.gelectriic.com/) for professional services and commercial support.
 
 ## About Me
 > "What? You want to know about me too? Well, I enjoy developing software, roleplaying games, long walks on the beach and a fourth secret thing."

{arthexis-0.1.3 → arthexis-0.1.5}/README.md

@@ -10,7 +10,7 @@ Arthexis Constellation is a narrative-driven Django-based suite that centralizes
 - Single codebase with special features per role
 
 ## Support
-You may contact us at tecnologia at gelectriic dot com or visit our web page https://www.gelectriic.com/ for professional services and commercial support.
+You may contact us at tecnologia at gelectriic dot com or visit our [web page](https://www.gelectriic.com/) for professional services and commercial support.
 
 ## About Me
 > "What? You want to know about me too? Well, I enjoy developing software, roleplaying games, long walks on the beach and a fourth secret thing."

{arthexis-0.1.3 → arthexis-0.1.5}/arthexis.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: arthexis
-Version: 0.1.3
+Version: 0.1.5
 Summary: Django-based MESH system
 Author-email: "Rafael J. Guillén-Osorio" <tecnologia@gelectriic.com>
 License-Expression: MIT
@@ -118,7 +118,7 @@ Arthexis Constellation is a narrative-driven Django-based suite that centralizes
 - Single codebase with special features per role
 
 ## Support
-You may contact us at tecnologia at gelectriic dot com or visit our web page https://www.gelectriic.com/ for professional services and commercial support.
+You may contact us at tecnologia at gelectriic dot com or visit our [web page](https://www.gelectriic.com/) for professional services and commercial support.
 
 ## About Me
 > "What? You want to know about me too? Well, I enjoy developing software, roleplaying games, long walks on the beach and a fourth secret thing."

{arthexis-0.1.3 → arthexis-0.1.5}/core/admin.py

@@ -3,7 +3,7 @@ from django.contrib import admin
 from django.contrib.admin.widgets import RelatedFieldWidgetWrapper
 from django.urls import path, reverse
 from django.shortcuts import redirect, render
-from django.http import JsonResponse
+from django.http import JsonResponse, HttpResponseBase
 from django.template.response import TemplateResponse
 from django.views.decorators.csrf import csrf_exempt
 from django.core.exceptions import ValidationError
@@ -17,6 +17,7 @@ from import_export import resources, fields
 from import_export.admin import ImportExportModelAdmin
 from import_export.widgets import ForeignKeyWidget
 from django.contrib.auth.models import Group
+from django.templatetags.static import static
 from django.utils.html import format_html
 import json
 import uuid
@@ -49,6 +50,19 @@ from .user_data import UserDatumAdminMixin
 admin.site.unregister(Group)
 
 
+class SaveBeforeChangeAction(DjangoObjectActions):
+    def response_change(self, request, obj):
+        action = request.POST.get("_action")
+        if action:
+            allowed = self.get_change_actions(request, str(obj.pk), None)
+            if action in allowed and hasattr(self, action):
+                response = getattr(self, action)(request, obj)
+                if isinstance(response, HttpResponseBase):
+                    return response
+                return redirect(request.path)
+        return super().response_change(request, obj)
+
+
 @admin.register(Reference)
 class ReferenceAdmin(admin.ModelAdmin):
     list_display = (
@@ -131,7 +145,7 @@ class ReleaseManagerAdmin(admin.ModelAdmin):
 
 
 @admin.register(Package)
-class PackageAdmin(DjangoObjectActions, admin.ModelAdmin):
+class PackageAdmin(SaveBeforeChangeAction, admin.ModelAdmin):
     list_display = ("name", "description", "homepage_url", "release_manager")
     actions = ["prepare_next_release"]
     change_actions = ["prepare_next_release_action"]
@@ -755,7 +769,7 @@ class RFIDAdmin(ImportExportModelAdmin):
 
 
 @admin.register(PackageRelease)
-class PackageReleaseAdmin(DjangoObjectActions, admin.ModelAdmin):
+class PackageReleaseAdmin(SaveBeforeChangeAction, admin.ModelAdmin):
     list_display = (
         "version",
         "package",
@@ -808,18 +822,18 @@ class PackageReleaseAdmin(DjangoObjectActions, admin.ModelAdmin):
     publish_release_action.short_description = "Publish this release"
 
     @staticmethod
-    def _checkbox(value: bool) -> str:
-        return format_html(
-            '<input type="checkbox"{} disabled>', " checked" if value else ""
-        )
+    def _boolean_icon(value: bool) -> str:
+        icon = static("admin/img/icon-yes.svg" if value else "admin/img/icon-no.svg")
+        alt = "True" if value else "False"
+        return format_html('<img src="{}" alt="{}">', icon, alt)
 
     @admin.display(description="Published")
     def published_status(self, obj):
-        return self._checkbox(obj.is_published)
+        return self._boolean_icon(obj.is_published)
 
     @admin.display(description="Is current")
     def is_current(self, obj):
-        return self._checkbox(obj.is_current)
+        return self._boolean_icon(obj.is_current)
 
     def pr_link(self, obj):
         if obj.pr_url:

{arthexis-0.1.3 → arthexis-0.1.5}/core/models.py

@@ -10,7 +10,7 @@ from django.utils.translation import gettext_lazy as _
 from django.core.validators import RegexValidator
 from django.core.exceptions import ValidationError
 from django.apps import apps
-from django.db.models.signals import m2m_changed, post_delete
+from django.db.models.signals import m2m_changed, post_delete, post_save
 from django.dispatch import receiver
 from datetime import timedelta
 from django.contrib.contenttypes.models import ContentType
@@ -1257,8 +1257,9 @@ class PackageRelease(Entity):
         return self.revision[-6:] if self.revision else ""
 
 
-@receiver(post_delete, sender=PackageRelease)
-def _delete_release_fixture(sender, instance, **kwargs) -> None:
+@receiver([post_save, post_delete], sender=PackageRelease)
+def _update_release_fixture(sender, instance, **kwargs) -> None:
+    """Keep the release fixture in sync with the database."""
     PackageRelease.dump_fixture()
 
 # Ensure each RFID can only be linked to one energy account

{arthexis-0.1.3 → arthexis-0.1.5}/core/views.py

@@ -43,6 +43,16 @@ def _changelog_notes(version: str) -> str:
 
 def _step_check_pypi(release, ctx, log_path: Path) -> None:
     from . import release as release_utils
+    from packaging.version import Version
+
+    version_path = Path("VERSION")
+    if version_path.exists():
+        current = version_path.read_text(encoding="utf-8").strip()
+        if current and Version(release.version) < Version(current):
+            raise Exception(
+                f"Version {release.version} is older than existing {current}"
+            )
+    version_path.write_text(release.version + "\n", encoding="utf-8")
 
     _append_log(log_path, f"Checking if version {release.version} exists on PyPI")
     if release_utils.network_available():
@@ -389,7 +399,10 @@ def release_progress(request, pk: int, action: str):
     identifier = f"{release.package.name}-{release.version}"
     if release.revision:
         identifier = f"{identifier}-{release.revision[:7]}"
-    log_name = ctx.get("log") or f"{identifier}.log"
+    log_name = f"{identifier}.log"
+    if ctx.get("log") != log_name:
+        ctx = {"step": 0, "log": log_name}
+        step_count = 0
     log_path = Path("logs") / log_name
     ctx.setdefault("log", log_name)
 

{arthexis-0.1.3 → arthexis-0.1.5}/pages/tests.py

@@ -9,6 +9,7 @@ from pages.models import Application, Module, SiteBadge, Favorite
 from core.user_data import UserDatum
 from pages.admin import ApplicationAdmin
 from django.apps import apps as django_apps
+from core.models import AdminHistory
 from django.core.files.uploadedfile import SimpleUploadedFile
 import base64
 import tempfile
@@ -86,6 +87,13 @@ class InvitationTests(TestCase):
         resp = self.client.get(reverse("pages:request-invite"))
         self.assertIn("csrftoken", resp.cookies)
 
+    def test_request_invite_allows_post_without_csrf(self):
+        client = Client(enforce_csrf_checks=True)
+        resp = client.post(
+            reverse("pages:request-invite"), {"email": "invite@example.com"}
+        )
+        self.assertEqual(resp.status_code, 200)
+
     def test_invitation_flow(self):
         resp = self.client.post(
             reverse("pages:request-invite"), {"email": "invite@example.com"}
@@ -626,3 +634,18 @@ class FavoriteTests(TestCase):
         resp = self.client.get(reverse("admin:index"))
         self.assertContains(resp, reverse("admin:pages_application_changelist"))
         self.assertContains(resp, reverse("admin:nodes_noderole_changelist"))
+
+    def test_dashboard_merges_duplicate_future_actions(self):
+        ct = ContentType.objects.get_for_model(NodeRole)
+        Favorite.objects.create(user=self.user, content_type=ct)
+        role = NodeRole.objects.create(name="DataRole2")
+        UserDatum.objects.create(user=self.user, content_type=ct, object_id=role.pk)
+        AdminHistory.objects.create(
+            user=self.user,
+            content_type=ct,
+            url=reverse("admin:nodes_noderole_changelist"),
+        )
+        resp = self.client.get(reverse("admin:index"))
+        url = reverse("admin:nodes_noderole_changelist")
+        self.assertEqual(resp.content.decode().count(url), 1)
+        self.assertContains(resp, NodeRole._meta.verbose_name_plural)

{arthexis-0.1.3 → arthexis-0.1.5}/pages/views.py

@@ -16,7 +16,7 @@ from django.utils.encoding import force_bytes, force_str
 from django.utils.http import urlsafe_base64_decode, urlsafe_base64_encode
 from django.core.mail import send_mail
 from django.utils.translation import gettext as _
-from django.views.decorators.csrf import ensure_csrf_cookie
+from django.views.decorators.csrf import csrf_exempt, ensure_csrf_cookie
 
 import markdown
 from pages.utils import landing
@@ -116,6 +116,7 @@ login_view = CustomLoginView.as_view()
 class InvitationRequestForm(forms.Form):
     email = forms.EmailField()
 
+@csrf_exempt
 @ensure_csrf_cookie
 def request_invite(request):
     form = InvitationRequestForm(request.POST if request.method == "POST" else None)

{arthexis-0.1.3 → arthexis-0.1.5}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "arthexis"
-version = "0.1.3"
+version = "0.1.5"
 description = "Django-based MESH system"
 requires-python = ">=3.10"
 license = "MIT"

{arthexis-0.1.3 → arthexis-0.1.5}/tests/test_package_release_admin_actions.py

@@ -28,12 +28,10 @@ class PackageReleaseAdminActionsTests(TestCase):
 
     def test_change_page_contains_publish_action(self):
         change_url = reverse("admin:core_packagerelease_change", args=[self.release.pk])
-        action_url = reverse(
-            "admin:core_packagerelease_actions",
-            args=[self.release.pk, "publish_release_action"],
-        )
         resp = self.client.get(change_url)
-        self.assertContains(resp, action_url)
+        self.assertContains(
+            resp, 'name="_action" value="publish_release_action"'
+        )
 
     def test_publish_action_redirects(self):
         url = reverse(
@@ -45,6 +43,21 @@ class PackageReleaseAdminActionsTests(TestCase):
             resp, reverse("release-progress", args=[self.release.pk, "publish"])
         )
 
+    def test_publish_action_saves_changes_before_execution(self):
+        change_url = reverse("admin:core_packagerelease_change", args=[self.release.pk])
+        data = {
+            "package": self.package.pk,
+            "release_manager": "",
+            "version": "1.0.1",
+            "_action": "publish_release_action",
+        }
+        resp = self.client.post(change_url, data)
+        self.assertRedirects(
+            resp, reverse("release-progress", args=[self.release.pk, "publish"])
+        )
+        self.release.refresh_from_db()
+        self.assertEqual(self.release.version, "1.0.1")
+
     def test_change_page_pypi_url_readonly(self):
         change_url = reverse("admin:core_packagerelease_change", args=[self.release.pk])
         resp = self.client.get(change_url)
@@ -77,7 +90,7 @@ class PackageReleaseAdminActionsTests(TestCase):
             resp = self.client.get(list_url)
         content = resp.content.decode()
         self.assertIn("Is current", content)
-        self.assertIn('<input type="checkbox" checked disabled>', content)
+        self.assertIn('icon-yes.svg', content)
 
     def test_release_revision_defaults_to_repo_revision(self):
         expected = revision_utils.get_revision()

{arthexis-0.1.3 → arthexis-0.1.5}/tests/test_release_fixture_cleanup.py

@@ -30,3 +30,8 @@ class ReleaseFixtureCleanupTests(TestCase):
         data = self.fixture_path.read_text()
         self.assertNotIn("1.0.0", data)
 
+    def test_create_updates_fixture(self):
+        PackageRelease.objects.create(package=self.package, version="2.0.0")
+        data = self.fixture_path.read_text()
+        self.assertIn("2.0.0", data)
+

{arthexis-0.1.3 → arthexis-0.1.5}/tests/test_release_progress.py

@@ -62,7 +62,12 @@ class ReleaseProgressTests(TestCase):
         self.assertContains(resp, "All steps completed")
         self.assertContains(
             resp,
-            '<a href="http://example.com/pr/1" target="_blank">http://example.com/pr/1</a>',
+            '<a href="http://example.com/pr/1" target="_blank" rel="noopener">http://example.com/pr/1</a>',
+            html=True,
+        )
+        self.assertContains(
+            resp,
+            '<a href="https://pypi.org/project/pkg/1.0.0/" target="_blank" rel="noopener">https://pypi.org/project/pkg/1.0.0/</a>',
             html=True,
         )
         release.refresh_from_db()
@@ -94,6 +99,11 @@ class ReleaseProgressTests(TestCase):
         self.assertEqual(resp.status_code, 200)
         self.assertContains(resp, "All steps completed")
         self.assertIsNone(resp.context["pr_url"])
+        self.assertContains(
+            resp,
+            '<a href="https://pypi.org/project/pkg/1.1.0/" target="_blank" rel="noopener">https://pypi.org/project/pkg/1.1.0/</a>',
+            html=True,
+        )
         release.refresh_from_db()
         self.assertTrue(release.is_published)
         pub.assert_called_once()
@@ -112,3 +122,44 @@ class ReleaseProgressTests(TestCase):
         self.assertContains(resp, f'<a href="{app_url}">Business Models</a>')
         list_url = reverse("admin:core_packagerelease_changelist")
         self.assertContains(resp, f'<a href="{list_url}">Package Releases</a>')
+
+    def test_check_step_writes_version_file(self):
+        release = PackageRelease.objects.create(package=self.package, version="2.0.0")
+        url = reverse("release-progress", args=[release.pk, "publish"])
+        self.client.get(url)
+        with patch("core.views.release_utils.network_available", return_value=False):
+            resp = self.client.get(f"{url}?step=0")
+        self.assertEqual(resp.status_code, 200)
+        self.assertEqual(self.version_path.read_text().strip(), "2.0.0")
+
+    def test_check_step_fails_when_version_goes_backwards(self):
+        self.version_path.write_text("3.0.0\n")
+        release = PackageRelease.objects.create(package=self.package, version="2.0.0")
+        url = reverse("release-progress", args=[release.pk, "publish"])
+        self.client.get(url)
+        with patch("core.views.release_utils.network_available", return_value=False):
+            resp = self.client.get(f"{url}?step=0")
+        self.assertEqual(resp.context["error"], "Version 2.0.0 is older than existing 3.0.0")
+        self.assertEqual(self.version_path.read_text().strip(), "3.0.0")
+
+    def test_session_resets_when_version_changes(self):
+        release = PackageRelease.objects.create(package=self.package, version="1.2.0")
+        url = reverse("release-progress", args=[release.pk, "publish"])
+        self.client.get(url)
+        with patch("core.views.release_utils.network_available", return_value=False):
+            self.client.get(f"{url}?step=0")
+
+        release.version = "1.3.0"
+        release.save()
+
+        resp = self.client.get(url)
+        expected_log = f"logs/pkg-1.3.0-{release.revision[:7]}.log"
+        self.assertEqual(resp.context["log_path"], expected_log)
+        self.assertEqual(resp.context["current_step"], 0)
+
+        with patch("core.views.release_utils.network_available", return_value=False):
+            self.client.get(f"{url}?step=0")
+
+        log_content = Path(expected_log).read_text()
+        self.assertIn("Checking if version 1.3.0 exists on PyPI", log_content)
+        self.assertNotIn("1.2.0", log_content)