Skip to content

Commit

Permalink
Merge branch 'release-7.0.1'
Browse files Browse the repository at this point in the history
  • Loading branch information
mpenkov committed Feb 26, 2024
2 parents 882e52e + cdf0702 commit 49b9b32
Show file tree
Hide file tree
Showing 4 changed files with 13 additions and 2 deletions.
6 changes: 6 additions & 0 deletions .github/workflows/python-package.yml
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,12 @@ jobs:
- name: Upgrade PyOpenSSL
run: python -m pip install pyOpenSSL --upgrade

- name: Install smart_open without dependencies
run: pip install -e .

- name: Check that smart_open imports without dependencies
run: python -c 'import smart_open'

- name: Install smart_open and its dependencies
run: pip install -e .[test]

Expand Down
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
# 7.0.1, 2024-02-26

* Do not touch botocore unless it is installed (PR [#803](https://github.com/piskvorky/smart_open/pull/803), [@ddelange](https://github.com/ddelange))

# 7.0.0, 2024-02-26

* Upgrade dev status classifier to stable (PR [#798](https://github.com/piskvorky/smart_open/pull/798), [@seebi](https://github.com/seebi))
Expand Down
3 changes: 2 additions & 1 deletion smart_open/s3.py
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,8 @@ def _do(self, fn: Callable):
# The retry mechanism for this submodule. Client code may modify it, e.g. by
# updating RETRY.sleep_seconds and friends.
#
RETRY = Retry()
if 'MISSING_DEPS' not in locals():
RETRY = Retry()


class _ClientWrapper:
Expand Down
2 changes: 1 addition & 1 deletion smart_open/version.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
__version__ = '7.0.0'
__version__ = '7.0.1'


if __name__ == '__main__':
Expand Down

0 comments on commit 49b9b32

Please sign in to comment.