pyFF 2.1.6__tar.gz → 3.0.0__tar.gz

{pyff-2.1.6 → pyff-3.0.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: pyFF
-Version: 2.1.6
+Version: 3.0.0
 Summary: Federation Feeder
 Author: Leif Johansson, Fredrik Thulin, Enrique Pérez Arnaud, Mikael Frykholm
 Author-email: Leif Johansson <leifj@sunet.se>, Fredrik Thulin <redrik@thulin.net>, Mikael Frykholm <mifr@sunet.se>
@@ -31,33 +31,31 @@ License: Copyright 2016 SUNET. All rights reserved.
          authors and should not be interpreted as representing official policies, either expressed
          or implied, of SUNET.
 Requires-Dist: accept-types>=0.4.1
-Requires-Dist: apscheduler==3.6.3
+Requires-Dist: apscheduler>=3.11.3
 Requires-Dist: cachetools>=5.5.2
-Requires-Dist: eval-type-backport>=0.2.2 ; python_full_version == '3.9.*'
-Requires-Dist: gunicorn==25.0.3 ; python_full_version >= '3.10'
-Requires-Dist: gunicorn>=23.0.0
-Requires-Dist: lxml>=4.1.1
+Requires-Dist: cryptography>=42
+Requires-Dist: gunicorn>=25.2.0
 Requires-Dist: mako>=1.3.10
-Requires-Dist: pyconfig>=3.2.3,<3.3.0
+Requires-Dist: pyconfig>=3.3.0
 Requires-Dist: pydantic>=2.8
-Requires-Dist: pyramid>=2.0.2
+Requires-Dist: pyramid>=2.1
 Requires-Dist: pytz>=2025.2
-Requires-Dist: pyxmlsecurity>=1.0.0
+Requires-Dist: pyuppsala>=0.13.0
+Requires-Dist: pybergshamra>=0.11.0
 Requires-Dist: pyyaml>=3.10
 Requires-Dist: redis>=5.3.0
 Requires-Dist: redis-collections>=0.13.0
 Requires-Dist: requests>=2.32.3
 Requires-Dist: requests-cache==1.2.1
 Requires-Dist: requests-file==2.1.0
-Requires-Dist: setuptools>=78.1.1,<81
-Requires-Dist: sphinx-rtd-theme>=3.1.0
 Requires-Dist: str2bool>=1.1
 Requires-Dist: whoosh>=2.7.4
 Requires-Dist: wsgi-intercept>=1.13.1
 Requires-Dist: xmldiff>=2.7.0
+Requires-Dist: sphinx-rtd-theme>=3.1.0
 Maintainer: Mikael Frykholm
 Maintainer-email: Mikael Frykholm <mifr@sunet.se>
-Requires-Python: >=3.10
+Requires-Python: >=3.11
 Description-Content-Type: text/x-rst
 
 python SAML metadata aggregator
@@ -103,11 +101,13 @@ Features
 Dependencies
 ============
 
-* pyXMLSecurity
-* PyKCS11 (optional)
+* pybergshamra >= 0.11.0 (XML signatures and PKCS#11 support)
+* pyuppsala >= 0.11.0 (XML processing)
 * pygments
 * gunicorn (for the standalone pyffd server)
-* ... cf requirements.txt
+* ... cf pyproject.toml
+
+``uv sync`` installs pybergshamra from PyPI; no sibling checkout is required.
 
 More information
 ================

{pyff-2.1.6 → pyff-3.0.0}/README.rst

@@ -41,11 +41,13 @@ Features
 Dependencies
 ============
 
-* pyXMLSecurity
-* PyKCS11 (optional)
+* pybergshamra >= 0.11.0 (XML signatures and PKCS#11 support)
+* pyuppsala >= 0.11.0 (XML processing)
 * pygments
 * gunicorn (for the standalone pyffd server)
-* ... cf requirements.txt
+* ... cf pyproject.toml
+
+``uv sync`` installs pybergshamra from PyPI; no sibling checkout is required.
 
 More information
 ================

{pyff-2.1.6 → pyff-3.0.0}/pyproject.toml

@@ -1,35 +1,33 @@
 [project]
 name = "pyFF"
-version = "2.1.6"
+version = "3.0.0"
 readme = "README.rst"
 description = "Federation Feeder"
-requires-python = ">=3.10"
+requires-python = ">=3.11"
 dependencies = [
     "accept-types>=0.4.1",
-    "apscheduler==3.6.3",
+    "apscheduler>=3.11.3",
     "cachetools>=5.5.2",
-    "eval-type-backport>=0.2.2 ; python_full_version == '3.9.*'",
-    "gunicorn==25.0.3 ; python_full_version >= '3.10'",
-    "gunicorn>=23.0.0",
-    "lxml>=4.1.1",
+    "cryptography>=42",
+    "gunicorn>=25.2.0",
     "mako>=1.3.10",
-    "pyconfig>=3.2.3,<3.3.0",
+    "pyconfig>=3.3.0",
     "pydantic>=2.8",
-    "pyramid>=2.0.2",
+    "pyramid>=2.1",
     "pytz>=2025.2",
-    "pyxmlsecurity>=1.0.0",
+    "pyuppsala>=0.13.0",
+    "pybergshamra>=0.11.0",
     "pyyaml>=3.10",
     "redis>=5.3.0",
     "redis-collections>=0.13.0",
     "requests>=2.32.3",
     "requests-cache==1.2.1",
     "requests-file==2.1.0",
-    "setuptools>=78.1.1,<81",
-    "sphinx-rtd-theme>=3.1.0",
     "str2bool>=1.1",
     "whoosh>=2.7.4",
     "wsgi-intercept>=1.13.1",
     "xmldiff>=2.7.0",
+    "sphinx-rtd-theme>=3.1.0",
 ]
 
 [project.license]

{pyff-2.1.6 → pyff-3.0.0}/pyproject.toml.orig

@@ -1,9 +1,9 @@
 [project]
 name = "pyFF"
-version = "2.1.6"
+version = "3.0.0"
 readme = "README.rst"
 description = "Federation Feeder"
-requires-python = ">=3.10"
+requires-python = ">=3.11"
 license = {file = "LICENSE"}
 
 authors = [
@@ -17,30 +17,28 @@ maintainers = [
 ]
 dependencies = [
     "accept-types>=0.4.1",
-    "apscheduler==3.6.3",
+    "apscheduler>=3.11.3",
     "cachetools>=5.5.2",
-    "eval-type-backport>=0.2.2 ; python_full_version == '3.9.*'",
-    "gunicorn==25.0.3 ; python_full_version >= '3.10'",
-    "gunicorn>=23.0.0",
-    "lxml>=4.1.1",
+    "cryptography>=42",
+    "gunicorn>=25.2.0",
     "mako>=1.3.10",
-    "pyconfig>=3.2.3,<3.3.0",
+    "pyconfig>=3.3.0",
     "pydantic>=2.8",
-    "pyramid>=2.0.2",
+    "pyramid>=2.1",
     "pytz>=2025.2",
-    "pyxmlsecurity>=1.0.0",
+    "pyuppsala>=0.13.0",
+    "pybergshamra>=0.11.0",
     "pyyaml>=3.10",
     "redis>=5.3.0",
     "redis-collections>=0.13.0",
     "requests>=2.32.3",
     "requests-cache==1.2.1",
     "requests-file==2.1.0",
-    "setuptools>=78.1.1,<81",
-    "sphinx-rtd-theme>=3.1.0",
     "str2bool>=1.1",
     "whoosh>=2.7.4",
     "wsgi-intercept>=1.13.1",
     "xmldiff>=2.7.0",
+    "sphinx-rtd-theme>=3.1.0",
 ]
 
 [dependency-groups]

{pyff-2.1.6 → pyff-3.0.0}/src/pyff/api.py

@@ -4,18 +4,18 @@ from collections.abc import Generator, Iterable, Mapping
 from datetime import datetime, timedelta
 from json import dumps
 from typing import Any, Optional
-from urllib.parse import quote_plus
+from urllib.parse import quote
 
 import pyramid.httpexceptions as exc
 import pytz
 import requests
 from accept_types import AcceptableType
 from cachetools import TTLCache
-from lxml import etree
 from pyramid.config import Configurator
 from pyramid.events import NewRequest
 from pyramid.request import Request
 from pyramid.response import Response
+from pyuppsala import etree
 
 from pyff import __version__
 from pyff.constants import config
@@ -395,7 +395,7 @@ def webfinger_handler(request: Request) -> Response:
     aliases = request.registry.aliases
     for a in aliases.keys():
         for v in request.registry.md.store.attribute(aliases[a]):
-            _links(f'{a}/{quote_plus(v)}')
+            _links(f"{a}/{quote(v, safe='')}")
 
     response = Response(dumps(jrd, default=json_serializer))
     response.headers['Content-Type'] = 'application/json'
@@ -467,7 +467,7 @@ def search_handler(request: Request) -> Response:
         for e in entities:
             if in_loop:
                 yield b','
-            yield dumps(e)
+            yield dumps(e).encode('utf-8')
             in_loop = True
         yield b']'