improve instructions
@@ -43,12 +43,12 @@ def check_sciris():
try:
import sciris as sc
except ModuleNotFoundError:
- errormsg = 'Sciris is a required dependency but is not found; please install via "pip install sciris"'
+ errormsg = 'Sciris is a required dependency but is not found; please rerun setup.py or install via "pip install sciris"'
raise ModuleNotFoundError(errormsg)
ver = sc.__version__
minver = min_versions['sciris']
if sc.compareversions(ver, minver) < 0:
- errormsg = f'You have Sciris {ver} but {minver} is required; please upgrade via "pip install --upgrade sciris"'
+ errormsg = f'You have Sciris {ver} but {minver} is required; please rerun setup.py or upgrade via "pip install --upgrade sciris"'
raise ImportError(errormsg)
return
@@ -64,12 +64,12 @@ def check_scirisweb(die=False):
try:
import scirisweb
except ModuleNotFoundError:
- import_error = 'Scirisweb not found; please install via "pip install scirisweb"'
+ import_error = 'Scirisweb not found; please rerun setup.py or install via "pip install scirisweb"'
if not import_error:
ver = scirisweb.__version__
minver = min_versions['scirisweb']
if sc.compareversions(ver, minver) < 0:
- version_error = f'You have Scirisweb {ver} but {minver} is required; please upgrade via "pip install --upgrade scirisweb"'
+ version_error = f'You have Scirisweb {ver} but {minver} is required; please rerun setup.py or upgrade via "pip install --upgrade scirisweb"'
# Handle consequences
if die:
@@ -97,7 +97,7 @@ def check_extra_libs():
import covid_healthsystems # noqa
available['covid_healthsystems'] = True
except ImportError as E:
- import_error = f'Warning: covid_healthsystems is not available. Hospital capacity analyses will not be available. (Error: {str(E)})\n'
+ import_error = f'Warning: covid_healthsystems is not available. Hospital capacity analyses will not be available. (Reason: {str(E)})\n'
available['covid_healthsystems'] = False
print(import_error)
@@ -106,7 +106,7 @@ def check_extra_libs():
import synthpops # noqa
available['synthpops'] = True
except ImportError as E:
- import_error = f'Warning: synthpops is not available. Detailed demographic data will not be available. (Error: {str(E)})\n'
+ import_error = f'Warning: synthpops is not available. Detailed demographic data will not be available. (Reason: {str(E)})\n'
available['synthpops'] = True
print(import_error)
@@ -115,7 +115,7 @@ def check_extra_libs():
# import parestlib as _parest_available # noqa
# available['parestlib'] = True
# except ImportError as E:
- # import_error = f'Warning: parestlib is not available. Automated calibration will not be available. (Error: {str(E)})\n'
+ # import_error = f'Warning: parestlib is not available. Automated calibration will not be available. (Reason: {str(E)})\n'
# available['parestlib'] = True
# print(import_error)
