[fc] Repository: plone.app.viewletmanager

Branch: refs/heads/master Date: 2018-05-16T23:46:51+02:00 Author: ale-rt (ale-rt) <alessandro.pisa@gmail.com> Commit: plone/plone.app.viewletmanager@23150b0 Fix imports Files changed: M CHANGES.rst M plone/app/viewletmanager/tests/test_exportimport.py Repository: plone.app.viewletmanager Branch: refs/heads/master Date: 2018-05-17T09:16:07+02:00 Author: Alessandro Pisa (ale-rt) <alessandro.pisa@gmail.com> Commit: plone/plone.app.viewletmanager@1e08fb1 Merge pull request #15 from plone/pep8 Fix imports Files changed: M CHANGES.rst M plone/app/viewletmanager/tests/test_exportimport.py
plone · May 17, 2018 · aa04a98 · aa04a98
1 parent fc0769d
commit aa04a98
Showing 1 changed file with 95 additions and 230 deletions.
diff --git a/last_commit.txt b/last_commit.txt
@@ -1,267 +1,132 @@
-Repository: Products.Archetypes
+Repository: plone.app.viewletmanager
 
 
 Branch: refs/heads/master
-Date: 2018-05-16T12:02:38+02:00
-Author: Michael Howitz (icemac) <mh@gocept.com>
-Commit: https://github.com/plone/Products.Archetypes/commit/830e56208e9a629db0275ea1d2a4fb616fc7f37c
+Date: 2018-05-16T23:46:51+02:00
+Author: ale-rt (ale-rt) <alessandro.pisa@gmail.com>
+Commit: https://github.com/plone/plone.app.viewletmanager/commit/23150b097b2725b5e555ce13a1adbfe44bc6a243
 
