Merge pull request #30 from antzucaro/setup-py-breakfix

setup.py breakfix

diff --git a/README.md b/README.md
index 931c313d69ae5dcd5f1dcb52e1ff5e376d5946bd..02e50b0fdc7d8af0fc9c3e34ebec7128e08c8aa6 100644 (file)
--- a/README.md
+++ b/README.md
@@ -3,9 +3,18 @@ This is **XonStat**, the application in front of [xonstatdb][xonstatdb].
 
 ----
 
-To start, first run the following from the root directory to set up dependencies:
+To start, create a virtualenv and install dependencies:
 
-    python setup.py develop
+    virtualenv env
+    source env/bin/activate
+
+From within the directory you've cloned the repo, install the dependencies:
+
+    pip install -r requirements.txt
+
+Next, install the application itself:
+
+    pip install -e .
 
 Next you'll want to set up [xonstatdb][xonstatdb]. This is maintained as a separate project here:
 

diff --git a/setup.py b/setup.py
index 6dbde2be58b500786ed63c621e4b015eaeae7352..0a100f10d228c129bd89f4b1538d5c339c26025d 100644 (file)
--- a/setup.py
+++ b/setup.py
@@ -4,7 +4,7 @@ requires = [
     'pyramid',
     'SQLAlchemy',
     'transaction',
-    'repoze.tm2>=1.0b1', # default_commit_veto
+    'repoze.tm2>=1.0b1',
     'zope.sqlalchemy',
     'WebError',
     'sqlahelper',
@@ -33,6 +33,10 @@ setup(
     packages=find_packages(),
     include_package_data=True,
     zip_safe=False,
-    install_requires=requires
+    install_requires=requires,
+    entry_points={
+        'paste.app_factory': [
+            'main = xonstat:main',
+        ],
+    },
 )
-