Skip to content

Commit 974d29b

Browse files
committed
Release version 1.8.0
1 parent 0bb3859 commit 974d29b

6 files changed

Lines changed: 30 additions & 30 deletions

File tree

.travis.yml

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,14 @@ python:
55
- 3.5
66
- 3.6
77
env:
8-
- DJANGO=django==1.8.17 DRF=3.3.1 DATABASE_URL=mysql://root@localhost/test
9-
- DJANGO=django==1.8.17 DRF=3.3.1 DATABASE_URL=postgres://postgres@localhost/test
10-
- DJANGO=django==1.9.12 DRF=3.3.1 DATABASE_URL=mysql://root@localhost/test
11-
- DJANGO=django==1.9.12 DRF=3.3.1 DATABASE_URL=postgres://postgres@localhost/test
12-
- DJANGO=django==1.10.5 DRF=3.5.3 DATABASE_URL=mysql://root@localhost/test
13-
- DJANGO=django==1.10.5 DRF=3.5.3 DATABASE_URL=postgres://postgres@localhost/test
14-
- DJANGO=https://github.com/django/django/archive/stable/1.11.x.tar.gz DRF=3.5.3 DATABASE_URL=mysql://root@localhost/test
15-
- DJANGO=https://github.com/django/django/archive/stable/1.11.x.tar.gz DRF=3.5.3 DATABASE_URL=postgres://postgres@localhost/test
8+
- DJANGO=django==1.8.18 DRF=3.3.1 DATABASE_URL=mysql://root@localhost/test
9+
- DJANGO=django==1.8.18 DRF=3.3.1 DATABASE_URL=postgres://postgres@localhost/test
10+
- DJANGO=django==1.9.13 DRF=3.3.1 DATABASE_URL=mysql://root@localhost/test
11+
- DJANGO=django==1.9.13 DRF=3.3.1 DATABASE_URL=postgres://postgres@localhost/test
12+
- DJANGO=django==1.10.7 DRF=3.5.3 DATABASE_URL=mysql://root@localhost/test
13+
- DJANGO=django==1.10.7 DRF=3.5.3 DATABASE_URL=postgres://postgres@localhost/test
14+
- DJANGO=django==1.11 DRF=3.5.3 DATABASE_URL=mysql://root@localhost/test
15+
- DJANGO=django==1.11 DRF=3.5.3 DATABASE_URL=postgres://postgres@localhost/test
1616

1717
sudo: false
1818
install:
@@ -31,14 +31,14 @@ after_success:
3131
matrix:
3232
exclude:
3333
- python: 3.6
34-
env: DJANGO=django==1.8.17 DRF=3.3.1 DATABASE_URL=mysql://root@localhost/test
34+
env: DJANGO=django==1.8.18 DRF=3.3.1 DATABASE_URL=mysql://root@localhost/test
3535
- python: 3.6
36-
env: DJANGO=django==1.8.17 DRF=3.3.1 DATABASE_URL=postgres://postgres@localhost/test
36+
env: DJANGO=django==1.8.18 DRF=3.3.1 DATABASE_URL=postgres://postgres@localhost/test
3737
- python: 3.6
38-
env: DJANGO=django==1.9.12 DRF=3.3.1 DATABASE_URL=mysql://root@localhost/test
38+
env: DJANGO=django==1.9.13 DRF=3.3.1 DATABASE_URL=mysql://root@localhost/test
3939
- python: 3.6
40-
env: DJANGO=django==1.9.12 DRF=3.3.1 DATABASE_URL=postgres://postgres@localhost/test
40+
env: DJANGO=django==1.9.13 DRF=3.3.1 DATABASE_URL=postgres://postgres@localhost/test
4141
- python: 3.6
42-
env: DJANGO=django==1.10.5 DRF=3.5.3 DATABASE_URL=mysql://root@localhost/test
42+
env: DJANGO=django==1.10.7 DRF=3.5.3 DATABASE_URL=mysql://root@localhost/test
4343
- python: 3.6
44-
env: DJANGO=django==1.10.5 DRF=3.5.3 DATABASE_URL=postgres://postgres@localhost/test
44+
env: DJANGO=django==1.10.7 DRF=3.5.3 DATABASE_URL=postgres://postgres@localhost/test