-Test against Plone 5.2.
-
-Files changed:
-M buildout.cfg
-
-diff --git a/buildout.cfg b/buildout.cfg
-index 6301f529..1b54d85b 100644
---- a/buildout.cfg
-+++ b/buildout.cfg
-@@ -1,8 +1,19 @@
- [buildout]
-+extensions = mr.developer
-+auto-checkout = *
- index = https://pypi.python.org/simple/
- develop = .
- parts = test
--extends = http://dist.plone.org/release/5.1-latest/versions.cfg
-+# extends = http://dist.plone.org/release/5.1-latest/versions.cfg
-+extends = https://raw.githubusercontent.com/plone/buildout.coredev/5.2/versions.cfg
-+
-+[remotes]
-+plone = https://github.com/plone
-+plone_push = git@github.com:plone
-+
-+[sources]
-+Products.CMFPlone = git ${remotes:plone}/Products.CMFPlone.git pushurl=${remotes:plone_push}/Products.CMFPlone.git branch=master
-+Products.CMFFormController = git ${remotes:plone}/Products.CMFFormController.git pushurl=${remotes:plone_push}/Products.CMFFormController.git branch=master
-
- [versions]
- Products.Archetypes =
-
-
-Repository: Products.Archetypes
-
-
-Branch: refs/heads/master
-Date: 2018-05-16T12:56:05+02:00
-Author: Alexander Loechel (loechel) <Alexander.Loechel@lmu.de>
-Commit: https://github.com/plone/Products.Archetypes/commit/7a66ce9a2785ee022306b8cfb2f36f6e9ee8314f
-
-add annotate step in travis
-
-Files changed:
-M .travis.yml
-
-diff --git a/.travis.yml b/.travis.yml
-index 527e594c..7e26e7b6 100644
---- a/.travis.yml
-+++ b/.travis.yml
-@@ -11,6 +11,7 @@ before_install:
- # Keep in sync with buildout.cfg:
-   - bin/python bootstrap.py --setuptools-version=38.2.4 --buildout-version=2.11.3
- install:
-+  - bin/buildout -Nvt 5 -c travis.cfg annotate
-   - bin/buildout -Nvt 5 -c travis.cfg
- script:
-   - bin/test
-
-
-Repository: Products.Archetypes
-
-
-Branch: refs/heads/master
-Date: 2018-05-16T12:59:53+02:00
-Author: Alexander Loechel (loechel) <Alexander.Loechel@lmu.de>
-Commit: https://github.com/plone/Products.Archetypes/commit/aa4d6db4e19ca0d1f48c63bf588b66bd38713114
-
-explicit ask for python version in travis
-
-Files changed:
-M .travis.yml
-
-diff --git a/.travis.yml b/.travis.yml
-index 7e26e7b6..3bb6317a 100644
---- a/.travis.yml
-+++ b/.travis.yml
-@@ -11,6 +11,7 @@ before_install:
- # Keep in sync with buildout.cfg:
-   - bin/python bootstrap.py --setuptools-version=38.2.4 --buildout-version=2.11.3
- install:
-+  - bin/python -V
-   - bin/buildout -Nvt 5 -c travis.cfg annotate
-   - bin/buildout -Nvt 5 -c travis.cfg
- script:
-
-
-Repository: Products.Archetypes
-
-
-Branch: refs/heads/master
-Date: 2018-05-16T13:02:46+02:00
-Author: Alexander Loechel (loechel) <Alexander.Loechel@lmu.de>
-Commit: https://github.com/plone/Products.Archetypes/commit/820e57954c12919e129f8924ea52758adc4b4071
-
-explicit force to new virtualenv and python version
-
-Files changed:
-M .travis.yml
-
-diff --git a/.travis.yml b/.travis.yml
-index 3bb6317a..4d3ee376 100644
---- a/.travis.yml
-+++ b/.travis.yml
-@@ -7,7 +7,8 @@ cache:
-     - $HOME/buildout-cache
- before_install:
-   - mkdir -p $HOME/buildout-cache/{eggs,downloads}
--  - virtualenv .
-+  - python -m pip install -U pip virtualenv
-+  - python -m virtualenv .
- # Keep in sync with buildout.cfg:
-   - bin/python bootstrap.py --setuptools-version=38.2.4 --buildout-version=2.11.3
- install:
-
-
-Repository: Products.Archetypes
-
-
-Branch: refs/heads/master
-Date: 2018-05-16T13:06:25+02:00
-Author: Alexander Loechel (loechel) <Alexander.Loechel@lmu.de>
-Commit: https://github.com/plone/Products.Archetypes/commit/f16f4a56ee54e784ec2a2318a33423082cac0422
-
-run test in verbose mode
-
-Files changed:
-M .travis.yml
-
-diff --git a/.travis.yml b/.travis.yml
-index 4d3ee376..cfe1c892 100644
---- a/.travis.yml
-+++ b/.travis.yml
-@@ -16,4 +16,4 @@ install:
-   - bin/buildout -Nvt 5 -c travis.cfg annotate
-   - bin/buildout -Nvt 5 -c travis.cfg
- script:
--  - bin/test
-+  - bin/test -vc
-
-
-Repository: Products.Archetypes
-
-
-Branch: refs/heads/master
-Date: 2018-05-16T14:12:28+02:00
-Author: Michael Howitz (icemac) <mh@gocept.com>
-Commit: https://github.com/plone/Products.Archetypes/commit/d3a3199f02910ca7a519de8a1799b85e0f59555e
-
-Add change log entry.
+Fix imports
 
 Files changed:
 M CHANGES.rst
+M plone/app/viewletmanager/tests/test_exportimport.py
 
 diff --git a/CHANGES.rst b/CHANGES.rst
-index 71b12c56..fd757d4e 100644
+index 4feedfc..a206126 100644
 --- a/CHANGES.rst
 +++ b/CHANGES.rst
-@@ -10,11 +10,13 @@ Breaking changes:
-
- New features:
+@@ -17,6 +17,7 @@ New features:
+ Bug fixes:
 
--- *add item here*
-+- Test against Plone 5.2
-+  [icemac]
+ - More Python 2 / 3 compatibility [ale-rt, pbauer]
++- Start making code flake8 compliant [ale-rt]
 
- Bug fixes:
 
