From 2fb0511e77a94617f4b5d04da6d673c36f2fa9de Mon Sep 17 00:00:00 2001 From: Manel Clos Date: Thu, 10 Sep 2020 16:01:54 +0200 Subject: [PATCH] update support matrix --- .travis.yml | 75 +++++++++++++++++++++++++---------------------- README.rst | 10 ++++--- setup.py | 4 +++ tests/settings.py | 1 + 4 files changed, 51 insertions(+), 39 deletions(-) diff --git a/.travis.yml b/.travis.yml index bbe9615..5527142 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,20 +1,15 @@ language: python python: - - "2.7" - - "3.3" - - "3.4" - - "3.5" - - "3.6" + - "3.8" - "3.7" + - "3.6" env: - - DJANGO="Django>=1.8,<1.9" - - DJANGO="Django>=1.9,<1.10" - - DJANGO="Django>=1.10,<1.11" - - DJANGO="Django>=1.11,<2.0" - - DJANGO="Django>=2.0,<2.1" - DJANGO="https://github.com/django/django/archive/master.tar.gz" + - DJANGO="Django>=3.1,<3.2" + - DJANGO="Django>=3.0,<3.1" + - DJANGO="Django>=2.2,<3.0" install: - pip install -q $DJANGO @@ -27,44 +22,54 @@ script: after_success: coveralls matrix: - exclude: - - python: "3.6" - env: DJANGO="Django>=1.8,<1.9" - - python: "3.7" - env: DJANGO="Django>=1.8,<1.9" + allow_failures: + - env: DJANGO="https://github.com/django/django/archive/master.tar.gz" - - python: "3.3" - env: DJANGO="Django>=1.9,<1.10" + include: + - python: "3.5" + env: DJANGO="Django>=2.1,<2.2" - python: "3.6" - env: DJANGO="Django>=1.9,<1.10" + env: DJANGO="Django>=2.1,<2.2" - python: "3.7" - env: DJANGO="Django>=1.9,<1.10" + env: DJANGO="Django>=2.1,<2.2" - - python: "3.3" - env: DJANGO="Django>=1.10,<1.11" + - python: "3.4" + env: DJANGO="Django>=2.0,<2.1" + - python: "3.5" + env: DJANGO="Django>=2.0,<2.1" - python: "3.6" - env: DJANGO="Django>=1.10,<1.11" + env: DJANGO="Django>=2.0,<2.1" - python: "3.7" - env: DJANGO="Django>=1.10,<1.11" + env: DJANGO="Django>=2.0,<2.1" - - python: "3.3" + - python: "2.7" + env: DJANGO="Django>=1.11,<2.0" + - python: "3.4" + env: DJANGO="Django>=1.11,<2.0" + - python: "3.5" + env: DJANGO="Django>=1.11,<2.0" + - python: "3.6" env: DJANGO="Django>=1.11,<2.0" - python: "3.7" env: DJANGO="Django>=1.11,<2.0" - python: "2.7" - env: DJANGO="Django>=2.0,<2.1" - - python: "3.3" - env: DJANGO="Django>=2.0,<2.1" - - python: "3.7" - env: DJANGO="Django>=2.0,<2.1" + env: DJANGO="Django>=1.10,<1.11" + - python: "3.4" + env: DJANGO="Django>=1.10,<1.11" + - python: "3.5" + env: DJANGO="Django>=1.10,<1.11" - python: "2.7" - env: DJANGO="https://github.com/django/django/archive/master.tar.gz" - - python: "3.3" - env: DJANGO="https://github.com/django/django/archive/master.tar.gz" + env: DJANGO="Django>=1.9,<1.10" - python: "3.4" - env: DJANGO="https://github.com/django/django/archive/master.tar.gz" + env: DJANGO="Django>=1.9,<1.10" + - python: "3.5" + env: DJANGO="Django>=1.9,<1.10" - allow_failures: - - env: DJANGO="https://github.com/django/django/archive/master.tar.gz" + - python: "2.7" + env: DJANGO="Django>=1.8,<1.9" + - python: "3.4" + env: DJANGO="Django>=1.8,<1.9" + - python: "3.5" + env: DJANGO="Django>=1.8,<1.9" diff --git a/README.rst b/README.rst index 2ca16d9..d6206d2 100644 --- a/README.rst +++ b/README.rst @@ -1,7 +1,7 @@ Django GroupAdmin Users ======================= -|Build Status| |Coverage Status| +|Build Status| |Coverage Status| |PyPI version| Edit users in group from the Group add and edit pages. @@ -23,7 +23,7 @@ Add ''groupadmin\_users'' to INSTALLED\_APPS after Alternatively, don't add ''groupadmin\_users'' to INSTALLED\_APPS, but use and further customize this code: -:: +.. code-block:: python from django.contrib import admin from django.contrib.auth.models import Group @@ -54,6 +54,8 @@ Example image from Stack Overflow answer: :alt: Example image .. |Build Status| image:: https://travis-ci.org/Microdisseny/django-groupadmin-users.svg?branch=master - :target: https://travis-ci.org/Microdisseny/django-groupadmin-users + :target: https://travis-ci.org/Microdisseny/django-groupadmin-users .. |Coverage Status| image:: https://coveralls.io/repos/github/Microdisseny/django-groupadmin-users/badge.svg?branch=master - :target: https://coveralls.io/github/Microdisseny/django-groupadmin-users?branch=master + :target: https://coveralls.io/github/Microdisseny/django-groupadmin-users?branch=master +.. |PyPI version| image:: https://badge.fury.io/py/django-groupadmin-users.svg + :target: https://badge.fury.io/py/django-groupadmin-users diff --git a/setup.py b/setup.py index 33062cf..fc80604 100644 --- a/setup.py +++ b/setup.py @@ -18,9 +18,13 @@ 'Topic :: Software Development :: Libraries :: Python Modules', ] +with open('README.rst', 'r') as f: + long_desc = f.read() + setup( name='django-groupadmin-users', description='Edit users in group from the Group add and edit pages', + long_description=long_desc, version=VERSION, author='Manel Clos', author_email='manelclos@gmail.com', diff --git a/tests/settings.py b/tests/settings.py index 20c5855..3c349c7 100644 --- a/tests/settings.py +++ b/tests/settings.py @@ -6,6 +6,7 @@ 'django.contrib.admin', 'django.contrib.auth', 'django.contrib.contenttypes', + 'django.contrib.messages', 'django.contrib.sessions', 'django.contrib.sites',