Update gam.spec

.github/workflows/build.yml

@@ -467,6 +467,8 @@ jobs:
           git clone https://github.com/pyinstaller/pyinstaller.git
           cd pyinstaller
           export latest_release=$(git tag --list | grep -v dev | grep -v rc | sort -Vr | head -n1)
+          # temp pin to 5.9
+          export latest_release="v5.9.0"
           git checkout "${latest_release}"
           # remove pre-compiled bootloaders so we fail if bootloader compile fails
           rm -rvf PyInstaller/bootloader/*-*/*

src/gam.spec

@@ -1,12 +1,15 @@
 # -*- mode: python ; coding: utf-8 -*-
 from os import getenv
+from re import search
 from sys import platform
 
 from PyInstaller.utils.hooks import copy_metadata
 
+from gam.var import GAM_VER_LIBS
 
 extra_files = []
-extra_files += copy_metadata('google-api-python-client')
+for pkg in GAM_VER_LIBS:
+    extra_files += copy_metadata(pkg, recursive=True)
 extra_files += [('cbcm-v1.1beta1.json', '.')]
 extra_files += [('contactdelegation-v1.json', '.')]
 extra_files += [('admin-directory_v1.1beta1.json', '.')]

src/gam/__init__.py

@@ -6,10 +6,7 @@ import configparser
 import csv
 import datetime
 from email import message_from_string
-try:
-    from importlib.metadata import version as lib_version
-except ImportError:
-    from importlib_metadata import version as lib_version
+from importlib.metadata import version as lib_version
 import io
 import json
 import mimetypes
@@ -887,20 +884,11 @@ def doGAMVersion(checkForArgs=True):
         doGAMCheckForUpdates(forceCheck)
     if extended:
         print(ssl.OPENSSL_VERSION)
-        libs = ['cryptography',
-                'filelock',
-                'google-auth-httplib2',
-                'google-auth-oauthlib',
-                'google-auth',
-                'httplib2',
-                'passlib',
-                'python-dateutil',
-                'yubikey-manager',
-                ]
-        for lib in libs:
+        for lib in GAM_VER_LIBS:
             try:
                 print(f'{lib} {lib_version(lib)}')
-            except:
+            except Exception as e:
+                print(e)
                 pass
         tls_ver, cipher_name, used_ip = _getServerTLSUsed(testLocation)
         print(

src/gam/transport.py

@@ -10,7 +10,7 @@ from gam.var import GC_TLS_MIN_VERSION
 from gam.var import GC_Values
 
 # Bump default retries
-#httplib2.RETRIES = 5
+httplib2.RETRIES = 5
 
 def create_http(cache=None,
                 timeout=None,

src/gam/var.py

@@ -17,6 +17,18 @@ GAM_INFO = (
     f'Python {platform.python_version()} {sys.version_info.releaselevel} / '
     f'{platform.platform()} {platform.machine()}')
 
+# Packages we want version info available
+# for "gam version extended"
+GAM_VER_LIBS = ['cryptography',
+                'filelock',
+                'google-auth-httplib2',
+                'google-auth-oauthlib',
+                'google-auth',
+                'httplib2',
+                'passlib',
+                'python-dateutil',
+                'yubikey-manager',
+                ]
 GAM_RELEASES = 'https://github.com/GAM-team/GAM/releases'
 GAM_WIKI = 'https://github.com/GAM-team/GAM/wiki'
 GAM_ALL_RELEASES = 'https://api.github.com/repos/GAM-team/GAM/releases'