Skip to content

Commit

Permalink
Merge pull request #367 from plone/fix-travis-setup
Browse files Browse the repository at this point in the history
Fix travis setup
  • Loading branch information
MrTango committed Apr 14, 2019
2 parents e9b1d82 + 3df6667 commit 6a1cfcd
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 7 deletions.
3 changes: 2 additions & 1 deletion CHANGES.rst
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,8 @@ Changelog
4.0.3 (unreleased)
------------------

- Nothing changed yet.
- Fix travis setup in addon template.
[erral]


4.0.2 (2019-03-25)
Expand Down
10 changes: 4 additions & 6 deletions bobtemplates/plone/addon/.travis.yml.bob
Original file line number Diff line number Diff line change
Expand Up @@ -30,11 +30,11 @@ before_install:
- bin/pip install -r requirements.txt -c constraints_plone$PLONE_VERSION.txt
# - bin/buildout -N out:download-cache=downloads code-analysis:return-status-codes=True annotate
# - bin/buildout -N buildout:download-cache=downloads code-analysis:return-status-codes=True
- cp test_$PLONE_VERSION.cfg buildout.cfg
- cp test_plone$PLONE_VERSION.cfg buildout.cfg

install:
- buildout -N -t 3 code-analysis:return-status-codes=True annotate
- buildout -N -t 3 code-analysis:return-status-codes=True
- bin/buildout -N -t 3 code-analysis:return-status-codes=True annotate
- bin/buildout -N -t 3 code-analysis:return-status-codes=True

before_script:
- 'export DISPLAY=:99.0'
Expand All @@ -47,10 +47,8 @@ script:
- python --version 2> /dev/stdout | grep 3.6 || bin/code-analysis
- bin/test --all

after_script:
- bin/createcoverage --output-dir=parts/test/coverage

after_success:
- bin/createcoverage --output-dir=parts/test/coverage
- bin/pip install coverage
- bin/python -m coverage.pickle2json
- bin/pip install -q coveralls
Expand Down

0 comments on commit 6a1cfcd

Please sign in to comment.