Updating python_requires and classifiers

MANIFEST.in

@@ -1,2 +1,5 @@
-include README.md LICENSE pypi_readme.rst
+global-exclude *.py[cod] __pycache__ *.so
 graft test
+include README.rst
+include LICENSE
+include requirements.txt

pypi_readme.rst → README.rst

@@ -1,4 +1,5 @@
-.. image:: https://circleci.com/gh/ARMmbed/mbed-cli.svg?style=svg
+Arm Mbed CLI
+============
 
 Mbed CLI is the name of the `Arm Mbed <https://mbed.com>`_ command line tool, packaged as mbed-cli, which enables the full mbed workflow: repositories version control, maintaining dependencies, publishing code, updating from remotely hosted repositories (GitHub, GitLab and mbed.com), and invoking Arm Mbed's own build system and export functions, among other operations.
 

circle_tests.py

@@ -74,5 +74,5 @@ def remove_readonly(func, path, _):
     proc.communicate()
 
     if proc.returncode != 0:
-        print "\n------------\nERROR: \"%s\"" % cmd
+        print("\n------------\nERROR: \"%s\"" % cmd)
         sys.exit(1)

requirements.txt

@@ -0,0 +1,3 @@
+pyserial>=3.0,<4.0
+mbed-os-tools>=0.0.9,<0.1.0
+mercurial>=5.2

setup.py

@@ -12,41 +12,55 @@
 
 import os
 from setuptools import setup
+from setuptools import find_packages
 
-with open("README.md", "r") as fh:
+NAME = 'mbed-cli'
+__version__ = '1.10.3'
+
+repository_dir = os.path.dirname(__file__)
+
+# .rst readme needed for pypi
+with open(os.path.join(repository_dir, 'README.rst')) as fh:
+    long_description = fh.read()
+
+with open(os.path.join(repository_dir, 'requirements.txt')) as fh:
+    requirements = fh.readlines()
+
+with open("README.rst", "r") as fh:
     long_description = fh.read()
 
 setup(
-    name="mbed-cli",
-    version="1.10.2",
-    description="Arm Mbed command line tool for repositories version control, publishing and updating code from remotely hosted repositories (GitHub, GitLab and mbed.com), and invoking Mbed OS own build system and export functions, among other operations",
-    long_description=long_description,
-    long_description_content_type="text/markdown",
-    url='http://github.com/ARMmbed/mbed-cli',
     author='Arm mbed',
     author_email='[email protected]',
-    packages=["mbed"],
-    entry_points={
-        'console_scripts': [
-            'mbed=mbed.mbed:main',
-            'mbed-cli=mbed.mbed:main',
-        ]
-    },
-    python_requires='>=2.7.10, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.0, !=3.4.1, !=3.4.2, <4',
     classifiers=(
+        'Development Status :: 5 - Production/Stable',
+        'Intended Audience :: Developers',
+        'License :: OSI Approved :: Apache Software License',
         'Programming Language :: Python :: 2',
         'Programming Language :: Python :: 2.7',
         'Programming Language :: Python :: 3',
-        'Programming Language :: Python :: 3.4',
         'Programming Language :: Python :: 3.5',
         'Programming Language :: Python :: 3.6',
         'Programming Language :: Python :: 3.7',
-        "License :: OSI Approved :: Apache Software License",
-        "Operating System :: OS Independent",
+        'Programming Language :: Python',
+        'Topic :: Software Development :: Build Tools',
+        'Topic :: Software Development :: Embedded Systems',
     ),
-    install_requires=[
-        "pyserial>=3.0,<4.0",
-        "mbed-os-tools>=0.0.9,<0.1.0",
-        "mercurial>=5.2"
-    ]
+    description="Command line tool for interacting with Mbed OS projects",
+    keywords="Mbed OS CLI",
+    include_package_data=True,
+    install_requires=requirements,
+    license='Apache 2.0',
+    long_description=long_description,
+    name=NAME,
+    packages=find_packages(),
+    python_requires='>=2.7.10, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*, <4',
+    url="http://github.com/ARMmbed/mbed-cli",
+    version=__version__,
+    entry_points={
+        'console_scripts': [
+            'mbed=mbed.mbed:main',
+            'mbed-cli=mbed.mbed:main',
+        ]
+    }
 )