bump version, merge branch 'devel'

Author: casperdcl

.travis.yml

@@ -14,7 +14,7 @@ stages:
 - check
 - test
 - name: deploy
-  if: repo = casperdcl/argopt
+  if: repo = casperdcl/argopt AND NOT type = pull_request
 jobs:
   include:
   - stage: test

Makefile

@@ -24,6 +24,7 @@
 	testtimer
 	distclean
 	coverclean
+	pre-commit
 	prebuildclean
 	clean
 	toxclean
@@ -70,6 +71,11 @@ distclean:
 	@+make coverclean
 	@+make prebuildclean
 	@+make clean
+pre-commit:
+	# quick sanity checks
+	@make testsetup
+	@flake8 -j 8 --count --statistics .
+	@make testnose
 prebuildclean:
 	@+python -c "import shutil; shutil.rmtree('build', True)"
 	@+python -c "import shutil; shutil.rmtree('dist', True)"

argopt/_docopt.py

@@ -9,8 +9,12 @@
 """
 import re
 from ._utils import typecast
+try:
+    from ._utils import file  # NOQA
+except ImportError:
+    pass
 
-__version__ = '0.6.2-casper.3'
+__version__ = '0.6.2-casper.4'
 
 
 class DocoptLanguageError(Exception):

argopt/_utils.py

@@ -11,6 +11,7 @@
     _range = xrange
 except NameError:  # pragma: no cover
     _range = range
+    file = open
 
 
 class DictAttrWrap(object):

argopt/_version.py

@@ -12,7 +12,7 @@
 __all__ = ["__version__"]
 
 # major, minor, patch, -extra
-version_info = 0, 6, 0
+version_info = 0, 6, 1
 
 # Nice string for the version
 __version__ = '.'.join(map(str, version_info))

setup.cfg

@@ -3,4 +3,4 @@ universal = 1
 
 [flake8]
 max_line_length = 80
-exclude = .asv,.tox,.ipynb_checkpoints,build,dist,.git,__pycache__
+exclude = .tox,.ipynb_checkpoints,build,dist,.git,__pycache__