From b31a5679db00fd1a393af93865c5546f61c721c5 Mon Sep 17 00:00:00 2001
From: Jonathan Karr <jonrkarr@gmail.com>
Date: Mon, 17 Sep 2018 11:50:19 -0400
Subject: [PATCH] updating docs requirements for Sphinx 1.8

---
 docs/requirements.txt                                |  6 +++---
 karr_lab_build_utils/templates/docs/requirements.txt |  6 +++---
 requirements.txt                                     |  6 +++---
 tests/test_core.py                                   | 10 +++++-----
 4 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/docs/requirements.txt b/docs/requirements.txt
index bd7912e..fac809a 100644
--- a/docs/requirements.txt
+++ b/docs/requirements.txt
@@ -1,6 +1,6 @@
-robpol86_sphinxcontrib_googleanalytics
-sphinx >= 1.7
+git+https://github.com/KarrLab/sphinxcontrib-googleanalytics.git#egg=sphinxcontrib_googleanalytics-0.1.1 >= 0.1.1
+sphinx >= 1.8
 sphinx_rtd_theme
-sphinxcontrib_addmetahtml
+git+https://github.com/KarrLab/sphinxcontrib-addmetahtml.git#egg=sphinxcontrib_addmetahtml-0.1.1 >= 0.1.1
 sphinxcontrib_bibtex
 sphinxcontrib_spelling
diff --git a/karr_lab_build_utils/templates/docs/requirements.txt b/karr_lab_build_utils/templates/docs/requirements.txt
index bd7912e..fac809a 100644
--- a/karr_lab_build_utils/templates/docs/requirements.txt
+++ b/karr_lab_build_utils/templates/docs/requirements.txt
@@ -1,6 +1,6 @@
-robpol86_sphinxcontrib_googleanalytics
-sphinx >= 1.7
+git+https://github.com/KarrLab/sphinxcontrib-googleanalytics.git#egg=sphinxcontrib_googleanalytics-0.1.1 >= 0.1.1
+sphinx >= 1.8
 sphinx_rtd_theme
-sphinxcontrib_addmetahtml
+git+https://github.com/KarrLab/sphinxcontrib-addmetahtml.git#egg=sphinxcontrib_addmetahtml-0.1.1 >= 0.1.1
 sphinxcontrib_bibtex
 sphinxcontrib_spelling
diff --git a/requirements.txt b/requirements.txt
index 12f952f..bda7a52 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -24,12 +24,12 @@ pytest
 python_dateutil
 pyyaml
 requests
-robpol86_sphinxcontrib_googleanalytics
+git+https://github.com/KarrLab/sphinxcontrib-googleanalytics#egg=sphinxcontrib_googleanalytics-0.1.1 >= 0.1.1
 setuptools >= 40.0.0
 six
-sphinx >= 1.7
+sphinx >= 1.8
 sphinx_rtd_theme
-sphinxcontrib_addmetahtml
+git+https://github.com/KarrLab/sphinxcontrib-addmetahtml.git#egg=sphinxcontrib_addmetahtml-0.1.1 >= 0.1.1
 sphinxcontrib_bibtex
 sphinxcontrib_spelling
 twine
diff --git a/tests/test_core.py b/tests/test_core.py
index 763f4f6..abb63aa 100644
--- a/tests/test_core.py
+++ b/tests/test_core.py
@@ -1555,7 +1555,7 @@ def test_make_and_archive_reports_with_missing_req(self):
             pass
         try:
             with self.assertRaisesRegexp(core.BuildHelperError, 'The following requirements are missing:\n  '):
-                warning = 'The following requirements appear to be unused:\n  robpol86_sphinxcontrib_googleanalytics'
+                warning = 'The following requirements appear to be unused:\n  sphinxcontrib_googleanalytics'
                 with pytest.warns(UserWarning, match=warning):
                     build_helper.make_and_archive_reports(coverage_dirname=self.tmp_dirname, dry_run=True)
         finally:
@@ -1809,7 +1809,7 @@ def test_make_documentation_error(self):
         if os.path.isdir(build_helper.proj_docs_static_dir):
             shutil.rmtree(build_helper.proj_docs_static_dir)
 
-        with self.assertRaisesRegexp(Exception, 'Test exception'):
+        with self.assertRaises(SystemExit):
             with mock.patch.object(Sphinx, '__init__', side_effect=Exception('Test exception')):
                 build_helper.make_documentation()
 
@@ -2374,11 +2374,11 @@ def test_find_unused_requirements(self):
         unused = build_helper.find_unused_requirements('karr_lab_build_utils', ignore_files=['karr_lab_build_utils/templates/*'])
         unused.sort()
 
-        expected_unused = [
-            'robpol86_sphinxcontrib_googleanalytics',
+        expected_unused = [            
             'sphinx_rtd_theme',
             'sphinxcontrib_addmetahtml',
             'sphinxcontrib_bibtex',
+            'sphinxcontrib_googleanalytics',
             'sphinxcontrib_spelling',
             'wheel',
         ]
@@ -2396,7 +2396,7 @@ def test_find_unused_requirements(self):
                     self.assertRegexpMatches(captured.stdout.get_text(),
                                              'The following requirements from requirements.txt may not be necessary:')
                     self.assertRegexpMatches(captured.stdout.get_text(),
-                                             'robpol86_sphinxcontrib_googleanalytics')
+                                             'sphinxcontrib_googleanalytics')
                     self.assertEqual(captured.stderr.get_text(), '')
 
         os.rename('requirements.txt', 'requirements.txt.save')