Skip to content

Commit

Permalink
Release version 1.8.0
Browse files Browse the repository at this point in the history
  • Loading branch information
spectras committed Apr 28, 2017
1 parent 0bb3859 commit 974d29b
Show file tree
Hide file tree
Showing 6 changed files with 30 additions and 30 deletions.
28 changes: 14 additions & 14 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,14 +5,14 @@ python:
- 3.5
- 3.6
env:
- DJANGO=django==1.8.17 DRF=3.3.1 DATABASE_URL=mysql://root@localhost/test
- DJANGO=django==1.8.17 DRF=3.3.1 DATABASE_URL=postgres://postgres@localhost/test
- DJANGO=django==1.9.12 DRF=3.3.1 DATABASE_URL=mysql://root@localhost/test
- DJANGO=django==1.9.12 DRF=3.3.1 DATABASE_URL=postgres://postgres@localhost/test
- DJANGO=django==1.10.5 DRF=3.5.3 DATABASE_URL=mysql://root@localhost/test
- DJANGO=django==1.10.5 DRF=3.5.3 DATABASE_URL=postgres://postgres@localhost/test
- DJANGO=https://github.com/django/django/archive/stable/1.11.x.tar.gz DRF=3.5.3 DATABASE_URL=mysql://root@localhost/test
- DJANGO=https://github.com/django/django/archive/stable/1.11.x.tar.gz DRF=3.5.3 DATABASE_URL=postgres://postgres@localhost/test
- DJANGO=django==1.8.18 DRF=3.3.1 DATABASE_URL=mysql://root@localhost/test
- DJANGO=django==1.8.18 DRF=3.3.1 DATABASE_URL=postgres://postgres@localhost/test
- DJANGO=django==1.9.13 DRF=3.3.1 DATABASE_URL=mysql://root@localhost/test
- DJANGO=django==1.9.13 DRF=3.3.1 DATABASE_URL=postgres://postgres@localhost/test
- DJANGO=django==1.10.7 DRF=3.5.3 DATABASE_URL=mysql://root@localhost/test
- DJANGO=django==1.10.7 DRF=3.5.3 DATABASE_URL=postgres://postgres@localhost/test
- DJANGO=django==1.11 DRF=3.5.3 DATABASE_URL=mysql://root@localhost/test
- DJANGO=django==1.11 DRF=3.5.3 DATABASE_URL=postgres://postgres@localhost/test

sudo: false
install:
Expand All @@ -31,14 +31,14 @@ after_success:
matrix:
exclude:
- python: 3.6
env: DJANGO=django==1.8.17 DRF=3.3.1 DATABASE_URL=mysql://root@localhost/test
env: DJANGO=django==1.8.18 DRF=3.3.1 DATABASE_URL=mysql://root@localhost/test
- python: 3.6
env: DJANGO=django==1.8.17 DRF=3.3.1 DATABASE_URL=postgres://postgres@localhost/test
env: DJANGO=django==1.8.18 DRF=3.3.1 DATABASE_URL=postgres://postgres@localhost/test
- python: 3.6
env: DJANGO=django==1.9.12 DRF=3.3.1 DATABASE_URL=mysql://root@localhost/test
env: DJANGO=django==1.9.13 DRF=3.3.1 DATABASE_URL=mysql://root@localhost/test
- python: 3.6
env: DJANGO=django==1.9.12 DRF=3.3.1 DATABASE_URL=postgres://postgres@localhost/test
env: DJANGO=django==1.9.13 DRF=3.3.1 DATABASE_URL=postgres://postgres@localhost/test
- python: 3.6
env: DJANGO=django==1.10.5 DRF=3.5.3 DATABASE_URL=mysql://root@localhost/test
env: DJANGO=django==1.10.7 DRF=3.5.3 DATABASE_URL=mysql://root@localhost/test
- python: 3.6
env: DJANGO=django==1.10.5 DRF=3.5.3 DATABASE_URL=postgres://postgres@localhost/test
env: DJANGO=django==1.10.7 DRF=3.5.3 DATABASE_URL=postgres://postgres@localhost/test
6 changes: 3 additions & 3 deletions README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ Features
* **Complete** - relationships, custom managers and querysets, proxy models, and abstract models.
* **Batteries included** - translation-enabled forms and admin are provided.
* **Reliable** - more than 300 test cases and counting. |coverage| |build|
* **Compatible** with Django 1.8 to 1.10, running Python 2.7, 3.4 or 3.5.
* **Compatible** with Django 1.8 to 1.11, running Python 2.7, 3.4, 3.5 or 3.6.

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

* Stable branch 1.6, available through `PyPI`_ and git branch ``releases/1.6.x``.
* Stable branch 1.7, available through `PyPI`_ and git branch ``releases/1.7.x``.
* Development branch 1.8, available through git branch ``master``.
* Stable branch 1.8, available through `PyPI`_ and git branch ``releases/1.8.x``.
* Development branch 1.9, available through git branch ``master``.

Stable branches have minor bugfix releases as needed, with guaranteed compatibility.
See the `installation guide`_ for details, or have a look at the `release notes`_.
Expand Down
9 changes: 6 additions & 3 deletions docs/public/release_notes.rst
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,17 @@ Release Notes
#############

*****************************
1.8.0 - upcoming release
1.8.0 - current release
*****************************

Released on April 28, 2017

Python and Django versions supported:

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

New features:

Expand Down Expand Up @@ -64,7 +67,7 @@ Fixes:
:issue:`322`.

*****************************
1.7.0 - current release
1.7.0
*****************************

Released on February 8, 2017
Expand Down
12 changes: 5 additions & 7 deletions hvad/admin.py
Original file line number Diff line number Diff line change
Expand Up @@ -80,13 +80,11 @@ def all_translations(self, obj):
all_translations.short_description = _(u'all translations')

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

def get_language_tabs(self, obj, request, available_languages):
info = None if obj is None else (obj._meta.app_label, obj._meta.model_name)
Expand Down
4 changes: 1 addition & 3 deletions hvad/tests/admin.py
Original file line number Diff line number Diff line change
Expand Up @@ -151,9 +151,7 @@ def test_all_translations_prefetch_related(self):
def test_get_available_languages(self):
obj = Normal.objects.language('en').get(pk=self.normal_id[1])
admin = self._get_admin(Normal)
with self.assertThrowsWarning(DeprecationWarning, 2):
self.assertCountEqual(list(admin.get_available_languages(obj)), self.translations)
self.assertCountEqual(list(admin.get_available_languages(None)), [])
self.assertRaises(NotImplementedError, admin.get_available_languages, obj)

def test_get_object(self):
# Check if it returns a model, if there is at least one translation
Expand Down
1 change: 1 addition & 0 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@
"Programming Language :: Python :: 2.7",
"Programming Language :: Python :: 3.4",
"Programming Language :: Python :: 3.5",
"Programming Language :: Python :: 3.6",
"Topic :: Database",
"Topic :: Internet :: WWW/HTTP :: Dynamic Content",
"Topic :: Text Processing :: Linguistic",
Expand Down

0 comments on commit 974d29b

Please sign in to comment.