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

devpi_web-5.1.0/.flake8

@@ -0,0 +1,3 @@
+[flake8]
+# E203 is ignored because we enforce ruff format which contradicts it
+ignore = E203,E501,E704,E741,W503

{devpi_web-5.0.1 → devpi_web-5.1.0}/CHANGELOG

@@ -2,6 +2,46 @@
 
 .. 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)
+==================
+
+Bug Fixes
+---------
+
+- Prevent double indexing work on first start of freshly initialized/imported instance.
+
+- Optimize preparation of mirror project data for indexing.
+
+- Consistently use offline mode when indexing. This especially helps performance on startup.
+
+- Skip redirect if an installer is detected which is configured without ``+simple`` in the URL.
+
+Other Changes
+-------------
+
+- Support string timestamps for file history log entries from devpi-server 7.0.0.
+
+
 5.0.1 (2025-06-15)
 ==================
 
@@ -11,7 +51,6 @@ Bug Fixes
 - Fix traceback during unpacking of documentation in some cases.
 
 
-
 5.0.0 (2025-06-12)
 ==================
 
@@ -24,15 +63,11 @@ Deprecations and Removals
 
 - Future releases will more often require newer devpi-server than before.
 
-
-
 Bug Fixes
 ---------
 
 - Fix #930: remove remaining uses of unmaintained py library.
 
-
-
 Other Changes
 -------------
 
@@ -69,7 +104,6 @@ Other Changes
 - macros.pt: Move ``versions`` macro to separate ``footer_versions.pt`` template.
 
 
-
 4.3.0 (2024-10-16)
 ==================
 
@@ -79,7 +113,6 @@ 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)
 ==================
 
@@ -95,7 +128,6 @@ Bug Fixes
 - Increase threshold for index status from 60 s to 300 s for warnings and from 300 s to 3600 s for fatal.
 
 
-
 4.2.2 (2024-04-20)
 ==================
 
@@ -109,7 +141,6 @@ Bug Fixes
 - Fix #970: overwrite fixed html/body heights like ``100%`` in documentation iframe content.
 
 
-
 4.2.1 (2023-07-02)
 ==================
 
@@ -131,7 +162,6 @@ Features
 
 - Add ``--keep-docs-packed`` option.
 
-
 Bug Fixes
 ---------
 
@@ -151,7 +181,6 @@ Bug Fixes
 4.1.1 (2022-09-28)
 ==================
 
-
 Bug Fixes
 ---------
 
@@ -170,7 +199,6 @@ Features
 
 - project.pt: add navigation links to original project page for mirrors and to "Simple page" of projects.
 
-
 Bug Fixes
 ---------
 
@@ -216,7 +244,6 @@ Bug Fixes
 
 - Use a lock file to prevent concurrent unpacking of documentation.
 
-
 Other Changes
 -------------
 
@@ -277,7 +304,6 @@ Deprecations and Removals
 
 - Dropped support for Python 2.7.
 
-
 Features
 --------
 
@@ -317,7 +343,6 @@ Features
 
 - Indexer backend options can now be specified as a dict in yaml config files.
 
-
 Bug Fixes
 ---------
 
@@ -325,7 +350,6 @@ Bug Fixes
 
 - Pass query string on to documentation iframe, this fixes Sphinx search among other things.
 
-
 Other Changes
 -------------
 
@@ -364,7 +388,6 @@ Features
 
 - feature #193: adding support for using markdown in package descriptions.
 
-
 Bug Fixes
 ---------
 
@@ -404,7 +427,6 @@ Features
 
 - Use ``mirror_web_url_fmt`` in ``get_description`` for mirror indexes.
 
-
 Bug Fixes
 ---------
 
@@ -629,7 +651,6 @@ Bug Fixes
 - fix notfound-redirect when serving under an outside URL with a sub path
 
 
-
 2.2.0
 =====
 

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

@@ -9,6 +9,46 @@ 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)
+==================
+
+Bug Fixes
+---------
+
+- Prevent double indexing work on first start of freshly initialized/imported instance.
+
+- Optimize preparation of mirror project data for indexing.
+
+- Consistently use offline mode when indexing. This especially helps performance on startup.
+
+- Skip redirect if an installer is detected which is configured without ``+simple`` in the URL.
+
+Other Changes
+-------------
+
+- Support string timestamps for file history log entries from devpi-server 7.0.0.
+
+
 5.0.1 (2025-06-15)
 ==================
 
@@ -18,7 +58,6 @@ Bug Fixes
 - Fix traceback during unpacking of documentation in some cases.
 
 
-
 5.0.0 (2025-06-12)
 ==================
 
@@ -31,15 +70,11 @@ Deprecations and Removals
 
 - Future releases will more often require newer devpi-server than before.
 
-
-
 Bug Fixes
 ---------
 
 - Fix #930: remove remaining uses of unmaintained py library.
 
-
-
 Other Changes
 -------------
 
@@ -76,7 +111,6 @@ Other Changes
 - macros.pt: Move ``versions`` macro to separate ``footer_versions.pt`` template.
 
 
-
 4.3.0 (2024-10-16)
 ==================
 
@@ -85,34 +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.
-
-
-
-4.2.2 (2024-04-20)
-==================
-
-Bug Fixes
----------
-
-- style.css: Always let content be full browser height. This also gives more height with some documentation themes when content is short.
-
-- style.css: set ``scrollbar-gutter: stable`` on ``body`` to prevent jumping content in documentation iframe.
-
-- Fix #970: overwrite fixed html/body heights like ``100%`` in documentation iframe content.
-
-

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: devpi-web
-Version: 5.0.1
+Version: 5.1.0
 Summary: devpi-web: a web view for devpi-server
 Maintainer-email: Florian Schulze <mail@pyfidelity.com>
 License-Expression: MIT
