Merge e86b490 into 9466f03

README.rst

@@ -3,6 +3,7 @@
 
 
 
+
 .. _NOTE: see docs/index.rst for the starting-point
 .. _ALSO: https://txtorcon.readthedocs.org for rendered docs
 

scripts/check_release_metadata.py

@@ -0,0 +1,25 @@
+import sys
+import subprocess
+from os.path import join
+
+
+def main():
+    """
+    This does checks on the release metadata for PyPI and pip-licenses:
+    """
+
+    subprocess.run(
+        [sys.executable, "setup.py", "bdist_wheel"],
+        check=True,
+    )
+    import txtorcon
+    dist_file = join("dist", "txtorcon-{}-py2.py3-none-any.whl".format(txtorcon.__version__))
+    print("dist: {}".format(dist_file))
+    subprocess.run(
+        [sys.executable, "-m", "twine", "check", dist_file],
+        check=True,
+    )
+
+
+if __name__ == "__main__":
+    main()

setup.py

@@ -36,7 +36,9 @@
     version=__version__,
     description=description,
     setup_requires="setuptools>=36.2",
-    long_description=open('README.rst', 'r').read(),
+#    long_description=open('README.rst', 'r').read(),
+    long_description="txtorcon\n========\n\n",
+    long_description_content_type="text/x-rst",
     keywords=['python', 'twisted', 'tor', 'tor controller'],
     install_requires=open('requirements.txt').readlines(),
     # "pip install -e .[dev]" will install development requirements

tox.ini

@@ -219,6 +219,8 @@ commands=
 basepython=python3
 deps=
     readme_renderer
+    twine
 
 commands=
-    python setup.py check -r -s
+    #python setup.py check -r -s
+    python scripts/check_release_metadata.py

txtorcon/_metadata.py

@@ -1,4 +1,4 @@
-__version__ = '19.0.0'
+__version__ = '19.1.0'
 __author__ = 'meejah'
 __contact__ = 'meejah@meejah.ca'
 __url__ = 'https://github.com/meejah/txtorcon'