consolidation of watcher

Change-Id: I9c82ef4d8a81af98afdfc34f5ad496bcade4af6a

tox.ini

@@ -19,7 +19,7 @@ commands = flake8
 commands = {posargs}
 
 [testenv:cover]
-commands = python setup.py testr --coverage --testr-args='{posargs}'
+commands = python setup.py testr --coverage --omit="watcher/tests/*,watcher/openstack/*" --testr-args='{posargs}'
 
 [testenv:docs]
 commands = python setup.py build_sphinx
@@ -33,7 +33,7 @@ commands =
   oslo-config-generator --namespace watcher \
                         --namespace keystonemiddleware.auth_token \
                         --namespace oslo.db \
-                        --output-file etc/watcher/watcher.conf
+                        --output-file etc/watcher/watcher.conf.sample
 
 [flake8]
 # E123, E125 skipped as they are invalid PEP-8.
@@ -41,4 +41,12 @@ commands =
 show-source=True
 ignore=E123,E125,H404,H405,H305
 builtins= _
-exclude=.venv,.git,.tox,dist,doc,*openstack/common*,*lib/python*,*egg,build,*sqlalchemy/alembic/versions/*
+exclude=.venv,.git,.tox,dist,doc,*openstack/common*,*lib/python*,*egg,build,*sqlalchemy/alembic/versions/*,demo/
+
+[testenv:pypi]
+commands =
+    python setup.py sdist bdist_wheel
+    twine upload --config-file .pypirc {posargs} dist/*
+
+[testenv:wheel]
+commands = python setup.py bdist_wheel