Skip to content

Commit

Permalink
Merge pull request #440 from nephila/hotfix/tox_fixes
Browse files Browse the repository at this point in the history
Fix tox dependencies
  • Loading branch information
yakky authored Mar 12, 2018
2 parents 70074ba + 22094b2 commit 47838c5
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 2 deletions.
1 change: 1 addition & 0 deletions requirements-docs.txt
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
-r requirements-test.txt
Django<2.0
html5lib<0.99999999
easy-thumbnails<2.5
6 changes: 4 additions & 2 deletions tox.ini
Original file line number Diff line number Diff line change
Expand Up @@ -22,21 +22,23 @@ deps =
django111: django-mptt>=0.8
django111: https://github.com/divio/django-filer/archive/develop.zip
django111: django-appdata>=0.2.0
django111: https://github.com/aldryn/aldryn-apphooks-config/archive/feature/django11.zip
cms32: https://github.com/divio/django-cms/archive/release/3.2.x.zip
cms32: djangocms-text-ckeditor<3.0
cms32: aldryn-apphooks-config<0.4
cms33: https://github.com/divio/django-cms/archive/release/3.3.x.zip
cms33: djangocms-text-ckeditor>=3.0
cms33: aldryn-apphooks-config<0.4
cms34: https://github.com/divio/django-cms/archive/release/3.4.x.zip
cms34: djangocms-text-ckeditor>=3.2
cms34: aldryn-apphooks-config>=0.4.0rc1
cms35: https://github.com/divio/django-cms/archive/release/3.5.x.zip
cms35: djangocms-text-ckeditor>=3.5
cms35: aldryn-apphooks-config>=0.4.0rc1
channels<2.0
https://github.com/nephila/django-knocker/archive/master.zip?0.1.1
django-meta>=1.2
html5lib<0.99999999
https://github.com/nephila/djangocms-helper/archive/develop.zip
aldryn-apphooks-config
https://github.com/nephila/djangocms-apphook-setup/archive/master.zip
-r{toxinidir}/requirements-test.txt

Expand Down

0 comments on commit 47838c5

Please sign in to comment.