Skip to content

Commit

Permalink
update support matrix
Browse files Browse the repository at this point in the history
  • Loading branch information
manelclos committed Sep 10, 2020
1 parent 18c66c0 commit 2fb0511
Show file tree
Hide file tree
Showing 4 changed files with 51 additions and 39 deletions.
75 changes: 40 additions & 35 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -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"
10 changes: 6 additions & 4 deletions README.rst
Original file line number Diff line number Diff line change
@@ -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.

Expand All @@ -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
Expand Down Expand Up @@ -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
4 changes: 4 additions & 0 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -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',
Expand Down
1 change: 1 addition & 0 deletions tests/settings.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
'django.contrib.admin',
'django.contrib.auth',
'django.contrib.contenttypes',
'django.contrib.messages',
'django.contrib.sessions',
'django.contrib.sites',

Expand Down

0 comments on commit 2fb0511

Please sign in to comment.