Merge pull request #241 from Nurdok/master

Setup better bumpversion and pytest configurations

.bumpversion.cfg

@@ -0,0 +1,17 @@
+[bumpversion]
+current_version = 2.0.0rc
+commit = True
+parse = (?P<major>\d+)\.(?P<minor>\d+)\.(?P<patch>\d+)((?P<release>.*))?
+serialize =
+	{major}.{minor}.{patch}{release}
+	{major}.{minor}.{patch}
+tag_name = {new_version}
+
+[bumpversion:part:release]
+optional_value = production
+values =
+	rc
+	production
+
+[bumpversion:file:setup.py]
+[bumpversion:file:src/pydocstyle/utils.py]

setup.cfg

@@ -1,19 +1,2 @@
-[bumpversion]
-current_version = 2.0.0rc
-commit = True
-parse = (?P<major>\d+)\.(?P<minor>\d+)\.(?P<patch>\d+)((?P<release>.*))?
-serialize = 
-	{major}.{minor}.{patch}{release}
-	{major}.{minor}.{patch}
-
 [wheel]
 universal = 1
-
-[bumpversion:part:release]
-optional_value = production
-values = 
-	rc
-	production
-
-[bumpversion:file:src/pydocstyle/utils.py]
-

setup.py

@@ -2,14 +2,8 @@
 import os
 from setuptools import setup
 
-
-this_dir = os.path.dirname(__file__)
-
-with open(os.path.join(this_dir, 'src', 'pydocstyle', 'utils.py')) as f:
-    for line in f:
-        if line.startswith('__version__'):
-            version = eval(line.split('=')[-1])
-
+# Do not update the version manually - it is managed by `bumpversion`.
+version = '2.0.0rc'
 
 setup(
     name='pydocstyle',

src/pydocstyle/utils.py

@@ -7,6 +7,7 @@
     from itertools import izip_longest as zip_longest
 
 
+# Do not update the version manually - it is managed by `bumpversion`.
 __version__ = '2.0.0rc'
 log = logging.getLogger(__name__)
 

tox.ini

@@ -11,10 +11,10 @@ envlist = py27, py33, py34, py35, pypy, docs
 setenv =
     LANG=C
     LC_ALL=C
-commands = py.test --pep8 --cache-clear
+commands = py.test --pep8 --cache-clear src/tests
 deps =
-   -rrequirements/runtime.txt
-   -rrequirements/tests.txt
+    -rrequirements/runtime.txt
+    -rrequirements/tests.txt
 
 [testenv:docs]
 changedir=docs