devpi-server 6.9.0__tar.gz → 6.9.1__tar.gz

{devpi-server-6.9.0 → devpi-server-6.9.1}/CHANGELOG

@@ -2,6 +2,17 @@
 
 .. towncrier release notes start
 
+6.9.1 (2023-07-02)
+==================
+
+Bug Fixes
+---------
+
+- Prevent error in find_pre_existing_file in case of incomplete metadata.
+
+- Fix #980: Remove long deprecated backward compatibility for old pluggy versions to fix error with pluggy 1.1.0.
+
+
 6.9.0 (2023-05-23)
 ==================
 

{devpi-server-6.9.0 → devpi-server-6.9.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: devpi-server
-Version: 6.9.0
+Version: 6.9.1
 Summary: devpi-server: reliable private and pypi.org caching server
 Home-page: https://devpi.net
 Maintainer: Florian Schulze
@@ -102,6 +102,17 @@ Changelog
 
 .. towncrier release notes start
 
+6.9.1 (2023-07-02)
+==================
+
+Bug Fixes
+---------
+
+- Prevent error in find_pre_existing_file in case of incomplete metadata.
+
+- Fix #980: Remove long deprecated backward compatibility for old pluggy versions to fix error with pluggy 1.1.0.
+
+
 6.9.0 (2023-05-23)
 ==================
 
@@ -179,32 +190,3 @@ Bug Fixes
 
 - Preserve toxresult filenames during import to keep them being accessible on the same URLs after the fix for #686 in 5.2.0.
 
-
-6.6.0 (2022-08-16)
-==================
-
-Features
---------
-
-- Fix #592: return dict from ``list_projects_perstage`` of mirrors where the values contain the un-normalized project name. This allows support in devpi-web 4.1.0 to index them correctly.
-
-- Check name in project list instead of fetching project page for mirrors. This improves response times and avoids leaking typos of private package names upstream.
-
-- Use ETag header if provided by mirror to reduce bandwidth usage and latency.
-
-- Prevent concurrent updates of simple links on mirrors with a short lived lock.
-
-- Support `PEP-691 <https://peps.python.org/pep-0691/>`_ conformant fetching for mirrors, and requests with JSON result for installers. Proxy servers should add compression support for the ``application/vnd.pypi.simple.v1+json`` content type (``gzip_types`` for nginx).
-
-
-Bug Fixes
----------
-
-- Fix #743: support PEP427 escaped wheels with local version, where the + is replaced by _.
-
-- Fix #895: store and return content of data-yanked.
-
-- Fix #908: include basic auth from ``mirror_url`` when fetching packages.
-
-- Fix #914: switch to write transaction as late as possible when streaming a file from a mirror.
-

devpi-server-6.9.1/devpi_server/__init__.py

@@ -0,0 +1 @@
+__version__ = '6.9.1'

{devpi-server-6.9.0 → devpi-server-6.9.1}/devpi_server/config.py

@@ -45,8 +45,6 @@ def strtobool(val):
 
 def get_pluginmanager(load_entrypoints=True):
     pm = PluginManager("devpiserver")
-    # support old plugins, but emit deprecation warnings
-    pm._implprefix = "devpiserver_"
     pm.add_hookspecs(hookspecs)
     # XXX load internal plugins here
     if load_entrypoints:

{devpi-server-6.9.0 → devpi-server-6.9.1}/devpi_server/keyfs.py

@@ -28,6 +28,10 @@ from devpi_common.types import cached_property
 absent = object()
 
 
+class KeyfsTimeoutError(TimeoutError):
+    pass
+
+
 class MissingFileException(Exception):
     def __init__(self, relpath, serial):
         msg = "missing file '%s' at serial %s" % (relpath, serial)
@@ -761,7 +765,11 @@ class Transaction(object):
             "restarting %s transaction afresh as %s transaction",
             "write" if self.write else "read",
             "write" if write else "read")
-        newtx = self.__class__(self.keyfs, write=write)
+        try:
+            newtx = self.__class__(self.keyfs, write=write)
+        except BaseException:
+            self.doomed = True
+            raise
         self.__dict__ = newtx.__dict__
 
     def doom(self):

{devpi-server-6.9.0 → devpi-server-6.9.1}/devpi_server/keyfs_sqlite.py

@@ -2,6 +2,7 @@ from devpi_common.types import cached_property
 from .config import hookimpl
 from .fileutil import dumps, loads
 from .interfaces import IStorageConnection2
+from .keyfs import KeyfsTimeoutError
 from .keyfs import RelpathInfo
 from .keyfs import get_relpath_at
 from .log import threadlog, thread_push_log, thread_pop_log
@@ -115,7 +116,11 @@ class BaseConnection:
         self._sqlconn.commit()
 
     def rollback(self):
-        self._sqlconn.rollback()
+        try:
+            self._sqlconn.rollback()
+        except sqlite3.ProgrammingError as e:
+            if not e.args or 'closed database' not in e.args[0]:
+                raise
 
     @cached_property
     def last_changelog_serial(self):
@@ -441,7 +446,8 @@ class BaseStorage(object):
                     elapsed = time.monotonic() - start_time
                     if elapsed > timeout:
                         # if it takes this long, something is wrong
