From 918c85f52d8a48487446b97a9274134de0ec1e3d Mon Sep 17 00:00:00 2001 From: Sander Roosendaal Date: Tue, 24 Sep 2019 14:00:42 +0200 Subject: [PATCH 1/3] upgraded django-mailbox --- requirements.txt | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/requirements.txt b/requirements.txt index 4c12a926..c6a60c34 100644 --- a/requirements.txt +++ b/requirements.txt @@ -43,7 +43,7 @@ django-debug-toolbar==1.11 django-extensions==2.1.6 django-htmlmin==0.11.0 django-leaflet==0.24.0 -django-mailbox==4.7.1 +django-mailbox==4.8.0 django-oauth-toolkit==1.2.0 django-oauth2-provider==0.2.6.1 django-redis==4.10.0 @@ -67,6 +67,7 @@ Faker==1.0.4 fitparse==1.1.0 Flask==1.0.2 future==0.17.1 +GDAL==2.3.3 geocoder==1.38.1 geos==0.2.1 holoviews==1.11.3 @@ -108,7 +109,6 @@ mistune==0.8.4 mock==2.0.0 more-itertools==6.0.0 mpld3==0.3 -mysqlclient==1.4.2.post1 nbconvert==5.4.1 nbformat==4.4.0 nose==1.3.7 @@ -192,6 +192,7 @@ wcwidth==0.1.7 webencodings==0.5.1 Werkzeug==0.15.1 widgetsnbextension==3.4.2 +winkerberos==0.7.0 xlrd==1.2.0 xmltodict==0.12.0 yamjam==0.1.7 From a2eb6ee8969b7d19cda249b3be41290353e0bbc1 Mon Sep 17 00:00:00 2001 From: Sander Roosendaal Date: Tue, 24 Sep 2019 19:23:57 +0200 Subject: [PATCH 2/3] added char set to database settings --- rowsandall_app/settings.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/rowsandall_app/settings.py b/rowsandall_app/settings.py index 02616365..33831eb8 100644 --- a/rowsandall_app/settings.py +++ b/rowsandall_app/settings.py @@ -157,7 +157,8 @@ DATABASES = { 'HOST': CFG['db_host'], 'PORT': CFG['db_port'], 'OPTIONS': { - 'init_command': "SET sql_mode='STRICT_TRANS_TABLES'" + 'init_command': "SET sql_mode='STRICT_TRANS_TABLES'", + 'charset': 'utf8mb4', } }, 'slave': { From eb1f6d9fc1912225d71ed2b679adc6ddd86e411a Mon Sep 17 00:00:00 2001 From: Sander Roosendaal Date: Tue, 24 Sep 2019 19:27:45 +0200 Subject: [PATCH 3/3] tested --- rowers/tests/testdata/testdata.csv.gz | Bin 12642 -> 12642 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/rowers/tests/testdata/testdata.csv.gz b/rowers/tests/testdata/testdata.csv.gz index 38a2dead25f26c9f31b11359e8e765971b642e12..e21c31abd2d1f233c2c11d8af1324727232378a3 100644 GIT binary patch delta 16 XcmaEq^eBm4zMF&NL15QL_Gm)@J6i@x delta 16 XcmaEq^eBm4zMF$%mSX2d_Gm)@I7|i7