From a443d2d58f46d6b63b7cabe72a8851234a59b10e Mon Sep 17 00:00:00 2001 From: Bruno Wagner Goncalves Date: Wed, 20 Aug 2014 17:56:43 -0300 Subject: Removed go and runtests - setup.py develop creates a pixelated-user-agent script that you can run --- service/go | 6 ------ service/pixelated/user_agent.py | 2 +- service/runtests | 2 -- service/setup.py | 9 ++++++++- service/stop | 2 -- 5 files changed, 9 insertions(+), 12 deletions(-) delete mode 100755 service/go delete mode 100755 service/runtests delete mode 100755 service/stop diff --git a/service/go b/service/go deleted file mode 100755 index a937b8b1..00000000 --- a/service/go +++ /dev/null @@ -1,6 +0,0 @@ -#!/usr/bin/env python -from pixelated.user_agent import setup -import os -os.environ['PIXELATED_UA_CFG']='../config/pixelated_ua.cfg' -setup() - diff --git a/service/pixelated/user_agent.py b/service/pixelated/user_agent.py index b70ed37c..ff38910b 100644 --- a/service/pixelated/user_agent.py +++ b/service/pixelated/user_agent.py @@ -132,7 +132,7 @@ def index(): def setup(): reactor_manager.start_reactor() - app.config.from_envvar('PIXELATED_UA_CFG') + app.config.from_pyfile('config/pixelated_ua.cfg') account = app.config['ACCOUNT'] app.run(host=app.config['HOST'], debug=app.config['DEBUG'], port=app.config['PORT']) diff --git a/service/runtests b/service/runtests deleted file mode 100755 index 458e8926..00000000 --- a/service/runtests +++ /dev/null @@ -1,2 +0,0 @@ -#!/bin/bash -py.test test/ diff --git a/service/setup.py b/service/setup.py index 5dc26b28..91b2a119 100644 --- a/service/setup.py +++ b/service/setup.py @@ -17,7 +17,7 @@ setup(name='Pixelated User Agent Service', author='Thoughtworks', author_email='pixelated-team@thoughtworks.com', url='http://pixelated-project.github.io', - packages=['pixelated'], + packages=['pixelated', 'pixelated.adapter', 'pixelated.bitmask_libraries'], test_suite='nose.collector', install_requires=[ 'Twisted', @@ -34,5 +34,12 @@ setup(name='Pixelated User Agent Service', 'nose', 'mock', 'httmock', + 'service_identity' ], + package_data={'': ['config/*']}, + entry_points={ + 'console_scripts': [ + 'pixelated-user-agent = pixelated.user_agent:setup' + ] + } ) diff --git a/service/stop b/service/stop deleted file mode 100755 index c4a8f11e..00000000 --- a/service/stop +++ /dev/null @@ -1,2 +0,0 @@ -#!/bin/bash -pgrep -f 'python ./go' | xargs kill -9 -- cgit v1.2.3