From 05c77b6f4a1dbf3a3f115cb41c86121f3d086659 Mon Sep 17 00:00:00 2001
From: uzumaxy <uzumaxy@gmail.com>
Date: Fri, 19 Sep 2014 02:01:38 +0300
Subject: [PATCH] Improved installation script.

---
 MANIFEST.in                     |  4 ----
 README.rst                      |  5 ++---
 pyspectator_tornado/__init__.py |  2 ++
 setup.cfg                       |  2 --
 setup.py                        | 13 +++++++------
 5 files changed, 11 insertions(+), 15 deletions(-)
 delete mode 100644 MANIFEST.in
 create mode 100644 pyspectator_tornado/__init__.py
 delete mode 100644 setup.cfg

diff --git a/MANIFEST.in b/MANIFEST.in
deleted file mode 100644
index bdfcc03..0000000
--- a/MANIFEST.in
+++ /dev/null
@@ -1,4 +0,0 @@
-include runner README.rst
-include runner LICENSE
-recursive-include pyspectator_tornado/static *
-recursive-include pyspectator_tornado/templates *
\ No newline at end of file
diff --git a/README.rst b/README.rst
index d88452a..d060016 100644
--- a/README.rst
+++ b/README.rst
@@ -44,7 +44,7 @@ Run as root user:
 
 .. code-block:: bash
 
-    pip install pyspectator_tornado
+    pip install -U pyspectator_tornado
 
 
 ==================
@@ -60,8 +60,7 @@ Most simple method, where pyspectator_tornado will be binded on port "8888" and
     python start.py
 
 
-If you want use simple address "localhost" or
-port "8888" is busy by another application, you specify custom port, for example:
+If you want use simple address "localhost" or port "8888" is busy by another application, you specify custom port, for example:
 
 .. code-block:: bash
 
diff --git a/pyspectator_tornado/__init__.py b/pyspectator_tornado/__init__.py
new file mode 100644
index 0000000..f50e0d6
--- /dev/null
+++ b/pyspectator_tornado/__init__.py
@@ -0,0 +1,2 @@
+version = (1, 1, 0)
+version_str = '.'.join([str(n) for n in version])
diff --git a/setup.cfg b/setup.cfg
deleted file mode 100644
index 11e9ec4..0000000
--- a/setup.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-[metadata]
-description-file = README.rst
\ No newline at end of file
diff --git a/setup.py b/setup.py
index ec047e8..9a7647d 100644
--- a/setup.py
+++ b/setup.py
@@ -1,5 +1,6 @@
 import sys
 import os
+from pyspectator_tornado import version_str
 
 try:
     from setuptools import setup
@@ -17,15 +18,18 @@ def main():
     # Describe installer
     setup(
         name='pyspectator_tornado',
-        version='1.0.4',
+        license='BSD',
+        version=version_str,
         author='Maxim Grischuk',
         author_email='uzumaxy@gmail.com',
         maintainer='Maxim Grischuk',
         maintainer_email='uzumaxy@gmail.com',
-        packages=['pyspectator_tornado'],
         url='https://github.com/uzumaxy/pyspectator_tornado',
         download_url='https://github.com/uzumaxy/pyspectator_tornado/releases',
-        license='BSD',
+        packages=['pyspectator_tornado'],
+        package_data={
+            'pyspectator_tornado': ['LICENSE', 'README.rst']
+        },
         description='pyspectator_tornado is a web-monitoring tool ported on'
                     'Tornado with pyspectator as a main monitoring module.',
         long_description=open('README.rst').read(),
@@ -43,9 +47,6 @@ def main():
             'web', 'tornado', 'www'
         ],
         platforms='Platform Independent',
-        package_data={
-            'pyspectator': ['LICENSE', 'README.rst']
-        },
         scripts=['start.py'],
         classifiers=[
             'Development Status :: 5 - Production/Stable',