Skip to content

Commit

Permalink
Merge 2a50ffb into a38efe3
Browse files Browse the repository at this point in the history
  • Loading branch information
dependabot-preview[bot] committed Aug 9, 2019
2 parents a38efe3 + 2a50ffb commit ba237e2
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 2 deletions.
3 changes: 2 additions & 1 deletion requirements-docs.txt
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
-r requirements-test.txt
Django<2.0
Django<2.2
djangocms-helper
djangocms-page-tags>0.6,<0.7
7 changes: 6 additions & 1 deletion tox.ini
Original file line number Diff line number Diff line change
Expand Up @@ -10,19 +10,25 @@ deps =
django18: django-polymorphic<0.9
django18: djangocms-page-tags<0.7
django18: djangocms-helper<1.1
django18: django-sekizai<1.0
django18: django-classy-tags<0.9
django19: Django>=1.9,<1.10
django19: django-mptt>=0.8,<0.9
django19: django-taggit>=0.18,<0.22
django19: django-polymorphic<0.9
django19: djangocms-page-tags<0.7
django19: djangocms-helper<1.1
django19: django-sekizai<1.0
django19: django-classy-tags<0.9
django110: Django>=1.10,<1.11
django110: django-mptt>=0.8,<0.9
django110: django-taggit>=0.18,<0.22
django110: django-polymorphic>=0.9,<2.0
django110: django-filer>=1.3,<1.4
django110: djangocms-page-tags<0.7
django110: djangocms-helper<1.1
django110: django-sekizai<1.0
django110: django-classy-tags<0.9
django111: Django>=1.11,<2.0
django111: django-mptt>=0.8
django111: django-taggit>=0.18,<0.24
Expand Down Expand Up @@ -62,7 +68,6 @@ skip_install = true
deps =
sphinx
sphinx-rtd-theme
djangocms-page-tags>0.6,<0.7
-rrequirements-docs.txt
changedir=docs
skip_install = true
Expand Down

0 comments on commit ba237e2

Please sign in to comment.