use latest Plone 5.1

plone · Aug 6, 2018 · 1eadcfd · 1eadcfd
1 parent 4b02960
commit 1eadcfd
Show file tree

Hide file tree

Showing 11 changed files with 80 additions and 238 deletions.
diff --git a/.gitignore b/.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
 
diff --git a/.travis.yml b/.travis.yml
@@ -6,48 +6,53 @@ 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:$SAUCE_ACCESS_KEY@ondemand.saucelabs.com: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:$SAUCE_ACCESS_KEY@ondemand.saucelabs.com: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
+  - bin/buildout -N -t 3 -c travis.cfg
+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/"
diff --git a/CHANGES.rst b/CHANGES.rst
@@ -14,7 +14,8 @@ New features:
 
 Bug fixes:
 
-- *add item here*
+- Fix Travis CI setup.
+  [jensens]
 
 
 1.2.1 (2018-06-22)

diff --git a/bootstrap.py b/bootstrap.py
diff --git a/buildout.cfg b/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

diff --git a/requirements.txt b/requirements.txt
@@ -0,0 +1,2 @@
+setuptools==33.1.1
+zc.buildout==2.12.1
diff --git a/setup.cfg b/setup.cfg
@@ -12,3 +12,12 @@ ignore =
 
 [zest.releaser]
 create-wheel = yes
+
+[isort]
+force_alphabetical_sort = True
+force_single_line = True
+lines_after_imports = 2
+line_length = 79
+not_skip = __init__.py
+use_parentheses = True
+multi_line_output = 3
diff --git a/setup.py b/setup.py
@@ -67,7 +67,7 @@ def indent(line):
         'argparse',
         'decorator',   # required by r.selenium2library on Python 2.6.x
         'simplejson',  # required for SauceLabs-keywords on Python 2.6.x
-        ])
+    ])
 
 test_requires = [
     'plone.app.dexterity',

diff --git a/travis.cfg b/travis.cfg
@@ -1,10 +1,13 @@
 [buildout]
-extends = buildout.cfg
-parts = docs libdoc test
+extends =
+    buildout.cfg
+
+parts =
+    docs
+    libdoc
+    test
 
 [test]
 eggs =
-    Pillow
-    Products.CMFPlacefulWorkflow
     plone.app.robotframework [test,speak]
 defaults = ['--auto-color', '--auto-progress', '-s', 'plone.app.robotframework']
diff --git a/versions-staging.cfg b/versions-staging.cfg
diff --git a/versions.cfg b/versions.cfg
@@ -1,10 +1,14 @@
-# Good known versions for plone.app.robotframework and friends
 [versions]
-Pygments = 2.0.2
-plone.app.robotframework = 1.1
-robotframework = 3.0
-robotframework-selenium2library = 1.7.4
-robotframework-selenium2screenshots = 0.7.0
-robotsuite = 1.7.0
-selenium = 2.53.6
-sphinxcontrib-robotframework = 0.7.0
+# Good known versions for plone.app.robotframework and friends
+
+# THOSE ARE PART OF PLONE COREDEV BUILDOUT
+# NEWER VERSIONS CAN BE TESTED HERE FOR BRANCHES BUT NEED AN UPDATE OF
+# BUILDOUT COREDEV DIRECTLY AFTER MERGE
+
+# Pygments = 2.0.2
+# robotframework = 3.0
+# robotframework-selenium2library = 1.7.4
+# robotframework-selenium2screenshots = 0.7.0
+# robotsuite = 1.7.0
+# selenium = 2.53.6
+# sphinxcontrib-robotframework = 0.7.0