README.rst

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ Features
2626
* **Complete** - relationships, custom managers and querysets, proxy models, and abstract models.
2727
* **Batteries included** - translation-enabled forms and admin are provided.
2828
* **Reliable** - more than 300 test cases and counting. |coverage| |build|
29-
* **Compatible** with Django 1.8 to 1.10, running Python 2.7, 3.4 or 3.5.
29+
* **Compatible** with Django 1.8 to 1.11, running Python 2.7, 3.4, 3.5 or 3.6.
3030

3131
Django-hvad also features support for `Django REST framework`_ 3.1 or newer, including
3232
translation-aware serializers.
@@ -113,9 +113,9 @@ Releases
113113
Django-hvad uses the same release pattern as Django. The following versions
114114
are thus available:
115115

116-
* Stable branch 1.6, available through `PyPI`_ and git branch ``releases/1.6.x``.
117116
* Stable branch 1.7, available through `PyPI`_ and git branch ``releases/1.7.x``.
118-
* Development branch 1.8, available through git branch ``master``.
117+
* Stable branch 1.8, available through `PyPI`_ and git branch ``releases/1.8.x``.
118+
* Development branch 1.9, available through git branch ``master``.
119119

120120
Stable branches have minor bugfix releases as needed, with guaranteed compatibility.
121121
See the `installation guide`_ for details, or have a look at the `release notes`_.

docs/public/release_notes.rst

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,17 @@ Release Notes
33
#############
44

55
*****************************
6-
1.8.0 - upcoming release
6+
1.8.0 - current release
77
*****************************
88

9+
Released on April 28, 2017
10+
911
Python and Django versions supported:
1012

13+
- Support for Django 1.10 was added.
1114
- Django 1.7 is no longer supported.
1215
- So, as a reminder, supported Django versions for this release are:
13-
1.8 LTS, 1.9, 1.10.x (for x ≥ 1).
16+
1.8 LTS, 1.9, 1.10.x (for x ≥ 1) and 1.11.
1417

1518
New features:
1619

@@ -64,7 +67,7 @@ Fixes:
6467
:issue:`322`.
6568

6669
*****************************
67-
1.7.0 - current release
70+
1.7.0
6871
*****************************
6972

7073
Released on February 8, 2017

hvad/admin.py

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -80,13 +80,11 @@ def all_translations(self, obj):
8080
all_translations.short_description = _(u'all translations')
8181

8282
def get_available_languages(self, obj):
83-
# remove in 1.8
84-
warnings.warn('admin.get_available_languages is deprecated and will be removed. '
85-
'Please invoke the instance\'s get_available_languages directly.',
86-
DeprecationWarning, stacklevel=2)
87-
if obj is None:
88-
return []
89-
return obj.get_available_languages()
83+
# remove in 1.9
84+
raise NotImplementedError(
85+
'admin.get_available_languages is obsolete and has been removed. '
86+
'Invoke the instance\'s get_available_languages() method directly.'
87+
)
9088

9189
def get_language_tabs(self, obj, request, available_languages):
9290
info = None if obj is None else (obj._meta.app_label, obj._meta.model_name)

hvad/tests/admin.py

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -151,9 +151,7 @@ def test_all_translations_prefetch_related(self):
151151
def test_get_available_languages(self):
152152
obj = Normal.objects.language('en').get(pk=self.normal_id[1])
153153
admin = self._get_admin(Normal)
154-
with self.assertThrowsWarning(DeprecationWarning, 2):
155-
self.assertCountEqual(list(admin.get_available_languages(obj)), self.translations)
156-
self.assertCountEqual(list(admin.get_available_languages(None)), [])
154+
self.assertRaises(NotImplementedError, admin.get_available_languages, obj)
157155

158156
def test_get_object(self):
159157
# Check if it returns a model, if there is at least one translation

setup.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@
3333
"Programming Language :: Python :: 2.7",
3434
"Programming Language :: Python :: 3.4",
3535
"Programming Language :: Python :: 3.5",
36+
"Programming Language :: Python :: 3.6",
3637
"Topic :: Database",
3738
"Topic :: Internet :: WWW/HTTP :: Dynamic Content",
3839
"Topic :: Text Processing :: Linguistic",

0 commit comments

Comments
 (0)