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

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

@@ -2,6 +2,37 @@
 
 .. 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)
+===================
+
+Features
+--------
+
+- Allow pushing of versions which only have documentation and no releases.
+
+- Allow pushing of release files only with no documentation. Requires devpi-client 7.2.0.
+
+- Allow pushing of documentation only with no release files. Requires devpi-client 7.2.0.
+
+
+
+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)
 ===================
 

{devpi-server-6.13.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.13.0 → devpi-server-6.15.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: devpi-server
-Version: 6.13.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,37 @@ 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)
+===================
+
+Features
+--------
+
+- Allow pushing of versions which only have documentation and no releases.
+
+- Allow pushing of release files only with no documentation. Requires devpi-client 7.2.0.
+
+- Allow pushing of documentation only with no release files. Requires devpi-client 7.2.0.
+
+
+
+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)
 ===================
 
@@ -172,45 +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.
-
-
-
-6.10.0 (2023-12-19)
-===================
-
-Features
---------
-
-- Use ``Authorization`` header instead of adding username/password to URL when fetching from mirror.
-
-- Fix #998: Use the pure Python httpx library instead of aiohttp to prevent delays in supporting newest Python releases.
-
-
-
-Bug Fixes
----------
-
-- Fix #996: support hashes other than sha256 in application/vnd.pypi.simple.v1+json responses.
-
-- Only compare hostname instead of full URL prefix when parsing mirror packages to fix mirrors with basic authentication and absolute URLs. See #1006
-
-

devpi-server-6.15.0/devpi_server/__init__.py

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

{devpi-server-6.13.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.13.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.13.0 → devpi-server-6.15.0}/devpi_server/main.py

@@ -365,9 +365,12 @@ class XOM:
 
     @cached_property
     def supported_features(self):
-        results = set((
+        results = {
+            'push-no-docs',
+            'push-only-docs',
+            'push-register-project',
             'server-keyvalue-parsing',
-        ))
+        }
         for features in self.config.hook.devpiserver_get_features():
             results.update(features)
         return tuple(sorted(results))

{devpi-server-6.13.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.13.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.13.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.13.0 → devpi-server-6.15.0}/devpi_server/views.py

@@ -10,6 +10,7 @@ from devpi_common.url import URL
 from devpi_common.metadata import get_pyversion_filetype
 import devpi_server
 from html import escape
+from http import HTTPStatus
 from lazy import lazy
 from operator import attrgetter
 from pluggy import HookimplMarker
@@ -141,7 +142,7 @@ class HTTPResponse(HTTPSuccessful):
         Exception.__init__(self)
 
 
-def apireturn(code, message=None, result=None, type=None):
+def apiresult(code, message=None, result=None, type=None):  # noqa: A002
     d = dict()
     if result is not None:
         assert type is not None
@@ -151,7 +152,11 @@ def apireturn(code, message=None, result=None, type=None):
         d["message"] = message
     data = json.dumps(d, indent=2) + "\n"
     headers = {"content-type": "application/json"}
-    raise HTTPResponse(body=data, status=code, headers=headers)
+    return HTTPResponse(body=data, status=code, headers=headers)
+
+
+def apireturn(code, message=None, result=None, type=None):  # noqa: A002
+    raise apiresult(code, message=message, result=result, type=type)
 
 
 def json_preferred(request):
@@ -1007,8 +1012,8 @@ class PyPIView:
         stage = self.context.stage
         pushdata = getjson(request)
         try:
-            name = pushdata["name"]
-            version = pushdata["version"]
+            name = pushdata.pop("name")
+            version = pushdata.pop("version")
         except KeyError:
             apireturn(400, message="no name/version specified in json")
 
@@ -1018,14 +1023,21 @@ class PyPIView:
         except stage.MissesRegistration:
             apireturn(400, "there are no files for %s-%s on stage %s" % (
                 name, version, stage.name))
+        rels = {'releasefile', 'doczip', 'toxresult'}
+        no_docs = pushdata.pop("no_docs", False)
+        only_docs = pushdata.pop("only_docs", False)
+        if no_docs and only_docs:
+            return apiresult(400, "can't use 'no_docs' and 'only_docs' together")
+        if no_docs:
+            rels.remove('doczip')
+        elif only_docs:
+            rels = {'doczip'}
         links = {
             rel: sorted(linkstore.get_links(rel=rel), key=attrgetter('basename'))
-            for rel in ('releasefile', 'doczip', 'toxresult')}
-        if not links["releasefile"]:
-            self.log.info("%s: no release files for version %s-%s" %
-                          (stage.name, name, version))
-            apireturn(404, message="no release/files found for %s-%s" % (
-                name, version))
+            for rel in rels}
+        if not any(links.values()):
+            self.log.info("%s: no files for version %s %s", stage.name, name, version)
+            apireturn(404, f"no release/files found for {name} {version}")
 
         if not request.has_permission("pkg_read"):
             abort(request, 403, "package read forbidden")
