Skip to content

Commit

Permalink
Restrict django-model-utils version with Django 1.5.5 tests
Browse files Browse the repository at this point in the history
  • Loading branch information
Sebastian Vetter committed Feb 12, 2014
1 parent f80db24 commit 5b63a22
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 6 deletions.
8 changes: 4 additions & 4 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,16 +3,16 @@ python:
- '2.7'
env:
matrix:
- DRF_VERSRION=">=2.3,<2.4" DJANGO_VERSION=">=1.4,<1.5"
- DRF_VERSRION=">=2.3,<2.4" DJANGO_VERSION=">=1.5,<1.6"
- DRF_VERSRION=">=2.3,<2.4" DJANGO_VERSION=">=1.6,<1.7"
- DRF_VERSRION=">=2.3,<2.4" DJANGO_VERSION=">=1.4,<1.5" MODEL_UTILS_VERSION=">2.0"
- DRF_VERSRION=">=2.3,<2.4" DJANGO_VERSION=">=1.5,<1.6" MODEL_UTILS_VERSION=">1.5"
- DRF_VERSRION=">=2.3,<2.4" DJANGO_VERSION=">=1.6,<1.7" MODEL_UTILS_VERSION=">2.0"
before_install:
- "export DISPLAY=:99.0"
- "sh -e /etc/init.d/xvfb start"
- "/sbin/start-stop-daemon --start --quiet --pidfile /tmp/custom_xvfb_99.pid --make-pidfile --background --exec /usr/bin/Xvfb -- :99 -ac -screen 0 1280x1024x16"
install:
- pip install wheel setuptools -U
- pip install Django$DJANGO_VERSION djangorestframework$DRF_VERSION --use-wheel
- pip install Django$DJANGO_VERSION djangorestframework$DRF_VERSION django-model-utils$MODEL_UTILS_VERSION --use-wheel
- pip install . --use-mirrors --use-wheel
- pip install -r requirements.txt --use-mirrors --use-wheel
script:
Expand Down
8 changes: 6 additions & 2 deletions README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@ Fancy CMS-style page editing for Django
:alt: Requirements Status


.. note: This is a work in progress and part of this project will likely change
and could potentially break things. Be careful with using it.
**Note:** This is a work in progress and part of this project will likely
change and could potentially break things. Be careful with using it.


Fancypages provides an easy way to edit content in your Django project.
Expand All @@ -28,6 +28,10 @@ The way this Django app works is inspired by `django-frontend-admin`_,
template tags to define customisable sections in a Django template is
based on the ideas in the two apps mentioned above.

**Warning:** There's currently an issue with *django-model-utils* 2.0+ and
Django 1.5.5. Until this is resolved, we advise to use **version 1.5** with
that specific version of Django.

.. _`django-frontend-admin`: https://github.com/bartTC/django-frontendadmin
.. _`django-content-blocks`: https://github.com/KevinBrolly/django-content-blocks

Expand Down

0 comments on commit 5b63a22

Please sign in to comment.