devpi-server 6.17.0__tar.gz → 6.18.0__tar.gz

{devpi_server-6.17.0 → devpi_server-6.18.0}/.flake8

@@ -3,7 +3,6 @@
 ignore = E203,E501,E704,E741,W503
 per-file-ignores =
     plugin.py:E127,E128,E231
-    importexport.py:E127
     model.py:E128,E231
     test_importexport.py:E121
     test*.py:E126,E127,E128,E225,E226,E231,E251

{devpi_server-6.17.0 → devpi_server-6.18.0}/CHANGELOG

@@ -2,6 +2,37 @@
 
 .. towncrier release notes start
 
+6.18.0 (2026-01-27)
+===================
+
+Features
+--------
+
+- Store all available hashes of files.
+
+- Validate hashes of all files during devpi-import, not only releases.
+
+Bug Fixes
+---------
+
+- Apply argparse transformations on values read from config file or environment.
+
+- Restore Python and platform info in user agent string after switch to httpx.
+
+- Remove all database entries on project deletion instead of only emptying them.
+
+- Fix error at end of replica streaming caused by changed behavior from switch to httpx.
+
+- Fix #1102: The data stream was cut off after 64k when proxying from replica to primary after switching to httpx.
+
+- Fix #1107: retry file downloads if there has been an error during download.
+
+Other Changes
+-------------
+
+- The filenames of some exported doczip files change due to normalization of the project name caused by changing the internals during export to allow ``--hard-links`` to work.
+
+
 6.17.0 (2025-08-27)
 ===================
 

{devpi_server-6.17.0 → devpi_server-6.18.0}/CHANGELOG.short.rst

@@ -9,6 +9,37 @@ Changelog
 
 .. towncrier release notes start
 
+6.18.0 (2026-01-27)
+===================
+
+Features
+--------
+
+- Store all available hashes of files.
+
+- Validate hashes of all files during devpi-import, not only releases.
+
+Bug Fixes
+---------
+
+- Apply argparse transformations on values read from config file or environment.
+
+- Restore Python and platform info in user agent string after switch to httpx.
+
+- Remove all database entries on project deletion instead of only emptying them.
+
+- Fix error at end of replica streaming caused by changed behavior from switch to httpx.
+
+- Fix #1102: The data stream was cut off after 64k when proxying from replica to primary after switching to httpx.
+
+- Fix #1107: retry file downloads if there has been an error during download.
+
+Other Changes
+-------------
+
+- The filenames of some exported doczip files change due to normalization of the project name caused by changing the internals during export to allow ``--hard-links`` to work.
+
+
 6.17.0 (2025-08-27)
 ===================
 
@@ -104,33 +135,3 @@ Bug Fixes
 
 - No longer automatically "register" a project when pushing releases to PyPI. The reply changed from HTTP status 410 to 400 breaking the upload. With devpi-client 7.2.0 there is a ``--register-project`` option if it is still required for some other package registry.
 
-
-6.13.0 (2024-09-19)
-===================
-
-Deprecations and Removals
--------------------------
-
-- Remove/Deprecate "master" related terminology in favor of "primary".
-  Usage related changes are the switch to ``--primary-url`` instead of ``--master-url`` and ``--role=primary`` instead of ``--role=master``.
-  Using the old terms will now output warnings.
-  The ``+status`` API has additional fields and the ``role`` field content will change with 7.0.0.
-
-Features
---------
-
-- Enable logging command line options for all commands.
-
-- Added support uv pip as an installer.
-
-Bug Fixes
----------
-
-- Don't report on lagging event processing while replicating.
-
-- Report primary serial correctly with streaming replication.
-
-- Don't store file data in memory when fetching a release while pushing from a mirror.
-
-- Only warn about replica not being in sync instead of fatal status while still replicating.
-

