From d721f3d479a9041a204de1187dd7a8b2eefac0a5 Mon Sep 17 00:00:00 2001 From: Sander Roosendaal Date: Fri, 26 Jul 2019 11:53:27 +0200 Subject: [PATCH] restoring on linux --- requirements.txt | 4 ++-- rowers/migrations/0001_initial.py | 2 +- rowsandall_app/settings_dev.py | 16 ++++++++-------- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/requirements.txt b/requirements.txt index a957a7fc..55d80f51 100644 --- a/requirements.txt +++ b/requirements.txt @@ -67,7 +67,7 @@ Faker==1.0.4 fitparse==1.1.0 Flask==1.0.2 future==0.17.1 -GDAL==2.3.3 +#GDAL==2.3.3 geocoder==1.38.1 geos==0.2.1 holoviews==1.11.3 @@ -192,7 +192,7 @@ wcwidth==0.1.7 webencodings==0.5.1 Werkzeug==0.15.1 widgetsnbextension==3.4.2 -winkerberos==0.7.0 +#winkerberos==0.7.0 xlrd==1.2.0 xmltodict==0.12.0 yamjam==0.1.7 diff --git a/rowers/migrations/0001_initial.py b/rowers/migrations/0001_initial.py index e067b19e..84b67e88 100644 --- a/rowers/migrations/0001_initial.py +++ b/rowers/migrations/0001_initial.py @@ -1,4 +1,4 @@ -# Generated by Django 2.1.7 on 2019-07-24 12:56 +# Generated by Django 2.1.7 on 2019-07-26 09:28 import datetime from django.conf import settings diff --git a/rowsandall_app/settings_dev.py b/rowsandall_app/settings_dev.py index 738307bd..4ba07609 100644 --- a/rowsandall_app/settings_dev.py +++ b/rowsandall_app/settings_dev.py @@ -11,12 +11,12 @@ https://docs.djangoproject.com/en/1.9/ref/settings/ """ from .settings import * -DATABASES = { - 'default': { - 'ENGINE': 'django.db.backends.sqlite3', - 'NAME': os.path.join(BASE_DIR, 'db.sqlite3'), - 'HOST': 'localhost', - }, +#DATABASES = { +# 'default': { +# 'ENGINE': 'django.db.backends.sqlite3', +# 'NAME': os.path.join(BASE_DIR, 'db.sqlite3'), +# 'HOST': 'localhost', +# }, # 'TEST': { # 'CHARSET': 'utf8', # 'COLLATION': 'utf8_general_ci', @@ -30,7 +30,7 @@ DATABASES = { # 'HOST': 'store3.rosti.cz', # 'PORT': '3306', # } - } +# } BROKER_URL = 'redis://localhost:6379/0' CELERY_RESULT_BACKEND = 'redis://localhost:6379/0' @@ -66,7 +66,7 @@ CACHES = { STATIC_URL = '/static/' -STATIC_ROOT = 'C:/python/rowsandallapp' +#STATIC_ROOT = 'C:/python/rowsandallapp' INTERNAL_IPS = ['127.0.0.1']