-                        raise TimeoutError(f"Timeout after {elapsed} seconds.") from e
+                        raise KeyfsTimeoutError(
+                            f"Timeout after {int(elapsed)} seconds.") from e
         conn = self.Connection(sqlconn, self.basedir, self)
         if closing:
             return contextlib.closing(conn)

{devpi-server-6.9.0 → devpi-server-6.9.1}/devpi_server/replica.py

@@ -855,11 +855,12 @@ class FileReplicationThread:
         path = os.path.join(self.file_search_path, entry.relpath)
         if not os.path.exists(path):
             # look for file in export layout
-            path = os.path.join(
-                self.file_search_path,
+            parts = (
                 entry.user, entry.index,
                 entry.project, entry.version,
                 entry.basename)
+            if all(part is not None for part in parts):
+                path = os.path.join(self.file_search_path, *parts)
         if not os.path.exists(path):
             threadlog.debug("path for existing file not found: %s", path)
             return

{devpi-server-6.9.0 → devpi-server-6.9.1}/devpi_server/views.py

@@ -16,6 +16,7 @@ from pyramid.interfaces import IRootFactory
 from pyramid.interfaces import IRoutesMapper
 from pyramid.httpexceptions import HTTPException, HTTPFound, HTTPSuccessful
 from pyramid.httpexceptions import HTTPForbidden
+from pyramid.httpexceptions import HTTPInternalServerError
 from pyramid.httpexceptions import HTTPOk
 from pyramid.httpexceptions import HTTPUnauthorized
 from pyramid.httpexceptions import exception_response
@@ -36,9 +37,11 @@ from devpi_common.request import new_requests_session
 from devpi_common.validation import normalize_name, is_valid_archive_name
 
 from .config import hookimpl
+from .exceptions import lazy_format_exception_only
 from .filestore import BadGateway
 from .filestore import get_checksum_error
 from .fileutil import buffered_iterator
+from .keyfs import KeyfsTimeoutError
 from .model import InvalidIndex, InvalidIndexconfig, InvalidUser, InvalidUserconfig
 from .model import ReadonlyIndex
 from .model import RemoveValue
@@ -223,7 +226,13 @@ def tween_keyfs_transaction(handler, registry):
         write = is_mutating_http_method(request.method) and not is_replica
         with keyfs.transaction(write=write) as tx:
             threadlog.debug("in-transaction %s", tx.at_serial)
-            response = handler(request)
+            try:
+                response = handler(request)
+            except KeyfsTimeoutError as e:
+                msg = lazy_format_exception_only(e)
+                threadlog.error(
+                    "Keyfs timeout: %s", msg)
+                return HTTPInternalServerError(msg)
         set_header_devpi_serial(response, tx)
         return response
     return request_tx_handler

{devpi-server-6.9.0 → devpi-server-6.9.1}/devpi_server.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: devpi-server
-Version: 6.9.0
+Version: 6.9.1
 Summary: devpi-server: reliable private and pypi.org caching server
 Home-page: https://devpi.net
 Maintainer: Florian Schulze
@@ -102,6 +102,17 @@ Changelog
 
 .. towncrier release notes start
 
+6.9.1 (2023-07-02)
+==================
+
+Bug Fixes
+---------
+
+- Prevent error in find_pre_existing_file in case of incomplete metadata.
+
+- Fix #980: Remove long deprecated backward compatibility for old pluggy versions to fix error with pluggy 1.1.0.
+
+
 6.9.0 (2023-05-23)
 ==================
 
@@ -179,32 +190,3 @@ Bug Fixes
 
 - Preserve toxresult filenames during import to keep them being accessible on the same URLs after the fix for #686 in 5.2.0.
 
-
-6.6.0 (2022-08-16)
-==================
-
-Features
---------
-
-- Fix #592: return dict from ``list_projects_perstage`` of mirrors where the values contain the un-normalized project name. This allows support in devpi-web 4.1.0 to index them correctly.
-
-- Check name in project list instead of fetching project page for mirrors. This improves response times and avoids leaking typos of private package names upstream.
-
-- Use ETag header if provided by mirror to reduce bandwidth usage and latency.
-
-- Prevent concurrent updates of simple links on mirrors with a short lived lock.
-
-- Support `PEP-691 <https://peps.python.org/pep-0691/>`_ conformant fetching for mirrors, and requests with JSON result for installers. Proxy servers should add compression support for the ``application/vnd.pypi.simple.v1+json`` content type (``gzip_types`` for nginx).
-
-
-Bug Fixes
----------
-
-- Fix #743: support PEP427 escaped wheels with local version, where the + is replaced by _.
-
-- Fix #895: store and return content of data-yanked.
-
-- Fix #908: include basic auth from ``mirror_url`` when fetching packages.
-
-- Fix #914: switch to write transaction as late as possible when streaming a file from a mirror.
-

{devpi-server-6.9.0 → devpi-server-6.9.1}/setup.py

@@ -57,7 +57,7 @@ if __name__ == "__main__":
         'Documentation': 'https://doc.devpi.net',
         'Source Code': 'https://github.com/devpi/devpi'
       },
-      version='6.9.0',
+      version='6.9.1',
       maintainer="Florian Schulze",
       maintainer_email="mail@pyfidelity.com",
       packages=[

devpi-server-6.9.0/devpi_server/__init__.py

@@ -1 +0,0 @@
-__version__ = '6.9.0'