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

devpi_web-5.0.2/.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.0 → devpi_web-5.0.2}/CHANGELOG

@@ -2,6 +2,35 @@
 
 .. towncrier release notes start
 
+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)
+==================
+
+Bug Fixes
+---------
+
+- Fix traceback during unpacking of documentation in some cases.
+
+
 5.0.0 (2025-06-12)
 ==================
 
@@ -14,15 +43,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
 -------------
 
@@ -59,7 +84,6 @@ Other Changes
 - macros.pt: Move ``versions`` macro to separate ``footer_versions.pt`` template.
 
 
-
 4.3.0 (2024-10-16)
 ==================
 
@@ -69,7 +93,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)
 ==================
 
@@ -85,7 +108,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)
 ==================
 
@@ -99,7 +121,6 @@ Bug Fixes
 - Fix #970: overwrite fixed html/body heights like ``100%`` in documentation iframe content.
 
 
-
 4.2.1 (2023-07-02)
 ==================
 
@@ -121,7 +142,6 @@ Features
 
 - Add ``--keep-docs-packed`` option.
 
-
 Bug Fixes
 ---------
 
@@ -141,7 +161,6 @@ Bug Fixes
 4.1.1 (2022-09-28)
 ==================
 
-
 Bug Fixes
 ---------
 
@@ -160,7 +179,6 @@ Features
 
 - project.pt: add navigation links to original project page for mirrors and to "Simple page" of projects.
 
-
 Bug Fixes
 ---------
 
@@ -206,7 +224,6 @@ Bug Fixes
 
 - Use a lock file to prevent concurrent unpacking of documentation.
 
-
 Other Changes
 -------------
 
@@ -267,7 +284,6 @@ Deprecations and Removals
 
 - Dropped support for Python 2.7.
 
-
 Features
 --------
 
@@ -307,7 +323,6 @@ Features
 
 - Indexer backend options can now be specified as a dict in yaml config files.
 
-
 Bug Fixes
 ---------
 
@@ -315,7 +330,6 @@ Bug Fixes
 
 - Pass query string on to documentation iframe, this fixes Sphinx search among other things.
 
-
 Other Changes
 -------------
 
@@ -354,7 +368,6 @@ Features
 
 - feature #193: adding support for using markdown in package descriptions.
 
-
 Bug Fixes
 ---------
 
@@ -394,7 +407,6 @@ Features
 
 - Use ``mirror_web_url_fmt`` in ``get_description`` for mirror indexes.
 
-
 Bug Fixes
 ---------
 
@@ -619,7 +631,6 @@ Bug Fixes
 - fix notfound-redirect when serving under an outside URL with a sub path
 
 
-
 2.2.0
 =====
 

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

@@ -9,6 +9,35 @@ Changelog
 
 .. towncrier release notes start
 
+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)
+==================
+
+Bug Fixes
+---------
+
+- Fix traceback during unpacking of documentation in some cases.
+
+
 5.0.0 (2025-06-12)
 ==================
 
@@ -21,15 +50,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
 -------------
 
@@ -66,7 +91,6 @@ Other Changes
 - macros.pt: Move ``versions`` macro to separate ``footer_versions.pt`` template.
 
 
-
 4.3.0 (2024-10-16)
 ==================
 
@@ -76,7 +100,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)
 ==================
 
@@ -91,29 +114,3 @@ 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)
-==================
-
-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.
-
-
-
-4.2.1 (2023-07-02)
-==================
-
-Bug Fixes
----------
-
-- Fix #953: Exception when browsers send ETag for documentation pages.
-
-- Fix #980: Remove long deprecated backward compatibility for old pluggy versions to fix error with pluggy 1.1.0.
-

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: devpi-web
-Version: 5.0.0
+Version: 5.0.2
 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,35 @@ Changelog
 
 .. towncrier release notes start
 
+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)
+==================
+
+Bug Fixes
+---------
+
+- Fix traceback during unpacking of documentation in some cases.
+
+
 5.0.0 (2025-06-12)
 ==================
 
@@ -99,15 +129,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
 -------------
 
@@ -144,7 +170,6 @@ Other Changes
 - macros.pt: Move ``versions`` macro to separate ``footer_versions.pt`` template.
 
 
-
 4.3.0 (2024-10-16)
 ==================
 
@@ -154,7 +179,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)
 ==================
 
@@ -169,29 +193,3 @@ 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)
-==================
-
-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.
-
-
-
-4.2.1 (2023-07-02)
-==================
-
-Bug Fixes
----------
-
-- Fix #953: Exception when browsers send ETag for documentation pages.
-
-- Fix #980: Remove long deprecated backward compatibility for old pluggy versions to fix error with pluggy 1.1.0.
-

