Skip to content

Commit

Permalink
Refactor development and CI configurations
Browse files Browse the repository at this point in the history
collective.cover must be installed only in Plone < 5.0.
  • Loading branch information
hvelarde committed Mar 31, 2016
1 parent 7e32266 commit b9cce23
Show file tree
Hide file tree
Showing 5 changed files with 15 additions and 8 deletions.
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ matrix:
- env: PLONE_VERSION=5.0
fast_finish: true
install:
- sed -ie "s#test-4.3#test-$PLONE_VERSION#" buildout.cfg
- sed -ie "s#4.3.x.cfg#$PLONE_VERSION.x.cfg#" buildout.cfg
- python bootstrap.py
- bin/buildout annotate
- bin/buildout
Expand Down
7 changes: 1 addition & 6 deletions buildout.cfg
Original file line number Diff line number Diff line change
@@ -1,10 +1,5 @@
[buildout]
extends =
https://raw.github.com/collective/buildout.plonetest/master/test-4.3.x.cfg
https://raw.github.com/collective/buildout.plonetest/master/qa.cfg
https://raw.github.com/plone/plone.app.robotframework/master/versions.cfg
https://raw.githubusercontent.com/collective/collective.cover/1.0a12/versions-4.3.x.cfg

extends = test-4.3.x.cfg
package-name = sc.embedder
package-extras = [test]

Expand Down
1 change: 0 additions & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,6 @@
],
extras_require={
'test': [
'collective.cover',
'httmock',
'plone.app.robotframework',
'plone.app.testing [robot]',
Expand Down
8 changes: 8 additions & 0 deletions test-4.3.x.cfg
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
[buildout]
extends =
https://raw.githubusercontent.com/collective/buildout.plonetest/master/test-4.3.x.cfg
https://raw.githubusercontent.com/collective/buildout.plonetest/master/qa.cfg
https://raw.githubusercontent.com/plone/plone.app.robotframework/master/versions.cfg
https://raw.githubusercontent.com/collective/collective.cover/1.1b1/versions-4.3.x.cfg

test-eggs = collective.cover==1.1b1
5 changes: 5 additions & 0 deletions test-5.0.x.cfg
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
[buildout]
extends =
https://raw.githubusercontent.com/collective/buildout.plonetest/master/test-5.0.x.cfg
https://raw.githubusercontent.com/collective/buildout.plonetest/master/qa.cfg
https://raw.githubusercontent.com/plone/plone.app.robotframework/master/versions.cfg

0 comments on commit b9cce23

Please sign in to comment.