Merge branch 'develop' into master

* develop:
  Update CHANGELOG.md
  Drop 3.7 support in pyproject.toml (#871)
  Fix CI badge (#869)
  Bump softprops/action-gh-release in the github-actions group (#867)
  Fix release.sh merge message and final merge (#868)

Author: ddelange

.github/workflows/release.yml

@@ -32,7 +32,7 @@ jobs:
         python -m build
 
     - name: Upload package distributions as release assets
-      uses: softprops/action-gh-release@v2.2.1
+      uses: softprops/action-gh-release@v2.3.2
       with:
         files: dist/*
 

CHANGELOG.md

@@ -1,3 +1,10 @@
+# 7.3.0.post1, 2025-07-03
+
+- Fix release.sh merge message and final merge (PR [#868](https://github.com/piskvorky/smart_open/pull/868), [@ddelange](https://github.com/ddelange))
+- Bump softprops/action-gh-release from 2.2.1 to 2.3.2 in the github-actions group (PR [#867](https://github.com/piskvorky/smart_open/pull/867), [@dependabot[bot]](https://github.com/apps/dependabot))
+- Fix CI badge (PR [#869](https://github.com/piskvorky/smart_open/pull/869), [@ddelange](https://github.com/ddelange))
+- Drop 3.7 support in pyproject.toml (PR [#871](https://github.com/piskvorky/smart_open/pull/871), [@ddelange](https://github.com/ddelange))
+
 # 7.3.0, 2025-07-01
 
 - Remove head_bucket call from s3.SinglepartWriter (PR [#857](https://github.com/piskvorky/smart_open/pull/857), [@ddelange](https://github.com/ddelange))

README.rst

@@ -3,14 +3,14 @@ smart_open — utils for streaming large files in Python
 ======================================================
 
 
-|License|_ |GHA|_ |Coveralls|_ |Downloads|_
+|License|_ |CI|_ |Coveralls|_ |Downloads|_
 
 .. |License| image:: https://img.shields.io/pypi/l/smart_open.svg
-.. |GHA| image:: https://github.com/piskvorky/smart_open/workflows/Test/badge.svg
+.. |CI| image:: https://github.com/piskvorky/smart_open/actions/workflows/python-package.yml/badge.svg?branch=develop&event=push
 .. |Coveralls| image:: https://coveralls.io/repos/github/RaRe-Technologies/smart_open/badge.svg?branch=develop
 .. |Downloads| image:: https://pepy.tech/badge/smart-open/month
 .. _License: https://github.com/piskvorky/smart_open/blob/master/LICENSE
-.. _GHA: https://github.com/piskvorky/smart_open/actions?query=workflow%3ATest
+.. _CI: https://github.com/piskvorky/smart_open/actions/workflows/python-package.yml
 .. _Coveralls: https://coveralls.io/github/RaRe-Technologies/smart_open?branch=HEAD
 .. _Downloads: https://pypi.org/project/smart-open/
 
@@ -51,16 +51,16 @@ How?
   'User-Agent: *\n'
 
   >>> # stream from/to compressed files, with transparent (de)compression:
-  >>> for line in open('smart_open/tests/test_data/1984.txt.gz', encoding='utf-8'):
+  >>> for line in open('tests/test_data/1984.txt.gz', encoding='utf-8'):
   ...    print(repr(line))
   'It was a bright cold day in April, and the clocks were striking thirteen.\n'
   'Winston Smith, his chin nuzzled into his breast in an effort to escape the vile\n'
   'wind, slipped quickly through the glass doors of Victory Mansions, though not\n'
   'quickly enough to prevent a swirl of gritty dust from entering along with him.\n'
 
   >>> # can use context managers too:
-  >>> with open('smart_open/tests/test_data/1984.txt.gz') as fin:
-  ...    with open('smart_open/tests/test_data/1984.txt.bz2', 'w') as fout:
+  >>> with open('tests/test_data/1984.txt.gz') as fin:
+  ...    with open('tests/test_data/1984.txt.bz2', 'w') as fout:
   ...        for line in fin:
   ...           fout.write(line)
   74
@@ -246,7 +246,7 @@ By default, ``smart_open`` determines the compression algorithm to use based on
 .. code-block:: python
 
     >>> from smart_open import open, register_compressor
-    >>> with open('smart_open/tests/test_data/1984.txt.gz') as fin:
+    >>> with open('tests/test_data/1984.txt.gz') as fin:
     ...     print(fin.read(32))
     It was a bright cold day in Apri
 
@@ -256,7 +256,7 @@ To disable compression:
 .. code-block:: python
 
     >>> from smart_open import open, register_compressor
-    >>> with open('smart_open/tests/test_data/1984.txt.gz', 'rb', compression='disable') as fin:
+    >>> with open('tests/test_data/1984.txt.gz', 'rb', compression='disable') as fin:
     ...     print(fin.read(32))
     b'\x1f\x8b\x08\x08\x85F\x94\\\x00\x031984.txt\x005\x8f=r\xc3@\x08\x85{\x9d\xe2\x1d@'
 
@@ -266,7 +266,7 @@ To specify the algorithm explicitly (e.g. for non-standard file extensions):
 .. code-block:: python
 
     >>> from smart_open import open, register_compressor
-    >>> with open('smart_open/tests/test_data/1984.txt.gzip', compression='.gz') as fin:
+    >>> with open('tests/test_data/1984.txt.gzip', compression='.gz') as fin:
     ...     print(fin.read(32))
     It was a bright cold day in Apri
 
@@ -283,7 +283,7 @@ For example, to open xz-compressed files:
 
     >>> register_compressor('.xz', _handle_xz)
 
-    >>> with open('smart_open/tests/test_data/1984.txt.xz') as fin:
+    >>> with open('tests/test_data/1984.txt.xz') as fin:
     ...     print(fin.read(32))
     It was a bright cold day in Apri
 
@@ -482,7 +482,7 @@ This can be helpful when e.g. working with compressed files.
     >>>
     >>> _ = patch_pathlib()  # replace `Path.open` with `smart_open.open`
     >>>
-    >>> path = Path("smart_open/tests/test_data/crime-and-punishment.txt.gz")
+    >>> path = Path("tests/test_data/crime-and-punishment.txt.gz")
     >>>
     >>> with path.open("r") as infile:
     ...     print(infile.readline()[:41])

help.txt

@@ -289,16 +289,16 @@ FUNCTIONS
         'User-Agent: *\n'
 
         >>> # stream from/to compressed files, with transparent (de)compression:
-        >>> for line in open('smart_open/tests/test_data/1984.txt.gz', encoding='utf-8'):
+        >>> for line in open('tests/test_data/1984.txt.gz', encoding='utf-8'):
         ...    print(repr(line))
         'It was a bright cold day in April, and the clocks were striking thirteen.\n'
         'Winston Smith, his chin nuzzled into his breast in an effort to escape the vile\n'
         'wind, slipped quickly through the glass doors of Victory Mansions, though not\n'
         'quickly enough to prevent a swirl of gritty dust from entering along with him.\n'
 
         >>> # can use context managers too:
-        >>> with open('smart_open/tests/test_data/1984.txt.gz') as fin:
-        ...    with open('smart_open/tests/test_data/1984.txt.bz2', 'w') as fout:
+        >>> with open('tests/test_data/1984.txt.gz') as fin:
+        ...    with open('tests/test_data/1984.txt.bz2', 'w') as fout:
         ...        for line in fin:
         ...           fout.write(line)
         74
@@ -333,7 +333,7 @@ FUNCTIONS
 
         See Also
         --------
-        - `Standard library reference <https://docs.python.org/3.7/library/functions.html#open>`__
+        - `Standard library reference <https://docs.python.org/3.13/library/functions.html#open>`__
         - `smart_open README.rst
           <https://github.com/piskvorky/smart_open/blob/master/README.rst>`__
 

integration-tests/test_http.py

@@ -14,7 +14,7 @@
 
 GZIP_MAGIC = b'\x1f\x8b'
 BASE_URL = ('https://raw.githubusercontent.com/RaRe-Technologies/smart_open/'
-            'master/smart_open/tests/test_data/')
+            'master/tests/test_data/')
 
 
 class ReadTest(unittest.TestCase):

integration-tests/test_s3_ported.py

@@ -204,7 +204,7 @@ def test_write(self):
 
     def test_multipart(self):
         """Does s3 multipart chunking work correctly?"""
-        data_dir = os.path.join(os.path.dirname(__file__), "../smart_open/tests/test_data")
+        data_dir = os.path.join(os.path.dirname(__file__), "../tests/test_data")
         with open(os.path.join(data_dir, "crime-and-punishment.txt"), "rb") as fin:
             crime = fin.read()
         data = b''

pyproject.toml

@@ -11,7 +11,7 @@ description = "Utils for streaming large files (S3, HDFS, GCS, SFTP, Azure Blob
 readme = "README.rst"
 urls = {Repository = "https://github.com/piskvorky/smart_open"}
 authors = [{name = "Radim Rehurek", email = "[email protected]"}]
-requires-python = ">=3.7,<4.0" # sync with classifiers below
+requires-python = ">=3.8,<4.0" # sync with classifiers below
 classifiers = [
   "Development Status :: 5 - Production/Stable",
   "Environment :: Console",
@@ -20,7 +20,6 @@ classifiers = [
   "Operating System :: OS Independent",
   "Programming Language :: Python",
   "Programming Language :: Python :: 3",
-  "Programming Language :: Python :: 3.7",
   "Programming Language :: Python :: 3.8",
   "Programming Language :: Python :: 3.9",
   "Programming Language :: Python :: 3.10",

release/release.sh

@@ -18,7 +18,10 @@ git push
 git checkout master
 git pull
 # Merge `develop` into `master` and push
-git pull . develop --no-ff --no-edit
+git merge develop --no-ff -m "Merge branch 'develop' into master"
+git push
+# Merge `master` back into `develop` and push
+git merge master --no-ff -m "Merge branch 'master' into develop"
 git push
 # Open the new GitHub Release page for convenience
 new_release_url="https://github.com/piskvorky/smart_open/releases/new"

smart_open/smart_open_lib.py

@@ -151,7 +151,7 @@ def open(
 
     See Also
     --------
-    - `Standard library reference <https://docs.python.org/3.7/library/functions.html#open>`__
+    - `Standard library reference <https://docs.python.org/3.13/library/functions.html#open>`__
     - `smart_open README.rst
       <https://github.com/piskvorky/smart_open/blob/master/README.rst>`__
 

smart_open/utils.py

@@ -169,7 +169,7 @@ def safe_urlsplit(url):
     See Also
     --------
     https://bugs.python.org/issue43882
-    https://github.com/python/cpython/blob/3.7/Lib/urllib/parse.py
+    https://github.com/python/cpython/blob/3.13/Lib/urllib/parse.py
     https://github.com/piskvorky/smart_open/issues/285
     https://github.com/piskvorky/smart_open/issues/458
     smart_open/utils.py:QUESTION_MARK_PLACEHOLDER