From 7167b689b998d8822a40085a9395e3e4fc375b9c Mon Sep 17 00:00:00 2001
From: Takeshi KOMIYA <i.tkomiya@gmail.com>
Date: Sun, 14 Jun 2020 13:38:55 +0900
Subject: [PATCH] Do "twine check" on CI process

---
 .github/workflows/lint.yml |  2 +-
 tox.ini                    | 12 +++++++++++-
 utils/release-checklist    |  4 ----
 3 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
index 0c09c778b..fea1f17a2 100644
--- a/.github/workflows/lint.yml
+++ b/.github/workflows/lint.yml
@@ -8,7 +8,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        tool: [docslint, flake8, mypy]
+        tool: [docslint, flake8, mypy, twine]
 
     steps:
     - uses: actions/checkout@v2
diff --git a/tox.ini b/tox.ini
index d9f040544..ccfd60f84 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,6 +1,6 @@
 [tox]
 minversion = 2.4.0
-envlist = docs,flake8,mypy,coverage,py{35,36,37,38,39},du{12,13,14,15}
+envlist = docs,flake8,mypy,twine,coverage,py{35,36,37,38,39},du{12,13,14,15}
 
 [testenv]
 usedevelop = True
@@ -88,6 +88,16 @@ extras =
 commands =
     python utils/doclinter.py CHANGES CONTRIBUTING.rst README.rst doc/
 
+[testenv:twine]
+basepython = python3
+description =
+    Lint package.
+deps =
+    twine
+commands =
+    python setup.py release bdist_wheel sdist
+    twine check dist/*
+
 [testenv:bindep]
 description =
     Install binary dependencies.
diff --git a/utils/release-checklist b/utils/release-checklist
index 5a60e59c8..582d26685 100644
--- a/utils/release-checklist
+++ b/utils/release-checklist
@@ -11,7 +11,6 @@ for stable releases
 * ``git commit -am 'Bump to X.Y.Z final'``
 * ``make clean``
 * ``python setup.py release bdist_wheel sdist``
-* ``twine check dist/Sphinx-*``
 * ``twine upload dist/Sphinx-* --sign --identity [your GPG key]``
 * open https://pypi.org/project/Sphinx/ and check there are no obvious errors
 * ``sh utils/bump_docker.sh X.Y.Z``
@@ -38,7 +37,6 @@ for first beta releases
 * ``git commit -am 'Bump to X.Y.0 beta1'``
 * ``make clean``
 * ``python setup.py release bdist_wheel sdist``
-* ``twine check dist/Sphinx-*``
 * ``twine upload dist/Sphinx-* --sign --identity [your GPG key]``
 * open https://pypi.org/project/Sphinx/ and check there are no obvious errors
 * ``git tag vX.Y.0b1``
@@ -67,7 +65,6 @@ for other beta releases
 * ``git commit -am 'Bump to X.Y.0 betaN'``
 * ``make clean``
 * ``python setup.py release bdist_wheel sdist``
-* ``twine check dist/Sphinx-*``
 * ``twine upload dist/Sphinx-* --sign --identity [your GPG key]``
 * open https://pypi.org/project/Sphinx/ and check there are no obvious errors
 * ``git tag vX.Y.0bN``
@@ -95,7 +92,6 @@ for major releases
 * ``git commit -am 'Bump to X.Y.0 final'``
 * ``make clean``
 * ``python setup.py release bdist_wheel sdist``
-* ``twine check dist/Sphinx-*``
 * ``twine upload dist/Sphinx-* --sign --identity [your GPG key]``
 * open https://pypi.org/project/Sphinx/ and check there are no obvious errors
 * ``sh utils/bump_docker.sh X.Y.Z``