Merge branch 'master' into python3

.gitignore

@@ -13,7 +13,13 @@ bin
 buildout-cache
 develop-eggs
 dist
+docs/make.bat
+docs/Makefile
 etc
+include
+lib
+local
 parts
+pip-selfcheck.json
 var
 

.travis.yml

@@ -6,48 +6,52 @@ addons:
     username: $SAUCE_USERNAME
     access_key: $SAUCE_ACCESS_KEY
 cache:
+  pip: true
   directories:
-  - eggs
-install:
-- python bootstrap.py -c travis.cfg
-- bin/buildout -N -t 3 -c travis.cfg ${VERSIONS}
-script: bin/test
-after_script:
-- cd docs && ./libdoc.sh && cd ..
-- bin/sphinx-build docs/source docs/html
-- bundle install
-- bundle exec travis-artifacts upload --path parts/test
-- bundle exec travis-artifacts upload --path docs/html
-- bundle exec travis-artifacts upload --target-path latest --path docs/html
-- bundle exec travis-artifacts upload --target-path latest --path parts/test
-- 'echo "Sphinx: http://plone.app.robotframework.s3-website-us-east-1.amazonaws.com/artifacts/${TRAVIS_BUILD_NUMBER}/${TRAVIS_JOB_NUMBER}/"'
-- 'echo "Robot: http://plone.app.robotframework.s3-website-us-east-1.amazonaws.com/artifacts/${TRAVIS_BUILD_NUMBER}/${TRAVIS_JOB_NUMBER}/robot_report.html"'
-
+    - eggs
+    - downloads
 env:
   global:
-  - secure: YLol0TyHB+XAUbCzzjfc5JJ5AFqEi/GVhGphtAAcSv8+JY6MhTVVTjyCPeoK 2nT7tDhQRnYKOAMBmTuP/TUdzFqBf5LvjrFxvcjBawJMRW85kuYEuXsS8XEx C+lc1bbXSUPGA0x03tvSHIYbCowvVPZNUupxgRQdW2QLa5HcSuQ=
-  - secure: YhG9gTzNMbQWiHLO6RU2J9btjB8L4X/QpKgu4c48XHYEf0Mwgxi5kKhZTTqp KY6/buwYhcBFWh0PQVC1b35lHHxI+bD4/d3v8xea7v670COdP0zMrgjXlSLn bfV7g3/doSmAUtbEyUQdfzmWS8kyst0div6XzpWtR3cl6lP6Tfo=
-  - secure: AOFoFixluD1YzjtKuNLClALcpH6YpJyxZYfx8QVs0SQ3aDJRc53lVw2e0YKpghGSuuHm75cAKbmZVJVYT/qgYFdZfah6+amKFRgTVDsGEnGIGcL8+z43n+y3b1NZotwPXXZz4hboFLL4FknuEymGmKl4ZJdpQFcf+36iylg2KFQ=
-  - secure: eK2r6iQU0M8tq2qC+SpoqJJmtyBa8Okdr5DjlrAa4efuA7fiIzsfvSfcTcb9zQ0T+7cbOoGiEFQVFcat0uSY49fAZcxTjJakjYC1plwBfQl/StQGHZIlx+oy2GZTthi6UWAVYeC6NmLTqBtoGxVvCMp6+LtNhzd2Fc4MUHrafqQ=
-  - ARTIFACTS_S3_BUCKET=plone.app.robotframework
-  - ROBOT_BUILD_NUMBER=travis-$TRAVIS_BUILD_NUMBER
-  - ROBOT_REMOTE_URL=http://$SAUCE_USERNAME:[email protected]:80/wd/hub
+    - secure: YLol0TyHB+XAUbCzzjfc5JJ5AFqEi/GVhGphtAAcSv8+JY6MhTVVTjyCPeoK 2nT7tDhQRnYKOAMBmTuP/TUdzFqBf5LvjrFxvcjBawJMRW85kuYEuXsS8XEx C+lc1bbXSUPGA0x03tvSHIYbCowvVPZNUupxgRQdW2QLa5HcSuQ=
+    - secure: YhG9gTzNMbQWiHLO6RU2J9btjB8L4X/QpKgu4c48XHYEf0Mwgxi5kKhZTTqp KY6/buwYhcBFWh0PQVC1b35lHHxI+bD4/d3v8xea7v670COdP0zMrgjXlSLn bfV7g3/doSmAUtbEyUQdfzmWS8kyst0div6XzpWtR3cl6lP6Tfo=
+    - secure: AOFoFixluD1YzjtKuNLClALcpH6YpJyxZYfx8QVs0SQ3aDJRc53lVw2e0YKpghGSuuHm75cAKbmZVJVYT/qgYFdZfah6+amKFRgTVDsGEnGIGcL8+z43n+y3b1NZotwPXXZz4hboFLL4FknuEymGmKl4ZJdpQFcf+36iylg2KFQ=
+    - secure: eK2r6iQU0M8tq2qC+SpoqJJmtyBa8Okdr5DjlrAa4efuA7fiIzsfvSfcTcb9zQ0T+7cbOoGiEFQVFcat0uSY49fAZcxTjJakjYC1plwBfQl/StQGHZIlx+oy2GZTthi6UWAVYeC6NmLTqBtoGxVvCMp6+LtNhzd2Fc4MUHrafqQ=
+    - ARTIFACTS_S3_BUCKET=plone.app.robotframework
+    - ROBOT_BUILD_NUMBER=travis-$TRAVIS_BUILD_NUMBER
+    - ROBOT_REMOTE_URL=http://$SAUCE_USERNAME:[email protected]:80/wd/hub
   matrix:
