From aa9f60234887534a3f79b0e6e87a34bb60b8842c Mon Sep 17 00:00:00 2001 From: Maurits van Rees Date: Thu, 3 Oct 2019 00:35:39 +0200 Subject: [PATCH 1/3] Removed travis-5.2.x.cfg and updated docs to not use the buildout-cache.cfg anymore. Plus other small fixes in the documentation. Fixes https://github.com/collective/buildout.plonetest/issues/51 --- README.rst | 164 ++++++++++++++++++++++++++++++++--------------- travis-5.2.x.cfg | 8 --- 2 files changed, 111 insertions(+), 61 deletions(-) delete mode 100644 travis-5.2.x.cfg diff --git a/README.rst b/README.rst index 2595d7f..dedea01 100644 --- a/README.rst +++ b/README.rst @@ -6,40 +6,56 @@ Testing/development buildouts for Plone This repository contains a number of configuration files for using `zc.buildout`_ to quickly set up a testing/development environment for your -package. The intended usage is to create a ``buildout.cfg`` like:: +package. + +A good example of how to use this, is `bobtemplates.plone `_. +Follow the instructions there to create a Plone add-on, and look at the created files, +especially the various buildout configs and `.travis.yml `_. + +The intended usage is to create a ``buildout.cfg`` like:: [buildout] - extends = https://raw.github.com/collective/buildout.plonetest/master/test-4.x.cfg + extends = https://raw.github.com/collective/buildout.plonetest/master/test-5.x.cfg package-name = plone.app.foo -Running buildout should give you a ``bin/test`` script, which can be used to +Create a virtualenv and run buildout. +This should give you a ``bin/test`` script, which can be used to run your package's tests. If your tests have additional dependencies, you should declare them via the ``extras_require`` parameter of ``setuptools.setup`` and refer to the key used using the ``package-extras`` variable:: [buildout] - extends = https://raw.github.com/collective/buildout.plonetest/master/test-4.x.cfg - package-name = plone.app.foo - package-extras = [test] - -If you want to do `continuous integration`_ with `Travis CI`_ you should -create a ``travis.cfg`` like:: - - [buildout] - extends = https://raw.github.com/collective/buildout.plonetest/master/travis-4.x.cfg + extends = https://raw.github.com/collective/buildout.plonetest/master/test-5.x.cfg package-name = plone.app.foo package-extras = [test] +If you want to do `continuous integration`_ with `Travis CI`_ you can use this same buildout config. And a ``.travis.yml`` like:: language: python python: 2.7 + sudo: false + cache: + pip: true + directories: + - eggs + before_install: + - virtualenv -p `which python` . + - bin/pip install -r requirements.txt + - bin/buildout -N -t 3 annotate install: - - mkdir -p buildout-cache/downloads - - python bootstrap.py -c travis.cfg - - bin/buildout -N -t 3 -c travis.cfg - script: bin/test + - bin/buildout -N -t 3 + script: + - bin/test + +.. ATTENTION:: + This repository also has ``travis-*.cfg`` files, that try to be faster by downloading the Plone universal installer. + This is no longer recommended, because Travis meanwhile has better caching support. + Only the Travis config files for Plone 5.1 and earlier have been kept, to avoid breaking add-ons. + In your own buildout config, replace ``travis-*.cfg`` with ``test-*.cfg`` and you should be fine. + Also take over the ``cache`` setting from the ``.travis.yml`` file above. + i18ndude helper script to update po files ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ @@ -48,21 +64,25 @@ Include the following in your buildout configuration to create an `i18ndude`_ helper script to update the po files of your product:: [buildout] - parts = - ... + extends = + https://raw.github.com/collective/buildout.plonetest/master/test-5.x.cfg + https://raw.github.com/collective/buildout.plonetest/master/qa.cfg + package-name = plone.app.foo + package-extras = [test] + parts+= + i18ndude rebuild_i18n-sh - [rebuild_i18n-sh] - recipe = collective.recipe.template - url = https://raw.github.com/collective/buildout.plonetest/master/templates/rebuild_i18n.sh.in - output = ${buildout:directory}/bin/rebuild_i18n.sh - mode = 755 - -After running 'bin/buildout' you will find a 'bin/rebuild_i18n.sh'; run the +After running ``bin/buildout`` you will find a ``bin/rebuild_i18n.sh``; run the script and the po files will be updated. -Domain name is taken from the ${buildout:package-name} variable; Plone domain -is also included. +Domain name is taken from the ``${buildout:package-name}`` variable. +The plone domain is also included. + +.. ATTENTION:: + Originally, the ``rebuild_i18n-sh`` part used a `filesystem template `_. + This is deprecated and no longer updated. + Functional tests with Robot Framework and SeleniumLibrary in Travis CI ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ @@ -73,45 +93,77 @@ Update your ``.travis.yml`` file with the following:: - export DISPLAY=:99.0 - sh -e /etc/init.d/xvfb start -Testing in Travis CI with multiple versions of Plone -^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ -The ``travis.cfg`` file in your package should look like this:: +Testing in Travis CI with multiple versions of Plone and Python +^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ + +The ``buildout.cfg`` file in your package should look like this:: [buildout] extends = - https://raw.github.com/collective/buildout.plonetest/master/travis-4.x.cfg + https://raw.github.com/collective/buildout.plonetest/master/test-5.x.cfg package-name = collective.foo package-extras = [test] - allow-hosts += - code.google.com - robotframework.googlecode.com + [versions] + setuptools = 41.2.0 + zc.buildout = 2.13.2 + +The versions are optional, but they can help in avoiding restarts when buildout tries to upgrade itself to a version pinned in Plone. +It is fine to start without them, but when you run into problems in `Travis CI`_, consider adding them. +In this way, all Plone versions use the same buildout and setuptools versions. + +These versions match a ``requirements.txt`` like this:: -And the ``.travis.yml`` file should look like this:: + setuptools==41.2.0 + zc.buildout==2.13.2 +The ``.travis.yml`` file should look like this:: + + dist: bionic language: python python: 2.7 - env: - - PLONE_VERSION=4.2 - - PLONE_VERSION=4.3 + sudo: false + cache: + pip: true + directories: + - eggs + matrix: + include: + - python: "2.7" + env: PLONE_VERSION="4.3" + - python: "2.7" + env: PLONE_VERSION="5.1" + - python: "2.7" + env: PLONE_VERSION="5.2" + - python: "3.7" + env: PLONE_VERSION="5.2" + - python: "3.7" + env: PLONE_VERSION="5.2" + sudo: true + fast_finish: true + before_install: + - virtualenv -p `which python` . + - bin/pip install -r requirements.txt + - sed -ie "s#test-5.x.cfg#test-$PLONE_VERSION.x.cfg#" buildout.cfg + - bin/buildout -N -t 3 annotate install: - - sed -ie "s#travis-4.x.cfg#travis-$PLONE_VERSION.x.cfg#" travis.cfg - - mkdir -p buildout-cache/downloads - - python bootstrap.py -c travis.cfg - - bin/buildout -c travis.cfg -N -q -t 3 - script: bin/test + - bin/buildout -N -t 3 + script: + - bin/test The trick here is to replace the extended configuration with the right one using the `sed`_ command. + Experimental configurations =========================== .. Caution:: The following configurations are experimental and may change at any time. + Quality Assurance ^^^^^^^^^^^^^^^^^ @@ -120,7 +172,7 @@ update your ``travis.cfg`` file like:: [buildout] extends = - https://raw.github.com/collective/buildout.plonetest/master/travis-4.x.cfg + https://raw.github.com/collective/buildout.plonetest/master/test-5.x.cfg https://raw.github.com/collective/buildout.plonetest/master/qa.cfg package-name = plone.app.foo package-extras = [test] @@ -130,23 +182,29 @@ update your ``travis.cfg`` file like:: coverage-sh code-analysis -and add and commit ``.coveragerc`` file -(see example at https://github.com/plone/plone.recipe.codeanalysis/blob/master/.coveragerc) +and add and commit ``.coveragerc`` file +(see example at https://github.com/plone/plone.recipe.codeanalysis/blob/master/.coveragerc) and update your ``.travis.yml`` like:: language: python python: 2.7 + sudo: false + cache: + pip: true + directories: + - eggs env: - TARGET=test - TARGET=coverage.sh - - install: - - mkdir -p buildout-cache/downloads - - python bootstrap.py -c travis.cfg - - bin/buildout -c travis.cfg -N -q -t 3 - - script: bin/$TARGET + before_install: + - virtualenv -p `which python` . + - bin/pip install -r requirements.txt + - bin/buildout -N -t 3 annotate + install: + - bin/buildout -N -t 3 + script: + - bin/$TARGET .. _`continuous integration`: https://en.wikipedia.org/wiki/Continuous_integration .. _`i18ndude`: http://pypi.python.org/pypi/i18ndude/ diff --git a/travis-5.2.x.cfg b/travis-5.2.x.cfg deleted file mode 100644 index ea736a8..0000000 --- a/travis-5.2.x.cfg +++ /dev/null @@ -1,8 +0,0 @@ -# installer for 5.2.x not available right now ... just preparing -[buildout-prepare] -extends = test-5.2.x.cfg buildout-cache.cfg -parts = download install test -plone-series = 5.2 -package-name = -package-extras = -test-eggs = From 44e3d59065df4b23333c5cbc07bed8ebb753a7cd Mon Sep 17 00:00:00 2001 From: Maurits van Rees Date: Mon, 7 Oct 2019 11:32:31 +0200 Subject: [PATCH 2/3] Use the same indentation in the .travis.yml examples. --- README.rst | 38 +++++++++++++++++++------------------- 1 file changed, 19 insertions(+), 19 deletions(-) diff --git a/README.rst b/README.rst index dedea01..6382269 100644 --- a/README.rst +++ b/README.rst @@ -39,15 +39,15 @@ And a ``.travis.yml`` like:: cache: pip: true directories: - - eggs + - eggs before_install: - - virtualenv -p `which python` . - - bin/pip install -r requirements.txt - - bin/buildout -N -t 3 annotate + - virtualenv -p `which python` . + - bin/pip install -r requirements.txt + - bin/buildout -N -t 3 annotate install: - - bin/buildout -N -t 3 + - bin/buildout -N -t 3 script: - - bin/test + - bin/test .. ATTENTION:: This repository also has ``travis-*.cfg`` files, that try to be faster by downloading the Plone universal installer. @@ -128,7 +128,7 @@ The ``.travis.yml`` file should look like this:: cache: pip: true directories: - - eggs + - eggs matrix: include: - python: "2.7" @@ -144,14 +144,14 @@ The ``.travis.yml`` file should look like this:: sudo: true fast_finish: true before_install: - - virtualenv -p `which python` . - - bin/pip install -r requirements.txt - - sed -ie "s#test-5.x.cfg#test-$PLONE_VERSION.x.cfg#" buildout.cfg - - bin/buildout -N -t 3 annotate + - virtualenv -p `which python` . + - bin/pip install -r requirements.txt + - sed -ie "s#test-5.x.cfg#test-$PLONE_VERSION.x.cfg#" buildout.cfg + - bin/buildout -N -t 3 annotate install: - - bin/buildout -N -t 3 + - bin/buildout -N -t 3 script: - - bin/test + - bin/test The trick here is to replace the extended configuration with the right one using the `sed`_ command. @@ -193,18 +193,18 @@ and update your ``.travis.yml`` like:: cache: pip: true directories: - - eggs + - eggs env: - TARGET=test - TARGET=coverage.sh before_install: - - virtualenv -p `which python` . - - bin/pip install -r requirements.txt - - bin/buildout -N -t 3 annotate + - virtualenv -p `which python` . + - bin/pip install -r requirements.txt + - bin/buildout -N -t 3 annotate install: - - bin/buildout -N -t 3 + - bin/buildout -N -t 3 script: - - bin/$TARGET + - bin/$TARGET .. _`continuous integration`: https://en.wikipedia.org/wiki/Continuous_integration .. _`i18ndude`: http://pypi.python.org/pypi/i18ndude/ From 17b660b9831e1de89ee9a69483e0a690ba529d9b Mon Sep 17 00:00:00 2001 From: Maurits van Rees Date: Mon, 7 Oct 2019 12:01:35 +0200 Subject: [PATCH 3/3] Disabled travis-5.x.cfg. It was broken, because it makes a bad combination of plone-series and the UnifiedInstaller location. --- travis-5.x.cfg | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/travis-5.x.cfg b/travis-5.x.cfg index 583cb32..04d08d7 100644 --- a/travis-5.x.cfg +++ b/travis-5.x.cfg @@ -1,7 +1,11 @@ -[buildout] -extends = test-5.x.cfg buildout-cache.cfg -parts = download install test -plone-series = 5.1 -package-name = -package-extras = -test-eggs = +This file is DEPRECATED and must not be used anymore. +Please see README.rst for current instructions on how to use buildout.plonetest. + +Note: the other travis-*.cfg files will be kept for now. +So if you really want, you can switch to travis-5.1.x if you only want to test Plone 5.1. +But these travis files will not work for Plone 5.2. + +For information about the change, see this issue: +https://github.com/collective/buildout.plonetest/issues/10 +And see this PR: +https://github.com/collective/buildout.plonetest/pull/52