Merge branch 'master' of github.com:ged-lab/khmer into oxli/initial

Conflicts:
	ChangeLog

.gitignore

@@ -21,6 +21,8 @@ doc/_build
 coverage.xml
 coverage-gcovr.xml
 coverage-debug
+htmlcov/
+diff-cover.html
 khmer-cov.tgz
 cppcheck-result.xml
 MANIFEST

ChangeLog

@@ -1,10 +1,16 @@
-2015-05-19  Jacob Fenton  <bocajnotnef@gmail.com>
+2015-05-20  Jacob Fenton  <bocajnotnef@gmail.com>
 
    * oxli/{__init__,khmer_api,common}.py,scripts/build-graph.py,
    tests/test_scripts.py: added oxli module, oxlified load_graph script, tests
    * scripts/load-graph.py: replaced with oxlified version
    * setup.py: added oxli module and entry point
 
+2015-05-20  Kevin Murray  <spam@kdmurray.id.au>
+
+   * .gitignore: Add htmlcov/ and diff-cover.html to gitignore
+   * Makefile: Use rm -f to remove files to quash error messages on
+   non-existant files
+
 2015-05-18  Sherine Awad  <sherine.awad@gmail.com>
 
    * tests/test_scripts.py: Test loading of compressed counting table

Makefile

@@ -63,11 +63,12 @@ dist/khmer-$(VERSION).tar.gz: $(SOURCES)
 clean: FORCE
 	cd lib && ${MAKE} clean || true
 	cd tests && rm -rf khmertest_* || true
-	rm -f khmer/_khmermodule.so || true
-	rm khmer/*.pyc lib/*.pyc || true
+	rm -f khmer/_khmermodule.so
+	rm -f khmer/*.pyc lib/*.pyc
 	./setup.py clean --all || true
-	rm coverage-debug || true
-	rm -Rf .coverage || true
+	rm -f coverage-debug
+	rm -Rf .coverage
+	rm -f diff-cover.html
 
 debug: FORCE
 	export CFLAGS="-pg -fprofile-arcs"; python setup.py build_ext --debug \