Merge pull request #2193 from docker/update_setup_py

Update setup.py for modern pypi / setuptools

scripts/release.sh

@@ -3,12 +3,6 @@
 # Create the official release
 #
 
-if [ -z "$(command -v pandoc 2> /dev/null)" ]; then
-    >&2 echo "$0 requires http://pandoc.org/"
-    >&2 echo "Please install it and make sure it is available on your \$PATH."
-    exit 2
-fi
-
 VERSION=$1
 REPO=docker/docker-py
 GITHUB_REPO=git@github.com:$REPO
@@ -37,11 +31,10 @@ if  [[ $2 == 'upload' ]]; then
 fi
 
 
-pandoc -f markdown -t rst README.md -o README.rst || exit 1
 echo "##> sdist & wheel"
 python setup.py sdist bdist_wheel
 
 if [[ $2 == 'upload' ]]; then
     echo '##> Uploading sdist to pypi'
     twine upload dist/docker-$VERSION*
-fi
+fi

setup.py

@@ -55,24 +55,27 @@ with open('./test-requirements.txt') as test_reqs_txt:
 
 
 long_description = ''
-try:
+with codecs.open('./README.md', encoding='utf-8') as readme_md:
-    with codecs.open('./README.rst', encoding='utf-8') as readme_rst:
+    long_description = readme_md.read()
-        long_description = readme_rst.read()
-except IOError:
-    # README.rst is only generated on release. Its absence should not prevent
-    # setup.py from working properly.
-    pass
 
 setup(
     name="docker",
     version=version,
     description="A Python library for the Docker Engine API.",
     long_description=long_description,
+    long_description_content_type='text/markdown',
     url='https://github.com/docker/docker-py',
+    project_urls={
+        'Documentation': 'https://docker-py.readthedocs.io',
+        'Changelog': 'https://docker-py.readthedocs.io/en/stable/change-log.html',  # flake8: noqa
+        'Source': 'https://github.com/docker/docker-py',
+        'Tracker': 'https://github.com/docker/docker-py/issues',
+    },
     packages=find_packages(exclude=["tests.*", "tests"]),
     install_requires=requirements,
     tests_require=test_requirements,
     extras_require=extras_require,
+    python_requires='>=2.7, !=3.0.*, !=3.1.*, !=3.2.*',
     zip_safe=False,
     test_suite='tests',
     classifiers=[
@@ -89,6 +92,7 @@ setup(
         'Programming Language :: Python :: 3.5',
         'Programming Language :: Python :: 3.6',
         'Programming Language :: Python :: 3.7',
+        'Topic :: Software Development',
         'Topic :: Utilities',
         'License :: OSI Approved :: Apache Software License',
     ],