code clean

.travis.yml

@@ -9,10 +9,10 @@ env:
 
 install:
   - "export PATH=$PWD/~build/casperjs/bin:$PATH"
-  - pip install coverage python-coveralls py.test
+  - make install-deps
 
 script:
-  - make ci
+  - make init-db ci
 
 before_script:
   - make init-db install-casperjs

Makefile

@@ -1,36 +1,34 @@
 VERSION=2.0.0
 BUILDDIR=${PWD}/~build
 BINDIR=${PWD}/~build/bin
-DJANGO_SETTINGS_MODULE:=demoproject.settings
 PYTHONPATH := ${PWD}/demo/:${PWD}
 DJANGO_14=django==1.4.10
 DJANGO_15=django==1.5.5
 DJANGO_16=django==1.6
 DJANGO_DEV=git+git://github.com/django/django.git
-
-
 CASPERJS_DIR=${BUILDDIR}/casperjs
 PHANTOMJS_DIR=${BUILDDIR}/phantomjs
 
-
 mkbuilddir:
 	mkdir -p ${BUILDDIR} ${BINDIR}
 
-test:
-	py.test
+
+install-deps:
+	pip install -q \
+	        -r adminactions/requirements/install.pip \
+	        -r adminactions/requirements/testing.pip \
+	        python-coveralls
+
+
+install-casperjs: mkbuilddir
+	@sh -c "if [ -d ${CASPERJS_DIR} ]; then cd ${CASPERJS_DIR} && git pull; else git clone git://github.com/n1k0/casperjs.git ${CASPERJS_DIR}; fi"
 
 
 locale:
 	cd adminactions && django-admin.py makemessages -l en
 	export PYTHONPATH=${PYTHONPATH} && cd adminactions && django-admin.py compilemessages --settings=${DJANGO_SETTINGS_MODULE}
 
 
-coverage: mkbuilddir
-	py.test --cov=adminactions --cov-report=html --cov-config=.coveragerc -vvv
-
-install-casperjs: mkbuilddir
-	@sh -c "if [ -d ${CASPERJS_DIR} ]; then cd ${CASPERJS_DIR} && git pull; else git clone git://github.com/n1k0/casperjs.git ${CASPERJS_DIR}; fi"
-
 init-db:
 	@sh -c "if [ '${DBENGINE}' = 'mysql' ]; then mysql -e 'DROP DATABASE IF EXISTS adminactions;'; fi"
 	@sh -c "if [ '${DBENGINE}' = 'mysql' ]; then mysql -e 'create database IF NOT EXISTS adminactions CHARSET=utf-8 COLLATE=utf8_general_ci;'; fi"
@@ -40,7 +38,16 @@ init-db:
 	@sh -c "if [ '${DBENGINE}' = 'pg' ]; then psql -c 'CREATE DATABASE adminactions;' -U postgres; fi"
 	@sh -c "if [ '${DBENGINE}' = 'pg' ]; then pip install -q psycopg2; fi"
 
-ci: init-db
+
+test:
+	py.test
+
+
+coverage: mkbuilddir
+	py.test --cov=adminactions --cov-report=html --cov-config=.coveragerc -vvv
+
+
+ci: init-db install-deps
 	@sh -c "if [ '${DJANGO}' = '1.4.x' ]; then pip install ${DJANGO_14}; fi"
 	@sh -c "if [ '${DJANGO}' = '1.5.x' ]; then pip install ${DJANGO_15}; fi"
 	@sh -c "if [ '${DJANGO}' = '1.6.x' ]; then pip install ${DJANGO_16}; fi"
@@ -49,7 +56,6 @@ ci: init-db
 	@pip install coverage
 	@python -c "from __future__ import print_function;import django;print('Django version:', django.get_version())"
 	@echo "Database:" ${DBENGINE}
-	@pip install -qr adminactions/requirements/install.pip -qr adminactions/requirements/testing.pip
 
 	export PATH=${CASPERJS_DIR}/bin:$${PATH} && $(MAKE) coverage
 
@@ -59,6 +65,11 @@ clean:
 	find . -name __pycache__ -o -name "*.py?" -o -name "*.orig" -prune | xargs rm -rf
 	find adminactions/locale -name django.mo | xargs rm -f
 
+
+clonedigger: mkbuilddir
+	-clonedigger concurrency -l python -o ${BUILDDIR}/clonedigger.html --fast
+
+
 docs: mkbuilddir
 	mkdir -p ${BUILDDIR}/docs
 	sphinx-build -aE docs/source ${BUILDDIR}/docs