Adding setup.cfg file

Adding manifest file
Removing CHANGELOG.md since pbr generates that

Change-Id: I17141859d6719f4226e819e88b972c7214326bc8
This commit is contained in:
gary-hessler 2014-07-21 15:12:45 -06:00
parent a60555cf32
commit 0bf17705bf
7 changed files with 63 additions and 151 deletions

4
.gitignore vendored
View File

@ -9,3 +9,7 @@ dist
artifacts
root
.tox/
AUTHORS
ChangeLog
monasca_agent.egg-info
pbr-0.9.0-py2.7.egg

View File

@ -1,6 +0,0 @@
Change Log
=======
# 1.0.0 / 2014-07-16
## Changes
- New package renamed and moved over to StackForge from https://github.com/hpcloud-mon/mon-agent

6
MANIFEST.in Normal file
View File

@ -0,0 +1,6 @@
include AUTHORS
include ChangeLog
exclude .gitignore
exclude .gitreview
include README.md
include tox.ini

View File

@ -1 +1 @@
__version__ = '1.0.0'
__version__ = '1.0.1'

View File

@ -11,4 +11,4 @@ redis
simplejson
supervisor
tornado
python-monclient
python-monascaclient

48
setup.cfg Normal file
View File

@ -0,0 +1,48 @@
[metadata]
name=monasca-agent
version=1.0.1
maintainer=Hewlett Packard
maintainer_email=hpcs-mon@hp.com
description-file = README.md
home-page = https://github.com/stackforge/monasca-agent
keywords=
openstack
monitoring
license=Apache-2
include_package_data=True
test_suite=nose.collector
classifier=
Development Status :: 5 - Production/Stable
License :: OSI Approved :: Apache Software License
Topic :: System :: Monitoring
[files]
packages = monagent
data_files=
share/monasca/agent =
agent.conf.template
packaging/supervisor.conf
packaging/monasca-agent.init
share/monasca/agent/conf.d = conf.d/*
[entry_points]
console_scripts =
monasca-forwarder = monagent.forwarder.daemon:main
monasca-collector = monagent.collector.daemon:main
monasca-statsd = monagent.monstatsd.daemon:main
monasca-setup = monsetup.main:main
[global]
setup-hooks =
pbr.hooks.setup_hook
[pbr]
autodoc_index_modules = True
[wheel]
universal = 1
[egg_info]
tag_build =
tag_date = 0
tag_svn_revision = 0

146
setup.py
View File

@ -1,146 +1,6 @@
from glob import glob
import sys
from setuptools import setup, find_packages
# Read in the version
exec(open('monagent/common/version.py').read())
# Prereqs of the build. Won't get installed when deploying the egg.
setup_requires = [
]
# Prereqs of the install. Will install when deploying the egg.
install_requires = [
'requests',
'gearman',
'httplib2',
'nose==1.3.0',
'ntplib',
'pymongo',
'pylint',
'psutil',
'python-memcached',
'PyYAML',
'redis',
'simplejson',
'supervisor',
'tornado',
'python-monascaclient',
]
if sys.platform == 'win32':
from glob import glob
install_requires.extend([
'tornado==3.0.1',
'pywin32==217',
'wmi==1.4.9',
'simplejson==2.6.1',
'mysql-python==1.2.3',
'pymongo==2.3',
'psycopg2',
'python-memcached==1.48',
'redis==2.6.2',
'adodbapi'
'elementtree',
'pycurl',
'MySQLdb',
'psutil',
])
# Modules to force-include in the exe
include_modules = [
# 3p
'win32service',
'win32serviceutil',
'win32event',
'simplejson',
'adodbapi',
'elementtree.ElementTree',
'pycurl',
'tornado.curl_httpclient',
'pymongo',
'MySQLdb',
'psutil',
'psycopg2',
# agent
'checks.services_checks',
'checks.libs.httplib2',
# pup
'pup',
'pup.pup',
'tornado.websocket',
'tornado.web',
'tornado.ioloop',
]
class Target(object):
def __init__(self, **kw):
self.__dict__.update(kw)
self.version = '1.0.0'
self.cmdline_style = 'pywin32'
agent_svc = Target(name='Monasca Agent', modules='win32.agent', dest_base='monascaagent')
from monagent.collector.jmxfetch import JMX_FETCH_JAR_NAME
extra_args = {
'options': {
'py2exe': {
'includes': ','.join(include_modules),
'optimize': 0,
'compressed': True,
'bundle_files': 3,
},
},
'console': ['win32\shell.py'],
'service': [agent_svc],
'windows': [{'script': 'win32\gui.py',
'dest_base': "agent-manager",
# The manager needs to be administrator to stop/start the service
'uac_info': "requireAdministrator",
'icon_resources': [(1, r"packaging\monasca-agent\win32\install_files\dd_agent_win_256.ico")],
}],
'data_files': [
("Microsoft.VC90.CRT", glob(r'C:\Python27\redist\*.*')),
('pup', glob('pup/pup.html')),
('pup', glob('pup/status.html')),
('pup/static', glob('pup/static/*.*')),
('jmxfetch', glob('checks/libs/%s' % JMX_FETCH_JAR_NAME)),
],
}
from setuptools import setup
setup(
name='monasca-agent',
maintainer="Tim Kuhlman",
maintainer_email="tim.kuhlman@hp.com",
version=__version__,
description="Collects metrics from the host it is installed on and sends to the monitoring api",
classifiers=[
"Development Status :: 5 - Production/Stable",
"License :: OSI Approved :: Apache Software License",
"Topic :: System :: Monitoring"
],
license="Apache",
keywords="openstack monitoring",
install_requires=install_requires,
setup_requires=setup_requires,
url="https://github.com/stackforge/monasca-agent",
packages=find_packages(exclude=['tests', 'build*', 'packaging*']),
entry_points={
'console_scripts': [
'monasca-forwarder = monagent.forwarder.daemon:main',
'monasca-collector = monagent.collector.daemon:main',
'monasca-statsd = monagent.monstatsd.daemon:main',
'monasca-setup = monsetup.main:main'
],
},
include_package_data=True,
data_files=[('share/monasca/agent', ['agent.conf.template', 'packaging/supervisor.conf', 'packaging/monasca-agent.init']),
('share/monasca/agent/conf.d', glob('conf.d/*'))],
test_suite='nose.collector'
setup_requires=['pbr'],
pbr=True
)