From 1cfa14d8d2666bbff7cd0e3c52ea67c79a5aa537 Mon Sep 17 00:00:00 2001
From: Jay Lee <jay0lee@gmail.com>
Date: Wed, 12 Apr 2023 14:38:24 +0000
Subject: [PATCH] only copy metadata for imports that exist

---
 src/gam.spec        | 4 +++-
 src/gam/__init__.py | 5 +----
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/src/gam.spec b/src/gam.spec
index 615e8739..7c857bc3 100644
--- a/src/gam.spec
+++ b/src/gam.spec
@@ -1,4 +1,5 @@
 # -*- mode: python ; coding: utf-8 -*-
+from importlib.util import find_spec
 from os import getenv
 from re import search
 from sys import platform
@@ -11,7 +12,8 @@ with open('requirements.txt', 'r') as reqs:
     for req in reqs:
         r = search('^[a-z,A-Z,0-9-_]*', req)
         pkg = r.group(0) if r else ''
-        extra_files += copy_metadata(pkg, recursive=True)
+        if find_spec(pkg):
+            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', '.')]
diff --git a/src/gam/__init__.py b/src/gam/__init__.py
index bad9b9b0..c981aeae 100755
--- a/src/gam/__init__.py
+++ b/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