Various structure updates.

.bumpversion.cfg

@@ -4,10 +4,17 @@ commit = True
 tag = True
 
 [bumpversion:file:setup.py]
+search = version='{current_version}'
+replace = version='{new_version}'
 
 [bumpversion:file:README.rst]
+search = v{current_version}.
+replace = v{new_version}.
 
 [bumpversion:file:docs/conf.py]
+search = version = release = '{current_version}'
+replace = version = release = '{new_version}'
 
 [bumpversion:file:src/hunter/__init__.py]
-
+search = __version__ = '{current_version}'
+replace = __version__ = '{new_version}'

.cookiecutterrc

@@ -1,36 +1,39 @@
 # Generated by cookiepatcher, a small shim around cookiecutter (pip install cookiepatcher)
 
 cookiecutter:
-    appveyor: 'yes'
-    c_extension_cython: 'yes'
-    c_extension_optional: 'yes'
-    c_extension_support: 'yes'
-    codacy: 'yes'
-    codeclimate: 'yes'
-    codecov: 'yes'
-    command_line_interface: 'no'
-    command_line_interface_bin_name: '-'
-    coveralls: 'yes'
+    _template: cookiecutter-pylibrary
+    appveyor: yes
+    c_extension_function: '-'
+    c_extension_module: '-'
+    c_extension_optional: yes
+    c_extension_support: cython
+    codacy: no
+    codeclimate: no
+    codecov: yes
+    command_line_interface: argparse
+    command_line_interface_bin_name: hunter-trace
+    coveralls: yes
     distribution_name: hunter
     email: [email protected]
     full_name: Ionel Cristian Mărieș
     github_username: ionelmc
-    landscape: 'yes'
-    license: BSD license
+    landscape: no
+    license: BSD 2-Clause License
     linter: flake8
     package_name: hunter
     project_name: Hunter
     project_short_description: Hunter is a flexible code tracing toolkit, not for measuring coverage, but for debugging, logging, inspection and other nefarious purposes. It has a simple Python API and a convenient terminal API (see `Environment variable activation <env-var-activation_>`_).
-    release_date: '2016-09-24'
+    release_date: '2017-11-24'
     repo_name: python-hunter
-    requiresio: 'yes'
-    scrutinizer: 'yes'
-    sphinx_doctest: 'no'
+    requiresio: yes
+    scrutinizer: no
+    sphinx_docs: yes
+    sphinx_doctest: no
     sphinx_theme: sphinx-py3doc-enhanced-theme
-    test_matrix_configurator: 'no'
-    test_matrix_separate_coverage: 'yes'
+    test_matrix_configurator: no
+    test_matrix_separate_coverage: yes
     test_runner: pytest
-    travis: 'yes'
-    version: 1.4.1
+    travis: yes
+    version: 2.0.2
     website: https://blog.ionelmc.ro
-    year: 2015-2017
+    year: 2015-2018

.gitignore

@@ -30,6 +30,7 @@ pip-log.txt
 .coverage
 .tox
 .coverage.*
+.pytest_cache/
 nosetests.xml
 coverage.xml
 htmlcov

.travis.yml

@@ -84,18 +84,30 @@ matrix:
         - TOXENV=py37-cython-nocov
       sudo: required
       dist: xenial
-    - python: 'pypy-5.4'
+    - python: 'pypy'
       env:
         - TOXENV=pypy-pure-cover,report,coveralls,codecov
-    - python: 'pypy-5.4'
+    - python: 'pypy'
       env:
         - TOXENV=pypy-pure-nocov
-    - python: 'pypy-5.4'
+    - python: 'pypy'
       env:
         - TOXENV=pypy-cython-cover,report,coveralls,codecov
-    - python: 'pypy-5.4'
+    - python: 'pypy'
       env:
         - TOXENV=pypy-cython-nocov
+    - python: 'pypy3'
+      env:
+        - TOXENV=pypy3-pure-cover,report,coveralls,codecov
+    - python: 'pypy3'
+      env:
+        - TOXENV=pypy3-pure-nocov
+    - python: 'pypy3'
+      env:
+        - TOXENV=pypy3-cython-cover,report,coveralls,codecov
+    - python: 'pypy3'
+      env:
+        - TOXENV=pypy3-cython-nocov
 before_install:
   - python --version
   - uname -a