{devpi_server-6.17.0 → devpi_server-6.18.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: devpi-server
-Version: 6.17.0
+Version: 6.18.0
 Summary: devpi-server: reliable, private, and pypi.org caching server
 Maintainer-email: Florian Schulze <mail@pyfidelity.com>
 License-Expression: MIT
@@ -42,6 +42,7 @@ Requires-Dist: pluggy<2.0,>=0.6.0
 Requires-Dist: py>=1.4.23
 Requires-Dist: pyramid>=2
 Requires-Dist: repoze.lru>=0.6
+Requires-Dist: strenum; python_version < "3.11"
 Requires-Dist: strictyaml
 Requires-Dist: waitress>=1.0.1
 Requires-Dist: ruamel.yaml
@@ -121,6 +122,37 @@ Changelog
 
 .. towncrier release notes start
 
+6.18.0 (2026-01-27)
+===================
+
+Features
+--------
+
+- Store all available hashes of files.
+
+- Validate hashes of all files during devpi-import, not only releases.
+
+Bug Fixes
+---------
+
+- Apply argparse transformations on values read from config file or environment.
+
+- Restore Python and platform info in user agent string after switch to httpx.
+
+- Remove all database entries on project deletion instead of only emptying them.
+
+- Fix error at end of replica streaming caused by changed behavior from switch to httpx.
+
+- Fix #1102: The data stream was cut off after 64k when proxying from replica to primary after switching to httpx.
+
+- Fix #1107: retry file downloads if there has been an error during download.
+
+Other Changes
+-------------
+
+- The filenames of some exported doczip files change due to normalization of the project name caused by changing the internals during export to allow ``--hard-links`` to work.
+
+
 6.17.0 (2025-08-27)
 ===================
 
@@ -216,33 +248,3 @@ Bug Fixes
 
 - No longer automatically "register" a project when pushing releases to PyPI. The reply changed from HTTP status 410 to 400 breaking the upload. With devpi-client 7.2.0 there is a ``--register-project`` option if it is still required for some other package registry.
 
-
-6.13.0 (2024-09-19)
-===================
-
-Deprecations and Removals
--------------------------
-
-- Remove/Deprecate "master" related terminology in favor of "primary".
-  Usage related changes are the switch to ``--primary-url`` instead of ``--master-url`` and ``--role=primary`` instead of ``--role=master``.
-  Using the old terms will now output warnings.
-  The ``+status`` API has additional fields and the ``role`` field content will change with 7.0.0.
-
-Features
---------
-
-- Enable logging command line options for all commands.
-
-- Added support uv pip as an installer.
-
-Bug Fixes
----------
-
-- Don't report on lagging event processing while replicating.
-
-- Report primary serial correctly with streaming replication.
-
-- Don't store file data in memory when fetching a release while pushing from a mirror.
-
-- Only warn about replica not being in sync instead of fatal status while still replicating.
-

devpi_server-6.18.0/devpi_server/__init__.py

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

{devpi_server-6.17.0 → devpi_server-6.18.0}/devpi_server/__main__.py

@@ -1,4 +1,5 @@
 import devpi_server.main
 
+
 if __name__ == "__main__":
     devpi_server.main.main()

devpi_server-6.18.0/devpi_server/compat.py

@@ -0,0 +1,35 @@
+try:
+    from enum import StrEnum
+except ImportError:
+    from strenum import StrEnum  # noqa: F401
+from tempfile import SpooledTemporaryFile
+
+
+# before Python 3.11 some methods were missing
+if not hasattr(SpooledTemporaryFile, "readable"):
+
+    def readable(self):
+        return self._file.readable()
+
+    SpooledTemporaryFile.readable = readable  # type: ignore[method-assign]
+
+if not hasattr(SpooledTemporaryFile, "readinto"):
+
+    def readinto(self, buffer):
+        return self._file.readinto(buffer)
+
+    SpooledTemporaryFile.readinto = readinto  # type: ignore[attr-defined]
+
+if not hasattr(SpooledTemporaryFile, "seekable"):
+
+    def seekable(self):
+        return self._file.seekable()
+
+    SpooledTemporaryFile.seekable = seekable  # type: ignore[method-assign]
+
+if not hasattr(SpooledTemporaryFile, "writable"):
+
+    def writable(self):
+        return self._file.writable()
+
+    SpooledTemporaryFile.writable = writable  # type: ignore[method-assign]

{devpi_server-6.17.0 → devpi_server-6.18.0}/devpi_server/config.py

@@ -1,26 +1,36 @@
+from __future__ import annotations
+
+from . import fileutil
+from . import hookspecs
+from .interfaces import IIOFileFactory
+from .log import threadlog
+from devpi_common.types import cached_property
+from devpi_common.url import URL
+from functools import partial
+from operator import itemgetter
+from pathlib import Path
+from pluggy import HookimplMarker
+from pluggy import PluginManager
+from tempfile import NamedTemporaryFile
+from typing import TYPE_CHECKING
 import argon2
+import argparse
 import base64
+import devpi_server
+import json
 import os.path
-import argparse
+import py
 import secrets
 import sys
 import uuid
-from operator import itemgetter
-from pathlib import Path
-from tempfile import NamedTemporaryFile
-from pluggy import HookimplMarker, PluginManager
-import py
-from devpi_common.types import cached_property
-from functools import partial
-from .log import threadlog
-from . import fileutil
-from . import hookspecs
-import json
-import devpi_server
-from devpi_common.url import URL
 import warnings
 
 
+if TYPE_CHECKING:
+    from .interfaces import IStorageConnection4
+    from collections.abc import Callable
+
+
 log = threadlog
 
 
@@ -70,7 +80,7 @@ def traced_pluggy_call(hook, **caller_kwargs):
             if firstresult:
                 break
     if firstresult:
-        results = results[0] if results else None
+        return (results[0] if results else None, plugin_names)
     return (results, plugin_names)
 
 
@@ -458,9 +468,11 @@ def get_parser(pluginmanager):
 
 def find_config_file():
     import platformdirs
-    config_dirs = platformdirs.site_config_dir(
-        'devpi-server', 'devpi', multipath=True)
-    config_dirs = config_dirs.split(os.pathsep)
+
+    config_dirs_str: str = platformdirs.site_config_dir(
+        "devpi-server", "devpi", multipath=True
+    )
+    config_dirs: list[str] = config_dirs_str.split(os.pathsep)
     config_dirs.append(
         platformdirs.user_config_dir('devpi-server', 'devpi'))
     config_files = []
@@ -537,15 +549,18 @@ def parseoptions(pluginmanager, argv, parser=None):
     try:
         config_options = load_config_file(config_file)
     except InvalidConfigError as e:
-        log.error("Error in config file '%s':\n  %s" % (  # noqa: TRY400
-            config_file, e))
+        log.error(  # noqa: TRY400
+            "Error in config file '%s':\n  %s", config_file, e
+        )
         sys.exit(4)
     defaultget = partial(
         default_getter,
         config_options=config_options,
         environ=os.environ)
     parser.post_process_actions(defaultget=defaultget)
-    if args.help is True:
+    # the getattr is a workaround for a problem with 3.14t-dev
+    # weirdly enough it does not happen with 3.14-dev
+    if getattr(args, "help", False) is True:
         parser.print_help()
         parser.exit()
     args = parser.parse_args(argv[1:])
@@ -553,12 +568,11 @@ def parseoptions(pluginmanager, argv, parser=None):
     return config
 
 
-def get_action_long_name(action):
-    """ extract long name of action
+def get_action_long_option_string(action):
+    """extract long option string of action
 
-        Looks for the first option string that is long enough and
-        starts with two ``prefix_chars``.
-        For example ``--no-events`` would return ``no-events``.
+    Looks for the first option string that is long enough and
+    starts with two ``prefix_chars``.
     """
     for option_string in action.option_strings:
         if not len(option_string) > 2:
@@ -567,7 +581,8 @@ def get_action_long_name(action):
             continue
         if option_string[1] not in action.container.prefix_chars:
             continue
-        return option_string[2:]
+        return option_string
+    return None
 
 
 class MyArgumentParser(argparse.ArgumentParser):
@@ -584,25 +599,33 @@ class MyArgumentParser(argparse.ArgumentParser):
             get the current value if a global or user config file is loaded.
         """
         for action in self._actions:
-            if defaultget is not None:
+            if isinstance(action, argparse._HelpAction):
+                continue
+            default = action.default
+            option_string = get_action_long_option_string(action)
+            if defaultget is not None and option_string is not None:
                 try:
-                    action.default = defaultget(get_action_long_name(action))
+                    default = defaultget(option_string[2:])
                 except KeyError:
                     pass
                 else:
                     if isinstance(action, argparse._StoreTrueAction):
-                        action.default = bool(strtobool(action.default))
+                        default = bool(strtobool(default))
                     elif isinstance(action, argparse._StoreFalseAction):
-                        action.default = not bool(strtobool(action.default))
-            default = action.default
+                        default = not bool(strtobool(default))
+                    else:
+                        temp_args = argparse.Namespace()
+                        action(self, temp_args, default, option_string)
+                        default = getattr(temp_args, action.dest)
+                action.default = default
             if isinstance(action, argparse._StoreFalseAction):
                 default = not default
             if action.help and argparse.SUPPRESS not in (action.help, default):
                 action.help += " [%s]" % default
 
     def addgroup(self, *args, **kwargs):
-        grp = super(MyArgumentParser, self).add_argument_group(*args, **kwargs)
-        grp.addoption = grp.add_argument
+        grp = super().add_argument_group(*args, **kwargs)
+        grp.addoption = grp.add_argument  # type: ignore[attr-defined]
         return grp
 
     def add_all_options(self):
@@ -658,6 +681,36 @@ class ConfigurationError(Exception):
     """ incorrect configuration or environment settings. """
 
 
+def get_io_file_factory(storage_info: dict) -> IIOFileFactory:
+    from .interfaces import IIOFile
+    from zope.interface import provider
+    from zope.interface.verify import verifyObject
+
+    _io_file_factory: Callable
+    db_filestore = storage_info.setdefault("db_filestore", True)
+    settings = storage_info.setdefault("settings", {})
+    if db_filestore:
+        from .filestore_db import DBIOFile
+
+        _io_file_factory = DBIOFile
+    else:
+        fsbackend = settings.setdefault("fsbackend", "fs")
+        _io_file_factory = __import__(
+            f"filestore_{fsbackend}", globals=globals(), level=1
+        ).fsiofile_factory
+
+        storage_info.setdefault("_test_markers", []).append("storage_with_filesystem")
+    verifyObject(IIOFileFactory, _io_file_factory)
+
+    @provider(IIOFileFactory)
+    def io_file_factory(conn: IStorageConnection4) -> IIOFile:
+        result = IIOFile(_io_file_factory(conn, settings))
+        verifyObject(IIOFile, result)
+        return result
+
+    return io_file_factory
+
+
 class Config:
     def __init__(self, args, pluginmanager):
         self.args = args
@@ -1004,7 +1057,11 @@ class Config:
         return self._storage_info_from_name(name, settings)
 
     @property
-    def storage(self):
+    def io_file_factory(self) -> IIOFileFactory:
+        return get_io_file_factory(self._storage_info())
+
+    @property
+    def storage(self) -> type:
         return self._storage_info()["storage"]
 
     def _determine_storage(self):
@@ -1047,7 +1104,9 @@ class Config:
                 return None
             log.warning(
                 "Using deprecated existing secret file at '%s', use "
-                "--secretfile to explicitly provide the location." % secretfile)
+                "--secretfile to explicitly provide the location.",
+                secretfile,
+            )
             return secretfile
         return Path(self.args.secretfile).expanduser()