devpi-server 6.14.0__tar.gz → 6.15.0__tar.gz

{devpi-server-6.14.0 → devpi-server-6.15.0}/CHANGELOG

@@ -2,6 +2,16 @@
 
 .. towncrier release notes start
 
+6.15.0 (2025-05-18)
+===================
+
+Features
+--------
+
+- Add ``--connection-limit`` option to devpi-server passed on to waitress.
+
+
+
 6.14.0 (2024-10-16)
 ===================
 

{devpi-server-6.14.0 → devpi-server-6.15.0}/MANIFEST.in

@@ -1,4 +1,6 @@
 include .flake8 CHANGELOG *.ini *.rst LICENSE
-recursive-include devpi_server *.template 
+recursive-include devpi_server py.typed
+recursive-include devpi_server *.template
+recursive-include test_devpi_server py.typed
 recursive-include test_devpi_server *.py
 recursive-include test_devpi_server/importexportdata *.gz* *.json

{devpi-server-6.14.0 → devpi-server-6.15.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: devpi-server
-Version: 6.14.0
+Version: 6.15.0
 Summary: devpi-server: reliable private and pypi.org caching server
 Home-page: https://devpi.net
 Maintainer: Florian Schulze
@@ -105,6 +105,16 @@ Changelog
 
 .. towncrier release notes start
 
+6.15.0 (2025-05-18)
+===================
+
+Features
+--------
+
+- Add ``--connection-limit`` option to devpi-server passed on to waitress.
+
+
+
 6.14.0 (2024-10-16)
 ===================
 
@@ -193,24 +203,3 @@ Bug Fixes
 - Return json data if toxresult upload is forbidden.
 
 
-
-6.11.0 (2024-04-20)
-===================
-
-Features
---------
-
-- The ``devpi-fsck`` script now returns an error code when there have been missing files or checksum errors.
-
-- Fix #983: Add plugin hook for mirror authentication header.
-
-
-
-Bug Fixes
----------
-
-- Preserve last modified of docs and toxresults during export/import.
-
-- Fix #1033: Use ``int`` for ``--mirror-cache-expiry`` to fix value of ``proxy_cache_valid`` in nginx caching config.
-
-

devpi-server-6.15.0/devpi_server/__init__.py

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

{devpi-server-6.14.0 → devpi-server-6.15.0}/devpi_server/config.py

@@ -56,6 +56,24 @@ def get_pluginmanager(load_entrypoints=True):
     return pm
 
 
+def traced_pluggy_call(hook, **caller_kwargs):
+    firstresult = hook.spec.opts.get("firstresult", False) if hook.spec else False
+    results = []
+    plugin_names = []
+    hookimpls = hook._hookimpls if hasattr(hook, '_hookimpls') else hook.get_hookimpls()
+    for hook_impl in reversed(hookimpls):
+        args = [caller_kwargs[argname] for argname in hook_impl.argnames]
+        res = hook_impl.function(*args)
+        if res is not None:
+            results.append(res)
+            plugin_names.append(hook_impl.plugin_name)
+            if firstresult:
+                break
+    if firstresult:
+        results = results[0] if results else None
+    return (results, plugin_names)
+
+
 def add_help_option(parser, pluginmanager):
     parser.addoption(
         "-h", "--help",
@@ -155,6 +173,11 @@ def add_web_options(parser, pluginmanager):
         default=50,
         help="number of threads to start for serving clients.")
 
+    parser.addoption(
+        "--connection-limit", type=int,
+        default=100,
+        help="maximum number of simultaneous client connections.")
+
     parser.addoption(
         "--trusted-proxy", type=str,
         help="IP address of proxy we trust. See waitress documentation.")
@@ -446,8 +469,9 @@ def find_config_file():
             config_files.append(config_file)
     if len(config_files) > 1:
         log.warning("Multiple configuration files found:\n%s", "\n".join(config_files))
-    if len(config_files):
-        return config_files[-1]
+    if not config_files:
+        return None
+    return config_files[-1]
 
 
 class InvalidConfigError(ValueError):
@@ -680,6 +704,8 @@ class Config(object):
             kwargs["trusted_proxy_count"] = self.args.trusted_proxy_count
         if self.args.trusted_proxy_headers is not None:
             kwargs["trusted_proxy_headers"] = self.args.trusted_proxy_headers
+        if self.args.connection_limit is not None:
+            kwargs["connection_limit"] = self.args.connection_limit
         return dict(kwargs=kwargs, addresses=addresses)
 
     @cached_property

{devpi-server-6.14.0 → devpi-server-6.15.0}/devpi_server/hookspecs.py

@@ -158,6 +158,12 @@ def devpiserver_get_identity(request, credentials):
     """
 
 
+@hookspec
+def devpiserver_identity_loaded(request, credential_plugin_name, identity_plugin_name, identity):
+    """ called when identity is loaded for a request.
+    """
+
+
 @hookspec(warn_on_impl=DeprecationWarning("Use new devpiserver_auth_request hook instead"))
 def devpiserver_auth_user(userdict, username, password):
     """return dict containing authentication validation results.

{devpi-server-6.14.0 → devpi-server-6.15.0}/devpi_server/mirror.py

@@ -120,9 +120,9 @@ class IndexParser:
         appear later are ignored.
         """
         entry = self.basename2link.get(newlink.basename)
-        if entry is None or not entry.hash_spec and (newlink.hash_spec or (
+        if entry is None or (not entry.hash_spec and (newlink.hash_spec or (
             not entry.requires_python and newlink.requires_python
-        )):
+        ))):
             self.basename2link[newlink.basename] = newlink
             threadlog.debug("indexparser: adding link %s", newlink)
         else:
@@ -324,9 +324,9 @@ class MirrorStage(BaseStage):
         if key == "mirror_cache_expiry":
             try:
                 value = int(value)
-            except (TypeError, ValueError):
+            except (TypeError, ValueError) as e:
                 raise self.InvalidIndexconfig([
-                    "'mirror_cache_expiry' option must be an integer"])
+                    "'mirror_cache_expiry' option must be an integer"]) from e
             return value
         if key == "mirror_no_project_list":
             return ensure_boolean(value)
@@ -334,6 +334,7 @@ class MirrorStage(BaseStage):
             return ensure_boolean(value)
         if key in ("custom_data", "description", "mirror_web_url_fmt", "title"):
             return value
+        return None
 
     def delete(self):
         # delete all projects on this index

{devpi-server-6.14.0 → devpi-server-6.15.0}/devpi_server/model.py

@@ -1770,7 +1770,8 @@ class SimplelinkMeta:
     __slots__ = (
         '__basename', '__cmpval', '__ext', '__hash_spec',
         '__name', '__path', '__url', '__version',
-        'key', 'href', 'require_python', 'yanked')
+        'href', 'key', 'require_python', 'yanked',
+    )
 
     def __init__(self, link_info):
         self.__basename = notset

devpi-server-6.15.0/devpi_server/py.typed

@@ -0,0 +1 @@
+partial

{devpi-server-6.14.0 → devpi-server-6.15.0}/devpi_server/view_auth.py

@@ -4,6 +4,7 @@ from devpi_common.types import ensure_unicode
 from devpi_common.validation import normalize_name
 from devpi_server.auth import Auth
 from devpi_server.config import hookimpl
+from devpi_server.config import traced_pluggy_call
 from devpi_server.views import abort
 from devpi_server.model import BaseStage
 from devpi_server.model import UpstreamError
@@ -218,12 +219,23 @@ class DevpiSecurityPolicy:
         return [('WWW-Authenticate', 'Basic realm="%s"' % self.realm)]
 
     def _get_credentials(self, request):
-        return self.hook.devpiserver_get_credentials(request=request)
+        return traced_pluggy_call(
+            self.hook.devpiserver_get_credentials,
+            request=request)
 
     def load_identity(self, request):
-        credentials = self._get_credentials(request)
-        return self.hook.devpiserver_get_identity(
+        (credentials, plugin_names) = self._get_credentials(request)
+        credential_plugin_name = plugin_names[0] if plugin_names else None
+        (result, plugin_names) = traced_pluggy_call(
+            self.hook.devpiserver_get_identity,
             request=request, credentials=credentials)
+        identity_plugin_name = plugin_names[0] if plugin_names else None
+        self.hook.devpiserver_identity_loaded(
+            request=request,
+            credential_plugin_name=credential_plugin_name,
+            identity_plugin_name=identity_plugin_name,
+            identity=result)
+        return result
 
     def identity(self, request):
         return self.identity_cache.get_or_create(request)

{devpi-server-6.14.0 → devpi-server-6.15.0}/devpi_server.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: devpi-server
-Version: 6.14.0
+Version: 6.15.0
 Summary: devpi-server: reliable private and pypi.org caching server
 Home-page: https://devpi.net
 Maintainer: Florian Schulze
@@ -105,6 +105,16 @@ Changelog
 
 .. towncrier release notes start
 
+6.15.0 (2025-05-18)
+===================
+
+Features
+--------
+
+- Add ``--connection-limit`` option to devpi-server passed on to waitress.
+
+
+
 6.14.0 (2024-10-16)
 ===================
 
@@ -193,24 +203,3 @@ Bug Fixes
 - Return json data if toxresult upload is forbidden.
 
 
-
-6.11.0 (2024-04-20)
-===================
-
-Features
---------
-
-- The ``devpi-fsck`` script now returns an error code when there have been missing files or checksum errors.
-
-- Fix #983: Add plugin hook for mirror authentication header.
-
-
-
-Bug Fixes
----------
-
-- Preserve last modified of docs and toxresults during export/import.
-
-- Fix #1033: Use ``int`` for ``--mirror-cache-expiry`` to fix value of ``proxy_cache_valid`` in nginx caching config.
-
-

{devpi-server-6.14.0 → devpi-server-6.15.0}/devpi_server.egg-info/SOURCES.txt

@@ -36,6 +36,7 @@ devpi_server/mirror.py
 devpi_server/model.py
 devpi_server/mythread.py
 devpi_server/passwd.py
+devpi_server/py.typed
 devpi_server/readonly.py
 devpi_server/replica.py
 devpi_server/sizeof.py
@@ -68,6 +69,7 @@ test_devpi_server/conftest.py
 test_devpi_server/example.py
 test_devpi_server/functional.py
 test_devpi_server/plugin.py
+test_devpi_server/py.typed
 test_devpi_server/reqmock.py
 test_devpi_server/simpypi.py
 test_devpi_server/test_auth.py

{devpi-server-6.14.0 → devpi-server-6.15.0}/pyproject.toml

@@ -2,6 +2,85 @@
 extend = "../pyproject.toml"
 
 
+[tool.ruff.format]
+exclude = [
+    "devpi_server/__init__.py",
+    "devpi_server/auth.py",
+    "devpi_server/auth_basic.py",
+    "devpi_server/auth_devpi.py",
+    "devpi_server/config.py",
+    "devpi_server/exceptions.py",
+    "devpi_server/filestore.py",
+    "devpi_server/filestore_fs.py",
+    "devpi_server/fileutil.py",
+    "devpi_server/fsck.py",
+    "devpi_server/genconfig.py",
+    "devpi_server/hookspecs.py",
+    "devpi_server/importexport.py",
+    "devpi_server/init.py",
+    "devpi_server/interfaces.py",
+    "devpi_server/keyfs.py",
+    "devpi_server/keyfs_sqlite.py",
+    "devpi_server/keyfs_sqlite_fs.py",
+    "devpi_server/keyfs_types.py",
+    "devpi_server/log.py",
+    "devpi_server/main.py",
+    "devpi_server/markers.py",
+    "devpi_server/middleware.py",
+    "devpi_server/mirror.py",
+    "devpi_server/model.py",
+    "devpi_server/mythread.py",
+    "devpi_server/passwd.py",
+    "devpi_server/readonly.py",
+    "devpi_server/replica.py",
+    "devpi_server/sizeof.py",
+    "devpi_server/vendor/_pip.py",
+    "devpi_server/view_auth.py",
+    "devpi_server/views.py",
+    "pytest_devpi_server/__init__.py",
+    "setup.py",
+    "test_devpi_server/conftest.py",
+    "test_devpi_server/example.py",
+    "test_devpi_server/functional.py",
+    "test_devpi_server/plugin.py",
+    "test_devpi_server/reqmock.py",
+    "test_devpi_server/simpypi.py",
+    "test_devpi_server/test_auth.py",
+    "test_devpi_server/test_authcheck.py",
+    "test_devpi_server/test_config.py",
+    "test_devpi_server/test_conftest.py",
+    "test_devpi_server/test_filestore.py",
+    "test_devpi_server/test_fileutil.py",
+    "test_devpi_server/test_fsck.py",
+    "test_devpi_server/test_genconfig.py",
+    "test_devpi_server/test_importexport.py",
+    "test_devpi_server/test_keyfs.py",
+    "test_devpi_server/test_keyfs_sqlite_fs.py",
+    "test_devpi_server/test_log.py",
+    "test_devpi_server/test_main.py",
+    "test_devpi_server/test_mirror.py",
+    "test_devpi_server/test_mirror_no_project_list.py",
+    "test_devpi_server/test_model.py",
+    "test_devpi_server/test_mythread.py",
+    "test_devpi_server/test_nginx.py",
+    "test_devpi_server/test_nginx_replica.py",
+    "test_devpi_server/test_permissions.py",
+    "test_devpi_server/test_replica.py",
+    "test_devpi_server/test_replica_functional.py",
+    "test_devpi_server/test_reqmock.py",
+    "test_devpi_server/test_stage_customizer.py",
+    "test_devpi_server/test_streaming.py",
+    "test_devpi_server/test_streaming_nginx.py",
+    "test_devpi_server/test_streaming_replica.py",
+    "test_devpi_server/test_streaming_replica_nginx.py",
+    "test_devpi_server/test_view_auth.py",
+    "test_devpi_server/test_views.py",
+    "test_devpi_server/test_views_patch.py",
+    "test_devpi_server/test_views_push_external.py",
+    "test_devpi_server/test_views_status.py",
+]
+
+
 [tool.ruff.lint]
 extend-ignore = [
     "A001", # cleanup later - variable name shadows builtin

{devpi-server-6.14.0 → devpi-server-6.15.0}/setup.py

@@ -59,7 +59,7 @@ if __name__ == "__main__":
         'Funding': 'https://github.com/sponsors/devpi',
         'Source Code': 'https://github.com/devpi/devpi'
       },
-      version='6.14.0',
+      version='6.15.0',
       maintainer="Florian Schulze",
       maintainer_email="mail@pyfidelity.com",
       packages=[

devpi-server-6.15.0/test_devpi_server/py.typed

@@ -0,0 +1 @@
+partial

{devpi-server-6.14.0 → devpi-server-6.15.0}/test_devpi_server/test_main.py

@@ -337,15 +337,23 @@ def test_init_server_directory(call_devpi_in_dir, tmpdir):
 
 
 def test_serve_threads(monkeypatch, tmpdir):
-    def check_threads(app, host, port, threads, max_request_body_size):
+    def check_threads(app, host, port, threads, connection_limit, max_request_body_size):
         assert threads == 100
     monkeypatch.setattr("waitress.serve", check_threads)
     from devpi_server.main import main
     main(["devpi-server", "--threads", "100"])
 
 
+def test_serve_connection_limit(monkeypatch, tmpdir):
+    def check_connection_limit(app, host, port, threads, connection_limit, max_request_body_size):
+        assert connection_limit == 200
+    monkeypatch.setattr("waitress.serve", check_connection_limit)
+    from devpi_server.main import main
+    main(["devpi-server", "--connection-limit", "200"])
+
+
 def test_serve_max_body(monkeypatch, tmpdir):
-    def check_max_body(app, host, port, threads, max_request_body_size):
+    def check_max_body(app, host, port, threads, connection_limit, max_request_body_size):
         assert max_request_body_size == 42
     monkeypatch.setattr("waitress.serve", check_max_body)
     from devpi_server.main import main

{devpi-server-6.14.0 → devpi-server-6.15.0}/test_devpi_server/test_model.py

@@ -1513,10 +1513,10 @@ class TestUsers:
         model.create_user("user2", password="password")
         model.create_user("user3", password="password")
         newusers = model.get_usernames().difference(baselist)
-        assert newusers == set("user1 user2 user3".split())
+        assert newusers == {"user1", "user2", "user3"}
         model.get_user("user3").delete()
         newusers = model.get_usernames().difference(baselist)
-        assert newusers == set("user1 user2".split())
+        assert newusers == {"user1", "user2"}
 
     def test_server_passwd(self, model, monkeypatch):
         monkeypatch.setattr(getpass, "getpass", lambda x: "123")

{devpi-server-6.14.0 → devpi-server-6.15.0}/test_devpi_server/test_view_auth.py

@@ -12,6 +12,8 @@ class TestCredentialPlugin:
     @pytest.fixture
     def plugin(self):
         class Plugin:
+            __name__ = 'TestCredentialPlugin'
+
             @hookimpl
             def devpiserver_get_credentials(self, request):  # noqa: ARG002
                 return self.results.pop()
@@ -25,18 +27,20 @@ class TestCredentialPlugin:
     def test_credential_plugin_no_credentials(self, blank_request, dsp, plugin):
         plugin.results = [None]
         request = blank_request()
-        assert dsp._get_credentials(request) is None
+        assert dsp._get_credentials(request) == (None, [])
 
     def test_credential_plugin_got_credentials(self, blank_request, dsp, plugin):
         plugin.results = [('foo', 'bar')]
         request = blank_request()
-        assert dsp._get_credentials(request) == ('foo', 'bar')
+        assert dsp._get_credentials(request) == (('foo', 'bar'), ['TestCredentialPlugin'])
 
 
 class TestCredentialPlugins:
     @pytest.fixture
     def plugin1(self):
         class Plugin:
+            __name__ = 'TestCredentialPlugin1'
+
             @hookimpl
             def devpiserver_get_credentials(self, request):  # noqa: ARG002
                 return self.results.pop()
@@ -45,6 +49,8 @@ class TestCredentialPlugins:
     @pytest.fixture
     def plugin2(self):
         class Plugin:
+            __name__ = 'TestCredentialPlugin2'
+
             @hookimpl
             def devpiserver_get_credentials(self, request):  # noqa: ARG002
                 return self.results.pop()
@@ -62,32 +68,36 @@ class TestCredentialPlugins:
         plugin1.results = [None]
         plugin2.results = [None]
         request = blank_request()
-        assert dsp._get_credentials(request) is None
+        assert dsp._get_credentials(request) == (None, [])
 
     def test_credential_plugins_got_one_credential(self, blank_request, dsp, plugin1, plugin2):
         plugin1.results = [('foo', 'bar')]
         plugin2.results = [None]
         request = blank_request()
-        assert dsp._get_credentials(request) == ('foo', 'bar')
+        assert dsp._get_credentials(request) == (('foo', 'bar'), ['TestCredentialPlugin1'])
 
     def test_credential_plugins_got_another_credential(self, blank_request, dsp, plugin1, plugin2):
         plugin1.results = [None]
         plugin2.results = [('foo', 'bar')]
         request = blank_request()
-        assert dsp._get_credentials(request) == ('foo', 'bar')
+        assert dsp._get_credentials(request) == (('foo', 'bar'), ['TestCredentialPlugin2'])
 
     def test_credential_plugins_got_two_credential(self, blank_request, dsp, plugin1, plugin2):
         plugin1.results = [('ham', 'egg')]
         plugin2.results = [('foo', 'bar')]
         request = blank_request()
         # one of them wins, depends on entry point order and is undefined
-        assert dsp._get_credentials(request) in [('ham', 'egg'), ('foo', 'bar')]
+        assert dsp._get_credentials(request) in [
+            (('ham', 'egg'), ['TestCredentialPlugin1']),
+            (('foo', 'bar'), ['TestCredentialPlugin2'])]
 
 
 class TestHeaderCredentialPlugin:
     @pytest.fixture
     def plugin(self):
         class Plugin:
+            __name__ = 'TestHeaderCredentialPlugin'
+
             @hookimpl
             def devpiserver_get_credentials(self, request):
                 if 'X-Devpi-User' in request.headers:
@@ -101,13 +111,13 @@ class TestHeaderCredentialPlugin:
     @pytest.mark.usefixtures("plugin")
     def test_credential_plugin_no_credentials(self, blank_request, dsp):
         request = blank_request()
-        assert dsp._get_credentials(request) is None
+        assert dsp._get_credentials(request) == (None, [])
 
     @pytest.mark.usefixtures("plugin")
     def test_credential_plugin_got_credentials(self, blank_request, dsp):
         request = blank_request()
         request.headers['X-Devpi-User'] = 'foo'
-        assert dsp._get_credentials(request) == ('foo', '')
+        assert dsp._get_credentials(request) == (('foo', ''), ['TestHeaderCredentialPlugin'])
 
 
 class TestDevpiSecurityPolicy:

{devpi-server-6.14.0 → devpi-server-6.15.0}/test_devpi_server/test_views.py

@@ -1980,7 +1980,7 @@ def test_delete_volatile_force(mapp, testapp):
 
 
 @pytest.mark.nomocking
-def test_mirror_use_external_urls(mapp, simpypi, testapp, xom):
+def test_mirror_use_external_urls(mapp, simpypi, testapp):
     indexconfig = dict(
         type="mirror",
         mirror_url=simpypi.simpleurl,
@@ -1989,18 +1989,18 @@ def test_mirror_use_external_urls(mapp, simpypi, testapp, xom):
         volatile=True)
     api = mapp.create_and_use(indexconfig=indexconfig)
     name = "pytest"
-    pkgver = "%s-2.6.zip" % name
+    pkgver = f"{name}-2.6.zip"
     simpypi.add_release(name, pkgver=pkgver)
-    simpypi.add_file('/%s/%s' % (name, pkgver), b'123')
-    r = testapp.get(api.index + '/+simple/%s' % name)
+    simpypi.add_file(f'/{name}/{pkgver}', b'123')
+    r = testapp.get(f'{api.index}/+simple/{name}')
     (link,) = sorted(
-        x.get('href').replace('../../', '/%s/' % api.stagename)
+        x.get('href').replace('../../', f'/{api.stagename}/')
         for x in getlinks(r.text))
     path = link[1:]
     assert '2.6' in path
     # we should get a redirect to the original URL
     r = testapp.xget(302, link, follow=False)
-    assert r.location == "%s/pytest/pytest-2.6.zip" % simpypi.baseurl
+    assert r.location == f"{simpypi.baseurl}/pytest/pytest-2.6.zip"
     with testapp.xom.keyfs.read_transaction():
         assert not getentry(testapp, path).file_exists()
     # now turn external urls off

{devpi-server-6.14.0 → devpi-server-6.15.0}/tox.ini

@@ -18,7 +18,7 @@ deps=
     webtest
     pytest
     pytest-asyncio
-    pytest-github-actions-annotate-failures
+    pytest-github-actions-annotate-failures!=0.3.0
     pytest-instafail
     pytest-timeout
     beautifulsoup4 != 4.12.1

devpi-server-6.14.0/devpi_server/__init__.py

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