From d00428c30ad2d9a960f27a27f9a85d02f6c77003 Mon Sep 17 00:00:00 2001 From: Fabio Caccamo Date: Tue, 5 Dec 2017 12:14:27 +0100 Subject: [PATCH] Tested against django 2.0 --- .travis.yml | 4 ++++ README.md | 5 ++--- README.rst | 8 +++----- setup.py | 1 + tox.ini | 9 +++++---- 5 files changed, 15 insertions(+), 12 deletions(-) diff --git a/.travis.yml b/.travis.yml index 58943b5..74ee959 100644 --- a/.travis.yml +++ b/.travis.yml @@ -9,15 +9,19 @@ env: - TOX_ENV=py34-18 - TOX_ENV=py34-19 - TOX_ENV=py34-110 + - TOX_ENV=py34-20 - TOX_ENV=py34-master - TOX_ENV=py35-18 - TOX_ENV=py35-19 - TOX_ENV=py35-110 + - TOX_ENV=py35-20 - TOX_ENV=py35-master matrix: include: - python: "3.6" env: TOX_ENV=py36-111 + - python: "3.6" + env: TOX_ENV=py36-20 - python: "3.6" env: TOX_ENV=py36-master allow_failures: diff --git a/README.md b/README.md index c7c87e4..b6218c3 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,6 @@ [![Build Status](https://travis-ci.org/fabiocaccamo/django-admin-interface.svg?branch=master)](https://travis-ci.org/fabiocaccamo/django-admin-interface) [![codecov](https://codecov.io/gh/fabiocaccamo/django-admin-interface/branch/master/graph/badge.svg)](https://codecov.io/gh/fabiocaccamo/django-admin-interface) [![Code Health](https://landscape.io/github/fabiocaccamo/django-admin-interface/master/landscape.svg?style=flat)](https://landscape.io/github/fabiocaccamo/django-admin-interface/master) -[![Requirements Status](https://requires.io/github/fabiocaccamo/django-admin-interface/requirements.svg?branch=master)](https://requires.io/github/fabiocaccamo/django-admin-interface/requirements/?branch=master) [![PyPI version](https://badge.fury.io/py/django-admin-interface.svg)](https://badge.fury.io/py/django-admin-interface) [![Py versions](https://img.shields.io/pypi/pyversions/django-admin-interface.svg)](https://img.shields.io/pypi/pyversions/django-admin-interface.svg) [![License](https://img.shields.io/pypi/l/django-admin-interface.svg)](https://img.shields.io/pypi/l/django-admin-interface.svg) @@ -19,7 +18,7 @@ django-admin-interface is a modern **responsive flat admin interface customizabl ## Requirements - Python 2.7, 3.4, 3.5, 3.6 -- Django 1.7, 1.8, 1.9, 1.10, 1.11 +- Django 1.7, 1.8, 1.9, 1.10, 1.11, 2.0 ## Installation - Run `pip install django-admin-interface` @@ -28,7 +27,7 @@ django-admin-interface is a modern **responsive flat admin interface customizabl INSTALLED_APPS = ( #... 'admin_interface', - 'flat_responsive', + 'flat_responsive', # only if django version < 2.0 'flat', # only if django version < 1.9 'colorfield', #... diff --git a/README.rst b/README.rst index c3c9f56..7c2ca30 100644 --- a/README.rst +++ b/README.rst @@ -1,4 +1,4 @@ -|Build Status| |codecov| |Code Health| |Requirements Status| |PyPI version| |Py versions| |License| +|Build Status| |codecov| |Code Health| |PyPI version| |Py versions| |License| django-admin-interface ====================== @@ -20,13 +20,13 @@ Requirements ------------ - Python 2.7, 3.4, 3.5, 3.6 -- Django 1.7, 1.8, 1.9, 1.10, 1.11 +- Django 1.7, 1.8, 1.9, 1.10, 1.11, 2.0 Installation ------------ - Run ``pip install django-admin-interface`` -- Add ``admin_interface``, ``flat_responsive``, ``flat`` *(only if django version < 1.9)* and ``colorfield`` to ``settings.INSTALLED_APPS`` **before** ``django.contrib.admin`` +- Add ``admin_interface``, ``flat_responsive`` *(only if django version < 2.0)*, ``flat`` *(only if django version < 1.9)* and ``colorfield`` to ``settings.INSTALLED_APPS`` **before** ``django.contrib.admin`` - Run ``python manage.py migrate`` - Run ``python manage.py collectstatic`` - Restart your application server @@ -127,8 +127,6 @@ Released under **MIT License**. .. |Code Health| image:: https://landscape.io/github/fabiocaccamo/django-admin-interface/master/landscape.svg?style=flat -.. |Requirements Status| image:: https://requires.io/github/fabiocaccamo/django-admin-interface/requirements.svg?branch=master - .. |PyPI version| image:: https://badge.fury.io/py/django-admin-interface.svg .. |Py versions| image:: https://img.shields.io/pypi/pyversions/django-admin-interface.svg diff --git a/setup.py b/setup.py index 31ec35a..1393095 100644 --- a/setup.py +++ b/setup.py @@ -45,6 +45,7 @@ setup( 'Framework :: Django :: 1.9', 'Framework :: Django :: 1.10', 'Framework :: Django :: 1.11', + 'Framework :: Django :: 2.0', 'Intended Audience :: Developers', 'License :: OSI Approved :: MIT License', 'Natural Language :: English', diff --git a/tox.ini b/tox.ini index 5eca63e..c902352 100644 --- a/tox.ini +++ b/tox.ini @@ -1,9 +1,9 @@ [tox] envlist = py27-{17,18,19,110,111}, - py34-{17,18,19,110,111,master}, - py35-{18,19,110,111,master}, - py36-{18,19,110,111,master}, + py34-{17,18,19,110,111,20,master}, + py35-{18,19,110,111,20,master}, + py36-{18,19,110,111,20,master}, [testenv] passenv = CI TRAVIS TRAVIS_* deps = @@ -12,10 +12,11 @@ deps = 19: Django >= 1.9, < 1.10 110: Django >= 1.10, < 1.11 111: Django >= 1.11, < 1.12 + 20: Django >= 2.0, < 2.1 master: https://github.com/django/django/archive/master.tar.gz coverage codecov commands = coverage run --append --source=admin_interface setup.py test coverage report -m - codecov + codecov \ No newline at end of file