From 1c1056bfe5f147b738d870b185ae0f63e033cb8a Mon Sep 17 00:00:00 2001 From: Juergen Brendel Date: Sat, 19 Aug 2017 12:24:28 +1200 Subject: [PATCH] Changes to submit to PyPi. --- MANIFEST.in | 1 + requirements/deploy.txt | 2 +- setup.cfg | 3 +++ setup.py | 27 ++++++++++----------------- vpcrouter/__init__.py | 2 +- 5 files changed, 16 insertions(+), 19 deletions(-) create mode 100644 MANIFEST.in create mode 100644 setup.cfg diff --git a/MANIFEST.in b/MANIFEST.in new file mode 100644 index 0000000..bb3ec5f --- /dev/null +++ b/MANIFEST.in @@ -0,0 +1 @@ +include README.md diff --git a/requirements/deploy.txt b/requirements/deploy.txt index f0214ff..6e32bec 100644 --- a/requirements/deploy.txt +++ b/requirements/deploy.txt @@ -4,4 +4,4 @@ bottle==0.12.13 netaddr==0.7.19 wsgiref==0.1.2 watchdog==0.8.3 --e git+git://github.com/romana/multi-ping#egg=multiping +multiping>=1.0.4 diff --git a/setup.cfg b/setup.cfg new file mode 100644 index 0000000..8c28267 --- /dev/null +++ b/setup.cfg @@ -0,0 +1,3 @@ +[metadata] +description-file = README.md + diff --git a/setup.py b/setup.py index 73345a7..02ff1a4 100644 --- a/setup.py +++ b/setup.py @@ -15,26 +15,23 @@ """ -import os +from os import path from setuptools import setup, find_packages - +from codecs import open import vpcrouter -here = os.path.abspath(os.path.dirname(__file__)) - +here = path.abspath(path.dirname(__file__)) -def get_readme(): - try: - import pypandoc - return pypandoc.convert('README.md', 'rst') - except (IOError, ImportError): - return "" - -long_description = get_readme() +try: + with open(path.join(here, 'README.rst'), encoding='utf-8') as f: + long_description = f.read() +except (IOError): + with open(path.join(here, 'README.md'), encoding='utf-8') as f: + long_description = f.read() setup( @@ -59,14 +56,10 @@ def get_readme(): 'netaddr==0.7.19', 'wsgiref==0.1.2', 'watchdog==0.8.3', - 'multiping==1.0.2', - ], - dependency_links = [ - "https://github.com/romana/multi-ping/tarball/master#egg=multiping-1.0.2" + 'multiping>=1.0.4', ], classifiers = [ 'Programming Language :: Python', - 'Development Status :: 5 - Stable', 'Natural Language :: English', 'Environment :: No Input/Output (Daemon)', 'Intended Audience :: System Administrators', diff --git a/vpcrouter/__init__.py b/vpcrouter/__init__.py index 33455a4..9b10f9f 100644 --- a/vpcrouter/__init__.py +++ b/vpcrouter/__init__.py @@ -15,4 +15,4 @@ """ -__version__ = "1.6.2" +__version__ = "1.6.3"