@@ -107,6 +119,27 @@ install:
   - easy_install --version
   - pip --version
   - tox --version
+  - |
+    set -ex
+    if [[ $TRAVIS_PYTHON_VERSION == 'pypy' ]]; then
+        (cd $HOME
+         wget https://bitbucket.org/pypy/pypy/downloads/pypy2-v6.0.0-linux64.tar.bz2
+         tar xf pypy2-*.tar.bz2
+         pypy2-*/bin/pypy -m ensurepip
+         pypy2-*/bin/pypy -m pip install -U virtualenv)
+        export PATH=$(echo $HOME/pypy2-*/bin):$PATH
+        export TOXPYTHON=$(echo $HOME/pypy2-*/bin/pypy)
+    fi
+    if [[ $TRAVIS_PYTHON_VERSION == 'pypy3' ]]; then
+        (cd $HOME
+         wget https://bitbucket.org/pypy/pypy/downloads/pypy3-v6.0.0-linux64.tar.bz2
+         tar xf pypy3-*.tar.bz2
+         pypy3-*/bin/pypy3 -m ensurepip
+         pypy3-*/bin/pypy3 -m pip install -U virtualenv)
+        export PATH=$(echo $HOME/pypy3-*/bin):$PATH
+        export TOXPYTHON=$(echo $HOME/pypy3-*/bin/pypy3)
+    fi
+    set +x
 script:
   - tox -v
 after_failure:

CONTRIBUTING.rst

@@ -83,7 +83,7 @@ Tips
 
 To run a subset of tests::
 
-    tox -e envname -- py.test -k test_myfeature
+    tox -e envname -- pytest -k test_myfeature
 
 To run all the test environments in *parallel* (you need to ``pip install detox``)::
 

MANIFEST.in

@@ -7,7 +7,6 @@ include .bumpversion.cfg
 include .coveragerc
 include .cookiecutterrc
 include .editorconfig
-include .isort.cfg
 
 include AUTHORS.rst
 include CHANGELOG.rst

README.rst

@@ -12,7 +12,6 @@ Overview
     * - tests
       - | |travis| |appveyor| |requires|
         | |coveralls| |codecov|
-        | |landscape| |scrutinizer| |codacy| |codeclimate|
     * - package
       - | |version| |wheel| |supported-versions| |supported-implementations|
         | |commits-since|
@@ -21,6 +20,7 @@ Overview
     :target: https://readthedocs.org/projects/python-hunter
     :alt: Documentation Status
 
+
 .. |travis| image:: https://travis-ci.org/ionelmc/python-hunter.svg?branch=master
     :alt: Travis-CI Build Status
     :target: https://travis-ci.org/ionelmc/python-hunter
@@ -41,18 +41,6 @@ Overview
     :alt: Coverage Status
     :target: https://codecov.io/github/ionelmc/python-hunter
 
-.. |landscape| image:: https://landscape.io/github/ionelmc/python-hunter/master/landscape.svg?style=flat
-    :target: https://landscape.io/github/ionelmc/python-hunter/master
-    :alt: Code Quality Status
-
-.. |codacy| image:: https://img.shields.io/codacy/REPLACE_WITH_PROJECT_ID.svg
-    :target: https://www.codacy.com/app/ionelmc/python-hunter
-    :alt: Codacy Code Quality Status
-
-.. |codeclimate| image:: https://codeclimate.com/github/ionelmc/python-hunter/badges/gpa.svg
-   :target: https://codeclimate.com/github/ionelmc/python-hunter
-   :alt: CodeClimate Quality Status
-
 .. |version| image:: https://img.shields.io/pypi/v/hunter.svg
     :alt: PyPI Package latest release
     :target: https://pypi.python.org/pypi/hunter
@@ -73,18 +61,14 @@ Overview
     :alt: Supported implementations
     :target: https://pypi.python.org/pypi/hunter
 
-.. |scrutinizer| image:: https://img.shields.io/scrutinizer/g/ionelmc/python-hunter/master.svg
-    :alt: Scrutinizer Status
-    :target: https://scrutinizer-ci.com/g/ionelmc/python-hunter/
-
 
 .. end-badges
 
 Hunter is a flexible code tracing toolkit, not for measuring coverage, but for debugging, logging, inspection and other
