Merge 2f56bd4 into 249f5c1

nephila · Dec 22, 2019 · 7707ac3 · 7707ac3
2 parents 249f5c1 + 2f56bd4
commit 7707ac3
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 8 deletions.
diff --git a/HISTORY.rst b/HISTORY.rst
@@ -4,6 +4,11 @@
 History
 *******
 
+0.10.0 (unreleased)
+===================
+
+* Move from djangocms-helper to django-app-helper
+
 0.9.0 (2019-08-22)
 ==================
 

diff --git a/cms_helper.py b/cms_helper.py
@@ -69,13 +69,13 @@ def gettext(s): return s  # NOQA
 
 
 def run():
-    from djangocms_helper import runner
+    from app_helper import runner
     runner.cms('djangocms_page_meta')
 
 
 def setup():
     import sys
-    from djangocms_helper import runner
+    from app_helper import runner
     runner.setup('djangocms_page_meta', sys.modules[__name__], use_cms=True)
 
 

diff --git a/requirements-docs.txt b/requirements-docs.txt
@@ -1,4 +1,4 @@
 -r requirements-test.txt
 Django<2.3
-djangocms-helper
+django-app-helper
 djangocms-page-tags>0.6,<0.8
diff --git a/requirements-test.txt b/requirements-test.txt
@@ -4,3 +4,4 @@ coveralls
 mock>=1.0.1
 flake8
 tox
+django-app-helper
diff --git a/tests/__init__.py b/tests/__init__.py
@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 from __future__ import absolute_import, print_function, unicode_literals
 
-from djangocms_helper.base_test import BaseTestCase
+from app_helper.base_test import BaseTestCase
 
 
 class BaseTest(BaseTestCase):

diff --git a/tox.ini b/tox.ini
@@ -10,26 +10,23 @@ deps =
     django111: django-polymorphic>=0.9
     django111: django-filer>=1.3
     django111: djangocms-page-tags>=0.6.2
-    django111: djangocms-helper>1.0,<1.3
+    django111: django-formtools>=2.1,<2.2
     django20: Django>=2.0,<2.1
     django20: django-mptt>=0.8
     django20: django-taggit>=0.18
     django20: django-polymorphic>=0.9
     django20: django-filer>=1.3
     django20: djangocms-page-tags>=0.6.2
-    django20: djangocms-helper>1.0,<1.3
     django21: Django>=2.1,<2.2
     django21: django-mptt>=0.8
     django21: django-taggit>=0.18
     django21: django-polymorphic>=0.9
     django21: djangocms-page-tags>=0.6.2
-    django21: djangocms-helper>1.0,<1.3
     django22: Django>=2.2,<2.3
     django22: django-mptt>=0.8
     django22: django-taggit>=0.24
     django22: django-polymorphic>=0.9
     django22: djangocms-page-tags>=0.6.2
-    django22: djangocms-helper>1.2
     cms34: https://github.com/divio/django-cms/archive/release/3.4.x.zip
     cms35: https://github.com/divio/django-cms/archive/release/3.5.x.zip
     cms36: https://github.com/divio/django-cms/archive/release/3.6.x.zip