ungleich-public/djangocms_blog
6
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge pull request #106 from nephila/feature/minor_fixes

Browse source 
Minor fixes
This commit is contained in:
Iacopo Spalletti 2015-02-26 22:27:45 +01:00
commit 03073e45e4
4 changed files with 3 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
.travis.yml
View file

@ -10,7 +10,6 @@ python:
env: env:
matrix: matrix:
- DJANGO='django15'
- DJANGO='django16' - DJANGO='django16'
- DJANGO='django17' - DJANGO='django17'

1
README.rst
View file

@ -27,7 +27,6 @@ you encounter any issue, please open an issue.
Supported Django versions: Supported Django versions:
* Django 1.5
* Django 1.6 * Django 1.6
* Django 1.7 * Django 1.7

2
setup.py
View file

@ -39,7 +39,7 @@ setup(
install_requires=[ install_requires=[
'django-parler>=1.2', 'django-parler>=1.2',
'django-cms>=3.0', 'django-cms>=3.0',
'django-taggit', 'django-taggit>=0.12.2',
'django-filer', 'django-filer',
'pytz', 'pytz',
'django-taggit-templatetags', 'django-taggit-templatetags',

4
tox.ini
View file

@ -1,11 +1,11 @@
[tox] [tox]
envlist = py{26}-django{15,16},py{27,33,34}-django{15,16,17} envlist = py{26}-django{16},py{27,33,34}-django{16,17}
[testenv] [testenv]
deps = deps =
django15: Django>=1.5,<1.6
django16: Django>=1.6,<1.7 django16: Django>=1.6,<1.7
django17: Django>=1.7,<1.8 django17: Django>=1.7,<1.8
django17: https://github.com/divio/django-cms/archive/support/3.0.x.zip
py26: unittest2 py26: unittest2
py26: django-select2 py26: django-select2
py27: django-select2 py27: django-select2