finish packaging utilities for py3.5+

setup.cfg

@@ -1,6 +1,3 @@
-[bdist_wheel]
-universal = 1
-
 [flake8]
 max-line-length = 88
 exclude =

setup.py

@@ -4,13 +4,88 @@
 
 from setuptools import find_packages, setup
 
+
+if sys.version_info < (3, 5):
+    raise RuntimeError("ci_exec needs Python 3.5+")
+
 sys.path.insert(0, os.path.dirname(os.path.abspath(__file__)))
 import ci_exec  # noqa: E402, I100
 
+# Extract the descriptions from README.rst.
+try:
+    in_brief = False
+    brief = ""
+    in_long = False
+    in_final = False
+    long = ""
+    with open("README.rst") as readme:
+        for line in readme:
+            if line.startswith(".. begin_brief_desc"):
+                in_brief = True
+                continue
+            elif line.startswith(".. end_brief_desc"):
+                in_brief = False
+                continue
+            elif line.startswith(".. begin_long_desc"):
+                in_long = True
+                continue
+            elif line.startswith(".. end_long_desc"):
+                in_long = False
+                continue
+            elif line.startswith(".. begin_final_desc"):
+                in_final = True
+                continue
+            elif line.startswith(".. end_final_desc"):
+                in_final = False
+                continue
+
+            if in_brief:
+                brief += line.replace("\n", " ")  # so it is all on one line.
+            elif in_long:
+                long += line
+            elif in_final:
+                long += line
+
+    if not brief:
+        raise RuntimeError("Internal error: could not extract brief description.")
+    if not long:
+        raise RuntimeError("Internal error: could not extract long description.")
+except Exception as e:
+    raise RuntimeError("CRITICAL: {e}".format(e=e))
+
+brief_description = brief.rstrip()
+long_description = long.rstrip()
+
 setup(
     name="ci_exec",
     version=ci_exec.__version__,
-    packages=find_packages(exclude=["tests", "tests.*", "demos", "demos.*"]),
+    requires_python=">=3.5",
+    author="Stephen McDowell",
+    author_email="svenevs.pypi@gmail.com",
+    license="Apache v2.0",
+    description=brief_description,
+    long_description=long_description,
+    long_description_content_type="text/x-rst",
+    project_urls={
+        "Documentation": "https://ci-exec.readthedocs.io/en/latest/",
+        "Source": "https://github.com/svenevs/ci_exec"
+    },
+    url="https://github.com/svenevs/ci_exec",
+    packages=find_packages(exclude=[
+        "demos", "demos.*",
+        "docs", "docs.*",
+        "tests", "tests.*",
+    ]),
     zip_safe=True,
-    url="https://github.com/svenevs/ci_exec"
+    python_requires=">=3.5",
+    classifiers=[
+        "Development Status :: 3 - Alpha",
+        "Intended Audience :: Developers",
+        "Topic :: Software Development :: Build Tools",
+        "License :: OSI Approved :: Apache Software License",
+        "Programming Language :: Python :: 3.5",
+        "Programming Language :: Python :: 3.6",
+        "Programming Language :: Python :: 3.7",
+        "Programming Language :: Python :: 3.8"
+    ]
 )

tox.ini

@@ -84,12 +84,16 @@ commands =
 [testenv:dist]
 skip_install = true
 deps =
+    wheel
+    setuptools
     readme_renderer
+    twine
 commands =
-    # Checks RST for uploading to PyPi
+    # TODO: this is deprecated, but gives a legit exit code (twine check dist/* does not).
     {envpython} setup.py check -r -s
     {envpython} setup.py sdist
-    {envpython} setup.py bdist_wheel --universal
+    {envpython} setup.py bdist_wheel
+    twine check dist/*
 
 # Not exactly a typical thing to do with tox...but suits my workflow.
 [testenv:clean]