diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 946aa705..2a1ec9da 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -449,7 +449,7 @@ jobs: "$PYTHON" get-pip.py "$PYTHON" -m pip install --upgrade pip "$PYTHON" -m pip install --upgrade wheel - "$PYTHON" -m pip install setuptools==80.8.0 + "$PYTHON" -m pip install setuptools "$PYTHON" -m pip install --upgrade importlib-metadata "$PYTHON" -m pip install --upgrade setuptools-scm "$PYTHON" -m pip list diff --git a/pyproject.toml b/pyproject.toml index 359c782c..0e5d32e0 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -21,8 +21,8 @@ dependencies = [ "lxml>=5.4.0", "passlib>=1.7.4", "pathvalidate>=3.2.3", - "pyscard==2.2.1", "python-dateutil", + "yubikey-manager>=5.6.1", ] description = "CLI tool to manage Google Workspace" readme = "README.md" diff --git a/src/gam.spec b/src/gam.spec index 58080eff..8a928e85 100644 --- a/src/gam.spec +++ b/src/gam.spec @@ -38,6 +38,10 @@ hiddenimports = [ 'gam.gamlib.yubikey', ] +excludes = [ + 'pkg_resources', +] + runtime_hooks = [] a = Analysis( ['gam/__main__.py'], @@ -48,7 +52,7 @@ a = Analysis( hookspath=[], hooksconfig={}, runtime_hooks=runtime_hooks, - excludes=[], + excludes=excludes, win_no_prefer_redirects=False, win_private_assemblies=False, cipher=None, diff --git a/src/requirements.txt b/src/requirements.txt index f51f9bc1..7162c77e 100644 --- a/src/requirements.txt +++ b/src/requirements.txt @@ -10,6 +10,5 @@ httplib2>=0.22.0 lxml>=5.4.0 passlib>=1.7.4 pathvalidate>=3.2.3 -pyscard==2.2.1 python-dateutil yubikey-manager>=5.6.1 diff --git a/src/setup.cfg b/src/setup.cfg index 57a4c1ad..9ffad2bd 100644 --- a/src/setup.cfg +++ b/src/setup.cfg @@ -37,7 +37,6 @@ install_requires = lxml >= 5.4.0 passlib >= 1.7.4 pathvalidate >= 3.2.3 - pyscard == 2.2.1 python-dateutil yubikey-manager >= 5.6.1