@@ -1033,8 +1045,11 @@ class PyPIView:
         metadata = linkstore.metadata
 
         results = []
-        targetindex = pushdata.get("targetindex", None)
+        targetindex = pushdata.pop("targetindex", None)
         if targetindex is not None:  # in-server push
+            if pushdata:
+                keys = ', '.join(sorted(pushdata.keys()))
+                return apiresult(400, f"unknown additional options: {keys}")
             parts = targetindex.split("/")
             if len(parts) != 2:
                 apireturn(400, message="targetindex not in format user/index")
@@ -1057,6 +1072,7 @@ class PyPIView:
                 return apireturn(502, e.args[0])
             apireturn(200, result=results, type="actionlog")
         else:
+            register_project = pushdata.pop("register_project", False)
             posturl = pushdata["posturl"]
             username = pushdata["username"]
             password = pushdata["password"]
@@ -1064,22 +1080,25 @@ class PyPIView:
             # prepare metadata for submission
             metadata[":action"] = "submit"
             metadata["metadata_version"] = "2.1"
-            self.log.info("registering %s-%s to %s", name, version, posturl)
             session = new_requests_session(agent=("server", server_version))
             with contextlib.closing(session):
-                try:
-                    r = session.post(posturl, data=metadata, auth=pypiauth)
-                    r.close()
-                except Exception as e:
-                    exc_msg = ''.join(traceback.format_exception_only(e.__class__, e))
-                    results.append((-1, "exception on register:", exc_msg))
-                    apireturn(502, result=results, type="actionlog")
-                self.log.debug("register returned: %s", r.status_code)
-                results.append((r.status_code, "register", name, version))
-                ok_codes = (200, 201, 410)
-                proceed = (r.status_code in ok_codes)
+                ok_codes = {HTTPStatus.OK, HTTPStatus.CREATED}
+                if register_project:
+                    self.log.info("registering %s-%s to %s", name, version, posturl)
+                    try:
+                        r = session.post(posturl, data=metadata, auth=pypiauth)
+                        r.close()
+                    except Exception as e:  # noqa: BLE001
+                        exc_msg = ''.join(traceback.format_exception_only(e.__class__, e))
+                        results.append((-1, "exception on register:", exc_msg))
+                        apireturn(502, result=results, type="actionlog")
+                    self.log.debug("register returned: %s", r.status_code)
+                    results.append((r.status_code, "register", name, version))
+                    proceed = (r.status_code in ok_codes | {HTTPStatus.GONE})
+                else:
+                    proceed = True
                 if proceed:
-                    for link in links["releasefile"]:
+                    for link in links.get("releasefile", ()):
                         entry = link.entry
                         file_metadata = metadata.copy()
                         file_metadata[":action"] = "file_upload"
@@ -1106,7 +1125,7 @@ class PyPIView:
                             results.append((
                                 r.status_code, "upload", entry.relpath, text))
                             r.close()
-                    if links["doczip"]:
+                    if links.get("doczip", ()):
                         doc_metadata = metadata.copy()
                         doc_metadata[":action"] = "doc_upload"
                         doczip = links["doczip"][0].entry.file_get_content()
@@ -1128,7 +1147,7 @@ class PyPIView:
 
     def _push_links(self, links, target_stage, name, version):
         stage = self.context.stage
-        for link in links["releasefile"]:
+        for link in links.get("releasefile", ()):
             entry = link.entry
             logs = link.get_logs()
             del link
@@ -1170,7 +1189,7 @@ class PyPIView:
                         src=self.context.stage.name,
                         dst=target_stage.name)
                     yield (200, "store_toxresult", tlink.entrypath)
-        for link in links["doczip"]:
+        for link in links.get("doczip", ()):
             with link.entry.file_open_read() as doczip:
                 new_link = target_stage.store_doczip(
                     name, version, doczip, hashes=link.entry.hashes)

{devpi-server-6.13.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.13.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,37 @@ 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)
+===================
+
+Features
+--------
+
+- Allow pushing of versions which only have documentation and no releases.
+
+- Allow pushing of release files only with no documentation. Requires devpi-client 7.2.0.
+
+- Allow pushing of documentation only with no release files. Requires devpi-client 7.2.0.
+
+
+
+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)
 ===================
 
@@ -172,45 +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.
-
-
-
-6.10.0 (2023-12-19)
-===================
-
-Features
---------
-
-- Use ``Authorization`` header instead of adding username/password to URL when fetching from mirror.
-
-- Fix #998: Use the pure Python httpx library instead of aiohttp to prevent delays in supporting newest Python releases.
-
-
-
-Bug Fixes
----------
-
-- Fix #996: support hashes other than sha256 in application/vnd.pypi.simple.v1+json responses.
-
-- Only compare hostname instead of full URL prefix when parsing mirror packages to fix mirrors with basic authentication and absolute URLs. See #1006
-
-

{devpi-server-6.13.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.13.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.13.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.13.0',
+      version='6.15.0',
       maintainer="Florian Schulze",
       maintainer_email="mail@pyfidelity.com",
       packages=[