Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Release/v1.12.6 #714

Merged
merged 32 commits into from
Feb 26, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
32 commits
Select commit Hold shift + click to select a range
caaa692
fix bulk2 upload and download utf-8 encoding errors. (#688)
calbanese11 Oct 24, 2023
40f093e
Pass the column datatype along with current value to pd.Series (#692)
chrisolof Oct 24, 2023
82c76ee
added max retries to recursive refresh token functionality (#685)
rob-avestruz-kp Oct 24, 2023
e0b2603
remove pendulum depeendency and use native datetime
jon-wobken Jan 17, 2024
4e43eec
adding query_all function to fetch soft deleted records in sf (#697)
prazwalp007 Jan 17, 2024
2d55a56
Handle non-XML responses during error conditions (#695)
jsma Jan 17, 2024
9df3102
Adding utf-8 encoding when performing bulk2 data uploads. (#683)
rokadias Jan 17, 2024
f4305c0
Merge remote-tracking branch 'origin/release/v1.12.6' into release/v1…
jon-wobken Jan 17, 2024
c0a876c
add functionality to return detailed results from batch request/result
jon-wobken Jan 17, 2024
3ef74f2
simplify worker variable from batch_results to result
jon-wobken Jan 25, 2024
1ecb9b0
Update bulk2.py
jon-wobken Feb 20, 2024
d972135
pass instance_url to login (#711)
jshadle-vectr Feb 20, 2024
1203da2
Require cryptography as optional dependency of pyjwt (#680)
gdrosos Feb 20, 2024
6837bbe
Update .travis.yml - remove support for 3.6 and 3.7
jon-wobken Feb 20, 2024
30971c6
Update README.rst
jon-wobken Feb 20, 2024
ae1e24d
Add typing annotations (#660)
Shadow-Devil Feb 20, 2024
bcac87d
Update api.py
jon-wobken Feb 20, 2024
7203c44
Update bulk.py
jon-wobken Feb 20, 2024
253fab3
Update bulk2.py
jon-wobken Feb 20, 2024
5b0aa9e
Update login.py
jon-wobken Feb 20, 2024
a6ed2cf
Update api.py
jon-wobken Feb 20, 2024
e0b6723
Fix CI for release/v1.12.6 (#713)
Shadow-Devil Feb 21, 2024
d204a95
Include "fields" as a query param in GET requests (#705)
framarzar Feb 21, 2024
ea589a2
Update bulk.py
jon-wobken Feb 21, 2024
cb154e4
Update setup.py
jon-wobken Feb 21, 2024
65f21d8
Update bulk.py
jon-wobken Feb 26, 2024
4ddafe8
Update test_requirements.txt
jon-wobken Feb 26, 2024
9f48a5b
Update test_requirements.txt
jon-wobken Feb 26, 2024
596c109
Update .travis.yml
jon-wobken Feb 26, 2024
dda5071
Update .travis.yml
jon-wobken Feb 26, 2024
7b9d9ed
Update .travis.yml
jon-wobken Feb 26, 2024
8afd4bf
Update CHANGES
jon-wobken Feb 26, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -18,4 +18,5 @@ docs/simple_salesforce*.rst
docs/modules.rst
.vscode
venv
.mypy_cache
.python-version
5 changes: 2 additions & 3 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,11 @@ os: linux
dist: bionic
language: python
python:
- "3.6"
- "3.7"
- "3.8"
- "3.9"
- "3.10"
- "3.11"
- "3.12"
jobs:
fast_finish: true
include:
Expand All @@ -19,8 +18,8 @@ before_install:
- python -m pip install --upgrade virtualenv
install:
- pip install -U tox
- pip install --force-reinstall setuptools==59.5.0
script: tox
cache: false
notifications:
email: false
deploy:
Expand Down
14 changes: 14 additions & 0 deletions CHANGES
Original file line number Diff line number Diff line change
@@ -1,3 +1,17 @@
v1.12.6
======
Features
--------
- [#771] Add support for Non-Standrad Domain in JWT Token
- [#705] Allow parameters passed through to _call_salesforce using kwargs
- [#697] Add support for query_all in bulk2
- [#660] Add typing annotations

Bug Fixes
--------
- [#680] Remove unused dependency crytography
- [#683] Fix utf-8 encoding in bulk2

v1.12.5
======
Features
Expand Down
4 changes: 2 additions & 2 deletions README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ Simple Salesforce
:target: http://simple-salesforce.readthedocs.io/en/latest/?badge=latest
:alt: Documentation Status

Simple Salesforce is a basic Salesforce.com REST API client built for Python 3.6, 3.7 3.8, 3.9, 3.10, and 3.11. The goal is to provide a very low-level interface to the REST Resource and APEX API, returning a dictionary of the API JSON response.
Simple Salesforce is a basic Salesforce.com REST API client built for Python 3.8, 3.9, 3.10, 3.11, and 3.12. The goal is to provide a very low-level interface to the REST Resource and APEX API, returning a dictionary of the API JSON response.
You can find out more regarding the format of the results in the `Official Salesforce.com REST API Documentation`_

.. _Official Salesforce.com REST API Documentation: http://www.salesforce.com/us/developer/docs/api_rest/index.htm
Expand Down Expand Up @@ -770,7 +770,7 @@ Generate Pandas Dataframe from SFDC API Query (ex.query,query_all) and append re
listColumns = list(df.columns)
for col in listColumns:
if any (isinstance (df[col].values[i], dict) for i in range(0, len(df[col].values))):
df = pd.concat([df.drop(columns=[col]),df[col].apply(pd.Series).drop('attributes',axis=1).add_prefix(col+'.')],axis=1)
df = pd.concat([df.drop(columns=[col]),df[col].apply(pd.Series,dtype=df[col].dtype).drop('attributes',axis=1).add_prefix(col+'.')],axis=1)
new_columns = np.setdiff1d(df.columns, listColumns)
for i in new_columns:
listColumns.append(i)
Expand Down
23 changes: 23 additions & 0 deletions setup.cfg
Original file line number Diff line number Diff line change
@@ -1,2 +1,25 @@
[bdist_wheel]
universal = 1

[mypy]
packages = simple_salesforce
exclude = (?x)(
tests/.*
)
warn_unused_configs = True
warn_redundant_casts = True
warn_unused_ignores = True
strict_equality = True
extra_checks = True
check_untyped_defs = True
disallow_subclassing_any = True
disallow_untyped_decorators = True
disallow_any_generics = True
disallow_untyped_calls = True
disallow_incomplete_defs = True
disallow_untyped_defs = True
no_implicit_reexport = True
warn_return_any = True
disallow_any_unimported = True
warn_no_return = True
warn_unreachable = True
15 changes: 7 additions & 8 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -24,21 +24,19 @@
long_description=textwrap.dedent((here / 'README.rst').read_text()),
long_description_content_type='text/x-rst',
package_data={
'simple_salesforce': ['metadata.wsdl'],
'simple_salesforce': ['metadata.wsdl', 'py.typed'],
},
install_requires = [
'requests>=2.22.0',
'cryptography',
'typing-extensions',
'zeep',
'pyjwt',
'more-itertools',
'pendulum'
'pyjwt[crypto]',
'more-itertools'
],
tests_require=[
'pytest',
'pytz>=2014.1.1',
'responses>=0.5.1',
'cryptography<3.4',
],
test_suite='simple_salesforce.tests',
keywords=about['__keywords__'],
Expand All @@ -56,5 +54,6 @@
'Programming Language :: Python :: 3.10',
'Programming Language :: Python :: 3.11',
'Programming Language :: Python :: Implementation :: PyPy'
]
)
],
zip_safe=False,
)