From ab6b8b441ba651cdc5e2305beacc9bc7f4c88c61 Mon Sep 17 00:00:00 2001 From: anx-ckreuzberger Date: Tue, 7 Aug 2018 12:18:07 +0200 Subject: [PATCH] Added support for Django 2.1, dropped support for 1.8 --- .travis.yml | 18 +++++++++++++----- README.rst | 20 +++++++++++++++++--- setup.py | 6 +++--- tests/user_foreign_key_testapp | 2 +- tox.ini | 7 ++++--- 5 files changed, 38 insertions(+), 15 deletions(-) diff --git a/.travis.yml b/.travis.yml index acb7c5c..e27f617 100644 --- a/.travis.yml +++ b/.travis.yml @@ -4,10 +4,10 @@ python: # test various python versions (Django Support for various python versio - "3.4" - "3.5" - "3.6" - - "3.7-dev" +# - "3.7" - "pypy" # PyPy2 - "pypy3" # PyPy3 - - "nightly" # currently points to 3.7-dev + - "nightly" env: matrix: - DJANGO_VERSION=1.8 @@ -16,6 +16,8 @@ env: - DJANGO_VERSION=1.11.* # latest 1.11 - DJANGO_VERSION=2.0 - DJANGO_VERSION=2.0.* # latest 2.0 + - DJANGO_VERSION=2.1 + - DJANGO_VERSION=2.1.* # latest 2.1 cache: directories: - $HOME/.cache/pip @@ -29,18 +31,24 @@ matrix: - { python: "pypy", env: DJANGO_VERSION=2.0 } - { python: "2.7", env: DJANGO_VERSION=2.0.* } - { python: "pypy", env: DJANGO_VERSION=2.0.* } + - { python: "2.7", env: DJANGO_VERSION=2.1 } + - { python: "pypy", env: DJANGO_VERSION=2.1 } + - { python: "2.7", env: DJANGO_VERSION=2.1.* } + - { python: "pypy", env: DJANGO_VERSION=2.1.* } + # Django 2.1 does not support the above and Python 3.4 anymore + - { python: "3.4", env: DJANGO_VERSION=2.1 } + - { python: "3.4", env: DJANGO_VERSION=2.1.* } # Django 1.8 might not support newer versions of python - { python: "3.6", env: DJANGO_VERSION=1.8 } - - { python: "3.7", env: DJANGO_VERSION=1.8 } +# - { python: "3.7", env: DJANGO_VERSION=1.8 } - { python: "pypy3", env: DJANGO_VERSION=1.8 } - { python: "nightly", env: DJANGO_VERSION=1.8 } - { python: "3.6", env: DJANGO_VERSION=1.8.* } - - { python: "3.7", env: DJANGO_VERSION=1.8.* } +# - { python: "3.7", env: DJANGO_VERSION=1.8.* } - { python: "pypy3", env: DJANGO_VERSION=1.8.* } - { python: "nightly", env: DJANGO_VERSION=1.8.* } allow_failures: # newer python versions aswell as pypy may also always break our build - - python: "3.7-dev" - python: "pypy" - python: "pypy3" - python: "nightly" diff --git a/README.rst b/README.rst index 7fa26a5..ef413de 100644 --- a/README.rst +++ b/README.rst @@ -7,13 +7,15 @@ Django UserForeignKey .. image:: https://img.shields.io/pypi/v/django-userforeignkey.svg?maxAge=2592000 :target: -Django UserForeignKey is a simple Django app (supporting Django 1.8 up to Django 2.0) that will give you a UserForeignKey model field. +Django UserForeignKey is a simple Django app that will give you a `UserForeignKey` model field for Django models. This field extends a regular ForeignKey model field, and has the option to automatically set the currently logged in user on insert and/or update. -Currently, Django 1.8, 1.11 (Python 2.7, Python 3.4+) and Django 2.0 (Python 3.4+) are supported. +Currently, Django 1.11 (Python 2.7, Python 3.4+), Django 2.0 (Python 3.4+) and Django 2.1 (Python 3.5+) are supported. -*Note*: Django 1.9 and 1.10 should work too, but both versions are insecure and deprecated. Consider upgrading to a newer Django Version! +If you need support for the insecure and deprecated Django 1.8 (and possibly 1.9 and 1.10), please fall back to version 0.2.1. + +There also is a `video tutorial on YouTube `_ that shows you basic functionality of this package. Quick start ----------- @@ -104,6 +106,11 @@ The configuration options are similar to Djangos `DateField `_ in the master branch. Changes within that repository can be fetched by calling + +.. code-block:: bash + + git submodule update --remote + diff --git a/setup.py b/setup.py index f2faacd..5fa655d 100644 --- a/setup.py +++ b/setup.py @@ -10,7 +10,7 @@ setup( name='django-userforeignkey', - version='0.2.1', + version='0.3.0', packages=find_packages(), include_package_data=True, license='BSD License', @@ -23,9 +23,9 @@ 'Development Status :: 5 - Production/Stable', 'Environment :: Web Environment', 'Framework :: Django', - 'Framework :: Django :: 1.8', 'Framework :: Django :: 1.11', 'Framework :: Django :: 2.0', + 'Framework :: Django :: 2.1', 'Intended Audience :: Developers', 'License :: OSI Approved :: BSD License', 'Operating System :: OS Independent', @@ -33,10 +33,10 @@ 'Programming Language :: Python :: 2', 'Programming Language :: Python :: 2.7', 'Programming Language :: Python :: 3', - 'Programming Language :: Python :: 3.3', 'Programming Language :: Python :: 3.4', 'Programming Language :: Python :: 3.5', 'Programming Language :: Python :: 3.6', + 'Programming Language :: Python :: 3.7', 'Topic :: Internet :: WWW/HTTP', 'Topic :: Internet :: WWW/HTTP :: Dynamic Content', ], diff --git a/tests/user_foreign_key_testapp b/tests/user_foreign_key_testapp index be195f2..d6ccd9b 160000 --- a/tests/user_foreign_key_testapp +++ b/tests/user_foreign_key_testapp @@ -1 +1 @@ -Subproject commit be195f21b2ad4c8d99c5a436e39264c1cd15d854 +Subproject commit d6ccd9b1ee4931cdcd7b09d61c7fe2cf8ae0a0e3 diff --git a/tox.ini b/tox.ini index f8061b0..f8ff510 100644 --- a/tox.ini +++ b/tox.ini @@ -1,16 +1,17 @@ [tox] envlist = - {py27,py33,py34,py35,pypy}-django18 {py27,py34,py35,py36,pypy}-django11 - {py34,py35,py36,pypy}-django20 + {py34,py35,py36,py37,pypy3}-django20 + {py35,py36,py37,pypy3}-django21 skipsdist = True [testenv] deps = - django18: Django==1.8.* django11: Django==1.11.* django20: Django==2.0.* + django21: Django==2.1.* + commands = python ../../setup.py install