-  - ROBOT_BROWSER=firefox ROBOT_DESIRED_CAPABILITIES=tunnel-identifier:$TRAVIS_JOB_NUMBER
-  - ROBOT_BROWSER=chrome ROBOT_DESIRED_CAPABILITIES=tunnel-identifier:$TRAVIS_JOB_NUMBER
-  - ROBOT_BROWSER=ie ROBOT_DESIRED_CAPABILITIES=tunnel-identifier:$TRAVIS_JOB_NUMBER
+    - ROBOT_BROWSER=firefox ROBOT_DESIRED_CAPABILITIES=tunnel-identifier:$TRAVIS_JOB_NUMBER
+    - ROBOT_BROWSER=chrome ROBOT_DESIRED_CAPABILITIES=tunnel-identifier:$TRAVIS_JOB_NUMBER
+    - ROBOT_BROWSER=ie ROBOT_DESIRED_CAPABILITIES=tunnel-identifier:$TRAVIS_JOB_NUMBER
 matrix:
   allow_failures:
-  - env: ROBOT_BROWSER=ie ROBOT_DESIRED_CAPABILITIES=tunnel-identifier:$TRAVIS_JOB_NUMBER
+    - env: ROBOT_BROWSER=ie ROBOT_DESIRED_CAPABILITIES=tunnel-identifier:$TRAVIS_JOB_NUMBER
+install:
+  - virtualenv -p `which python` .
+  - bin/pip install -r requirements.txt
+  - bin/buildout -N buildout:download-cache=downloads code-analysis:return-status-codes=True annotate
+  - bin/buildout -N -t 3 -c travis.cfg buildout:download-cache=downloads code-analysis:return-status-codes=True
+script:
+  - bin/test
+after_script:
+  - cd docs && ./libdoc.sh && cd ..
+  - bin/sphinx-build docs/source docs/html
+  - bundle install
+  - bundle exec travis-artifacts upload --path parts/test
+  - bundle exec travis-artifacts upload --path docs/html
+  - bundle exec travis-artifacts upload --target-path latest --path docs/html
+  - bundle exec travis-artifacts upload --target-path latest --path parts/test
+  - 'echo "Sphinx: http://plone.app.robotframework.s3-website-us-east-1.amazonaws.com/artifacts/${TRAVIS_BUILD_NUMBER}/${TRAVIS_JOB_NUMBER}/"'
+  - 'echo "Robot: http://plone.app.robotframework.s3-website-us-east-1.amazonaws.com/artifacts/${TRAVIS_BUILD_NUMBER}/${TRAVIS_JOB_NUMBER}/robot_report.html"'
 
 notifications:
   irc:
     channels:
-    - irc.freenode.org#plone-testing
+      - irc.freenode.org#plone-testing
     template:
