Skip to content

Remove old dependencies #984

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -39,8 +39,6 @@ parse_xsd2 = "saml2.tools.parse_xsd2:main"
python = "^3.9"
cryptography = ">=3.1"
defusedxml = "*"
importlib-metadata = {version = ">=1.7.0", python = "<3.8"}
importlib-resources = {python = "<3.9", version = "*"}
paste = {optional = true, version = "*"}
pyopenssl = "<24.3.0"
python-dateutil = "*"
Expand Down
16 changes: 3 additions & 13 deletions src/saml2/sigver.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,31 +4,21 @@

import base64
import datetime
from importlib.resources import files as _resource_files
import hashlib
import itertools
import logging
import os
import re
from subprocess import PIPE
from subprocess import Popen
import sys
from tempfile import NamedTemporaryFile
from time import mktime
from uuid import uuid4 as gen_random_key

import dateutil


# importlib.resources was introduced in python 3.7
# files API from importlib.resources introduced in python 3.9
if sys.version_info[:2] >= (3, 9):
from importlib.resources import files as _resource_files
else:
from importlib_resources import files as _resource_files

from urllib import parse
from uuid import uuid4 as gen_random_key

from OpenSSL import crypto
import dateutil
import pytz

from saml2 import ExtensionElement
Expand Down
5 changes: 1 addition & 4 deletions src/saml2/version.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,4 @@
try:
from importlib.metadata import version as _resolve_package_version
except ImportError:
from importlib_metadata import version as _resolve_package_version # type: ignore[no-redef]
from importlib.metadata import version as _resolve_package_version


def _parse_version():
Expand Down
10 changes: 1 addition & 9 deletions src/saml2/xml/schema/__init__.py
Original file line number Diff line number Diff line change
@@ -1,12 +1,4 @@
import sys


# importlib.resources was introduced in python 3.7
# files API from importlib.resources introduced in python 3.9
if sys.version_info[:2] >= (3, 9):
from importlib.resources import files as _resource_files
else:
from importlib_resources import files as _resource_files
from importlib.resources import files as _resource_files

from xmlschema import XMLSchema as _XMLSchema
from xmlschema.exceptions import XMLSchemaException as _XMLSchemaException
Expand Down