Merge branch 'master' into issue-86-detached-sync-status

README.md

@@ -1,6 +1,6 @@
 -- AUTOMATICALLY GENERATED FILE. DO NOT EDIT --
 
-[![Build Status](https://travis-ci.org/NCAR/manage_externals.svg?branch=master)](https://travis-ci.org/NCAR/manage_externals)[![Coverage Status](https://coveralls.io/repos/github/NCAR/manage_externals/badge.svg?branch=master)](https://coveralls.io/github/NCAR/manage_externals?branch=master)
+[![Build Status](https://travis-ci.org/ESMCI/manage_externals.svg?branch=master)](https://travis-ci.org/ESMCI/manage_externals)[![Coverage Status](https://coveralls.io/repos/github/ESMCI/manage_externals/badge.svg?branch=master)](https://coveralls.io/github/ESMCI/manage_externals?branch=master)
 ```
 usage: checkout_externals [-h] [-e [EXTERNALS]] [-o] [-S] [-v] [--backtrace]
                           [-d] [--no-logging]
@@ -203,3 +203,9 @@ The root of the source tree will be referred to as `${SRC_ROOT}` below.
     'sub-externals.cfg'.
 
   * Lines begining with '#' or ';' are comments and will be ignored.
+
+# Obtaining this tool, reporting issues, etc.
+
+  The master repository for manage_externals is
+  https://github.com/ESMCI/manage_externals. Any issues with this tool
+  should be reported there.

manic/checkout.py

@@ -229,6 +229,11 @@ def commandline_arguments(args=None):
 
   * Lines begining with '#' or ';' are comments and will be ignored.
 
+# Obtaining this tool, reporting issues, etc.
+
+  The master repository for manage_externals is
+  https://github.com/ESMCI/manage_externals. Any issues with this tool
+  should be reported there.
 '''
 
     parser = argparse.ArgumentParser(

test/Makefile

@@ -39,7 +39,7 @@ PYLINT_ARGS=-j 2 --rcfile=.pylint.rc
 
 # code coverage
 COVERAGE=coverage
-COVERAGE_ARGS=--rcfile=.coveragerc --append
+COVERAGE_ARGS=--rcfile=.coveragerc
 
 # source files
 SRC = \
@@ -72,8 +72,8 @@ test : utest stest
 .PHONY : readme
 readme : $(CHECKOUT_EXE)
 	printf "%s\n\n" "-- AUTOMATICALLY GENERATED FILE. DO NOT EDIT --" > $(README)
-	printf "%s" '[![Build Status](https://travis-ci.org/NCAR/manage_externals.svg?branch=master)](https://travis-ci.org/NCAR/manage_externals)' >> $(README)
-	printf "%s" '[![Coverage Status](https://coveralls.io/repos/github/NCAR/manage_externals/badge.svg?branch=master)](https://coveralls.io/github/NCAR/manage_externals?branch=master)' >> $(README)
+	printf "%s" '[![Build Status](https://travis-ci.org/ESMCI/manage_externals.svg?branch=master)](https://travis-ci.org/ESMCI/manage_externals)' >> $(README)
+	printf "%s" '[![Coverage Status](https://coveralls.io/repos/github/ESMCI/manage_externals/badge.svg?branch=master)](https://coveralls.io/github/ESMCI/manage_externals?branch=master)' >> $(README)
 	printf "\n%s\n" '```' >> $(README)
 	$(CHECKOUT_EXE) --help >> $(README)
 
@@ -92,10 +92,13 @@ lint : FORCE
 stylint : style lint
 
 .PHONY : coverage
+# Need to use a single coverage run with a single pattern rather than
+# using two separate commands with separate patterns for test_unit_*.py
+# and test_sys_*.py: The latter clobbers some results from the first
+# run, even if we use the --append flag to 'coverage run'.
 coverage : FORCE
 	$(PYPATH) $(COVERAGE) erase
-	$(PYPATH) $(COVERAGE) run $(COVERAGE_ARGS) $(TEST_ARGS) --pattern 'test_unit_*.py'
-	$(PYPATH) $(COVERAGE) run $(COVERAGE_ARGS) $(TEST_ARGS) --pattern 'test_sys_*.py'
+	$(PYPATH) $(COVERAGE) run $(COVERAGE_ARGS) $(TEST_ARGS) --pattern 'test_*.py'
 	$(PYPATH) $(COVERAGE) html
 
 #