-    - "%{repository}#%{build_number} (%{branch} | %{commit} | %{author}): %{message}"
-#   - "Change: %{compare_url}"
-#   - "Details: %{build_url}"
-    - "Robot: http://plone.app.robotframework.s3-website-us-east-1.amazonaws.com/artifacts/%{build_number}/%{build_number}.1/robot_report.html"
-    - "Sphinx: http://plone.app.robotframework.s3-website-us-east-1.amazonaws.com/artifacts/%{build_number}/%{build_number}.1/"
-    - "Latest: http://plone.app.robotframework.s3-website-us-east-1.amazonaws.com/latest/"
+      - "%{repository}#%{build_number} (%{branch} | %{commit} | %{author}): %{message}"
+#      - "Change: %{compare_url}"
+#      - "Details: %{build_url}"
+      - "Robot: http://plone.app.robotframework.s3-website-us-east-1.amazonaws.com/artifacts/%{build_number}/%{build_number}.1/robot_report.html"
+      - "Sphinx: http://plone.app.robotframework.s3-website-us-east-1.amazonaws.com/artifacts/%{build_number}/%{build_number}.1/"
+      - "Latest: http://plone.app.robotframework.s3-website-us-east-1.amazonaws.com/latest/"

CHANGES.rst

@@ -1,22 +1,34 @@
 Changelog
 =========
 
-1.2.2 (unreleased)
+1.3.0 (unreleased)
 ------------------
 
 Breaking changes:
 
-- *add item here*
+- Skip Support for Plone 4.x.
+  [jensens]
 
 New features:
 
-- *add item here*
 
 Bug fixes:
 
 - Add support for Python 3.
   [davisagli]
 
+- Support for Plone 5.x toolbar, i18n, ...
+  [jensens]
+
+- Fix RemoteLibrary ``i18n`` to work proper with registry based settings.
+  [jensens]
+
+- Make robotframework work with merged ``plone.login``.
+  [jensens]
+
+- Fix Travis CI setup.
+  [jensens]
+
 
 1.2.1 (2018-06-22)
 ------------------

CONTRIBUTORS.rst

@@ -12,6 +12,7 @@
 - Godefroid Chapelle
 - Hector Velarde
 - Jean-Michel Francois
+- Jens Klein
 - Johan Beyers
 - Johannes Raggam
 - Jonas Baumann

buildout.cfg

@@ -1,6 +1,6 @@
 [buildout]
 extends =
-    https://raw.githubusercontent.com/collective/buildout.plonetest/master/test-4.3.x.cfg
+    https://raw.githubusercontent.com/collective/buildout.plonetest/master/test-5.1.x.cfg
     versions.cfg
 parts +=
     docs

docs/source/saucelabs.rst

@@ -18,53 +18,48 @@ Integrate with Sauce Labs
 
    .. code-block:: bash
 
-      $ travis encrypt SAUCE_USERNAME=... -r gh-user/myproduct --add
-      $ travis encrypt SAUCE_ACCESS_KEY=... -r hg-user/myproduct --add
+      $ travis encrypt SAUCE_USERNAME=... -r github-user-or-organization/myproduct --add
+      $ travis encrypt SAUCE_ACCESS_KEY=... -r github-user-or-organization/myproduct --add
 
 5. Update ``.travis.yml`` to set up the Sauce Labs connection before tests:
 
    .. code-block:: yaml
 
-      language: python
-      python: '2.7'
+      [...]
       addons:
         sauce_connect:
         - username: $SAUCE_USERNAME
         - access_key: $SAUCE_ACCESS_KEY
-      install:
-      - mkdir -p buildout-cache/downloads
-      - python bootstrap.py -c travis.cfg
-      - bin/buildout -N -t 3 -c travis.cfg
-      script: bin/test
+      [...]
       env:
+        [...]
         global:
         - secure: ...
         - secure: ...
         - ROBOT_BUILD_NUMBER=travis-$TRAVIS_BUILD_NUMBER
         - ROBOT_REMOTE_URL=http://$SAUCE_USERNAME:[email protected]:80/wd/hub
         - ROBOT_DESIRED_CAPABILITIES=tunnel-identifier:$TRAVIS_JOB_NUMBER
+      [...]
 
 .. note:: If you already have an ``env`` section, for instance to define
    different versions of Plone like this:
 
    .. code-block:: yaml
 
       env:
-      - PLONE_VERSION=4.0
-      - PLONE_VERSION=4.1
-      - PLONE_VERSION=4.2
-      - PLONE_VERSION=4.3
+      - PLONE_VERSION=5.0
+      - PLONE_VERSION=5.1
+      - PLONE_VERSION=5.2
 
    you will need to declare those variables in a ``matrix`` section, like this:
 
    .. code-block:: yaml
 
       env:
         matrix:
-        - PLONE_VERSION=4.0
-        - PLONE_VERSION=4.1
-        - PLONE_VERSION=4.2
-        - PLONE_VERSION=4.3
+        - PLONE_VERSION=5.0
+        - PLONE_VERSION=5.1
+        - PLONE_VERSION=5.2
         global:
         - secure: ...
         - secure: ...