Merge pull request #17 from HENNGE/wider-deps

allow wider dependencies

.pre-commit-config.yaml

@@ -1,26 +1,17 @@
 repos:
--   repo: https://github.com/ambv/black
-    rev: 19.10b0
+-   repo: git://github.com/psf/black
+    rev: 21.9b0
     hooks:
     - id: black
-      args: [--line-length=88, --safe]
-      language: python_venv
-      language_version: python3
--   repo: https://github.com/timothycrosley/isort
-    rev: 5.1.0
+-   repo: https://github.com/pycqa/isort
+    rev: 5.9.3
     hooks:
-    - id: isort
-      language: python_venv
-      language_version: python3
-      additional_dependencies:
-        - toml
-      exclude: README.md
--   repo: https://github.com/pre-commit/mirrors-mypy
-    rev: 'v0.782'
+      - id: isort
+-   repo: local
     hooks:
     -   id: mypy
-        args: [--config-file=mypy.ini]
-        additional_dependencies:
-          - 'minisignxml>=20.11b0'
-          - 'yarl'
-        exclude: tests|examples
+        name: mypy
+        entry: poetry run mypy src
+        language: system
+        types: [python]
+        pass_filenames: false

pyproject.toml

@@ -1,46 +1,51 @@
 [tool.poetry]
 name = "minisaml"
-version = "20.11b0"
+version = "21.10"
 description = "Minimal SAML2 client"
 authors = ["Jonas Obrist <jonas.obrist@hennge.com>"]
 license = "Apache-2.0"
 readme = "README.md"
 homepage = "https://github.com/HENNGE/minisaml"
 repository = "https://github.com/HENNGE/minisaml"
+documentation = "https://minisaml.readthedocs.io"
 classifiers = [
-    "Development Status :: 4 - Beta",
+    "Development Status :: 5 - Production/Stable",
     "Intended Audience :: Developers",
     "License :: OSI Approved :: Apache Software License",
+    "Programming Language :: Python :: 3.10",
+    "Programming Language :: Python :: 3.9",
+    "Programming Language :: Python :: 3.8",
+    "Programming Language :: Python :: 3.7",
     "Programming Language :: Python :: 3 :: Only",
     "Typing :: Typed"
 ]
 
 [tool.poetry.dependencies]
 python = "^3.7"
-minisignxml = { version = "^20.11b0", allow-prereleases = true }
-lxml = "^4.4.1"
-yarl = "^1.4.2"
+minisignxml = ">=20.0"
+lxml = ">=4.4.1"
+yarl = ">=1.4.2"
 sphinx = { version = "^3.2.0", optional = true }
 sphinxcontrib-mermaid = { version = "^0.4.0", optional = true }
 
 [tool.poetry.extras]
 docs = ["sphinx", "sphinxcontrib-mermaid"]
 
 [tool.poetry.dev-dependencies]
+pytest = ">=5.2"
 pytest-freezegun = "^0.4.2"
-isort = "^5.1.0"
-black = "^19.10b0"
-cryptography = "^2.8"
-flask = "^1.1.2"
-mypy = "^0.782"
+isort = ">=5.8.0"
+black = ">=21.9b0"
+cryptography = ">=2.8"
+cffi = ">=1.14.0"
+flask = ">=1.1.2"
+mypy = ">=0.782"
 
 [tool.isort]
 line_length = "88"
 multi_line_output = "3"
 combine_as_imports = "1"
 include_trailing_comma = "True"
-known_third_party = "cryptography,lxml,pytest,defusedxml"
-skip = "README.md"
 
 [build-system]
 requires = ["poetry>=0.12"]

src/minisaml/response.py

@@ -138,5 +138,8 @@ def gather_attributes(attribute_statement: Element) -> Iterable[Attribute]:
         name = extra_attributes.pop("Name")
         format = extra_attributes.pop("NameFormat", None)
         yield Attribute(
-            name=name, values=values, format=format, extra_attributes=extra_attributes,
+            name=name,
+            values=values,
+            format=format,
+            extra_attributes=extra_attributes,
         )