Ori.livneh has uploaded a new change for review. https://gerrit.wikimedia.org/r/173666
Change subject: Minor spring cleaning ...................................................................... Minor spring cleaning * Update copyright years for 2014. * Update version in setup.py to 1.06 (from debian/changelog). * Add trove classifiers and license information to setup.py. Change-Id: I6b615ee194f5496333595be469f1908a25cb7445 --- M .gitignore M pybal/ipvs.py M pybal/monitor.py M pybal/monitors/__init__.py M pybal/monitors/__skeleton__.py M pybal/monitors/dnsquery.py M pybal/pybal.py M setup.py 8 files changed, 48 insertions(+), 16 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/debs/pybal refs/changes/66/173666/1 diff --git a/.gitignore b/.gitignore index fd7f02e..f322c84 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,5 @@ .tox /.coverage _trial_temp +build +dist diff --git a/pybal/ipvs.py b/pybal/ipvs.py index 3ad8cf9..6d4aa76 100644 --- a/pybal/ipvs.py +++ b/pybal/ipvs.py @@ -1,6 +1,6 @@ """ ipvsadm.py -Copyright (C) 2006-2012 by Mark Bergsma <[email protected]> +Copyright (C) 2006-2014 by Mark Bergsma <[email protected]> LVS state/configuration classes for PyBal """ @@ -263,4 +263,4 @@ def getDepoolThreshold(self): """Returns the threshold below which no more down servers will be depooled""" - return self.configuration.getfloat('depool-threshold', .5) \ No newline at end of file + return self.configuration.getfloat('depool-threshold', .5) diff --git a/pybal/monitor.py b/pybal/monitor.py index 024fc94..6b42521 100644 --- a/pybal/monitor.py +++ b/pybal/monitor.py @@ -1,6 +1,6 @@ """ monitor.py -Copyright (C) 2006-2012 by Mark Bergsma <[email protected]> +Copyright (C) 2006-2014 by Mark Bergsma <[email protected]> Monitor class implementations for PyBal """ diff --git a/pybal/monitors/__init__.py b/pybal/monitors/__init__.py index 524db70..d0743a7 100644 --- a/pybal/monitors/__init__.py +++ b/pybal/monitors/__init__.py @@ -1,6 +1,6 @@ """ monitors.__init__.py -Copyright (C) 2006-2012 by Mark Bergsma <[email protected]> +Copyright (C) 2006-2014 by Mark Bergsma <[email protected]> The monitors package contains all (complete) monitoring implementations of PyBal """ diff --git a/pybal/monitors/__skeleton__.py b/pybal/monitors/__skeleton__.py index 14daacf..5592b4b 100644 --- a/pybal/monitors/__skeleton__.py +++ b/pybal/monitors/__skeleton__.py @@ -1,6 +1,6 @@ """ __skeleton__.py -Copyright (C) 2006-2012 by Mark Bergsma <[email protected]> +Copyright (C) 2006-2014 by Mark Bergsma <[email protected]> Copy and modify this file to write a new PyBal monitor. It contains the minimum imports and base methods that need diff --git a/pybal/monitors/dnsquery.py b/pybal/monitors/dnsquery.py index 3a65718..37e1cf5 100644 --- a/pybal/monitors/dnsquery.py +++ b/pybal/monitors/dnsquery.py @@ -1,6 +1,6 @@ """ dns.py -Copyright (C) 2012 by Mark Bergsma <[email protected]> +Copyright (C) 2012-2014 by Mark Bergsma <[email protected]> DNS Monitor class implementation for PyBal """ diff --git a/pybal/pybal.py b/pybal/pybal.py index 43ad576..6dae0d3 100644 --- a/pybal/pybal.py +++ b/pybal/pybal.py @@ -2,7 +2,7 @@ """ PyBal -Copyright (C) 2006-20012 by Mark Bergsma <[email protected]> +Copyright (C) 2006-2014 by Mark Bergsma <[email protected]> LVS Squid balancer/monitor for managing the Wikimedia Squid servers using LVS """ diff --git a/setup.py b/setup.py index 436443d..19fea7e 100644 --- a/setup.py +++ b/setup.py @@ -1,4 +1,12 @@ -#!/usr/bin/env python +""" +PyBal +~~~~~ + +PyBal is a cluster monitoring daemon. It executes health checks against +servers and updates LVS connection tables accordingly. PyBal is used in +production at Wikimedia. + +""" try: from setuptools import setup except ImportError: @@ -6,13 +14,35 @@ setup( - name="pybal", - version="0.1", - description="PyBal LVS monitor", - author="Mark Bergsma", - author_email="[email protected]", - url="http://wikitech.wikimedia.org/view/Pybal";, - packages=['pybal', 'pybal.monitors'], - requires=['twisted'], + name='PyBal', + version='1.06', + license='GPLv2+', + author='Mark Bergsma', + author_email='[email protected]', + url='https://wikitech.wikimedia.org/wiki/PyBal', + description='PyBal LVS monitor', + long_description=__doc__, + classifiers=( + 'Development Status :: 5 - Production/Stable', + 'Framework :: Twisted', + 'Intended Audience :: System Administrators', + 'License :: OSI Approved :: ' + 'GNU General Public License v2 or later (GPLv2+)', + 'Operating System :: POSIX :: Linux', + 'Programming Language :: Python :: 2.7', + 'Topic :: Internet :: Proxy Servers', + 'Topic :: System :: Networking :: Monitoring', + ), + packages=( + 'pybal', + 'pybal.monitors', + ), + scripts=( + 'scripts/pybal', + ), + zip_safe=False, + requires=( + 'twisted', + ), test_suite='pybal.test', ) -- To view, visit https://gerrit.wikimedia.org/r/173666 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I6b615ee194f5496333595be469f1908a25cb7445 Gerrit-PatchSet: 1 Gerrit-Project: operations/debs/pybal Gerrit-Branch: master Gerrit-Owner: Ori.livneh <[email protected]> _______________________________________________ MediaWiki-commits mailing list [email protected] https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
