comment out unneeded line from Jenkins script & document mrc additions

dib-lab · Jun 13, 2015 · 5095f32 · 5095f32
1 parent deccc8f
commit 5095f32
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,8 @@
+2015-06-13  Michael R. Crusoe  <crusoe@ucdavis.edu>
+
+   * Makefile, build-jenkins.sh: unify sphinx dependencies
+   * scripts/readstats.py: fix typo
+
 2015-06-13  Titus Brown  <titus@idyll.org>
 
    * doc/dev/getting-started.rst: update instructions for creating a new

diff --git a/jenkins-build.sh b/jenkins-build.sh
@@ -56,7 +56,7 @@ then
 	#hg clone http://bitbucket.org/mcrusoe/sphinx-contrib
 	#hg clone http://athyra.ged.msu.edu/~mcrusoe/sphinx-contrib
 	#pip install --upgrade sphinx-contrib/autoprogram/
-	pip install -r doc/requirements.txt
+	#pip install -r doc/requirements.txt # now covered by make install-dep
 	make doc
 fi
 make pylint 2>&1 > pylint.out