From 19ede8695aa0cd1c8e7ee9ef2c29c1cc9941b4e8 Mon Sep 17 00:00:00 2001 From: Nicolas Date: Sun, 12 Feb 2017 15:09:29 +0100 Subject: [PATCH 01/11] Fixed: 'odict_values' object does not support indexing And fixed : can't pickle dict_items objects --- cmsplugin_cascade/bootstrap3/secondary_menu.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmsplugin_cascade/bootstrap3/secondary_menu.py b/cmsplugin_cascade/bootstrap3/secondary_menu.py index ff9053ba9..e9e69418f 100644 --- a/cmsplugin_cascade/bootstrap3/secondary_menu.py +++ b/cmsplugin_cascade/bootstrap3/secondary_menu.py @@ -39,7 +39,7 @@ def get_form(self, request, obj=None, **kwargs): for page in Page.objects.filter(reverse_id__isnull=False).order_by('publisher_is_draft'): if page.reverse_id not in choices: choices[page.reverse_id] = page.get_title(lang) - self.glossary_fields[0].widget.choices = choices.items() + next(iter(self.glossary_fields)).widget.choices = list(choices.items()) return super(BootstrapSecondaryMenuPlugin, self).get_form(request, obj, **kwargs) plugin_pool.register_plugin(BootstrapSecondaryMenuPlugin) From 0373881a870322c300eef1393e0c745982f32934 Mon Sep 17 00:00:00 2001 From: Nicolas Date: Sun, 12 Feb 2017 15:16:15 +0100 Subject: [PATCH 02/11] Update secondary_menu.py --- cmsplugin_cascade/bootstrap3/secondary_menu.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmsplugin_cascade/bootstrap3/secondary_menu.py b/cmsplugin_cascade/bootstrap3/secondary_menu.py index e9e69418f..57147281a 100644 --- a/cmsplugin_cascade/bootstrap3/secondary_menu.py +++ b/cmsplugin_cascade/bootstrap3/secondary_menu.py @@ -39,7 +39,7 @@ def get_form(self, request, obj=None, **kwargs): for page in Page.objects.filter(reverse_id__isnull=False).order_by('publisher_is_draft'): if page.reverse_id not in choices: choices[page.reverse_id] = page.get_title(lang) - next(iter(self.glossary_fields)).widget.choices = list(choices.items()) + next(iter(self.glossary_fields)).widget.choices = list(choices.items()) return super(BootstrapSecondaryMenuPlugin, self).get_form(request, obj, **kwargs) plugin_pool.register_plugin(BootstrapSecondaryMenuPlugin) From 6462c173cf2c70e7f32c8cd20a36c60c0bde197c Mon Sep 17 00:00:00 2001 From: Nicolas Date: Sun, 19 Feb 2017 14:13:38 +0100 Subject: [PATCH 03/11] Update .travis.yml --- .travis.yml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index b14c0f7e6..d3f63e72c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -4,6 +4,7 @@ python: - 2.7 - 3.4 - 3.5 + - 3.6 env: matrix: @@ -18,7 +19,10 @@ before_script: - sh -e /etc/init.d/xvfb start - "if [[ $TRAVIS_PYTHON_VERSION == '2.7' ]]; then export PYVER=py27; fi" - "if [[ $TRAVIS_PYTHON_VERSION == '3.4' ]]; then export PYVER=py34; fi" - - "if [[ $TRAVIS_PYTHON_VERSION == '3.5' ]]; then export PYVER=py35; fi" + - "if [[ $TRAVIS_PYTHON_VERSION == '3.5' ]]; then export PYVER=py35; fi" + - "if [[ $TRAVIS_PYTHON_VERSION == '3.5' ]]; then export PYVER=py36; fi" + + script: - tox -e"$PYVER-$DJANGO-$CMS" From c33946f48203aa4ff0f526d32f5df88e11e60e16 Mon Sep 17 00:00:00 2001 From: Nicolas Date: Sun, 19 Feb 2017 14:31:21 +0100 Subject: [PATCH 04/11] Update .travis.yml --- .travis.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/.travis.yml b/.travis.yml index d3f63e72c..6c8294077 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,3 +1,9 @@ +# safelist +branches: + only: + - master + - releases/0.12.x + language: python python: From 9fa55ebb6ac8550f6d59f12782ea1a0d45c609c5 Mon Sep 17 00:00:00 2001 From: Nicolas Date: Sun, 19 Feb 2017 14:45:29 +0100 Subject: [PATCH 05/11] Update setup.py --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index b82403b04..34936c32d 100644 --- a/setup.py +++ b/setup.py @@ -39,7 +39,7 @@ def convert(filename, fmt): license='LICENSE-MIT', platforms=['OS Independent'], classifiers=CLASSIFIERS, - long_description=convert('README.md', 'rst'), + #long_description=convert('README.md', 'rst'), include_package_data=True, zip_safe=False, ) From 2b036e172e3e5d67f56a5f96cc40b9a33f13df8d Mon Sep 17 00:00:00 2001 From: np Date: Sun, 19 Feb 2017 14:58:57 +0100 Subject: [PATCH 06/11] =?UTF-8?q?=09nouveau=20fichier=C2=A0:=20test=5Ffile?= =?UTF-8?q?.txt?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- test_file.txt | 0 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 test_file.txt diff --git a/test_file.txt b/test_file.txt new file mode 100644 index 000000000..e69de29bb From edaaafbc981251c63f1e6cfd7dd791bd8cf187e5 Mon Sep 17 00:00:00 2001 From: Nicolas Date: Sun, 19 Feb 2017 15:03:40 +0100 Subject: [PATCH 07/11] Delete test_file.txt --- test_file.txt | 0 1 file changed, 0 insertions(+), 0 deletions(-) delete mode 100644 test_file.txt diff --git a/test_file.txt b/test_file.txt deleted file mode 100644 index e69de29bb..000000000 From abd724c4bf568c3b344880aaeb52a861650904da Mon Sep 17 00:00:00 2001 From: Nicolas Date: Sun, 19 Feb 2017 15:04:23 +0100 Subject: [PATCH 08/11] Update setup.py --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index 34936c32d..b82403b04 100644 --- a/setup.py +++ b/setup.py @@ -39,7 +39,7 @@ def convert(filename, fmt): license='LICENSE-MIT', platforms=['OS Independent'], classifiers=CLASSIFIERS, - #long_description=convert('README.md', 'rst'), + long_description=convert('README.md', 'rst'), include_package_data=True, zip_safe=False, ) From 4f5d1a9fe37f484917d9a9ff6f695045c91fb237 Mon Sep 17 00:00:00 2001 From: Nicolas Date: Sun, 19 Feb 2017 15:06:40 +0100 Subject: [PATCH 09/11] Update .travis.yml --- .travis.yml | 8 -------- 1 file changed, 8 deletions(-) diff --git a/.travis.yml b/.travis.yml index 6c8294077..7d70204b3 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,11 +1,3 @@ -# safelist -branches: - only: - - master - - releases/0.12.x - -language: python - python: - 2.7 - 3.4 From 0748eeb68ac739ce7b9e27a232529d05faad07eb Mon Sep 17 00:00:00 2001 From: Nicolas Date: Sun, 19 Feb 2017 15:27:43 +0100 Subject: [PATCH 10/11] Update .travis.yml --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 7d70204b3..66f066449 100644 --- a/.travis.yml +++ b/.travis.yml @@ -18,7 +18,7 @@ before_script: - "if [[ $TRAVIS_PYTHON_VERSION == '2.7' ]]; then export PYVER=py27; fi" - "if [[ $TRAVIS_PYTHON_VERSION == '3.4' ]]; then export PYVER=py34; fi" - "if [[ $TRAVIS_PYTHON_VERSION == '3.5' ]]; then export PYVER=py35; fi" - - "if [[ $TRAVIS_PYTHON_VERSION == '3.5' ]]; then export PYVER=py36; fi" + - "if [[ $TRAVIS_PYTHON_VERSION == '3.6' ]]; then export PYVER=py36; fi" From 96ba2dd13cd711ff0aac4f2f97d83254f5d34eb3 Mon Sep 17 00:00:00 2001 From: Nicolas Date: Sun, 19 Feb 2017 15:34:59 +0100 Subject: [PATCH 11/11] Update .travis.yml --- .travis.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.travis.yml b/.travis.yml index 66f066449..e599cabed 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,3 +1,5 @@ +language: python + python: - 2.7 - 3.4