From aaa25e0cf0c38ffba2b73270773eec3ded2f69c3 Mon Sep 17 00:00:00 2001
From: Angus Gratton <gus@projectgus.com>
Date: Thu, 21 Apr 2016 13:22:14 +1000
Subject: [PATCH] Version 1.0.1 as uploaded to pypi (metadata changes)

V1.0.0 had a mistake so I had to burn that version due to pypi policy (oops.)
---
 esptool.py |  2 +-
 setup.py   | 49 ++++++++++++++++++++++++++++++++++++++++---------
 2 files changed, 41 insertions(+), 10 deletions(-)

diff --git a/esptool.py b/esptool.py
index 79b1d13a55..25fe195c81 100755
--- a/esptool.py
+++ b/esptool.py
@@ -28,7 +28,7 @@
 import inspect
 
 
-__version__ = "1.0.0"
+__version__ = "1.0.1"
 
 
 class ESPROM:
diff --git a/setup.py b/setup.py
index d8925bd52b..fddb44fdf8 100644
--- a/setup.py
+++ b/setup.py
@@ -1,15 +1,12 @@
 from setuptools import setup
-from codecs import open
-from os import path
 import io
 import os
 import re
+import sys
 
-here = path.abspath(path.dirname(__file__))
-
-with open(path.join(here, 'README.md'), encoding='utf-8') as f:
-    long_description = f.read()
 
+if sys.version_info[0] > 2:
+    raise RuntimeError("esptool.py only supports Python 2.x")
 
 # Example code to pull version from esptool.py with regex, taken from
 # http://python-packaging-user-guide.readthedocs.org/en/latest/single_source_version/
@@ -29,6 +26,36 @@ def find_version(*file_paths):
         return version_match.group(1)
     raise RuntimeError("Unable to find version string.")
 
+long_description = """
+==========
+esptool.py
+==========
+A command line utility to communicate with the ROM bootloader in Espressif ESP8266 WiFi microcontroller.
+
+Allows flashing firmware, reading back firmware, querying chip parameters, etc. Developed by the community, not by Espressif Systems.
+
+The esptool.py project is hosted on github: https://github.com/themadinventor/esptool
+
+Installation
+------------
+
+esptool can be installed via pip:
+
+  $ pip install --upgrade esptool
+
+(esptool.py requires Python 2. If your default pip version is Python 3, install via ``pip2 install esptool``.)
+
+Usage
+-----
+
+Please see the `Usage section of the README.md file <https://github.com/themadinventor/esptool/tree/pypi#usage>`_.
+
+You can also get help information by running `esptool.py --help`.
+
+Contributing
+------------
+Please see the `CONTRIBUTING.md file on github <https://github.com/themadinventor/esptool/blob/master/CONTRIBUTING.md>`_.
+"""
 
 setup(
     name='esptool',
@@ -36,12 +63,16 @@ def find_version(*file_paths):
     description='A utility to communicate with the ROM bootloader in Espressif ESP8266.',
     long_description=long_description,
     url='https://github.com/themadinventor/esptool',
-    author='Fredrik Ahlberg',
-    author_email='fredrik@z80.se',
+    author='Fredrik Ahlberg (themadinventor) & Angus Gratton (projectgus)',
+    author_email='gus@projectgus.com',
     license='GPLv2+',
     classifiers=[
-        'Development Status :: 4 - Beta',
+        'Development Status :: 5 - Production/Stable',
         'Intended Audience :: Developers',
+        'Natural Language :: English',
+        'Operating System :: POSIX',
+        'Operating System :: Microsoft :: Windows',
+        'Operating System :: MacOS :: MacOS X',
         'Topic :: Software Development :: Embedded Systems',
         'Environment :: Console',
         'License :: OSI Approved :: GNU General Public License v2 or later (GPLv2+)',