From a70e31742fee6bcf21fcbe665be9d40857aeda73 Mon Sep 17 00:00:00 2001 From: Douglas Long Date: Sat, 13 Nov 2021 12:30:33 -0700 Subject: [PATCH 1/6] switch to suds-community and removed wsgiref and distribute as both are part of the standard lib now. --- requirements.txt | 5 +---- setup.py | 4 ++-- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/requirements.txt b/requirements.txt index 1b11c7a..2010471 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,6 +1,3 @@ PyJWT>=1.5.3 -distribute==0.7.3 requests>=2.18.4 -suds-jurko==0.6 -wsgiref==0.1.2 - +suds-community>=0.7 diff --git a/setup.py b/setup.py index 8fd47cd..354aca7 100644 --- a/setup.py +++ b/setup.py @@ -17,7 +17,7 @@ install_requires=[ 'pyjwt>=1.5.3', 'requests>=2.18.4', - 'suds-jurko==0.6', + 'suds-community>=0.7', ], classifiers=[ 'Development Status :: 4 - Beta', @@ -25,6 +25,6 @@ 'License :: OSI Approved :: MIT License', 'Operating System :: OS Independent', 'Topic :: Software Development :: Libraries', - 'Programming Language :: Python :: 3.3', + 'Programming Language :: Python :: 3.7', ], ) \ No newline at end of file From e420af594cffffbd2511e869fad594f35947f8f2 Mon Sep 17 00:00:00 2001 From: Douglas Long Date: Sat, 13 Nov 2021 13:13:36 -0700 Subject: [PATCH 2/6] set minimum python version in setup.py --- setup.py | 1 + 1 file changed, 1 insertion(+) diff --git a/setup.py b/setup.py index 354aca7..57e5df4 100644 --- a/setup.py +++ b/setup.py @@ -11,6 +11,7 @@ long_description_content_type="text/markdown", author='ExactTarget', py_modules=['ET_Client'], + python_requires='>=3', packages=['FuelSDK'], url='https://github.com/salesforce-marketingcloud/FuelSDK-Python', license='MIT', From ed39548da9dad1346bea77b627c82fc47248fb12 Mon Sep 17 00:00:00 2001 From: Douglas Long Date: Sat, 13 Nov 2021 13:13:56 -0700 Subject: [PATCH 3/6] update version number to 1.3.1 --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index 57e5df4..336b4ff 100644 --- a/setup.py +++ b/setup.py @@ -4,7 +4,7 @@ readme = f.read() setup( - version='1.3.0', + version='1.3.1', name='Salesforce-FuelSDK', description='Salesforce Marketing Cloud Fuel SDK for Python', long_description=readme, From c4132c150a2ba43d07d8c2e8741cd14033ebcc5a Mon Sep 17 00:00:00 2001 From: Douglas Long Date: Sat, 13 Nov 2021 13:17:34 -0700 Subject: [PATCH 4/6] updated readme for version 1.3.1 --- README.md | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/README.md b/README.md index b4e61a0..1446d65 100644 --- a/README.md +++ b/README.md @@ -6,6 +6,13 @@ Salesforce Marketing Cloud Fuel SDK for Python The Fuel SDK for Python provides easy access to Salesforce Marketing Cloud's Fuel API Family services, including a collection of REST APIs and a SOAP API. These APIs provide access to Salesforce Marketing Cloud functionality via common collection types such as array/hash. +New Features in Version 1.3.1 +------------ +* Removed dependency on suds-jurko due to setuptools>=58.0.0 not supporting 2to3, pointed to suds-community +* Removed wsgiref because it is part of the standard lib +* Removed distribute as it is part of setuptools. + + New Features in Version 1.3.0 ------------ * Added Refresh Token support for OAuth2 authentication From 92adde86026e84fb17ec146e3e13a88af5603dcf Mon Sep 17 00:00:00 2001 From: Douglas Long Date: Mon, 20 Jun 2022 10:46:46 -0600 Subject: [PATCH 5/6] updated requirements, added the new version, and published to pypi --- FuelSDK/__init__.py | 2 +- README.md | 4 +++- requirements.txt | 6 +++--- setup.py | 24 +++++++++++++++--------- 4 files changed, 22 insertions(+), 14 deletions(-) diff --git a/FuelSDK/__init__.py b/FuelSDK/__init__.py index 7dad4b6..1647699 100644 --- a/FuelSDK/__init__.py +++ b/FuelSDK/__init__.py @@ -1,4 +1,4 @@ -__version__ = '1.3.0' +__version__ = '1.3.1' # Runtime patch the suds library from FuelSDK.suds_patch import _PropertyAppender diff --git a/README.md b/README.md index 1446d65..1f3af5c 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,9 @@ # FuelSDK-Python v1.3.0 - Salesforce Marketing Cloud Fuel SDK for Python +This is a fork of the original repo, +the original repo is not maintained, so I decided to fork and maintain. + ## Overview The Fuel SDK for Python provides easy access to Salesforce Marketing Cloud's Fuel API Family services, including a collection of REST APIs and a SOAP API. These APIs provide access to Salesforce Marketing Cloud functionality via common collection types such as array/hash. diff --git a/requirements.txt b/requirements.txt index 2010471..96a610c 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,3 +1,3 @@ -PyJWT>=1.5.3 -requests>=2.18.4 -suds-community>=0.7 +PyJWT>=2.4.0 +requests>=2.28.0 +suds-community>=1.1.1 diff --git a/setup.py b/setup.py index 336b4ff..c6b6fc3 100644 --- a/setup.py +++ b/setup.py @@ -1,25 +1,31 @@ +from os.path import dirname, join, realpath from setuptools import setup + +__version__ = '1.3.1' + + with open('README.md') as f: readme = f.read() +with open(join(dirname(realpath(__file__)), 'requirements.txt')) as f: + PACKAGE_INSTALL_REQUIRES = [line[:-1] for line in f] + +print(PACKAGE_INSTALL_REQUIRES) + setup( - version='1.3.1', - name='Salesforce-FuelSDK', + version=__version__, + name='Salesforce-FuelSDK-Sans', description='Salesforce Marketing Cloud Fuel SDK for Python', long_description=readme, long_description_content_type="text/markdown", - author='ExactTarget', + author='Seahawks8', py_modules=['ET_Client'], python_requires='>=3', packages=['FuelSDK'], - url='https://github.com/salesforce-marketingcloud/FuelSDK-Python', + url='https://github.com/seahawks8/FuelSDK-Python', license='MIT', - install_requires=[ - 'pyjwt>=1.5.3', - 'requests>=2.18.4', - 'suds-community>=0.7', - ], + install_requires=PACKAGE_INSTALL_REQUIRES, classifiers=[ 'Development Status :: 4 - Beta', 'Intended Audience :: Developers', From eaaf4cee6f43c3377ecd2583fab96c24f2e3f987 Mon Sep 17 00:00:00 2001 From: Doug Date: Wed, 16 Jul 2025 16:32:08 -0600 Subject: [PATCH 6/6] Create SECURITY.md --- SECURITY.md | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) create mode 100644 SECURITY.md diff --git a/SECURITY.md b/SECURITY.md new file mode 100644 index 0000000..034e848 --- /dev/null +++ b/SECURITY.md @@ -0,0 +1,21 @@ +# Security Policy + +## Supported Versions + +Use this section to tell people about which versions of your project are +currently being supported with security updates. + +| Version | Supported | +| ------- | ------------------ | +| 5.1.x | :white_check_mark: | +| 5.0.x | :x: | +| 4.0.x | :white_check_mark: | +| < 4.0 | :x: | + +## Reporting a Vulnerability + +Use this section to tell people how to report a vulnerability. + +Tell them where to go, how often they can expect to get an update on a +reported vulnerability, what to expect if the vulnerability is accepted or +declined, etc.