Merge pull request #3154 from tornadoweb/build-workflow-publish

Set version number to 6.2, publish wheels via GH actions

.github/workflows/build.yml

@@ -10,7 +10,7 @@ on:
       # Run on release branches.
       - "branch[0-9]*"
       # Also run on certain other branches for testing.
-      - "build_workflow*"
+      - "build-workflow*"
 
 env:
   python-version: '3.9'
@@ -61,3 +61,34 @@ jobs:
       - uses: actions/upload-artifact@v2
         with:
           path: ./wheelhouse/*.whl
+
+  upload_pypi_test:
+    needs: [build_wheels, build_sdist]
+    runs-on: ubuntu-20.04
+    if: github.event_name == 'push' && startsWith(github.ref_name, 'build-workflow')
+    steps:
+      - uses: actions/download-artifact@v2
+        with:
+          name: artifact
+          path: dist
+
+      - uses: pypa/gh-action-pypi-publish@v1.5.0
+        with:
+          user: __token__
+          password: ${{ secrets.TEST_PYPI_API_TOKEN }}
+          repository_url: https://test.pypi.org/legacy/
+
+  upload_pypi:
+    needs: [build_wheels, build_sdist]
+    runs-on: ubuntu-20.04
+    if: github.event_name == 'push' && github.ref_type == 'tag' && startsWith(github.ref_name, 'v')
+    steps:
+      - uses: actions/download-artifact@v2
+        with:
+          name: artifact
+          path: dist
+
+      - uses: pypa/gh-action-pypi-publish@v1.5.0
+        with:
+          user: __token__
+          password: ${{ secrets.PYPI_API_TOKEN }}

setup.py

@@ -120,6 +120,7 @@ def build_extension(self, ext):
 
 with open("README.rst") as f:
     kwargs["long_description"] = f.read()
+    kwargs["long_description_content_type"] = "text/x-rst"
 
 if (
     platform.python_implementation() == "CPython"

tornado/__init__.py

@@ -22,5 +22,5 @@
 # is zero for an official release, positive for a development branch,
 # or negative for a release candidate or beta (after the base version
 # number has been incremented)
-version = "6.2.dev1"
-version_info = (6, 2, 0, -100)
+version = "6.2b1"
+version_info = (6, 2, 0, -99)