Merge branch 'hotfix/0.3.2-remove-lib-dir' into develop

.gitattributes

@@ -1 +1 @@
-lib/bridgedb/_version.py export-subst
+bridgedb/_version.py export-subst

.pylintrc

@@ -6,7 +6,7 @@
 # Python code to execute, usually for sys.path manipulation such as
 # pygtk.require().
 #init-hook='import sys,os; venv = os.environ.get("VIRTUAL_ENV"); v = os.path.join(venv, "lib", "python" + str(sys.version_info.major) + "." + str(sys.version_info.micro), "site-packages") if venv is not None else None; sys.path.insert(0, v);'
-init-hook="import sys,os;a=os.getcwd();print a;sys.path.insert(0, os.path.join(a, 'lib'));"
+init-hook="import sys,os;a=os.getcwd();print a;sys.path.insert(0, a));"
 
 # Profiled execution.
 profile=no

Makefile

@@ -11,13 +11,13 @@ test:
 	python setup.py test
 
 pep8:
-	find lib/bridgedb/*.py | xargs pep8
+	find bridgedb/*.py | xargs pep8
 
 pylint:
-	pylint --rcfile=./.pylintrc ./lib/bridgedb/
+	pylint --rcfile=./.pylintrc ./bridgedb/
 
 pyflakes:
-	pyflakes lib/bridgedb/
+	pyflakes ./bridgedb/
 
 install:
 	-python setup.py compile_catalog
@@ -55,11 +55,11 @@ clean-coverage-html:
 clean: clean-docs clean-coverage-html
 	-rm -rf build
 	-rm -rf dist
-	-rm -rf lib/bridgedb.egg-info
+	-rm -rf bridgedb.egg-info
 	-rm -rf _trial_temp
 
 coverage-test:
-	coverage run --rcfile=".coveragerc" $(TRIAL) ./lib/bridgedb/test/test_*.py
+	coverage run --rcfile=".coveragerc" $(TRIAL) ./test/test_*.py
 	coverage report --rcfile=".coveragerc"
 
 coverage-html: