diff --git a/pyros.py b/pyros.py index 15500f4..b8a8e9d 100755 --- a/pyros.py +++ b/pyros.py @@ -536,7 +536,7 @@ def test(app): if app != "obsconfig": # for every module except obsconfig, should use the simple observatory configuration in order to run the website with a configuration that isn't the observatory configuration used for production os.environ["PATH_TO_OBSCONF_FILE"] = os.path.join(os.path.abspath(PYROS_DJANGO_BASE_DIR),"obsconfig/fixtures/observatory_configuration_ok_simple.yml") - _loaddata() or die() + #_loaddata() or die() change_dir(PYROS_DJANGO_BASE_DIR) # Delete test_pyros database after tests #execProcessFromVenv('manage.py test ' + app) or die() @@ -1341,4 +1341,4 @@ if __name__ == '__main__': ''' if INSTALL_VENV: install_venv(VENV) if INSTALL_DB: install_database(VENV) -""" \ No newline at end of file +""" diff --git a/src/core/pyros_django/misc/templates/base.html b/src/core/pyros_django/misc/templates/base.html index 654b308..1d00bde 100644 --- a/src/core/pyros_django/misc/templates/base.html +++ b/src/core/pyros_django/misc/templates/base.html @@ -604,7 +604,7 @@ footer{