From 56ecd05cfa8c71982d899955877ab77bc99724cb Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Wed, 7 Aug 2019 07:54:12 +0000 Subject: [PATCH 1/4] Update django requirement from <2.0 to <3.0 Updates the requirements on [django](https://github.com/django/django) to permit the latest version. - [Release notes](https://github.com/django/django/releases) - [Commits](https://github.com/django/django/compare/1.0...2.2.4) Signed-off-by: dependabot-preview[bot] --- requirements-docs.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements-docs.txt b/requirements-docs.txt index 1292b5c..831fdac 100644 --- a/requirements-docs.txt +++ b/requirements-docs.txt @@ -1,3 +1,3 @@ -r requirements-test.txt -Django<2.0 +Django<3.0 djangocms-helper From 8ebe99066ad927b77260382bb11d3286e6773c6a Mon Sep 17 00:00:00 2001 From: Iacopo Spalletti Date: Thu, 8 Aug 2019 07:06:30 +0200 Subject: [PATCH 2/4] Update requirements-docs.txt --- requirements-docs.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements-docs.txt b/requirements-docs.txt index 831fdac..5a29406 100644 --- a/requirements-docs.txt +++ b/requirements-docs.txt @@ -1,3 +1,3 @@ -r requirements-test.txt -Django<3.0 +Django<2.2 djangocms-helper From b6ca6a95e961c7ae99f05a62f18d312e2a0e1f67 Mon Sep 17 00:00:00 2001 From: Iacopo Spalletti Date: Thu, 8 Aug 2019 08:14:45 +0200 Subject: [PATCH 3/4] Add djangocms-page-tags to docs requirements --- requirements-docs.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/requirements-docs.txt b/requirements-docs.txt index 5a29406..f4dbeaa 100644 --- a/requirements-docs.txt +++ b/requirements-docs.txt @@ -1,3 +1,4 @@ -r requirements-test.txt Django<2.2 djangocms-helper +djangocms-page-tags From 2a50ffb139148225d269c0dacbd6f6b86d16059b Mon Sep 17 00:00:00 2001 From: Iacopo Spalletti Date: Fri, 9 Aug 2019 07:06:06 +0200 Subject: [PATCH 4/4] Pin sekizai / classy-tags version --- requirements-docs.txt | 2 +- tox.ini | 7 ++++++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/requirements-docs.txt b/requirements-docs.txt index f4dbeaa..38eba9b 100644 --- a/requirements-docs.txt +++ b/requirements-docs.txt @@ -1,4 +1,4 @@ -r requirements-test.txt Django<2.2 djangocms-helper -djangocms-page-tags +djangocms-page-tags>0.6,<0.7 diff --git a/tox.ini b/tox.ini index 7dc2c7f..46c71c2 100644 --- a/tox.ini +++ b/tox.ini @@ -10,12 +10,16 @@ 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 @@ -23,6 +27,8 @@ deps = 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 @@ -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