Skip to content

Added Django 1.10 support #206

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Mar 29, 2017
Merged

Added Django 1.10 support #206

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion CHANGELOG.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,11 @@
ChangeLog
=========

Master (unreleased)
master (unreleased)
===================

* Added Django 1.10 support (#203).

Release 0.8.2 (2017-03-28)
==========================

Expand Down
10 changes: 4 additions & 6 deletions README.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,13 +10,11 @@ django-formidable
django-formidable is a full django application which allows you to create,
edit, delete and use forms.

Warning
=======

Python Compatibility : python2.7 (tox says it's compliant up to
python3.2, but I don't)
Django compatibility : django1.8
Warnings
========

* Python Compatibility : Python 2.7, 3.4, 3.5 (3.3, but only with Django 1.8)
* Django compatibility : Django 1.8, 1.9, 1.10

Licence
=======
Expand Down
1 change: 1 addition & 0 deletions circle.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ test:
override:
- tox -e $(tox -l | grep django18 | tr '\n' ',')
- tox -e $(tox -l | grep django19 | tr '\n' ',')
- tox -e $(tox -l | grep django110 | tr '\n' ',')
- tox -e flake8
- tox -e isort-check
- tox -e docs
2 changes: 1 addition & 1 deletion setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
author_email='guillaume.camera@people-doc.com, '
'guillaume.gerard@people-doc.com',
install_requires=[
'Django<1.10',
'Django',
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I would have set Django<1.11 here instead. Because, it'll install the very latest version of Django here if it's unpinned. What do you think?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this silly requirement has almost make me lose my mind ; I was working with tox "django110" jobs, and it was still Django 1.9 that was installed. Luckily I did a careful check to the "pip freeze -l" that is executed during the job, or we could have a "fake" Django 1.10 support.

Maybe we could think about having a "latest" job, that installs the latest Django version, run it through a cron job (I don't know if circle-ci is able to do it, but travis does) and periodically check if the latest django release is compatible, in order to anticipate further releases.

'djangorestframework',
'markdown',
'python-dateutil',
Expand Down
2 changes: 2 additions & 0 deletions tox.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
envlist =
django18-py{27,33,34,35}
django19-py{27,34,35}
django110-py{27,34,35}
flake8
isort-check
skipsdist = True
Expand All @@ -14,6 +15,7 @@ deps =
; Django versions
django18: Django>=1.8,<1.9
django19: Django>=1.9,<1.10
django110: Django>=1.10,<1.11
; Requirements from demo project
py27: mock
-rdemo/requirements-demo.pip
Expand Down