plone.api/read_only_second_approach: code conventions and test setup, including fixes

Repository: plone.api
Branch: refs/heads/read_only_second_approach
Date: 2017-07-20T15:00:52+02:00
Author: Alexander Loechel (loechel) <[email protected]>
Commit: https://github.com/plone/plone.api/commit/532aaf322bced76535f94cc4b7e7ca16248d2a18

code conventions and test setup, including fixes

Files changed:
M CHANGES.rst
M buildout.cfg
M setup.cfg
M setup.py
M src/plone/api/tests/test_portal.py
M tox.ini

diff --git a/CHANGES.rst b/CHANGES.rst
index 85dcdcf..f7184b9 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -10,7 +10,8 @@ Breaking changes:
 
 New features:
 
-- *add item here*
+- added tox.ini and code convention definitions in setup.py and .editorconfig so that they could be enforced
+  [loechel]
 
 Bug fixes:
 
diff --git a/buildout.cfg b/buildout.cfg
index d59dad3..fe9a06a 100644
--- a/buildout.cfg
+++ b/buildout.cfg
@@ -36,14 +36,6 @@ return-status-codes = True
 
 [versions]
 plone.api =
-flake8 = 2.6.2
-mccabe = 0.5.2
-plone.recipe.codeanalysis = 1.0b5
-pycodestyle = 2.0.0
-pyflakes = 1.2.3
-setuptools = 21.0.0
-zc.buildout = 2.5.3
 
-# Required by:
-# plone.recipe.codeanalysis==1.0b5
-zptlint = 0.2.4
+setuptools = 33.1.1
+zc.buildout = 2.8.0
\ No newline at end of file
diff --git a/setup.cfg b/setup.cfg
index 9a377df..19837e9 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -3,6 +3,19 @@ ignore =
     *.cfg
     .travis.yml
 
+[flake8]
+exclude =
+    bootstrap-buildout.py,
+
+ignore =
+    N801,
+    N802,
+    N803,
+    N805,
+    N806,
+    N812,
+    T000,
+    
 [isort]
 force_alphabetical_sort=True
 force_single_line=True
@@ -12,8 +25,11 @@ not_skip=__init__.py
 
 [coverage:run]
 branch = True
-source = src
-omit =
+source = 
+    src
+
+omit = 
+    *.rst
 
 [coverage:report]
 precision = 2
diff --git a/setup.py b/setup.py
index a078ee0..1f339a0 100644
--- a/setup.py
+++ b/setup.py
@@ -8,6 +8,7 @@
 def read(*rnames):
     return open(os.path.join(os.path.dirname(__file__), *rnames)).read()
 
+
 long_description = \
     read('README.rst') + '\n\n' + \
     read('CHANGES.rst') + '\n\n' + \
diff --git a/src/plone/api/tests/test_portal.py b/src/plone/api/tests/test_portal.py
index ea254ed..a2b518f 100644
--- a/src/plone/api/tests/test_portal.py
+++ b/src/plone/api/tests/test_portal.py
@@ -1,9 +1,9 @@
 # -*- coding: utf-8 -*-
 """Tests for plone.api.portal."""
 
-from DateTime import DateTime
 from datetime import date
 from datetime import datetime
+from DateTime import DateTime
 from email import message_from_string
 from pkg_resources import parse_version
 from plone.api import content
diff --git a/tox.ini b/tox.ini
index ef559bb..edb6952 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,6 +1,6 @@
 [tox]
 envlist =
-    py27-Plone-{4.3,5.0,5.1},
+    py27-plone-{4.3,5.0,5.1},
     isort,
     flake8,
     docs,
@@ -17,27 +17,18 @@ basepython:
 extras =
     test
 
-Plone-4.3:
-    commands =
-        mkdir -p {toxinidir}/reports/coverage
-        {envbindir}/buildout -c {toxinidir}/plone-4.3.x.cfg buildout:directory={envdir} buildout:develop={toxinidir} bootstrap
-        {envbindir}/buildout -c {toxinidir}/plone-4.3.x.cfg buildout:directory={envdir} buildout:develop={toxinidir}
-        coverage run {envbindir}/test -v1 --auto-color {posargs}
-Plone-5.0:
-    commands =
-        mkdir -p {toxinidir}/reports/coverage
-        {envbindir}/buildout -c {toxinidir}/plone-5.0.x.cfg buildout:directory={envdir} buildout:develop={toxinidir} bootstrap
-        {envbindir}/buildout -c {toxinidir}/plone-5.0.x.cfg buildout:directory={envdir} buildout:develop={toxinidir}
-        coverage run {envbindir}/test -v1 --auto-color {posargs}
-Plone-5.1:
-    commands =
-        mkdir -p {toxinidir}/reports/coverage
-        {envbindir}/buildout -c {toxinidir}/plone-5.1.x.cfg buildout:directory={envdir} buildout:develop={toxinidir} bootstrap
-        {envbindir}/buildout -c {toxinidir}/plone-5.1.x.cfg buildout:directory={envdir} buildout:develop={toxinidir}
-        coverage run {envbindir}/test -v1 --auto-color {posargs}
+commands =
+    mkdir -p {toxinidir}/reports/coverage
+    {envbindir}/buildout -c {toxinidir}/{env:BUILDOUT_FILE} buildout:directory={envdir} buildout:develop={toxinidir} bootstrap
+    {envbindir}/buildout -c {toxinidir}/{env:BUILDOUT_FILE} buildout:directory={envdir} buildout:develop={toxinidir}
+    {envbindir}/code-analysis
+    {envbindir}/coverage run {envbindir}/test -v1 --auto-color {posargs}
 
 setenv =
     COVERAGE_FILE=.coverage.{envname}
+    plone-4.3: BUILDOUT_FILE="plone-4.3.x.cfg"
+    plone-5.0: BUILDOUT_FILE="plone-5.0.x.cfg"
+    plone-5.1: BUILDOUT_FILE="plone-5.1.x.cfg"
 
 deps =
     pdbpp
@@ -121,3 +112,4 @@ deps =
 
 commands =
     sphinx-build -b html -d _build/docs/doctrees docs _build/docs/html
+    sphinx-build -b doctest docs _build/docs/doctrees



------------------------------------------------------------------------------
Check out the vibrant tech community on one of the world's most
engaging tech sites, Slashdot.org! http://sdm.link/slashdot