Skip to content

Commit

Permalink
Avoid make when running travis
Browse files Browse the repository at this point in the history
  • Loading branch information
gforcada committed Oct 29, 2016
1 parent a41ad3f commit 0227420
Show file tree
Hide file tree
Showing 4 changed files with 37 additions and 21 deletions.
15 changes: 8 additions & 7 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,18 +20,19 @@ install:
- mkdir -p buildout-cache/eggs
- mkdir -p buildout-cache/downloads
- sed -ie "s#-4.3.x#-$PLONE_VERSION.x#" buildout.cfg
- make "bin/python"
- bin/python bootstrap.py
- bin/buildout annotate
- make version=$TRAVIS_PYTHON_VERSION .installed.cfg
- pip install -U zc.buildout setuptools==20.1.1
- buildout annotate
- buildout

script:
- bin/code-analysis
- make coverage
- bin/test

after_success:
- pip install -q coverage==3.6 coveralls
- coveralls
- buildout -c coverage.cfg
- bin/coverage
- pip install -q coveralls
- coveralls

notifications:
irc:
Expand Down
33 changes: 21 additions & 12 deletions buildout.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ package-extras = [test]
test-eggs = Pillow
parts +=
omelette
scripts
code-analysis

# network speedup
Expand All @@ -23,12 +22,6 @@ allow-hosts =
recipe = collective.recipe.omelette
eggs = ${test:eggs}

[scripts]
recipe = z3c.recipe.scripts
dependent-scripts = true
interpreter = zopepy
eggs = plone.api [develop]

[code-analysis]
recipe = plone.recipe.codeanalysis
directory = ${buildout:directory}/src/plone/api
Expand All @@ -41,9 +34,25 @@ debug-statements = True
return-status-codes = True

[versions]
Sphinx = 1.1.3
zc.buildout = 1.7.1
zc.recipe.egg = 1.3.2
zope.pagetemplate = 3.6.3
zc.buildout = 2.5.3
plone.recipe.codeanalysis = 1.0b5
mock = 1.0.1
mccabe = 0.5.2
pycodestyle = 2.0.0
pyflakes = 1.2.3
setuptools = 20.1.1

# Required by:
# flake8==3.0.4
configparser = 3.5.0

# Required by:
# flake8==3.0.4
enum34 = 1.1.6

# Required by:
# plone.recipe.codeanalysis==1.0b5
flake8 = 2.6.2

# Required by:
# plone.recipe.codeanalysis==1.0b5
zptlint = 0.2.4
7 changes: 5 additions & 2 deletions coverage.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -17,11 +17,14 @@ recipe = zc.recipe.egg
eggs = coverage
initialization =
include = '--source=${buildout:directory}/src'
sys.argv = sys.argv[:] + ['run', include, 'bin/test', '--layer=PloneApiLayer:Integration']
sys.argv = sys.argv[:] + ['run', include, 'bin/test', ]

[report]
recipe = zc.recipe.egg
eggs = coverage
scripts = coverage=report
initialization =
sys.argv = sys.argv[:] + ['html', '-i']
sys.argv = sys.argv[:] + ['html', '-i']

[versions]
coverage = 4.2
3 changes: 3 additions & 0 deletions docs/CHANGES.rst
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,9 @@ Fixes:
- Typo in the documentation.
[ale-rt]

- Fix travis.
[gforcada]

1.5 (2016-02-20)
----------------

Expand Down

1 comment on commit 0227420

@jenkins-plone-org
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@gforcada Jenkins CI reporting about code analysis
See the full report here: http://jenkins.plone.org/job/package-plone.api/76/violations

src/plone/api/content.py:268:1: C901 'delete' is too complex (15)
src/plone/api/content.py:360:1: C901 '_wf_transitions_for' is too complex (13)
src/plone/api/content.py:425:1: C901 'transition' is too complex (13)
src/plone/api/tests/test_doctests.py:118:13: T001 print statement found.
src/plone/api/tests/test_env.py:31:14: D001 found declarePublic replace it with AccessControl.ClassSecurityInfo.public
src/plone/api/tests/test_env.py:32:14: D001 found declareProtected replace it with AccessControl.ClassSecurityInfo.protected
src/plone/api/tests/test_env.py:33:14: D001 found declareProtected replace it with AccessControl.ClassSecurityInfo.protected
src/plone/api/tests/test_env.py:34:14: D001 found declareProtected replace it with AccessControl.ClassSecurityInfo.protected
src/plone/api/tests/test_env.py:35:14: D001 found declarePrivate replace it with AccessControl.ClassSecurityInfo.private

Follow these instructions to reproduce it locally.

Please sign in to comment.