devpi-web 5.0.2__tar.gz → 5.1.0__tar.gz

{devpi_web-5.0.2 → devpi_web-5.1.0}/CHANGELOG

@@ -2,6 +2,26 @@
 
 .. towncrier release notes start
 
+5.1.0 (2026-04-30)
+==================
+
+Features
+--------
+
+- With devpi-server 7.x information and warnings about inheritance from bases of an index are reported. This includes inheritance cycles, missing bases and how rules for merging project releases from bases are applied.
+
+- Support upcoming devpi-server 7.0.0 release.
+
+Other Changes
+-------------
+
+- index.pt: Moved bases and whitelist info to ``index_bases.pt`` macro.
+
+- project.pt, version.pt: Moved whitelist info to ``merge_info.pt`` macro in preparation for changes in devpi-server 7.x.
+
+- project.pt: Moved refresh button to ``project_refresh.pt`` macro.
+
+
 5.0.2 (2026-03-17)
 ==================
 

{devpi_web-5.0.2 → devpi_web-5.1.0}/CHANGELOG.short.rst

@@ -9,6 +9,26 @@ Changelog
 
 .. towncrier release notes start
 
+5.1.0 (2026-04-30)
+==================
+
+Features
+--------
+
+- With devpi-server 7.x information and warnings about inheritance from bases of an index are reported. This includes inheritance cycles, missing bases and how rules for merging project releases from bases are applied.
+
+- Support upcoming devpi-server 7.0.0 release.
+
+Other Changes
+-------------
+
+- index.pt: Moved bases and whitelist info to ``index_bases.pt`` macro.
+
+- project.pt, version.pt: Moved whitelist info to ``merge_info.pt`` macro in preparation for changes in devpi-server 7.x.
+
+- project.pt: Moved refresh button to ``project_refresh.pt`` macro.
+
+
 5.0.2 (2026-03-17)
 ==================
 
@@ -99,18 +119,3 @@ Features
 
 - index.pt, project.pt, version.pt: Fix #1062: Added a link to download the documentation as zip-file to the index, project and version view.
 
-
-4.2.3 (2024-09-19)
-==================
-
-Bug Fixes
----------
-
-- Fix deprecation warnings from devpi-server 6.13.0.
-
-- Lazily evaluate file information. Especially with devpi-postgresql this safes many database accesses on most pages.
-
-- Guard against missing doczip files, which can happen on replicas during replication.
-
-- Increase threshold for index status from 60 s to 300 s for warnings and from 300 s to 3600 s for fatal.
-

{devpi_web-5.0.2 → devpi_web-5.1.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: devpi-web
-Version: 5.0.2
+Version: 5.1.0
 Summary: devpi-web: a web view for devpi-server
 Maintainer-email: Florian Schulze <mail@pyfidelity.com>
 License-Expression: MIT
@@ -88,6 +88,26 @@ Changelog
 
 .. towncrier release notes start
 
+5.1.0 (2026-04-30)
+==================
+
+Features
+--------
+
+- With devpi-server 7.x information and warnings about inheritance from bases of an index are reported. This includes inheritance cycles, missing bases and how rules for merging project releases from bases are applied.
+
+- Support upcoming devpi-server 7.0.0 release.
+
+Other Changes
+-------------
+
+- index.pt: Moved bases and whitelist info to ``index_bases.pt`` macro.
+
+- project.pt, version.pt: Moved whitelist info to ``merge_info.pt`` macro in preparation for changes in devpi-server 7.x.
+
+- project.pt: Moved refresh button to ``project_refresh.pt`` macro.
+
+
 5.0.2 (2026-03-17)
 ==================
 
@@ -178,18 +198,3 @@ Features
 
 - index.pt, project.pt, version.pt: Fix #1062: Added a link to download the documentation as zip-file to the index, project and version view.
 
-
-4.2.3 (2024-09-19)
-==================
-
-Bug Fixes
----------
-
-- Fix deprecation warnings from devpi-server 6.13.0.
-
-- Lazily evaluate file information. Especially with devpi-postgresql this safes many database accesses on most pages.
-
-- Guard against missing doczip files, which can happen on replicas during replication.
-
-- Increase threshold for index status from 60 s to 300 s for warnings and from 300 s to 3600 s for fatal.
-

devpi_web-5.1.0/devpi_web/__init__.py

@@ -0,0 +1 @@
+__version__ = "5.1.0"

{devpi_web-5.0.2 → devpi_web-5.1.0}/devpi_web/config.py

@@ -4,7 +4,7 @@ from pluggy import PluginManager
 
 def get_pluginmanager(config, load_entry_points=True):
     # lookup cached value
-    pm = getattr(config, 'devpiweb_pluginmanager', None)
+    pm = getattr(config, "devpiweb_pluginmanager", None)
     if pm is not None:
         return pm
     pm = PluginManager("devpiweb")
@@ -19,6 +19,10 @@ def get_pluginmanager(config, load_entry_points=True):
 
 def add_indexer_backend_option(parser, pluginmanager=None):
     parser.addoption(
-        "--indexer-backend", type=str, metavar="NAME", default="whoosh",
+        "--indexer-backend",
+        type=str,
+        metavar="NAME",
+        default="whoosh",
         action="store",
-        help="the indexer backend to use")
+        help="the indexer backend to use",
+    )

