Change curtail_uuid to django_curtail_uuid

Brightcells лет %!s(int64=7): %!d(string=назад)
Родитель
Сommit
7cb0d608cb
9 измененных файлов с 17 добавлено и 17 удалено
  1. 1 1
      account/account_views.py
  2. 1 1
      account/admin.py
  3. 1 1
      group/group_views.py
  4. 1 1
      group/lensman_views.py
  5. 1 1
      group/tourguidegroup_views.py
  6. 1 1
      miniapp/views.py
  7. 1 1
      photo/views.py
  8. 9 9
      requirements.txt
  9. 1 1
      utils/redis/ruuid.py

+ 1 - 1
account/account_views.py

@@ -1,8 +1,8 @@
1 1
 # -*- coding: utf-8 -*-
2 2
 
3
-from curtail_uuid import CurtailUUID
4 3
 from django.contrib.auth.models import Group, User
5 4
 from django.db import transaction
5
+from django_curtail_uuid import CurtailUUID
6 6
 from django_response import response
7 7
 from ipaddr import client_ip
8 8
 from logit import logit

+ 1 - 1
account/admin.py

@@ -1,9 +1,9 @@
1 1
 # -*- coding: utf-8 -*-
2 2
 
3
-from curtail_uuid import CurtailUUID
4 3
 from djadmin import ChangeOnlyModelAdmin, ReadOnlyModelAdmin
5 4
 from django.contrib import admin
6 5
 from django.db import transaction
6
+from django_curtail_uuid import CurtailUUID
7 7
 
8 8
 from account.models import LensmanIncomeExpensesInfo, LensmanInfo, TourGuideInfo, UserIncomeExpensesInfo, UserInfo
9 9
 

+ 1 - 1
group/group_views.py

@@ -2,9 +2,9 @@
2 2
 
3 3
 from __future__ import division
4 4
 
5
-from curtail_uuid import CurtailUUID
6 5
 from django.conf import settings
7 6
 from django.db import connection, transaction
7
+from django_curtail_uuid import CurtailUUID
8 8
 from django_response import response
9 9
 from logit import logit
10 10
 from paginator import pagination

+ 1 - 1
group/lensman_views.py

@@ -2,8 +2,8 @@
2 2
 
3 3
 from __future__ import division
4 4
 
5
-from curtail_uuid import CurtailUUID
6 5
 from django.db import transaction
6
+from django_curtail_uuid import CurtailUUID
7 7
 from django_response import response
8 8
 from ipaddr import client_ip
9 9
 from isoweek import Week

+ 1 - 1
group/tourguidegroup_views.py

@@ -5,9 +5,9 @@ from __future__ import division
5 5
 import json
6 6
 
7 7
 import shortuuid
8
-from curtail_uuid import CurtailUUID
9 8
 from django.conf import settings
10 9
 from django.core.serializers.json import DjangoJSONEncoder
10
+from django_curtail_uuid import CurtailUUID
11 11
 from django_response import response
12 12
 from logit import logit
13 13
 from TimeConvert import TimeConvert as tc

+ 1 - 1
miniapp/views.py

@@ -1,8 +1,8 @@
1 1
 # -*- coding: utf-8 -*-
2 2
 
3
-from curtail_uuid import CurtailUUID
4 3
 from django.conf import settings
5 4
 from django.db import transaction
5
+from django_curtail_uuid import CurtailUUID
6 6
 from django_response import response
7 7
 from ipaddr import client_ip
8 8
 from logit import logit

+ 1 - 1
photo/views.py

@@ -1,8 +1,8 @@
1 1
 # -*- coding: utf-8 -*-
2 2
 
3
-from curtail_uuid import CurtailUUID
4 3
 from django.db import transaction
5 4
 from django.shortcuts import render
5
+from django_curtail_uuid import CurtailUUID
6 6
 # from django_q.tasks import async
7 7
 from django_response import response
8 8
 from ipaddr import client_ip

+ 9 - 9
requirements.txt

@@ -1,12 +1,12 @@
1
-CodeConvert==2.0.4
2
-Django==1.11.9
1
+CodeConvert==2.0.5
2
+Django==1.11.11
3 3
 MySQL-python==1.2.5
4 4
 Pillow==5.0.0
5 5
 StatusCode==1.0.0
6
-TimeConvert==1.4.1
6
+TimeConvert==1.4.3
7 7
 cryptography==1.5.2
8 8
 django-admin==1.1.1
9
-django-curtail-uuid==1.0.0
9
+django-curtail-uuid==1.0.4
10 10
 django-detect==1.0.5
11 11
 django-file-md5==1.0.1
12 12
 django-ip==1.0.2
@@ -18,21 +18,21 @@ django-models-ext==1.1.0
18 18
 django-multidomain==1.1.4
19 19
 django-paginator2==1.0.3
20 20
 django-redis-connector==1.0.1
21
-django-response==1.0.0
21
+django-response==1.0.2
22 22
 django-rlog==1.0.7
23 23
 django-shortuuidfield==0.1.3
24 24
 django-six==1.0.4
25 25
 django-uniapi==1.0.1
26
-django-we==1.1.2
26
+django-we==1.1.4
27 27
 djangorestframework==3.7.7
28 28
 furl==1.0.1
29 29
 hiredis==0.2.0
30 30
 isoweek==1.3.3
31 31
 jsonfield==2.0.2
32 32
 mock==2.0.0
33
-pysnippets==1.0.4
33
+pysnippets==1.0.5
34 34
 pywe-jssdk==1.0.2
35
-pywe-miniapp==1.0.0
35
+pywe-miniapp==1.0.2
36 36
 pywe-oauth==1.0.6
37 37
 pywe-pay==1.0.11
38 38
 pywe-pay-notify==1.0.1
@@ -41,7 +41,7 @@ pywe-sign==1.0.6
41 41
 pywe-xml==1.0.0
42 42
 qiniu==7.2.0
43 43
 redis==2.10.6
44
-redis-extensions==1.2.0
44
+redis-extensions==1.2.1
45 45
 requests==2.18.4
46 46
 rlog==0.3
47 47
 rsa==3.4.2

+ 1 - 1
utils/redis/ruuid.py

@@ -1,6 +1,6 @@
1 1
 # -*- coding: utf-8 -*-
2 2
 
3
-from curtail_uuid import CurtailUUID
3
+from django_curtail_uuid import CurtailUUID
4 4
 
5 5
 from photo.models import UUIDInfo
6 6
 from utils.redis.connect import r