Merge branch 'release-4.1.2'

Author: mpenkov

.github/workflows/release.yml

@@ -2,8 +2,6 @@ name: Release to PyPI
 
 on:
   push:
-    branches:
-      - release
     tags:
       - 'v*.*.*'
 jobs:
@@ -34,9 +32,10 @@ jobs:
           . venv/bin/activate
           pip install twine
 
-      - name: Build tarball
+      - name: Build tarball and wheel
         run: |
           . venv/bin/activate
+          pip install wheel
           python setup.py sdist bdist_wheel
 
       - name: Upload tarball to PyPI

CHANGELOG.md

@@ -1,6 +1,6 @@
 # Unreleased
 
-# 4.1.1, 18 Jan 2021
+# 4.1.2, 18 Jan 2021
 
 - Correctly pass boto3 resource to writers (PR [#576](https://github.com/RaRe-Technologies/smart_open/pull/576), [@jackluo923](https://github.com/jackluo923))
 - Improve robustness of S3 reading (PR [#552](https://github.com/RaRe-Technologies/smart_open/pull/552), [@mpenkov](https://github.com/mpenkov))

release/merge.sh

@@ -67,7 +67,7 @@ git push --tags upstream master
 
 git checkout develop
 dev_version="$version.dev0"
-sed -i '' s/$(python smart_open/version.py)/$dev_version/ smart_open/version.py
+sed --in-place= -e s/$(python smart_open/version.py)/$dev_version/ smart_open/version.py
 git commit smart_open/version.py -m "bump version to $dev_version"
 git push upstream develop
 

smart_open/version.py

@@ -1,4 +1,4 @@
-__version__ = '4.1.1'
+__version__ = '4.1.2'
 
 
 if __name__ == '__main__':