{devpi_web-5.0.2 → devpi_web-5.1.0}/devpi_web/description.py

@@ -95,12 +95,17 @@ class DescriptionRenderer:
 
         :return: boolean
         """
-        return self.stage.ixconfig['type'] == 'mirror' \
+        return (
+            self.stage.ixconfig["type"] in {"mirror", "remote"}
             and self._get_mirror_web_url_fmt() is not None
+        )
 
     def _get_mirror_web_url_fmt(self):
         """ Fetch the remote's source url.
 
         :return: string
         """
-        return self.stage.ixconfig.get('mirror_web_url_fmt')
+        ixconfig = self.stage.ixconfig
+        if "remote_web_url_fmt" in ixconfig:
+            return ixconfig["remote_web_url_fmt"]
+        return ixconfig.get("mirror_web_url_fmt")

{devpi_web-5.0.2 → devpi_web-5.1.0}/devpi_web/hookspecs.py

@@ -1,5 +1,6 @@
 from pluggy import HookspecMarker
 
+
 hookspec = HookspecMarker("devpiweb")
 
 
@@ -14,7 +15,7 @@ def devpiweb_get_status_info(request):
 
 @hookspec
 def devpiweb_indexer_backend():
-    """ return dict containing indexer backend info.
+    """return dict containing indexer backend info.
 
     The following keys are defined:
 
@@ -26,5 +27,4 @@ def devpiweb_indexer_backend():
 
 @hookspec
 def devpiweb_modify_preprocess_project_result(project, result):
-    """ allows to modify the ``result`` dictionary used for indexing.
-    """
+    """allows to modify the ``result`` dictionary used for indexing."""

{devpi_web-5.0.2 → devpi_web-5.1.0}/devpi_web/indexing.py

@@ -15,10 +15,10 @@ if TYPE_CHECKING:
 
 
 def is_project_cached(stage, project):
-    if stage.ixconfig['type'] == 'mirror':
-        if not stage.is_project_cached(project):
-            return False
-    return True
+    return not (
+        stage.ixconfig["type"] in {"mirror", "remote"}
+        and not stage.is_project_cached(project)
+    )
 
 
 def preprocess_project(project: ProjectIndexingInfo) -> dict | None:
@@ -33,7 +33,7 @@ def preprocess_project(project: ProjectIndexingInfo) -> dict | None:
     user = ensure_unicode(user)
     index = ensure_unicode(index)
     result: dict[str, object]
-    if stage.ixconfig["type"] == "mirror":
+    if stage.ixconfig["type"] in {"mirror", "remote"}:
         stage.offline = True
         if not stage.is_project_cached(name):
             # only index basic info for projects with no downloads
@@ -86,17 +86,17 @@ class ProjectIndexingInfo:
 
     @property
     def is_from_mirror(self) -> bool:
-        return self.stage.ixconfig['type'] == 'mirror'
+        return self.stage.ixconfig["type"] in {"mirror", "remote"}
 
 
 def iter_indexes(xom):
     mirrors = []
     for user in xom.model.get_userlist():
         username = ensure_unicode(user.name)
-        user_info = user.get(user)
+        user_info = user.get()
         for index, index_info in user_info.get('indexes', {}).items():
             index = ensure_unicode(index)
-            if index_info['type'] == 'mirror':
+            if index_info["type"] in {"mirror", "remote"}:
                 mirrors.append((username, index))
             else:
                 yield (username, index)
@@ -110,7 +110,7 @@ def iter_projects(xom, *, offline=True):
             continue
         names = stage.list_projects_perstage()
         # only go offline after we got the projects list
-        if stage.ixconfig["type"] == "mirror":
+        if stage.ixconfig["type"] in {"mirror", "remote"}:
             stage.offline = offline
         if isinstance(names, Mapping):
             # since devpi-server 6.6.0 mirrors return a mapping where

{devpi_web-5.0.2 → devpi_web-5.1.0}/devpi_web/macros.py

@@ -80,11 +80,26 @@ def html_head_scripts(request):
     return dict(scripts=scripts)
 
 
+@macro_config(template="templates/index_bases.pt")
+def index_bases(request):  # noqa: ARG001
+    return dict()
+
+
 @macro_config(template="templates/logo.pt", groups="main_header_top")
 def logo(request):  # noqa: ARG001
     return dict()
 
 
+@macro_config(template="templates/merge_info.pt")
+def merge_info(request):  # noqa: ARG001
+    return dict()
+
+
+@macro_config(template="templates/project_refresh.pt")
+def project_refresh(request):  # noqa: ARG001
+    return dict()
+
+
 @macro_config(template="templates/query_docs.pt")
 def query_doc(request):
     query_docs_html = None

{devpi_web-5.0.2 → devpi_web-5.1.0}/devpi_web/main.py

@@ -272,8 +272,13 @@ def devpiserver_add_parser_options(parser):
     add_indexer_backend_option(indexing)
 
 
-@devpiserver_hookimpl
+@devpiserver_hookimpl(optionalhook=True)
 def devpiserver_mirror_initialnames(stage, projectnames):
+    devpiserver_remote_initialnames(stage, projectnames)
+
+
+@devpiserver_hookimpl(optionalhook=True)
+def devpiserver_remote_initialnames(stage, projectnames):
     ix = get_indexer(stage.xom)
     threadlog.info(
         "indexing '%s' mirror with %s projects",
@@ -299,7 +304,7 @@ def devpiserver_stage_created(stage):
     if stage is None:
         # the stage was deleted
         return
-    if stage.ixconfig["type"] == "mirror":
+    if stage.ixconfig["type"] in {"mirror", "remote"}:
         threadlog.info("triggering load of initial projectnames for %s", stage.name)
         stage.list_projects_perstage()
 
@@ -341,7 +346,7 @@ def devpiserver_on_changed_versiondata(stage, project, version, metadata):
     if stage is None:
         return
     if not metadata:
-        if stage.ixconfig["type"] == "mirror":
+        if stage.ixconfig["type"] in {"mirror", "remote"}:
             stage.offline = True
         if is_project_cached(stage, project) and not stage.has_project_perstage(project):
             delete_project(stage, project)

{devpi_web-5.0.2 → devpi_web-5.1.0}/devpi_web/templates/index.pt

@@ -76,20 +76,7 @@
             </dl>
         </tal:permissions>
 
-        <tal:bases condition="bases">
-        <h2>inherited bases</h2>
-        <ul>
-            <li tal:repeat="base bases">
-                <a href="${base.url}">${base.title}</a> (<a href="${base.simple_url}">simple</a>)
-            </li>
-        </ul>
-        </tal:bases>
-
-        <h2>whitelisted packages</h2>
-        <ul class="whitelist" tal:condition="whitelist">
-            <li tal:repeat="name whitelist">${name}</li>
-        </ul>
-        <p tal:condition="not whitelist">No packages whitelisted.</p>
+        <metal:indexbases use-macro="request.macros['index_bases']" />
         </div>
         <metal:footer use-macro="request.macros['footer']" />
     </body>

devpi_web-5.1.0/devpi_web/templates/index_bases.pt

@@ -0,0 +1,32 @@
+<tal:bases condition="bases">
+<h2>inherited bases</h2>
+<ul>
+    <li tal:repeat="base bases">
+        <a href="${base.url}">${base.title}</a> (<a href="${base.simple_url}">simple</a>)
+    </li>
+</ul>
+</tal:bases>
+
+<tal:noinheritanceinfo condition="inheritance_info is None">
+<h2>whitelisted packages</h2>
+<ul class="whitelist" tal:condition="whitelist">
+    <li tal:repeat="name whitelist">${name}</li>
+</ul>
+<p tal:condition="not whitelist">No packages whitelisted.</p>
+</tal:noinheritanceinfo>
+
+<tal:inheritanceinfo condition="inheritance_info is not None">
+<script id="inheritance-info" type="application/json">${inheritance_info}</script>
+<h2>inheritance information</h2>
+<div class="infonote" tal:condition="inheritance_info.reasons">
+    <ul>
+        <li tal:repeat="reason inheritance_info.reasons">${reason}</li>
+    </ul>
+</div>
+<dl tal:condition="project_inheritance_rules is not None">
+    <dt><code>project_inheritance_rules</code></dt>
+    <dd><ul>
+        <li tal:repeat="rule project_inheritance_rules"><code>${rule}</code></li>
+    </ul></dd>
+</dl>
+</tal:inheritanceinfo>

devpi_web-5.1.0/devpi_web/templates/merge_info.pt

@@ -0,0 +1,10 @@
+<p class="infonote" tal:condition="merge_info.blocked_remote_name and merge_info.reasons is None">
+    Because this project isn't in the <code>mirror_whitelist</code>,
+    no releases from <strong>${merge_info.blocked_remote_name}</strong> are included.
+</p>
+<script id="merge-info" type="application/json">${merge_info}</script>
+<div class="infonote" tal:condition="merge_info.reasons">
+    <ul>
+        <li tal:repeat="reason merge_info.reasons">${reason}</li>
+    </ul>
+</div>

{devpi_web-5.0.2 → devpi_web-5.1.0}/devpi_web/templates/project.pt

@@ -12,11 +12,8 @@
         <p class="projectnavigation" tal:condition="nav_links">
             <span tal:repeat="link nav_links"><a tal:attributes="class link.get('css_class')" href="${link.url}">${link.title}</a></span>
         </p>
-        <p class="infonote" tal:condition="blocked_by_mirror_whitelist">
-            Because this project isn't in the <code>mirror_whitelist</code>,
-            no releases from <strong>${blocked_by_mirror_whitelist}</strong> are included.
-        </p>
-        <p tal:condition="not blocked_by_mirror_whitelist" tal:content="structure refresh_form"></p>
+        <metal:mergeinfo use-macro="request.macros['merge_info']" />
+        <metal:projectrefresh use-macro="request.macros['project_refresh']" />
 
         <p tal:condition="latest_version">Latest version on stage is: <a href="${latest_url}">${latest_version}</a></p>
 

devpi_web-5.1.0/devpi_web/templates/project_refresh.pt

@@ -0,0 +1 @@
+<p tal:condition="not blocked_by_mirror_whitelist" tal:content="structure refresh_form"></p>

{devpi_web-5.0.2 → devpi_web-5.1.0}/devpi_web/templates/version.pt

@@ -21,10 +21,7 @@
             </tr>
         </table>
 
-        <p class="infonote" tal:condition="blocked_by_mirror_whitelist">
-            Because this project isn't in the <code>mirror_whitelist</code>,
-            no releases from <strong>${blocked_by_mirror_whitelist}</strong> are included.
-        </p>
+        <metal:mergeinfo use-macro="request.macros['merge_info']" />
 
         <table class="files">
             <thead>