Skip to content

Commit

Permalink
Update development and CI configurations
Browse files Browse the repository at this point in the history
- Use Plone 5.0 as main branch
- Use code analysis
- Clean up cluttering
- Add suport for Coveralls
  • Loading branch information
hvelarde committed Apr 24, 2014
1 parent a21b269 commit 5d025cb
Show file tree
Hide file tree
Showing 6 changed files with 55 additions and 73 deletions.
29 changes: 14 additions & 15 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,29 +1,28 @@
language: python
python:
- 2.6
- 2.7
python: 2.7
env:
- PLONE_VERSION=4.0
- PLONE_VERSION=4.1
- PLONE_VERSION=4.2
- PLONE_VERSION=4.3 QA=true
- PLONE_VERSION=5.0
matrix:
exclude:
- python: 2.7
env: PLONE_VERSION=4.0
- python: 2.7
env: PLONE_VERSION=4.1
include:
- python: 2.6
env: PLONE_VERSION=4.2
env: PLONE_VERSION=4.0
- python: 2.6
env: PLONE_VERSION=4.3 QA=true
env: PLONE_VERSION=4.1
allow_failures:
- env: PLONE_VERSION=5.0
fast_finish: true
install:
- sed -ie "s#travis-4.x.cfg#travis-$PLONE_VERSION.x.cfg#" travis.cfg
- make install
- mkdir -p buildout-cache/downloads
- python bootstrap.py -c travis.cfg
- bin/buildout -c travis.cfg annotate
- bin/buildout -c travis.cfg -N -q
before_script:
- "export DISPLAY=:99.0"
- "sh -e /etc/init.d/xvfb start"
script: make tests
after_success: make qa
script: bin/code-analysis && bin/test
after_success: test $QA && bin/coverage.sh && pip install -q coveralls && coveralls || true
notifications:
irc: irc.freenode.org#simplesconsultoria
36 changes: 0 additions & 36 deletions Makefile

This file was deleted.

23 changes: 21 additions & 2 deletions buildout.cfg
Original file line number Diff line number Diff line change
@@ -1,13 +1,32 @@
[buildout]
extends =
https://raw.github.com/collective/buildout.plonetest/master/test-4.x.cfg
https://raw.github.com/hvelarde/qa/master/tools.cfg
https://raw.github.com/collective/buildout.plonetest/master/qa.cfg

package-name = collective.prettydate
package-extras = [test]

parts += omelette
parts +=
i18ndude
omelette
rebuild_i18n-sh

[code-analysis]
directory = ${buildout:directory}/src/collective/prettydate
pre-commit-hook = True
flake8-ignore = E501
flake8-max-complexity = 48

[i18ndude]
recipe = zc.recipe.egg
eggs = i18ndude

[omelette]
recipe = collective.recipe.omelette
eggs = ${instance:eggs}

[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
18 changes: 0 additions & 18 deletions rebuild_i18n.sh

This file was deleted.

1 change: 0 additions & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,6 @@
author='Franco Pellegrini',
author_email='frapell@gmail.com',
url='https://github.com/collective/collective.prettydate',
license='GPLv2',
packages=find_packages('src'),
package_dir={'': 'src'},
namespace_packages=['collective'],
Expand Down
21 changes: 20 additions & 1 deletion travis.cfg
Original file line number Diff line number Diff line change
@@ -1,7 +1,26 @@
[versions]
# needed by Plone 4.0; overriden in newer versions
plone.app.testing = 4.0.2

[buildout]
extends =
https://raw.github.com/collective/buildout.plonetest/master/travis-4.x.cfg
https://raw.github.com/hvelarde/qa/master/tools.cfg
https://raw.github.com/collective/buildout.plonetest/master/qa.cfg

package-name = collective.prettydate
package-extras = [test]
package-min-coverage = 99

parts +=
createcoverage
coverage-sh

[code-analysis]
directory = ${buildout:directory}/src/collective/prettydate
pre-commit-hook = False
flake8-ignore = E501
return-status-codes = False

[versions]
# use latest version of setuptools
setuptools =

0 comments on commit 5d025cb

Please sign in to comment.