From 9c8e8b80f2602369eed1f2b3dcf3f23ea5f165f5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mat=C4=9Bj=20Koci=C3=A1n?= Date: Sat, 9 Jan 2016 17:03:40 +0100 Subject: [PATCH] =?UTF-8?q?Upgrade=20autocomplete=20a=20reversion,=20pad?= =?UTF-8?q?=C3=A1=20import=20urls?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- galerie/admin.py | 2 +- galerie/autocomplete_light_registry.py | 2 +- korektury/models.py | 2 +- requirements.txt | 68 +++++++++++++------------- seminar/admin.py | 2 +- seminar/autocomplete_light_registry.py | 2 +- seminar/models.py | 2 +- seminar/tools.py | 2 +- 8 files changed, 41 insertions(+), 41 deletions(-) diff --git a/galerie/admin.py b/galerie/admin.py index 1441ce09..8e9c1897 100644 --- a/galerie/admin.py +++ b/galerie/admin.py @@ -5,7 +5,7 @@ from django.contrib import admin from django.http import HttpResponseRedirect from django import forms from django.db import models -import autocomplete_light +from autocomplete_light import shortcuts as autocomplete_light # akction diff --git a/galerie/autocomplete_light_registry.py b/galerie/autocomplete_light_registry.py index 7b624d20..69dc6a5b 100644 --- a/galerie/autocomplete_light_registry.py +++ b/galerie/autocomplete_light_registry.py @@ -2,7 +2,7 @@ from __future__ import unicode_literals -import autocomplete_light +from autocomplete_light import shortcuts as autocomplete_light from models import Obrazek, Galerie from views import cesta_od_korene diff --git a/korektury/models.py b/korektury/models.py index ee873616..10577471 100644 --- a/korektury/models.py +++ b/korektury/models.py @@ -23,7 +23,7 @@ from django_countries.fields import CountryField from solo.models import SingletonModel from taggit.managers import TaggableManager -import reversion +from reversion import revisions as reversion # PrilohaReseni method def generate_filename(self, filename): diff --git a/requirements.txt b/requirements.txt index cff14d30..794f4b86 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,48 +1,48 @@ # basic libs -psycopg2==2.6.1 -html5lib==0.9999999 -ipython==4.0.0 -Pillow==2.9.0 -pytz==2014.10 -six==1.9.0 -pexpect==3.3 -traitlets==4.0.0 +psycopg2 +html5lib +ipython +Pillow +pytz +six +pexpect +traitlets # Django and modules -Django==1.7.10 # Updatable to 1.9 (possibly incompatible) -django-bootstrap-sass==0.0.6a0 -django-mptt==0.7.3 -django-reversion==1.9.3 -django-sekizai==0.8.1 -django-countries==3.2 -django-solo==1.1.0 -django-ckeditor==4.4.7 # Updatable to 5.0 (some incompatible changes) -django-flat-theme==0.9.3 -django-taggit==0.17 -django-autocomplete-light==2.2.6 -django-crispy-forms==1.4.0 -django-imagekit==3.2.7 +Django +django-bootstrap-sass +django-mptt +django-reversion +django-sekizai +django-countries +django-solo +django-ckeditor +django-flat-theme +django-taggit +django-autocomplete-light +django-crispy-forms +django-imagekit # Comments -akismet==0.2.0 -django-fluent-comments==1.0.2 -django-threadedcomments==1.0b1 -django-contrib-comments==1.6.1 +akismet +django-fluent-comments +django-threadedcomments +django-contrib-comments # debug tools/extensions -django-debug-toolbar==1.4 -django-extensions==1.5.6 -sqlparse==0.1.16 -Werkzeug==0.10.4 +django-debug-toolbar +django-extensions +sqlparse +Werkzeug # G+, FB authorisation -# django-allauth==0.19.1 -# oauthlib==0.7.2 -# python-openid==2.2.5 -# requests==2.5.3 -# requests-oauthlib==0.4.2 +# django-allauth +# oauthlib +# python-openid +# requests +# requests-oauthlib diff --git a/seminar/admin.py b/seminar/admin.py index 8fd5aa61..e2ec58cd 100644 --- a/seminar/admin.py +++ b/seminar/admin.py @@ -12,7 +12,7 @@ from django.db import models from django.contrib.auth.models import User from seminar.models import Skola, Resitel, Rocnik, Cislo, Problem, Reseni, PrilohaReseni, Nastaveni, Soustredeni, Soustredeni_Ucastnici, Soustredeni_Organizatori, Novinky, Organizator -import autocomplete_light +from autocomplete_light import shortcuts as autocomplete_light class UserModelChoiceField(forms.ModelChoiceField): diff --git a/seminar/autocomplete_light_registry.py b/seminar/autocomplete_light_registry.py index 76b9f6ba..13318877 100644 --- a/seminar/autocomplete_light_registry.py +++ b/seminar/autocomplete_light_registry.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -import autocomplete_light +from autocomplete_light import shortcuts as autocomplete_light from models import Skola, Resitel, Problem, Organizator from taggit.models import Tag diff --git a/seminar/models.py b/seminar/models.py index 361278e2..c5df19e9 100644 --- a/seminar/models.py +++ b/seminar/models.py @@ -24,7 +24,7 @@ from django_countries.fields import CountryField from solo.models import SingletonModel from taggit.managers import TaggableManager -import reversion +from reversion import revisions as reversion from seminar.utils import roman diff --git a/seminar/tools.py b/seminar/tools.py index 686ccb02..eb83332f 100644 --- a/seminar/tools.py +++ b/seminar/tools.py @@ -2,7 +2,7 @@ import logging as log from .models import Resitel -import reversion +from reversion import revisions as reversion def merge_props(r1, r2, prop, pretend=True, smaller=False, equal=True): """Merge r2.`prop` into r1.`prop`.