diff --git a/deployment/docker-dev/REQUIREMENTS.txt b/deployment/docker-dev/REQUIREMENTS.txt index 8a1bb96b..3bc48829 100644 --- a/deployment/docker-dev/REQUIREMENTS.txt +++ b/deployment/docker-dev/REQUIREMENTS.txt @@ -1,26 +1,26 @@ -requests +requests==2.11.1 Django>=1.7,<1.8 -django-bootstrap3-datetimepicker -psycopg2 -pytz -celery -django-celery -django-kombu +django-bootstrap3-datetimepicker==2.2.3 +psycopg2==2.6.2 +pytz==2016.7 +celery==3.1.24 +django-celery==3.1.17 +django-kombu==0.9.4 django-leaflet==0.14.0 -django-braces -django-model-utils +django-braces==1.9.0 +django-model-utils==2.6 django-pipeline<1.6,>=1.5 -nodeenv -raven -django-user-map +nodeenv==1.0.0 +raven==5.29.0 +django-user-map==1.1.1 djangorestframework==3.2.5 djangorestframework-gis==0.9.6 -markdown +Markdown==2.6.7 django-filter==0.11.0 -pillow -numpy -hammock -scrapy -python-dateutil -unicodecsv -beautifulsoup4 +Pillow==3.4.2 +numpy==1.11.2 +hammock==0.2.4 +Scrapy==1.2.0 +python-dateutil==2.5.3 +unicodecsv==0.14.1 +beautifulsoup4==4.5.1 diff --git a/deployment/docker-prod/REQUIREMENTS.txt b/deployment/docker-prod/REQUIREMENTS.txt index 8a1bb96b..3bc48829 100644 --- a/deployment/docker-prod/REQUIREMENTS.txt +++ b/deployment/docker-prod/REQUIREMENTS.txt @@ -1,26 +1,26 @@ -requests +requests==2.11.1 Django>=1.7,<1.8 -django-bootstrap3-datetimepicker -psycopg2 -pytz -celery -django-celery -django-kombu +django-bootstrap3-datetimepicker==2.2.3 +psycopg2==2.6.2 +pytz==2016.7 +celery==3.1.24 +django-celery==3.1.17 +django-kombu==0.9.4 django-leaflet==0.14.0 -django-braces -django-model-utils +django-braces==1.9.0 +django-model-utils==2.6 django-pipeline<1.6,>=1.5 -nodeenv -raven -django-user-map +nodeenv==1.0.0 +raven==5.29.0 +django-user-map==1.1.1 djangorestframework==3.2.5 djangorestframework-gis==0.9.6 -markdown +Markdown==2.6.7 django-filter==0.11.0 -pillow -numpy -hammock -scrapy -python-dateutil -unicodecsv -beautifulsoup4 +Pillow==3.4.2 +numpy==1.11.2 +hammock==0.2.4 +Scrapy==1.2.0 +python-dateutil==2.5.3 +unicodecsv==0.14.1 +beautifulsoup4==4.5.1 diff --git a/django_project/core/settings/utils.py b/django_project/core/settings/utils.py index 6c3329df..139ba11c 100644 --- a/django_project/core/settings/utils.py +++ b/django_project/core/settings/utils.py @@ -23,5 +23,6 @@ def ensure_secret_key_file(): with open(secret_path, 'w') as f: f.write("SECRET_KEY = " + repr(secret_key) + "\n") + # Import the secret key ensure_secret_key_file() diff --git a/django_project/realtime/scripts/check_indicators.py b/django_project/realtime/scripts/check_indicators.py index e82c97b2..c3e817f8 100644 --- a/django_project/realtime/scripts/check_indicators.py +++ b/django_project/realtime/scripts/check_indicators.py @@ -32,5 +32,6 @@ def check_indicator_status(): ind.label, ind.value_humanize) + if __name__ == '__main__': check_indicator_status() diff --git a/django_project/user_map/tests/test_settings.py b/django_project/user_map/tests/test_settings.py index 710775b8..0ce2890b 100644 --- a/django_project/user_map/tests/test_settings.py +++ b/django_project/user_map/tests/test_settings.py @@ -4,6 +4,7 @@ def local_path(path): return os.path.join(os.path.dirname(__file__), path) + SITE_ID = 1 DATABASES = {