sander/rowsandall
Private
Public Access
1
0
Fork 0
Code Activity

Merge branch 'release/v10.28'

Browse Source
This commit is contained in:
Sander Roosendaal
2019-09-24 19:27:56 +02:00
parent b160dabc28 eb1f6d9fc1
commit 41c5d16d1b
3 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
requirements.txt
View File

@@ -43,7 +43,7 @@ django-debug-toolbar==1.11
django-extensions==2.1.6 django-extensions==2.1.6
django-htmlmin==0.11.0 django-htmlmin==0.11.0
django-leaflet==0.24.0 django-leaflet==0.24.0
django-mailbox==4.7.1 django-mailbox==4.8.0
django-oauth-toolkit==1.2.0 django-oauth-toolkit==1.2.0
django-oauth2-provider==0.2.6.1 django-oauth2-provider==0.2.6.1
django-redis==4.10.0 django-redis==4.10.0
@@ -67,6 +67,7 @@ Faker==1.0.4
fitparse==1.1.0 fitparse==1.1.0
Flask==1.0.2 Flask==1.0.2
future==0.17.1 future==0.17.1
GDAL==2.3.3
geocoder==1.38.1 geocoder==1.38.1
geos==0.2.1 geos==0.2.1
holoviews==1.11.3 holoviews==1.11.3
@@ -108,7 +109,6 @@ mistune==0.8.4
mock==2.0.0 mock==2.0.0
more-itertools==6.0.0 more-itertools==6.0.0
mpld3==0.3 mpld3==0.3
mysqlclient==1.4.2.post1
nbconvert==5.4.1 nbconvert==5.4.1
nbformat==4.4.0 nbformat==4.4.0
nose==1.3.7 nose==1.3.7
@@ -192,6 +192,7 @@ wcwidth==0.1.7
webencodings==0.5.1 webencodings==0.5.1
Werkzeug==0.15.1 Werkzeug==0.15.1
widgetsnbextension==3.4.2 widgetsnbextension==3.4.2
winkerberos==0.7.0
xlrd==1.2.0 xlrd==1.2.0
xmltodict==0.12.0 xmltodict==0.12.0
yamjam==0.1.7 yamjam==0.1.7

BIN
rowers/tests/testdata/testdata.csv.gz vendored
View File

Binary file not shown.

3
rowsandall_app/settings.py
View File

@@ -157,7 +157,8 @@ DATABASES = {
'HOST': CFG['db_host'], 'HOST': CFG['db_host'],
'PORT': CFG['db_port'], 'PORT': CFG['db_port'],
'OPTIONS': { 'OPTIONS': {
'init_command': "SET sql_mode='STRICT_TRANS_TABLES'" 'init_command': "SET sql_mode='STRICT_TRANS_TABLES'",
'charset': 'utf8mb4',
} }
}, },
'slave': { 'slave': {