From 0ce08afa777194b73109bc6242e0c5a932091ab1 Mon Sep 17 00:00:00 2001 From: Michael Penkov Date: Mon, 26 Feb 2024 17:33:00 +0900 Subject: [PATCH 1/4] bump version to 7.0.0.dev0 --- smart_open/version.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/smart_open/version.py b/smart_open/version.py index 9524b41d..8918e098 100644 --- a/smart_open/version.py +++ b/smart_open/version.py @@ -1,4 +1,4 @@ -__version__ = '7.0.0' +__version__ = '7.0.0.dev0' if __name__ == '__main__': From d23ec4149e6488f922cd653376661611ecd3e76b Mon Sep 17 00:00:00 2001 From: ddelange <14880945+ddelange@users.noreply.github.com> Date: Mon, 26 Feb 2024 12:56:05 +0100 Subject: [PATCH 2/4] Do not touch botocore unless it is installed (#803) * Proper S3 exception on MISSING_DEPS * Fix check for MISSING_DEPS * Add test --- .github/workflows/python-package.yml | 6 ++++++ smart_open/s3.py | 3 ++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/.github/workflows/python-package.yml b/.github/workflows/python-package.yml index 767a691e..231dec02 100644 --- a/.github/workflows/python-package.yml +++ b/.github/workflows/python-package.yml @@ -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] diff --git a/smart_open/s3.py b/smart_open/s3.py index af4471fe..09433ad7 100644 --- a/smart_open/s3.py +++ b/smart_open/s3.py @@ -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: From 9bdbb1aa14d56686ac6491236b5acf3ba01479e2 Mon Sep 17 00:00:00 2001 From: Michael Penkov Date: Mon, 26 Feb 2024 20:57:45 +0900 Subject: [PATCH 3/4] bump version to 7.0.1 --- smart_open/version.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/smart_open/version.py b/smart_open/version.py index 8918e098..d385b318 100644 --- a/smart_open/version.py +++ b/smart_open/version.py @@ -1,4 +1,4 @@ -__version__ = '7.0.0.dev0' +__version__ = '7.0.1' if __name__ == '__main__': From cdf07029f5db0a8daea9adb3cce979f17ffb3bab Mon Sep 17 00:00:00 2001 From: Michael Penkov Date: Mon, 26 Feb 2024 20:58:12 +0900 Subject: [PATCH 4/4] updated CHANGELOG.md for version 7.0.1 --- CHANGELOG.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 8e1770b0..69b724ea 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -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))