Merge pull request #1788 from SEED-platform/develop

merge to master to trigger Docker Hub builds

.gitignore

@@ -46,6 +46,9 @@ src/
 *node_modules*
 bower_components/
 
+# JetBrainz tends to suggest a venv directory in the project root for virtual environments
+venv/
+
 package-lock.json
 dump.rdb
 log/*.log

requirements/base.txt

@@ -51,8 +51,8 @@ lxml==4.2.5
 probablepeople==0.5.4
 
 enum34==1.1.6  # enum34 needs to be specified to support cryptography and oauth2
+oauthlib==2.0.2
 jwt-oauth2>=0.1.1
 django-oauth-toolkit==0.12.0
-django-braces>=1.11.0
 
 future==0.16.0

seed/tests/test_portfoliomanager.py

@@ -9,7 +9,8 @@
 """
 import json
 import os
-from unittest import skipIf
+import requests
+from unittest import skip, skipIf
 
 from django.core.urlresolvers import reverse_lazy
 from django.test import TestCase
@@ -19,6 +20,27 @@
 from seed.views.portfoliomanager import PortfolioManagerImport
 
 
+PM_UN = 'SEED_PM_UN'
+PM_PW = 'SEED_PM_PW'
+pm_skip_test_check = skipIf(
+    not os.environ.get(PM_UN, False) and not os.environ.get(PM_PW, False),
+    'Cannot run "expect-pass" PM unit tests without %s and %s in environment' % (PM_UN, PM_PW)
+)
+
+# override this decorator for more pressing conditions
+try:
+    pm_avail_check = requests.get('http://isthewallbuilt.us/api.json', timeout=5)
+    string_response = pm_avail_check.json()['status']
+    if string_response == 'no':
+        skip_due_to_espm_down = True
+    else:
+        skip_due_to_espm_down = False
+    if skip_due_to_espm_down:
+        pm_skip_test_check = skip('ESPM is likely down temporarily, ESPM tests will not run')
+except Exception:
+    pass
+
+
 class PortfolioManagerImportTest(TestCase):
     def test_unsuccessful_login(self):
         # To test a successful login, we'd have to include valid PM credentials, which we don't want to do
@@ -86,6 +108,7 @@ def test_template_list_interface_no_password(self):
         self.assertEqual('error', data['status'])
         self.assertIn('missing password', data['message'])
 
+    @pm_skip_test_check
     def test_template_list_invalid_credentials(self):
         resp = self.client.post(
             reverse_lazy('api:v2.1:portfolio_manager-template-list'),
@@ -103,14 +126,6 @@ def test_template_list_invalid_credentials(self):
         self.assertIn('Check credentials.', data['message'])
 
 
-PM_UN = 'SEED_PM_UN'
-PM_PW = 'SEED_PM_PW'
-pm_skip_test_check = skipIf(
-    not os.environ.get(PM_UN, False) and not os.environ.get(PM_PW, False),
-    'Cannot run "expect-pass" PM unit tests without %s and %s in environment' % (PM_UN, PM_PW)
-)
-
-
 class PortfolioManagerTemplateListViewTestsSuccess(TestCase):
 
     def setUp(self):
@@ -231,6 +246,7 @@ def test_report_interface_no_template(self):
         self.assertEqual('error', data['status'])
         self.assertIn('missing template', data['message'])
 
+    @pm_skip_test_check
     def test_report_invalid_credentials(self):
         resp = self.client.post(
             reverse_lazy('api:v2.1:portfolio_manager-report'),