Permalink
Browse files

separate travis and precise builds

  • Loading branch information...
1 parent 3425fe3 commit 9dc296bb168b5ba1ece47ca56795756c20d8aceb @gyst gyst committed Apr 5, 2013
Showing with 31 additions and 22 deletions.
  1. +1 −1 .travis.yml
  2. +5 −2 Makefile
  3. +1 −19 buildout.cfg
  4. +24 −0 travis.cfg
View
2 .travis.yml
@@ -1,6 +1,6 @@
language: python
python: 2.7
-install: make buildout
+install: make travis
script: make test
notifications:
email: guido.stevens@cosent.net
View
7 Makefile
@@ -1,6 +1,9 @@
-default: buildout test
+default: devel test
-buildout: bin/buildout buildout-cache/downloads
+travis: bin/buildout buildout-cache/downloads
+ bin/buildout -c travis.cfg -N -t 3
+
+devel: bin/buildout buildout-cache/downloads
bin/buildout -c buildout.cfg -N -t 3
test:
View
20 buildout.cfg
@@ -1,14 +1,5 @@
[buildout]
-extends =
- https://raw.github.com/collective/buildout.plonetest/master/travis-4.x.cfg
-
-package-name = plonesocial.suite
-package-extras = [test]
-test-eggs =
- plonesocial.suite
- plonesocial.microblog
- plonesocial.activitystream
- plonesocial.network
+extends = travis.cfg
parts =
download
@@ -27,12 +18,3 @@ eggs += Pillow
[test]
eggs += Pillow
-[versions]
-zc.buildout = 1.6.3
-
-[flake8]
-recipe = zc.recipe.egg
-eggs = flake8
- ${instance:eggs}
-entry-points =
- flake8=flake8.run:main
View
24 travis.cfg
@@ -0,0 +1,24 @@
+[buildout]
+extends =
+ https://raw.github.com/collective/buildout.plonetest/master/travis-4.x.cfg
+
+package-name = plonesocial.suite
+package-extras = [test]
+test-eggs =
+ plonesocial.suite
+ plonesocial.microblog
+ plonesocial.activitystream
+ plonesocial.network
+
+parts +=
+ flake8
+
+[versions]
+zc.buildout = 1.6.3
+
+[flake8]
+recipe = zc.recipe.egg
+eggs = flake8
+ ${instance:eggs}
+entry-points =
+ flake8=flake8.run:main

0 comments on commit 9dc296b

Please sign in to comment.