Merge pull request #44 from IBM/dlangst

Dlangst
merative · Nov 18, 2021 · b679361 · b679361
2 parents d14c825 + bb31f22
commit b679361
Show file tree

Hide file tree

Showing 8 changed files with 12 additions and 12 deletions.
diff --git a/Makefile b/Makefile
@@ -4,10 +4,14 @@
 
 setup: deps dev_deps install_project
 
-all: setup test-unit lint
+all: upgrade_pip setup test-unit lint
 
-deps:
+ci: setup test-unit lint
+
+upgrade_pip:
         python -m pip install --upgrade pip
+
+deps:
 	python -m pip install -r requirements.txt
 
 dev_deps:

diff --git a/ibm_whcs_sdk/annotator_for_clinical_data/tests/integration/test_acd_analyze_apis.py b/ibm_whcs_sdk/annotator_for_clinical_data/tests/integration/test_acd_analyze_apis.py
@@ -26,7 +26,7 @@
 IAMURL = CONFIG.get('settings', 'iam_url')
 VERSION = CONFIG.get('settings', 'version')
 LEVEL = CONFIG.get('settings', 'logging_level')
-DISABLE_SSL = CONFIG.get('settings', 'disable_ssl')
+DISABLE_SSL = (CONFIG.get('settings', 'disable_ssl')=='True)
 FLOW = CONFIG.get('settings', 'flow')
 
 ACD = wh.AnnotatorForClinicalDataV1(

diff --git a/ibm_whcs_sdk/annotator_for_clinical_data/tests/integration/test_acd_annotator_apis.py b/ibm_whcs_sdk/annotator_for_clinical_data/tests/integration/test_acd_annotator_apis.py
@@ -25,7 +25,7 @@
 IAMURL = CONFIG.get('settings', 'iam_url')
 VERSION = CONFIG.get('settings', 'version')
 LEVEL = CONFIG.get('settings', 'logging_level')
-DISABLE_SSL = CONFIG.get('settings', 'disable_ssl')
+DISABLE_SSL = (CONFIG.get('settings', 'disable_ssl')=='True)
 
 ACD = wh.AnnotatorForClinicalDataV1(
     authenticator=IAMAuthenticator(apikey=APIKEY, url=IAMURL, disable_ssl_verification=DISABLE_SSL),

diff --git a/ibm_whcs_sdk/annotator_for_clinical_data/tests/integration/test_acd_flows_apis.py b/ibm_whcs_sdk/annotator_for_clinical_data/tests/integration/test_acd_flows_apis.py
@@ -25,7 +25,7 @@
 IAMURL = CONFIG.get('settings', 'iam_url')
 VERSION = CONFIG.get('settings', 'version')
 LEVEL = CONFIG.get('settings', 'logging_level')
-DISABLE_SSL = CONFIG.get('settings', 'disable_ssl')
+DISABLE_SSL = (CONFIG.get('settings', 'disable_ssl')=='True)
 FLOW = CONFIG.get('settings', 'flow')
 
 ACD = wh.AnnotatorForClinicalDataV1(

diff --git a/ibm_whcs_sdk/annotator_for_clinical_data/tests/integration/test_acd_health_check.py b/ibm_whcs_sdk/annotator_for_clinical_data/tests/integration/test_acd_health_check.py
@@ -25,7 +25,7 @@
 IAMURL = CONFIG.get('settings', 'iam_url')
 VERSION = CONFIG.get('settings', 'version')
 LEVEL = CONFIG.get('settings', 'logging_level')
-DISABLE_SSL = CONFIG.get('settings', 'disable_ssl')
+DISABLE_SSL = (CONFIG.get('settings', 'disable_ssl')=='True)
 
 ACD = wh.AnnotatorForClinicalDataV1(
     authenticator=IAMAuthenticator(apikey=APIKEY, url=IAMURL, disable_ssl_verification=DISABLE_SSL),
@@ -36,4 +36,4 @@
 
 def test_get_health_check():
     response = ACD.get_health_check_status()
-    assert response is not None
+    assert response is not None
diff --git a/ibm_whcs_sdk/annotator_for_clinical_data/tests/integration/test_acd_profiles_apis.py b/ibm_whcs_sdk/annotator_for_clinical_data/tests/integration/test_acd_profiles_apis.py
@@ -25,7 +25,7 @@
 IAMURL = CONFIG.get('settings', 'iam_url')
 VERSION = CONFIG.get('settings', 'version')
 LEVEL = CONFIG.get('settings', 'logging_level')
-DISABLE_SSL = CONFIG.get('settings', 'disable_ssl')
+DISABLE_SSL = (CONFIG.get('settings', 'disable_ssl')=='True)
 PROFILE = CONFIG.get('settings', 'profile')
 
 ACD = wh.AnnotatorForClinicalDataV1(

diff --git a/requirements-dev.txt b/requirements-dev.txt
@@ -3,8 +3,5 @@ pytest>=6.2.1,<7.0.0
 responses>=0.12.1,<1.0.0
 pylint>=2.6.0,<3.0.0
 tox>=3.2.0,<4.0.0
-
-# code coverage
 coverage>=4.5.4
-codecov>=2.1.0,<3.0.0
 pytest-cov>=2.2.1,<3.0.0
diff --git a/tox.ini b/tox.ini
@@ -12,7 +12,6 @@ commands =
 passenv = TOXENV CI TRAVIS*
 commands = 
     py.test --cov=ibm_whcs_sdk {toxinidir}/ibm_whcs_sdk/annotator_for_clinical_data/tests/unit {toxinidir}/ibm_whcs_sdk/insights_for_medical_literature/tests/unit
-    codecov -e TOXENV
 
 deps = 
     -r{toxinidir}/requirements.txt