Skip to content
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
15 changes: 12 additions & 3 deletions CyberSource/api_client.py
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,13 @@
import mimetypes
import tempfile
import threading
import pkg_resources
# Use stdlib importlib.metadata instead of pkg_resources: pkg_resources was
# removed in setuptools 82, and it was the only thing pulling setuptools in at
# runtime, so setuptools is no longer a runtime dependency.
try:
from importlib.metadata import version, PackageNotFoundError
except ImportError: # Python < 3.8
from importlib_metadata import version, PackageNotFoundError

from datetime import date, datetime

Expand Down Expand Up @@ -105,8 +111,11 @@ def set_default_header(self, header_name, header_value):
self.default_headers[header_name] = header_value

def get_client_id(self):
version = pkg_resources.require("cybersource-rest-client-python")[0].version
return "cybs-rest-sdk-python-" + version
try:
sdk_version = version("cybersource-rest-client-python")
except PackageNotFoundError:
sdk_version = "unknown"
return "cybs-rest-sdk-python-" + sdk_version

def remove_first_underscore(self, dict_obj):
converted_dict_obj = {}
Expand Down
15 changes: 12 additions & 3 deletions generator/cybersource-python-template/api_client.mustache
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,13 @@ import json
import mimetypes
import tempfile
import threading
import pkg_resources
# Use stdlib importlib.metadata instead of pkg_resources: pkg_resources was
# removed in setuptools 82, and it was the only thing pulling setuptools in at
# runtime, so setuptools is no longer a runtime dependency.
try:
from importlib.metadata import version, PackageNotFoundError
except ImportError: # Python < 3.8
from importlib_metadata import version, PackageNotFoundError

from datetime import date, datetime

Expand Down Expand Up @@ -97,8 +103,11 @@ class ApiClient(object):
self.default_headers[header_name] = header_value

def get_client_id(self):
version = pkg_resources.require("cybersource-rest-client-python")[0].version
return "cybs-rest-sdk-python-" + version
try:
sdk_version = version("cybersource-rest-client-python")
except PackageNotFoundError:
sdk_version = "unknown"
return "cybs-rest-sdk-python-" + sdk_version

def remove_first_underscore(self, dict_obj):
converted_dict_obj = {}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@ certifi
pycryptodome
PyJWT
DateTime
setuptools
six
urllib3-future
jwcrypto
cryptography
importlib_metadata; python_version < "3.8"
2 changes: 1 addition & 1 deletion requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@ certifi
pycryptodome
PyJWT
DateTime
setuptools
six
urllib3-future
jwcrypto
cryptography
importlib_metadata; python_version < "3.8"
4 changes: 2 additions & 2 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -23,13 +23,13 @@
"certifi",
"pycryptodome",
"DateTime",
"setuptools<=81.0.0",
"six",
"urllib3-future",
"jwcrypto",
"cryptography",
"pgpy",
"standard-imghdr; python_version >= '3.13'"
"standard-imghdr; python_version >= '3.13'",
"importlib_metadata; python_version < '3.8'"
],
packages=find_packages(),
include_package_data=True,
Expand Down