Skip to content

Commit 89ec3cc

Browse files
committed
Removes code producing DeprecationError
1 parent 6846dd1 commit 89ec3cc

File tree

5 files changed

+9
-4
lines changed

5 files changed

+9
-4
lines changed

CHANGES

+4
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
Release 2.x (dev)
2+
-------------
3+
* Removes code producing DeprecationError
4+
15
Release 2.2
26
-------------
37
* drop suppot django<3.0

src/concurrency/__init__.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
__author__ = 'sax'
22
default_app_config = 'concurrency.apps.ConcurrencyConfig'
33

4-
VERSION = __version__ = "2.2"
4+
VERSION = __version__ = "2.2.1"
55
NAME = 'django-concurrency'

src/concurrency/fields.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
from django.db.models.fields import Field
1212
from django.db.models.signals import class_prepared, post_migrate
1313
from django.utils.encoding import force_text
14-
from django.utils.translation import ugettext_lazy as _
14+
from django.utils.translation import gettext_lazy as _
1515

1616
from concurrency import forms
1717
from concurrency.api import get_revision_of_object

tests/test_admin_list_editable.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ def test_normal_add(self):
3232

3333
res = res.click(self.TARGET._meta.verbose_name_plural)
3434

35-
res = res.click('Add')
35+
res = res.click('Add', href='/admin/auth/user/add/')
3636
form = res.form
3737
form['username'] = 'CHAR'
3838
res = form.submit().follow()

tox.ini

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
[tox]
2-
envlist = d{30}-py{36,37,38}-{pg,sqlite,mysql}
2+
envlist = d{30,31}-py{36,37,38}-{pg,sqlite,mysql}
33

44

55
[pytest]
@@ -60,6 +60,7 @@ deps =
6060
; d21: django>=2.1,<2.2
6161
; d22: django>=2.2,<2.3
6262
d30: django>=3.0,<3.1
63+
d31: django>=3.1,<3.2
6364

6465

6566
commands =

0 commit comments

Comments
 (0)