Merge branch 'master' of python/django-test into production
This commit was merged in pull request #4.
This commit is contained in:
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -1 +1 @@
|
||||
NOT IMPLEMENTED YET
|
||||
NOT IMPLEMENTED YET!
|
||||
|
||||
@@ -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),
|
||||
]
|
||||
|
||||
Reference in New Issue
Block a user