-nefarious purposes. It has a Python API, terminal activation (see `Environment variable activation
-<environment-variable-activation_>`_). and supports tracing other processes (see `Tracing processes <tracing-processes_>`_).
+nefarious purposes. It has a simple Python API and a convenient terminal API (see `Environment variable activation
+<env-var-activation_>`_).
 
-* Free software: BSD license
+* Free software: BSD 2-Clause License
 
 Installation
 ============
@@ -96,8 +80,8 @@ Installation
 Documentation
 =============
 
-https://python-hunter.readthedocs.org/
 
+https://python-hunter.readthedocs.io/
 
 Overview
 ========

ci/bootstrap.py

@@ -28,9 +28,10 @@
             subprocess.check_call([sys.executable, "-m", "virtualenv", env_path])
         print("Installing `jinja2` into bootstrap environment...")
         subprocess.check_call([join(bin_path, "pip"), "install", "jinja2"])
-    activate = join(bin_path, "activate_this.py")
-    # noinspection PyCompatibility
-    exec(compile(open(activate, "rb").read(), activate, "exec"), dict(__file__=activate))
+    python_executable = join(bin_path, "python")
+    if not os.path.samefile(python_executable, sys.executable):
+        print("Re-executing with: {0}".format(python_executable))
+        os.execv(python_executable, [python_executable, __file__])
 
     import jinja2
 

ci/templates/.travis.yml

@@ -17,7 +17,7 @@ env:
 matrix:
   include:
 {%- for env in tox_environments %}{{ '' }}
-    - python: '{{ '{0[0]}-5.4'.format(env.split('-')) if env.startswith('pypy') else '{0[2]}.{0[3]}'.format(env) }}'
+    - python: '{{ env.split("-")[0] if env.startswith("pypy") else "{0[2]}.{0[3]}".format(env) }}'
       env:
         - TOXENV={{ env }}{% if 'cover' in env %},report,coveralls,codecov{% endif -%}
 {% if env.startswith('py37') %}
@@ -37,6 +37,27 @@ install:
   - easy_install --version
   - pip --version
   - tox --version
+  - |
+    set -ex
+    if [[ $TRAVIS_PYTHON_VERSION == 'pypy' ]]; then
+        (cd $HOME
+         wget https://bitbucket.org/pypy/pypy/downloads/pypy2-v6.0.0-linux64.tar.bz2
+         tar xf pypy2-*.tar.bz2
+         pypy2-*/bin/pypy -m ensurepip
+         pypy2-*/bin/pypy -m pip install -U virtualenv)
+        export PATH=$(echo $HOME/pypy2-*/bin):$PATH
+        export TOXPYTHON=$(echo $HOME/pypy2-*/bin/pypy)
+    fi
+    if [[ $TRAVIS_PYTHON_VERSION == 'pypy3' ]]; then
+        (cd $HOME
+         wget https://bitbucket.org/pypy/pypy/downloads/pypy3-v6.0.0-linux64.tar.bz2
+         tar xf pypy3-*.tar.bz2
+         pypy3-*/bin/pypy3 -m ensurepip
+         pypy3-*/bin/pypy3 -m pip install -U virtualenv)
+        export PATH=$(echo $HOME/pypy3-*/bin):$PATH
+        export TOXPYTHON=$(echo $HOME/pypy3-*/bin/pypy3)
+    fi
+    set +x
 script:
   - tox -v
 after_failure:

ci/templates/appveyor.yml

@@ -19,7 +19,7 @@ environment:
       PYTHON_ARCH: '32'
     - TOXENV: '{{ env }}{% if 'cover' in env %},report,codecov{%- endif %}'
       TOXPYTHON: C:\Python{{ env[2:4] }}-x64\python.exe
-      {%- if env.startswith(('py2', 'py33', 'py34')) %}
+      {%- if env.startswith(('py2', 'py34')) %}
 
       WINDOWS_SDK_VERSION: v7.{{ '1' if env.startswith('py3') else '0' }}
       {%- endif %}