Yelp · dnephin · Feb 20, 2015
diff --git a/.gitignore b/.gitignore
@@ -4,3 +4,4 @@
 dist/
 build/
 logs/
+.tox
diff --git a/Makefile b/Makefile
@@ -17,9 +17,7 @@ flakes:
 test: tests
 
 tests: all
-	LD_LIBRARY_PATH=build \
-	PYTHONPATH=src \
-	testify --summary --exclude-suite=disabled --verbose tests
+	tox
 
 clean:
 	make -C build clean

diff --git a/src/ybinlogp/parser.py b/src/ybinlogp/parser.py
@@ -16,7 +16,13 @@
 
 log = logging.getLogger('ybinlogp')
 
-library = ctypes.CDLL("libybinlogp.so.1", use_errno=True)
+try:
+	library = ctypes.CDLL("libybinlogp.so.1", use_errno=True)
+except OSError:
+	import os.path
+	from distutils.sysconfig import get_python_lib
+	path = os.path.join(get_python_lib(), '../../libybinlogp.so.1')
+	library = ctypes.CDLL(os.path.abspath(path), use_errno=True)
 
 
 class EventStruct(ctypes.Structure):

diff --git a/tox.ini b/tox.ini
@@ -0,0 +1,21 @@
+[tox]
+envlist = py26, py27
+
+[testenv]
+deps =
+    testify
+    flake8
+commands =
+	testify --summary --exclude-suite=disabled --verbose tests
+    flake8 src/ybinlogp
+
+[testenv:docs]
+deps =
+    -rrequirements.txt
+    sphinx
+changedir = docs
+commands = sphinx-build -b html -d build/doctrees source build/html
+
+[flake8]
+ignore = W191,E402,F401,E302,E101,E128,E126
+max_line_length = 90
-Original file line number
+Diff line change
@@ Expand Up / @@ -4,3 +4,4 @@ @@
     dist/
     build/
     logs/
+    .tox