Skip to content

Commit

Permalink
Merge pull request zsoldosp#42 from Sibyx/master
Browse files Browse the repository at this point in the history
Django 3.1 & Python 3.8 support
  • Loading branch information
belugame authored Aug 4, 2020
2 parents 290c564 + 6110c0f commit 8797fc7
Show file tree
Hide file tree
Showing 5 changed files with 17 additions and 8 deletions.
8 changes: 5 additions & 3 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,13 @@ matrix:
- python: "2.7"
env: TOX_ENVS=py27-django111
- python: "3.5"
env: TOX_ENVS=py35-django111,py35-django21,py35-django22
env: TOX_ENVS=py35-django21,py35-django22
- python: "3.6"
env: TOX_ENVS=py36-django111,py36-django21,py36-django22
env: TOX_ENVS=py36-django21,py36-django22,py36-django30,py36-django31
- python: "3.7"
env: TOX_ENVS=py37-django111,py37-django21,py37-django22
env: TOX_ENVS=py37-django21,py37-django22,py37-django30,py37-django31
- python: "3.8"
env: TOX_ENVS=py38-django21,py38-django22,py38-django30,py38-django31
script:
- tox -e $TOX_ENVS
before_deploy: "make clean"
Expand Down
2 changes: 2 additions & 0 deletions README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,8 @@ differences (as of django-cuser v.2017.3.16):

Release Notes
-------------
* 0.5.1 - add support for Django 3.1 and Python 3.8

* 0.5.0
- add support for update on save (thank you @felubra)
- no longer build on Python 3.5, deprecated
Expand Down
2 changes: 1 addition & 1 deletion django_currentuser/__init__.py
Original file line number Diff line number Diff line change
@@ -1 +1 @@
__version__ = '0.5.0'
__version__ = '0.5.1'
5 changes: 4 additions & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
],
include_package_data=True,
install_requires=[
'Django>=1.11.17,<3.1;python_version>="2.7"',
'Django>=1.11.17,<3.2;python_version>="2.7"',
],
license="BSD",
zip_safe=False,
Expand All @@ -47,9 +47,12 @@
'Programming Language :: Python :: 3.5',
'Programming Language :: Python :: 3.6',
'Programming Language :: Python :: 3.7',
'Programming Language :: Python :: 3.8',
'Framework :: Django',
'Framework :: Django :: 1.11',
'Framework :: Django :: 2.1',
'Framework :: Django :: 2.2',
'Framework :: Django :: 3.0',
'Framework :: Django :: 3.1',
],
)
8 changes: 5 additions & 3 deletions tox.ini
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,10 @@
[tox]
envlist =
py{27,36,37}-django111,
py{36,37}-django21,
py{36,37}-django22,
py{36,37}-django30,
py{36,37,38}-django21,
py{36,37,38}-django22,
py{36,37,38}-django30,
py{36,37,38}-django31,

[testenv]
commands =
Expand All @@ -21,6 +22,7 @@ deps =
django21: Django>=2.1.8,<2.2
django22: Django>=2.2.1,<2.3
django30: Django>=3.0,<3.1
django31: Django>=3.1,<3.2
flake8
docutils

Expand Down

0 comments on commit 8797fc7

Please sign in to comment.