From 8776c1dd9de2fc9dcd7a2ccdb791d538765394ec Mon Sep 17 00:00:00 2001 From: Jens Kleineheismann Date: Wed, 16 Oct 2019 17:04:08 +0200 Subject: [PATCH 1/3] Added punctuation in INSTALL.rst --- INSTALL.rst | 2 +- README.rst => README.md | 0 2 files changed, 1 insertion(+), 1 deletion(-) rename README.rst => README.md (100%) diff --git a/INSTALL.rst b/INSTALL.rst index d6a38c6..bea4e69 100644 --- a/INSTALL.rst +++ b/INSTALL.rst @@ -1 +1 @@ -NOT IMPLEMENTED YET +NOT IMPLEMENTED YET! diff --git a/README.rst b/README.md similarity index 100% rename from README.rst rename to README.md From 1aa2599c7eb7606fa63264de40070457bdb8cb9b Mon Sep 17 00:00:00 2001 From: Jens Kleineheismann Date: Thu, 17 Oct 2019 12:59:43 +0200 Subject: [PATCH 2/3] FIX: buildbot: install django<2 if python2 is used. --- .buildbot/deploy/01-requirements.sh | 4 ++++ .buildbot/test/01-requirements.sh | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/.buildbot/deploy/01-requirements.sh b/.buildbot/deploy/01-requirements.sh index f6a0d65..0704da7 100644 --- a/.buildbot/deploy/01-requirements.sh +++ b/.buildbot/deploy/01-requirements.sh @@ -1 +1,5 @@ +python_major_version=`python -c 'import sys; print sys.version_info.major'` +if test "$python_major_version" = "2" ; then + pip install 'django<2' +fi pip install -r requirements.txt diff --git a/.buildbot/test/01-requirements.sh b/.buildbot/test/01-requirements.sh index f6a0d65..0704da7 100644 --- a/.buildbot/test/01-requirements.sh +++ b/.buildbot/test/01-requirements.sh @@ -1 +1,5 @@ +python_major_version=`python -c 'import sys; print sys.version_info.major'` +if test "$python_major_version" = "2" ; then + pip install 'django<2' +fi pip install -r requirements.txt From 4cf297ee7445c41b938214f7506b26edab9b8bce Mon Sep 17 00:00:00 2001 From: Jens Kleineheismann Date: Thu, 17 Oct 2019 13:25:08 +0200 Subject: [PATCH 3/3] Closes #2 --- apps/base/urls.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/apps/base/urls.py b/apps/base/urls.py index d00d3f0..4a69660 100644 --- a/apps/base/urls.py +++ b/apps/base/urls.py @@ -1,11 +1,11 @@ # -*- coding: utf-8 -*- from __future__ import unicode_literals from django.contrib import admin -from django.urls import path +from django.conf.urls import url from . import views urlpatterns = [ - path('', views.RootView.as_view(), name='root'), - path('djangoadmin/', admin.site.urls), + url(r'^$', views.RootView.as_view(), name='root'), + url(r'^djangoadmin/', admin.site.urls), ]