Merge branch 'master' of github.com:dbcli/mycli into tsroten/pin_correct_pep8radius

Author: tsroten

.coveragerc

@@ -1,3 +1,3 @@
 [run]
-parallel=True
-source=mycli
+parallel = True
+source = mycli

.travis.yml

@@ -7,15 +7,14 @@ python:
   - "3.6"
 
 install:
-  - pip install PyMySQL . pytest mock codecov pexpect behave
+  - pip install PyMySQL pytest mock codecov pexpect behave pytest-cov
   - pip install git+https://github.com/hayd/pep8radius.git
+  - pip install -e .
 
 script:
   - set -e
-  - coverage run --source mycli -m py.test
-  - cd test
-  - behave
-  - cd ..
+  - py.test --cov-report= --cov=mycli
+  - behave test/features
   - ./setup.py lint
   - set +e
 
@@ -29,4 +28,3 @@ notifications:
       - YOUR_WEBHOOK_URL
     on_success: change  # options: [always|never|change] default: always
     on_failure: always  # options: [always|never|change] default: always
-    on_start: false     # default: false

MANIFEST.in

@@ -1,2 +1,6 @@
-include LICENSE.txt *.md *.rst TODO requirements-dev.txt screenshots/*
-include tasks.py conftest.py .coveragerc pytest.ini test tox.ini
+include LICENSE.txt *.md *.rst requirements-dev.txt screenshots/*
+include tasks.py .coveragerc tox.ini
+recursive-include test *.cnf
+recursive-include test *.feature
+recursive-include test *.py
+recursive-include test *.txt

TODO

@@ -56,7 +56,7 @@
 # Query tuples are used for maintaining history
 Query = namedtuple('Query', ['query', 'successful', 'mutating'])
 
-PACKAGE_ROOT = os.path.dirname(__file__)
+PACKAGE_ROOT = os.path.abspath(os.path.dirname(__file__))
 
 # no-op logging handler
 class NullHandler(logging.Handler):

Vagrantfile

@@ -1,15 +1,14 @@
 #!/usr/bin/env python
+"""A script to publish a release of mycli to PyPI."""
+
 from __future__ import print_function
+import io
+from optparse import OptionParser
 import re
-import ast
 import subprocess
 import sys
-from optparse import OptionParser
 
-try:
-    input = raw_input
-except NameError:
-    pass
+import click
 
 DEBUG = False
 CONFIRM_STEPS = False
@@ -24,9 +23,7 @@ def skip_step():
     global CONFIRM_STEPS
 
     if CONFIRM_STEPS:
-        choice = input("--- Confirm step? (y/N) [y] ")
-        if choice.lower() == 'n':
-            return True
+        return not click.confirm('--- Run this step?', default=True)
     return False
 
 
@@ -49,29 +46,26 @@ def run_step(*args):
 
 
 def version(version_file):
-    _version_re = re.compile(r'__version__\s+=\s+(.*)')
+    _version_re = re.compile(
+        r'__version__\s+=\s+(?P<quote>[\'"])(?P<version>.*)(?P=quote)')
 
-    with open(version_file, 'rb') as f:
-        ver = str(ast.literal_eval(_version_re.search(
-            f.read().decode('utf-8')).group(1)))
+    with io.open(version_file, encoding='utf-8') as f:
+        ver = _version_re.search(f.read()).group('version')
 
     return ver
 
 
 def commit_for_release(version_file, ver):
     run_step('git', 'reset')
     run_step('git', 'add', version_file)
-    run_step('git', 'commit', '--message', 'Releasing version %s' % ver)
+    run_step('git', 'commit', '--message',
+             'Releasing version {}'.format(ver))
 
 
 def create_git_tag(tag_name):
     run_step('git', 'tag', tag_name)
 
 
-def register_with_pypi():
-    run_step('python', 'setup.py', 'register')
-
-
 def create_distribution_files():
     run_step('python', 'setup.py', 'sdist', 'bdist_wheel')
 
@@ -90,8 +84,7 @@ def push_tags_to_github():
 
 def checklist(questions):
     for question in questions:
-        choice = input(question + ' (y/N) [n] ')
-        if choice.lower() != 'y':
+        if not click.confirm('--- {}'.format(question), default=False):
             sys.exit(1)
 
 
@@ -123,13 +116,11 @@ def checklist(questions):
     CONFIRM_STEPS = popts.confirm_steps
     DRY_RUN = popts.dry_run
 
-    choice = input('Are you sure? (y/N) [n] ')
-    if choice.lower() != 'y':
+    if not click.confirm('Are you sure?', default=False):
         sys.exit(1)
 
     commit_for_release('mycli/__init__.py', ver)
-    create_git_tag('v%s' % ver)
-    register_with_pypi()
+    create_git_tag('v{}'.format(ver))
     create_distribution_files()
     push_to_github()
     push_tags_to_github()

conftest.py

@@ -1,8 +1,10 @@
 mock
 pytest
+pytest-cov==2.4.0
 tox
 twine==1.8.1
 behave
 pexpect
 coverage==4.3.4
 git+https://github.com/hayd/pep8radius.git@c8aebd0e1d272160896124e104773b97a6249c3e#egg=pep8radius
+click==6.7

create_deb.sh

@@ -1,2 +1,11 @@
 [bdist_wheel]
 universal = 1
+
+[tool:pytest]
+addopts = --capture=sys
+          --showlocals
+          --doctest-modules
+          --ignore=setup.py
+          --ignore=mycli/magic.py
+          --ignore=mycli/packages/parseutils.py
+          --ignore=test/features