Merge branch 'master' of python/django-test into production
All checks were successful
buildbot/django-test-test-python2 Build done.
buildbot/django-test-test-python3 Build done.

This commit was merged in pull request #4.
This commit is contained in:
2019-10-17 13:36:11 +02:00
committed by Gitea
5 changed files with 12 additions and 4 deletions

View File

@@ -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 pip install -r requirements.txt

View File

@@ -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 pip install -r requirements.txt

View File

@@ -1 +1 @@
NOT IMPLEMENTED YET NOT IMPLEMENTED YET!

View File

@@ -1,11 +1,11 @@
# -*- coding: utf-8 -*- # -*- coding: utf-8 -*-
from __future__ import unicode_literals from __future__ import unicode_literals
from django.contrib import admin from django.contrib import admin
from django.urls import path from django.conf.urls import url
from . import views from . import views
urlpatterns = [ urlpatterns = [
path('', views.RootView.as_view(), name='root'), url(r'^$', views.RootView.as_view(), name='root'),
path('djangoadmin/', admin.site.urls), url(r'^djangoadmin/', admin.site.urls),
] ]