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 b4e61a0..1f3af5c 100644 --- a/README.md +++ b/README.md @@ -1,11 +1,20 @@ # 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. +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 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. diff --git a/requirements.txt b/requirements.txt index 1b11c7a..96a610c 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 - +PyJWT>=2.4.0 +requests>=2.28.0 +suds-community>=1.1.1 diff --git a/setup.py b/setup.py index 8fd47cd..c6b6fc3 100644 --- a/setup.py +++ b/setup.py @@ -1,30 +1,37 @@ +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.0', - 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-jurko==0.6', - ], + install_requires=PACKAGE_INSTALL_REQUIRES, classifiers=[ 'Development Status :: 4 - Beta', 'Intended Audience :: Developers', '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