--- *add item here*
-+- Fix Travis CI setup.
-+  [loechel]
+ 2.0.11 (2018-01-30)
+diff --git a/plone/app/viewletmanager/tests/test_exportimport.py b/plone/app/viewletmanager/tests/test_exportimport.py
+index 5336a49..fa79ab1 100644
+--- a/plone/app/viewletmanager/tests/test_exportimport.py
++++ b/plone/app/viewletmanager/tests/test_exportimport.py
+@@ -1,12 +1,11 @@
+ # -*- coding: utf-8 -*-
+-from OFS.Folder import Folder
+ from persistent.dict import PersistentDict
+-from plone.app.viewletmanager.exportimport.storage import exportViewletSettingsStorage
+-from plone.app.viewletmanager.exportimport.storage import importViewletSettingsStorage
+-from plone.app.viewletmanager.exportimport.storage import ViewletSettingsStorageNodeAdapter
++from plone.app.viewletmanager.exportimport.storage import exportViewletSettingsStorage  # noqa: E501
++from plone.app.viewletmanager.exportimport.storage import importViewletSettingsStorage  # noqa: E501
++from plone.app.viewletmanager.exportimport.storage import ViewletSettingsStorageNodeAdapter  # noqa: E501
+ from plone.app.viewletmanager.interfaces import IViewletSettingsStorage
+ from plone.app.viewletmanager.storage import ViewletSettingsStorage
+-from plone.app.viewletmanager.testing import PLONE_APP_VIEWLETMANAGER_INTEGRATION_TESTING
++from plone.app.viewletmanager.testing import PLONE_APP_VIEWLETMANAGER_INTEGRATION_TESTING  # noqa: E501
+ from Products.CMFPlone.exportimport.tests.base import BodyAdapterTestCase
+ from Products.GenericSetup.tests.common import BaseRegistryTests
+ from Products.GenericSetup.tests.common import DummyExportContext
+@@ -17,15 +16,6 @@
+ import unittest
 
 
- 1.15.2 (2018-05-03)
+-# BBB Zope 2.12
+-try:
+-    from Zope2.App import zcml
+-    from OFS import metaconfigure
+-except ImportError:
+-    from Products.Five import zcml
+-    from Products.Five import fiveconfigure as metaconfigure
+-
+-
+ COMMON_SETUP_ORDER = {
+     'basic': {'top': ('one', )},
+     'fancy': {'top': ('two', 'three', 'one')},
 
 
-Repository: Products.Archetypes
+Repository: plone.app.viewletmanager
 
 
 Branch: refs/heads/master
-Date: 2018-05-16T14:26:09+02:00
-Author: Alexander Loechel (loechel) <loechel@users.noreply.github.com>
-Commit: https://github.com/plone/Products.Archetypes/commit/699bda4af712c3c2b86102ee6bf1c2348f8e471a
+Date: 2018-05-17T09:16:07+02:00
+Author: Alessandro Pisa (ale-rt) <alessandro.pisa@gmail.com>
+Commit: https://github.com/plone/plone.app.viewletmanager/commit/1e08fb1a8d0d19ca61d0c9203770e5d0ef16ef1a
 
-Merge pull request #109 from plone/plone-5.2
+Merge pull request #15 from plone/pep8
 
-Test against Plone 5.2.
+Fix imports
 
 Files changed:
-M .travis.yml
 M CHANGES.rst
-M buildout.cfg
+M plone/app/viewletmanager/tests/test_exportimport.py
 
-diff --git a/.travis.yml b/.travis.yml
-index 527e594c..cfe1c892 100644
---- a/.travis.yml
-+++ b/.travis.yml
-@@ -7,10 +7,13 @@ cache:
-     - $HOME/buildout-cache
- before_install:
-   - mkdir -p $HOME/buildout-cache/{eggs,downloads}
--  - virtualenv .
-+  - python -m pip install -U pip virtualenv
-+  - python -m virtualenv .
- # Keep in sync with buildout.cfg:
-   - bin/python bootstrap.py --setuptools-version=38.2.4 --buildout-version=2.11.3
- install:
-+  - bin/python -V
-+  - bin/buildout -Nvt 5 -c travis.cfg annotate
-   - bin/buildout -Nvt 5 -c travis.cfg
- script:
--  - bin/test
-+  - bin/test -vc
 diff --git a/CHANGES.rst b/CHANGES.rst
-index 71b12c56..fd757d4e 100644
+index 4feedfc..a206126 100644
 --- a/CHANGES.rst
 +++ b/CHANGES.rst
-@@ -10,11 +10,13 @@ Breaking changes:
-
- New features:
-
--- *add item here*
-+- Test against Plone 5.2
-+  [icemac]
-
+@@ -17,6 +17,7 @@ New features:
  Bug fixes:
 
--- *add item here*
-+- Fix Travis CI setup.
-+  [loechel]
+ - More Python 2 / 3 compatibility [ale-rt, pbauer]
++- Start making code flake8 compliant [ale-rt]
+ 
 
+ 2.0.11 (2018-01-30)
+diff --git a/plone/app/viewletmanager/tests/test_exportimport.py b/plone/app/viewletmanager/tests/test_exportimport.py
+index 5336a49..fa79ab1 100644
+--- a/plone/app/viewletmanager/tests/test_exportimport.py
++++ b/plone/app/viewletmanager/tests/test_exportimport.py
+@@ -1,12 +1,11 @@
+ # -*- coding: utf-8 -*-
+-from OFS.Folder import Folder
+ from persistent.dict import PersistentDict
+-from plone.app.viewletmanager.exportimport.storage import exportViewletSettingsStorage
+-from plone.app.viewletmanager.exportimport.storage import importViewletSettingsStorage
+-from plone.app.viewletmanager.exportimport.storage import ViewletSettingsStorageNodeAdapter
++from plone.app.viewletmanager.exportimport.storage import exportViewletSettingsStorage  # noqa: E501
++from plone.app.viewletmanager.exportimport.storage import importViewletSettingsStorage  # noqa: E501
++from plone.app.viewletmanager.exportimport.storage import ViewletSettingsStorageNodeAdapter  # noqa: E501
+ from plone.app.viewletmanager.interfaces import IViewletSettingsStorage
+ from plone.app.viewletmanager.storage import ViewletSettingsStorage
+-from plone.app.viewletmanager.testing import PLONE_APP_VIEWLETMANAGER_INTEGRATION_TESTING
++from plone.app.viewletmanager.testing import PLONE_APP_VIEWLETMANAGER_INTEGRATION_TESTING  # noqa: E501
+ from Products.CMFPlone.exportimport.tests.base import BodyAdapterTestCase
+ from Products.GenericSetup.tests.common import BaseRegistryTests
+ from Products.GenericSetup.tests.common import DummyExportContext
+@@ -17,15 +16,6 @@
+ import unittest
 
- 1.15.2 (2018-05-03)
-diff --git a/buildout.cfg b/buildout.cfg
-index 6301f529..1b54d85b 100644
---- a/buildout.cfg
-+++ b/buildout.cfg
-@@ -1,8 +1,19 @@
- [buildout]
-+extensions = mr.developer
-+auto-checkout = *
- index = https://pypi.python.org/simple/
- develop = .
- parts = test
--extends = http://dist.plone.org/release/5.1-latest/versions.cfg
-+# extends = http://dist.plone.org/release/5.1-latest/versions.cfg
-+extends = https://raw.githubusercontent.com/plone/buildout.coredev/5.2/versions.cfg
-+
-+[remotes]
-+plone = https://github.com/plone
-+plone_push = git@github.com:plone
-+
-+[sources]
-+Products.CMFPlone = git ${remotes:plone}/Products.CMFPlone.git pushurl=${remotes:plone_push}/Products.CMFPlone.git branch=master
-+Products.CMFFormController = git ${remotes:plone}/Products.CMFFormController.git pushurl=${remotes:plone_push}/Products.CMFFormController.git branch=master
 
- [versions]
- Products.Archetypes =
+-# BBB Zope 2.12
+-try:
+-    from Zope2.App import zcml
+-    from OFS import metaconfigure
+-except ImportError:
+-    from Products.Five import zcml
+-    from Products.Five import fiveconfigure as metaconfigure
+-
+-
+ COMMON_SETUP_ORDER = {
+     'basic': {'top': ('one', )},
+     'fancy': {'top': ('two', 'three', 'one')},