@@ -20,6 +20,7 @@ Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
 Classifier: Programming Language :: Python :: 3.13
+Classifier: Programming Language :: Python :: 3.14
 Classifier: Programming Language :: Python :: Implementation :: PyPy
 Classifier: Topic :: Internet :: WWW/HTTP
 Classifier: Topic :: Internet :: WWW/HTTP :: WSGI :: Application
@@ -87,6 +88,46 @@ 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)
+==================
+
+Bug Fixes
+---------
+
+- Prevent double indexing work on first start of freshly initialized/imported instance.
+
+- Optimize preparation of mirror project data for indexing.
+
+- Consistently use offline mode when indexing. This especially helps performance on startup.
+
+- Skip redirect if an installer is detected which is configured without ``+simple`` in the URL.
+
+Other Changes
+-------------
+
+- Support string timestamps for file history log entries from devpi-server 7.0.0.
+
+
 5.0.1 (2025-06-15)
 ==================
 
@@ -96,7 +137,6 @@ Bug Fixes
 - Fix traceback during unpacking of documentation in some cases.
 
 
-
 5.0.0 (2025-06-12)
 ==================
 
@@ -109,15 +149,11 @@ Deprecations and Removals
 
 - Future releases will more often require newer devpi-server than before.
 
-
-
 Bug Fixes
 ---------
 
 - Fix #930: remove remaining uses of unmaintained py library.
 
-
-
 Other Changes
 -------------
 
@@ -154,7 +190,6 @@ Other Changes
 - macros.pt: Move ``versions`` macro to separate ``footer_versions.pt`` template.
 
 
-
 4.3.0 (2024-10-16)
 ==================
 
@@ -163,34 +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.
-
-
-
-4.2.2 (2024-04-20)
-==================
-
-Bug Fixes
----------
-
-- style.css: Always let content be full browser height. This also gives more height with some documentation themes when content is short.
-
-- style.css: set ``scrollbar-gutter: stable`` on ``body`` to prevent jumping content in documentation iframe.
-
-- Fix #970: overwrite fixed html/body heights like ``100%`` in documentation iframe content.
-
-

devpi_web-5.1.0/devpi_web/__init__.py

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

{devpi_web-5.0.1 → 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.1 → 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.1 → 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.1 → devpi_web-5.1.0}/devpi_web/indexing.py

@@ -1,20 +1,27 @@
+from __future__ import annotations
+
+from attrs import define
 from collections.abc import Mapping
-from devpi_common.types import ensure_unicode
 from devpi_common.metadata import get_sorted_versions
+from devpi_common.types import ensure_unicode
 from devpi_common.validation import normalize_name
 from devpi_web.config import get_pluginmanager
 from devpi_web.doczip import Docs
-import attr
+from typing import TYPE_CHECKING
+
+
+if TYPE_CHECKING:
+    from typing import Any
 
 
 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):
+def preprocess_project(project: ProjectIndexingInfo) -> dict | None:
     stage = project.stage
     pm = get_pluginmanager(stage.xom.config)
     name = normalize_name(project.name)
@@ -25,15 +32,19 @@ def preprocess_project(project):
         user, index = stage.name.split('/')
     user = ensure_unicode(user)
     index = ensure_unicode(index)
-    if not is_project_cached(stage, name):
-        result = dict(name=project.name, user=user, index=index)
-        pm.hook.devpiweb_modify_preprocess_project_result(
-            project=project, result=result)
-        return result
-    stage.offline = True
-    if not stage.has_project_perstage(name):
+    result: dict[str, object]
+    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
+            result = dict(name=project.name, user=user, index=index)
+            pm.hook.devpiweb_modify_preprocess_project_result(
+                project=project, result=result
+            )
+            return result
+    elif not stage.has_project_perstage(name):
         # project doesn't exist anymore
-        return
+        return None
     # metadata_keys is only available on private indexes
     setuptools_metadata = frozenset(getattr(stage, 'metadata_keys', ()))
     versions = get_sorted_versions(stage.list_versions_perstage(name))
@@ -49,8 +60,7 @@ def preprocess_project(project):
                 result['doc_version'] = version
                 result['+doczip'] = docs
             break
-        else:
-            assert '+doczip' not in result
+        assert "+doczip" not in result
 
     result[u'user'] = user
     result[u'index'] = index
@@ -64,46 +74,50 @@ def preprocess_project(project):
     return result
 
 
-@attr.s(slots=True)
-class ProjectIndexingInfo(object):
-    stage = attr.ib()
-    name = attr.ib(type=str)
+@define
+class ProjectIndexingInfo:
+    stage: Any
+    name: str
+    num_names: int
 
     @property
-    def indexname(self):
+    def indexname(self) -> str:
         return self.stage.name
 
     @property
-    def is_from_mirror(self):
-        return self.stage.ixconfig['type'] == 'mirror'
+    def is_from_mirror(self) -> bool:
+        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)
     yield from mirrors
 
 
-def iter_projects(xom):
+def iter_projects(xom, *, offline=True):
     for username, index in iter_indexes(xom):
         stage = xom.model.getstage(username, index)
         if stage is None:  # this is async, so the stage may be gone
             continue
         names = stage.list_projects_perstage()
+        # only go offline after we got the projects list
+        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
             # the un-normalized names are in the values
             names = names.values()
+        num_names = len(names)
         for name in names:
-            name = ensure_unicode(name)
             yield ProjectIndexingInfo(
-                stage=stage,
-                name=name)
+                stage=stage, name=ensure_unicode(name), num_names=num_names
+            )

{devpi_web-5.0.1 → 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