Skip to content

Commit

Permalink
1.0 Production Release (simple-salesforce#364)
Browse files Browse the repository at this point in the history
* Remove depreciated `SalesforceAPI` class

* Bumping default API version to 42.0

* Remove requests[security] and replace with requests >= 2.22.0

* Remove depreciated sandbox attribute

* Remove some trailing spaces

* Only support currently supported versions of python

* Run isort on codebase to sort imports

* Fix failing tests

* Fix listing problems / style issues

* List changes in CHANGES, change classifier, bump version

* Refactor travis to address warnings

Closes simple-salesforce#365

* Bit of cleanup for code readability

* Remove unnecessary python2.x `u` from strings, normalize quotations
  • Loading branch information
nickcatal committed Mar 20, 2020
1 parent 743cff1 commit 1ebee00
Show file tree
Hide file tree
Showing 16 changed files with 221 additions and 520 deletions.
19 changes: 8 additions & 11 deletions .travis.yml
@@ -1,29 +1,28 @@
os: linux
dist: bionic
language: python
python:
- "2.7"
- "3.5"
- "3.6"
- "3.7"
- "3.8"
- "pypy3"
# command to install dependencies (mock & nose are already installed)
install:
- pip install tox
# command to run tests
script: tox
matrix:
jobs:
fast_finish: true
include:
- python: "3.8"
env: TOXENV=static
# turn off email notifications
env:
- TOXENV=unit
install:
- pip install tox
script: tox
notifications:
email: false
deploy:
# Allow travis-ci to deploy new tags to PyPI
provider: pypi
user: simple-salesforce
username: simple-salesforce
password:
secure: "RdkngWbRCGN5qSOk4babeda3w0jhsxB+zbuPjnFIOCHYz3OOQkIccXsoFPJso/E4k35mRNTU1J6PEBeL9W3KEtSgsl6k3lX8jamgJzkZU/HPoV8OH5tvybd3uiSikKA6EoxS5yfGjgTuSdOo07AzS69X4+FxNkRnTnug37tLjds="
distributions: "sdist bdist_wheel"
Expand All @@ -32,5 +31,3 @@ deploy:
tags: true
all_branches: true
repo: simple-salesforce/simple-salesforce
env:
- TOXENV=unit
14 changes: 14 additions & 0 deletions CHANGES
@@ -1,3 +1,17 @@
v1.0.0
======

Other
-----

- [362] Increased default Salesforce API Version to 42.0
- [360] Remove depreciated interfaces
- [358] Removed support for Python 2.6, 2.7, 3.3, and 3.4
- [359] Make the minimum version of requests v 2.22.0, allowing us to
remove requests[security]
- Changed "Beta" classifier to "Production/Stable"


v0.75
=====

Expand Down
2 changes: 1 addition & 1 deletion LICENSE.txt
Expand Up @@ -22,4 +22,4 @@ Permission is hereby granted, free of charge, to any person obtaining a copy of

The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.

THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
1 change: 1 addition & 0 deletions docs/conf.py
Expand Up @@ -20,6 +20,7 @@
import os
import subprocess
import sys

sys.path.insert(0, os.path.abspath('../'))


Expand Down
34 changes: 10 additions & 24 deletions setup.py
@@ -1,20 +1,10 @@
"""Simple-Salesforce Package Setup"""

from setuptools import setup
import textwrap
import sys
import os
import sys
import textwrap


pyver_install_requires = []
pyver_tests_require = []
if sys.version_info < (2, 7):
pyver_install_requires.append('ordereddict>=1.1')
pyver_tests_require.append('unittest2>=0.5.1')

if sys.version_info < (3, 0):
pyver_tests_require.append('mock==1.0.1')

from setuptools import setup

here = os.path.abspath(os.path.dirname(__file__))

Expand All @@ -35,32 +25,28 @@
license=about['__license__'],
description=about['__description__'],
long_description=textwrap.dedent(open('README.rst', 'r').read()),

install_requires=[
'requests[security]',
'requests>=2.22.0',
'authlib'
] + pyver_install_requires,
],
tests_require=[
'nose>=1.3.0',
'pytz>=2014.1.1',
'responses>=0.5.1',
] + pyver_tests_require,
test_suite = 'nose.collector',

],
test_suite='nose.collector',
keywords=about['__keywords__'],
classifiers=[
'Development Status :: 4 - Beta',
'Development Status :: 5 - Production/Stable',
'License :: OSI Approved :: Apache Software License',
'Intended Audience :: Developers',
'Intended Audience :: System Administrators',
'Operating System :: OS Independent',
'Topic :: Internet :: WWW/HTTP',
'Programming Language :: Python :: 2.6',
'Programming Language :: Python :: 2.7',
'Programming Language :: Python :: 3.3',
'Programming Language :: Python :: 3.4',
'Programming Language :: Python :: 3.5',
'Programming Language :: Python :: 3.6',
'Programming Language :: Python :: 3.7',
'Programming Language :: Python :: 3.8',
'Programming Language :: Python :: Implementation :: PyPy'
]
)
32 changes: 8 additions & 24 deletions simple_salesforce/__init__.py
@@ -1,27 +1,11 @@
"""Simple-Salesforce Package"""
# flake8: noqa

from simple_salesforce.api import (
Salesforce,
SalesforceAPI,
SFType
)

from simple_salesforce.bulk import (
SFBulkHandler
)

from simple_salesforce.login import (
SalesforceLogin
)

from simple_salesforce.exceptions import (
SalesforceError,
SalesforceMoreThanOneRecord,
SalesforceExpiredSession,
SalesforceRefusedRequest,
SalesforceResourceNotFound,
SalesforceGeneralError,
SalesforceMalformedRequest,
SalesforceAuthenticationFailed
)
from .api import Salesforce, SFType
from .bulk import SFBulkHandler
from .exceptions import (SalesforceAuthenticationFailed, SalesforceError,
SalesforceExpiredSession, SalesforceGeneralError,
SalesforceMalformedRequest,
SalesforceMoreThanOneRecord, SalesforceRefusedRequest,
SalesforceResourceNotFound)
from .login import SalesforceLogin
2 changes: 1 addition & 1 deletion simple_salesforce/__version__.py
Expand Up @@ -5,7 +5,7 @@
__title__ = 'simple-salesforce'
__description__ = 'A basic Salesforce.com REST API client.'
__url__ = 'https://github.com/simple-salesforce/simple-salesforce'
__version__ = '0.75.3'
__version__ = '1.0.0'
__author__ = 'Nick Catalano'
__author_email__ = 'nickcatal@gmail.com'
__license__ = 'Apache 2.0'
Expand Down

0 comments on commit 1ebee00

Please sign in to comment.