devpi_web-5.0.2/devpi_web/__init__.py

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

{devpi_web-5.0.0 → devpi_web-5.0.2}/devpi_web/doczip.py

@@ -33,7 +33,9 @@ def locked_unpack_path(stage, name, version, *, remove_lock_file=False):
     hash_path = unpack_path.with_suffix(".hash")
     try:
         hash_path.parent.mkdir(parents=True, exist_ok=True)
-        with hash_path.open("a+") as hash_file:
+        with suppress(FileExistsError), hash_path.open("x"):
+            pass
+        with hash_path.open("r+") as hash_file:
             if fcntl:
                 fcntl.flock(hash_file, fcntl.LOCK_EX)
             try:
@@ -90,12 +92,13 @@ def unpack_docs(stage, name, version, entry):
     # we are not losing the original zip file anyway
     with locked_unpack_path(stage, name, version) as (hash_file, unpack_path):
         hash_file.seek(0)
-        if hash_file.read().strip() == entry.best_available_hash_spec:
+        hash_spec = hash_file.read().strip()
+        if hash_spec == entry.best_available_hash_spec:
             return unpack_path
         if unpack_path.exists():
             with suppress(FileNotFoundError):
                 # there is a rare possibility of a race condition here
-                unpack_path.unlink()
+                shutil.rmtree(unpack_path)
         if not entry.file_exists():
             return unpack_path
         with entry.file_open_read() as f, Archive(f) as archive:

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

@@ -1,10 +1,17 @@
+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):
@@ -14,7 +21,7 @@ def is_project_cached(stage, project):
     return True
 
 
-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"] == "mirror":
+        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,17 +74,18 @@ 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):
+    def is_from_mirror(self) -> bool:
         return self.stage.ixconfig['type'] == 'mirror'
 
 
@@ -92,18 +103,21 @@ def iter_indexes(xom):
     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"] == "mirror":
+            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.0 → devpi_web-5.0.2}/devpi_web/main.py

@@ -101,9 +101,8 @@ def status_info(request):
     msgs = []
     pm = request.registry['devpiweb-pluginmanager']
     for result in pm.hook.devpiweb_get_status_info(request=request):
-        for msg in result:
-            msgs.append(msg)
-    states = set(x['status'] for x in msgs)
+        msgs.extend(result)
+    states = {x["status"] for x in msgs}
     if 'fatal' in states:
         status = 'fatal'
         short_msg = 'fatal'
@@ -284,9 +283,11 @@ def devpiserver_mirror_initialnames(stage, projectnames):
         # since devpi-server 6.6.0 mirrors return a mapping where
         # the un-normalized names are in the values
         projectnames = projectnames.values()
+    num_names = len(projectnames)
     ix.update_projects(
-        ProjectIndexingInfo(stage=stage, name=name)
-        for name in projectnames)
+        ProjectIndexingInfo(stage=stage, name=name, num_names=num_names)
+        for name in projectnames
+    )
     threadlog.info("finished mirror indexing operation")
 
 
@@ -315,14 +316,14 @@ def delete_project(stage, name):
     if stage is None:
         return
     ix = get_indexer(stage.xom)
-    ix.delete_projects([ProjectIndexingInfo(stage=stage, name=name)])
+    ix.delete_projects([ProjectIndexingInfo(stage=stage, name=name, num_names=1)])
 
 
 def index_project(stage, name):
     if stage is None:
         return
     ix = get_indexer(stage.xom)
-    ix.update_projects([ProjectIndexingInfo(stage=stage, name=name)])
+    ix.update_projects([ProjectIndexingInfo(stage=stage, name=name, num_names=1)])
 
 
 @devpiserver_hookimpl
@@ -338,9 +339,10 @@ def devpiserver_on_upload(stage, project, version, link):
 @devpiserver_hookimpl
 def devpiserver_on_changed_versiondata(stage, project, version, metadata):
     if stage is None:
-        # TODO we don't have enough info to delete the project
         return
     if not metadata:
+        if stage.ixconfig["type"] == "mirror":
+            stage.offline = True
         if is_project_cached(stage, project) and not stage.has_project_perstage(project):
             delete_project(stage, project)
             return

{devpi_web-5.0.0 → devpi_web-5.0.2}/devpi_web/null_index.py

@@ -24,9 +24,7 @@ class Index:
         return dict(items=[])
 
     def _matcher(self, searchinfo):
-        items = list(
-            re.escape(x)
-            for x in searchinfo['fields']['name'])
+        items = [re.escape(x) for x in searchinfo["fields"]["name"]]
         return re.compile('|'.join(items)).search
 
     def query_packages(self, searchinfo, sro):