Skip to content

Commit

Permalink
Added support for Django 2.1, dropped support for 1.8
Browse files Browse the repository at this point in the history
  • Loading branch information
anx-ckreuzberger committed Aug 7, 2018
1 parent 3e171db commit ab6b8b4
Show file tree
Hide file tree
Showing 5 changed files with 38 additions and 15 deletions.
18 changes: 13 additions & 5 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand All @@ -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"
Expand Down
20 changes: 17 additions & 3 deletions README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -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 <https://www.youtube.com/watch?v=iJCbYMgUDW8>`_ that shows you basic functionality of this package.

Quick start
-----------
Expand Down Expand Up @@ -104,6 +106,11 @@ The configuration options are similar to Djangos `DateField <https://docs.django
Changelog
---------

0.3.0 (Meta release, no actual code changes)

* Dropped support for Django 1.8, 1.9 and 1.10
* Added support for Django 2.1

0.2.1

* Added ``setup.cfg`` with the ``license_file`` keyword, ensuring that the actual LICENSE file is also installed when using ``pip install``
Expand Down Expand Up @@ -137,3 +144,10 @@ Development and Tests
You can also use `tox` for testing, as it will test against several Django and Python versions automatically. See ``tox.ini`` for details.

The test source code is in another `repository <https://github.com/anx-ckreuzberger/user_foreign_key_testapp>`_ in the master branch. Changes within that repository can be fetched by calling

.. code-block:: bash
git submodule update --remote
6 changes: 3 additions & 3 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -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',
Expand All @@ -23,20 +23,20 @@
'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',
'Programming Language :: Python',
'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',
],
Expand Down
2 changes: 1 addition & 1 deletion tests/user_foreign_key_testapp
7 changes: 4 additions & 3 deletions tox.ini
Original file line number Diff line number Diff line change
@@ -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
Expand Down

0 comments on commit ab6b8b4

Please sign in to comment.