Updated setup and doc elements

VERSION.txt

@@ -0,0 +1 @@
+1.1.1.post1

doc/source/conf.py

@@ -50,7 +50,7 @@
 # The short X.Y version.
 version = '1.1'
 # The full version, including alpha/beta/rc tags.
-release = '1.1.0'
+release = '1.1.1'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.

odslib3/__init__.py

@@ -12,7 +12,10 @@
 from . import odsMimetype
 from . import odsManifest
 
-VERSION = '1.1.1'
+HERE = path.abspath(path.dirname(__file__))
+
+with open(path.join(HERE, '..', 'VERSION.txt'), encoding='utf-8') as f:
+        VERSION = f.read()
 
 def get_version():
     "Returns a PEP 386-compliant version number from VERSION."

publish.sh

@@ -1,6 +1,9 @@
 #!/bin/bash
-./setup.py sdist --formats=bztar upload
 echo "Generating docs"
 ./setup.py build_sphinx
-echo "Uploading docs to pypi"
-./setup.py upload_docs --upload-dir build/sphinx/html/
+echo "Creating sdist"
+./setup.py sdist --formats=bztar
+echo "Creating wheel package"
+./setup.py bdist_wheel
+echo "Uploading via twine"
+twine upload dist/*

setup.cfg

@@ -0,0 +1,2 @@
+[bdist_wheel]
+universal=1

setup.py

@@ -1,23 +1,33 @@
 #!/usr/bin/env python
 
 from setuptools import setup, find_packages
-version = '1.1.1'
+
+HERE = path.abspath(path.dirname(__file__))
+
+with open(path.join(HERE, 'README.rst'), encoding='utf-8') as f:
+    LONG_DESCRIPTION=f.read()
+with open(path.join(HERE, 'VERSION.txt'), encoding='utf-8') as f:
+    VERSION = f.read()
 
 if __name__ == '__main__':
     setup(name='odslib3',
-          version=version,
+          version=VERSION,
           description='An easy to use module that creates ODS documents. Fork of odslib (https://github.com/TauPan/odslib) as looking unmaintained. Original author: Joseph Colton. Adapted for Python3.x support by Joshua Logan',
+          long_description=LONG_DESCRIPTION
           author='Joshua Logan',
           author_email='joshua.logan@eveco.re',
           url='https://github.com/Exelscior/odslib3',
           packages=find_packages(),
           license='GPL',
+          keywords='ods libreoffice'
+          python_requires='>=2.7',
           classifiers=[
               "Development Status :: 5 - Production/Stable", 
               "Intended Audience :: Developers",
               "License :: OSI Approved :: GNU General Public License (GPL)",
               "Natural Language :: English",
-              "Programming Language :: Python",
+              "Programming Language :: Python :: 2.7",
+              "Programming Language :: Python :: 3",
               "Topic :: Software Development :: Libraries :: Python Modules",
               ],
           )