Update skel and replace py35 with py39 in test grid.

.appveyor.yml

@@ -1,5 +1,6 @@
 version: '{branch}-{build}'
 build: off
+image: Visual Studio 2019
 environment:
   global:
     TWINE_USERNAME: ionel
@@ -55,48 +56,6 @@ environment:
       PYTHON_ARCH: '64'
       WHEEL_PATH: .tox/dist
       WINDOWS_SDK_VERSION: v7.0
-    - TOXENV: py35-pure-cover,codecov
-      TOXPYTHON: C:\Python35\python.exe
-      PYTHON_HOME: C:\Python35
-      PYTHON_VERSION: '3.5'
-      PYTHON_ARCH: '32'
-    - TOXENV: py35-pure-cover,codecov
-      TOXPYTHON: C:\Python35-x64\python.exe
-      PYTHON_HOME: C:\Python35-x64
-      PYTHON_VERSION: '3.5'
-      PYTHON_ARCH: '64'
-    - TOXENV: py35-pure-nocov
-      TOXPYTHON: C:\Python35\python.exe
-      PYTHON_HOME: C:\Python35
-      PYTHON_VERSION: '3.5'
-      PYTHON_ARCH: '32'
-    - TOXENV: py35-pure-nocov
-      TOXPYTHON: C:\Python35-x64\python.exe
-      PYTHON_HOME: C:\Python35-x64
-      PYTHON_VERSION: '3.5'
-      PYTHON_ARCH: '64'
-    - TOXENV: py35-cython-cover,codecov
-      TOXPYTHON: C:\Python35\python.exe
-      PYTHON_HOME: C:\Python35
-      PYTHON_VERSION: '3.5'
-      PYTHON_ARCH: '32'
-    - TOXENV: py35-cython-cover,codecov
-      TOXPYTHON: C:\Python35-x64\python.exe
-      PYTHON_HOME: C:\Python35-x64
-      PYTHON_VERSION: '3.5'
-      PYTHON_ARCH: '64'
-    - TOXENV: py35-cython-nocov
-      TOXPYTHON: C:\Python35\python.exe
-      PYTHON_HOME: C:\Python35
-      PYTHON_VERSION: '3.5'
-      PYTHON_ARCH: '32'
-      WHEEL_PATH: .tox/dist
-    - TOXENV: py35-cython-nocov
-      TOXPYTHON: C:\Python35-x64\python.exe
-      PYTHON_HOME: C:\Python35-x64
-      PYTHON_VERSION: '3.5'
-      PYTHON_ARCH: '64'
-      WHEEL_PATH: .tox/dist
     - TOXENV: py36-pure-cover,codecov
       TOXPYTHON: C:\Python36\python.exe
       PYTHON_HOME: C:\Python36
@@ -223,6 +182,48 @@ environment:
       PYTHON_VERSION: '3.8'
       PYTHON_ARCH: '64'
       WHEEL_PATH: .tox/dist
+    - TOXENV: py39-pure-cover,codecov
+      TOXPYTHON: C:\Python39\python.exe
+      PYTHON_HOME: C:\Python39
+      PYTHON_VERSION: '3.9'
+      PYTHON_ARCH: '32'
+    - TOXENV: py39-pure-cover,codecov
+      TOXPYTHON: C:\Python39-x64\python.exe
+      PYTHON_HOME: C:\Python39-x64
+      PYTHON_VERSION: '3.9'
+      PYTHON_ARCH: '64'
+    - TOXENV: py39-pure-nocov
+      TOXPYTHON: C:\Python39\python.exe
+      PYTHON_HOME: C:\Python39
+      PYTHON_VERSION: '3.9'
+      PYTHON_ARCH: '32'
+    - TOXENV: py39-pure-nocov
+      TOXPYTHON: C:\Python39-x64\python.exe
+      PYTHON_HOME: C:\Python39-x64
+      PYTHON_VERSION: '3.9'
+      PYTHON_ARCH: '64'
+    - TOXENV: py39-cython-cover,codecov
+      TOXPYTHON: C:\Python39\python.exe
+      PYTHON_HOME: C:\Python39
+      PYTHON_VERSION: '3.9'
+      PYTHON_ARCH: '32'
+    - TOXENV: py39-cython-cover,codecov
+      TOXPYTHON: C:\Python39-x64\python.exe
+      PYTHON_HOME: C:\Python39-x64
+      PYTHON_VERSION: '3.9'
+      PYTHON_ARCH: '64'
+    - TOXENV: py39-cython-nocov
+      TOXPYTHON: C:\Python39\python.exe
+      PYTHON_HOME: C:\Python39
+      PYTHON_VERSION: '3.9'
+      PYTHON_ARCH: '32'
+      WHEEL_PATH: .tox/dist
+    - TOXENV: py39-cython-nocov
+      TOXPYTHON: C:\Python39-x64\python.exe
+      PYTHON_HOME: C:\Python39-x64
+      PYTHON_VERSION: '3.9'
+      PYTHON_ARCH: '64'
+      WHEEL_PATH: .tox/dist
 init:
   - ps: echo $env:TOXENV
   - ps: ls C:\Python*

.bumpversion.cfg

@@ -8,8 +8,8 @@ search = 'fallback_version': '{current_version}'
 replace = 'fallback_version': '{new_version}'
 
 [bumpversion:file:README.rst]
-search = v{current_version}.
-replace = v{new_version}.
+search = /v{current_version}.svg
+replace = /v{new_version}.svg
 
 [bumpversion:file:docs/conf.py]
 search = version = release = '{current_version}'

.cookiecutterrc

@@ -1,9 +1,6 @@
 # Generated by cookiepatcher, a small shim around cookiecutter (pip install cookiepatcher)
 
-cookiecutter:
-    _extensions:
-    -   jinja2_time.TimeExtension
-    _template: cookiecutter-pylibrary
+default_context:
     allow_tests_inside_package: no
     appveyor: yes
     c_extension_function: '-'
@@ -23,10 +20,11 @@ cookiecutter:
     distribution_name: hunter
     email: [email protected]
     full_name: Ionel Cristian Mărieș
-    landscape: no
+    legacy_python: yes
     license: BSD 2-Clause License
     linter: flake8
     package_name: hunter
+    pre_commit: yes
     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_>`_).
     pypi_badge: yes
@@ -49,7 +47,7 @@ cookiecutter:
     test_runner: pytest
     travis: yes
     travis_osx: no
-    version: 3.0.2
+    version: 3.3.1
     website: https://blog.ionelmc.ro
     year_from: '2015'
-    year_to: '2019'
+    year_to: '2021'

.editorconfig

@@ -1,16 +1,20 @@
-# see http://editorconfig.org
+# see https://editorconfig.org/
 root = true
 
 [*]
+# Use Unix-style newlines for most files (except Windows files, see below).
 end_of_line = lf
 trim_trailing_whitespace = true
-insert_final_newline = true
 indent_style = space
+insert_final_newline = true
 indent_size = 4
 charset = utf-8
 
 [*.{bat,cmd,ps1}]
 end_of_line = crlf
 
-[*.yml]
+[*.{yml,yaml}]
 indent_size = 2
+
+[*.tsv]
+indent_style = tab

.gitignore

@@ -39,11 +39,14 @@ htmlcov
 # Translations
 *.mo
 
-# Mr Developer
+# Buildout
 .mr.developer.cfg
+
+# IDE project files
 .project
 .pydevproject
 .idea
+.vscode
 *.iml
 *.komodoproject
 

.readthedocs.yml

@@ -0,0 +1,10 @@
+# See https://docs.readthedocs.io/en/stable/config-file/v2.html for details
+version: 2
+sphinx:
+  configuration: docs/conf.py
+formats: all
+python:
+  install:
+    - requirements: docs/requirements.txt
+    - method: pip
+      path: .

.travis.yml

@@ -88,42 +88,6 @@ matrix:
         - WHEEL_MANYLINUX="1 cp27"
       python: '2.7'
       arch: amd64
-    - env:
-        - TOXENV=py35-pure-cover,codecov
-      python: '3.5'
-      arch: arm64
-    - env:
-        - TOXENV=py35-pure-cover,codecov
-      python: '3.5'
-      arch: amd64
-    - env:
-        - TOXENV=py35-pure-nocov
-        - WHEEL_MANYLINUX="2014-arm cp35"
-      python: '3.5'
-      arch: arm64
-    - env:
-        - TOXENV=py35-pure-nocov
-        - WHEEL_MANYLINUX="1 cp35"
-      python: '3.5'
-      arch: amd64
-    - env:
-        - TOXENV=py35-cython-cover,codecov
-      python: '3.5'
-      arch: arm64
-    - env:
-        - TOXENV=py35-cython-cover,codecov
-      python: '3.5'
-      arch: amd64
-    - env:
-        - TOXENV=py35-cython-nocov
-        - WHEEL_MANYLINUX="2014-arm cp35"
-      python: '3.5'
-      arch: arm64
-    - env:
-        - TOXENV=py35-cython-nocov
-        - WHEEL_MANYLINUX="1 cp35"
-      python: '3.5'
-      arch: amd64
     - env:
         - TOXENV=py36-pure-cover,codecov
       python: '3.6'
@@ -258,6 +222,42 @@ matrix:
         - WHEEL_MANYLINUX="1 cp38"
       python: '3.8'
       arch: amd64
+    - env:
+        - TOXENV=py39-pure-cover,codecov
+      python: '3.9'
+      arch: arm64
+    - env:
+        - TOXENV=py39-pure-cover,codecov
+      python: '3.9'
+      arch: amd64
+    - env:
+        - TOXENV=py39-pure-nocov
+        - WHEEL_MANYLINUX="2014-arm cp39"
+      python: '3.9'
+      arch: arm64
+    - env:
+        - TOXENV=py39-pure-nocov
+        - WHEEL_MANYLINUX="1 cp39"
+      python: '3.9'
+      arch: amd64
+    - env:
+        - TOXENV=py39-cython-cover,codecov
+      python: '3.9'
+      arch: arm64
+    - env:
+        - TOXENV=py39-cython-cover,codecov
+      python: '3.9'
+      arch: amd64
+    - env:
+        - TOXENV=py39-cython-nocov
+        - WHEEL_MANYLINUX="2014-arm cp39"
+      python: '3.9'
+      arch: arm64
+    - env:
+        - TOXENV=py39-cython-nocov
+        - WHEEL_MANYLINUX="1 cp39"
+      python: '3.9'
+      arch: amd64
     - env:
         - TOXENV=pypy-pure-cover,codecov
         - TOXPYTHON=pypy

CONTRIBUTING.rst

@@ -37,18 +37,19 @@ Development
 
 To set up `python-hunter` for local development:
 
-1. `Fork python-hunter <https://github.com/ionelmc/python-hunter/fork>`_.
-2. Clone your fork locally (replace ``USERNAME`` with your GitHub username)::
+1. Fork `python-hunter <https://github.com/ionelmc/python-hunter>`_
+   (look for the "Fork" button).
+2. Clone your fork locally::
 
-    git clone [email protected]:USERNAME/python-hunter.git
+    git clone [email protected]:YOURGITHUBNAME/python-hunter.git
 
 3. Create a branch for local development::
 
     git checkout -b name-of-your-bugfix-or-feature
 
    Now you can make your changes locally.
 
-4. When you're done making changes, run all the checks, doc builder and spell checker with `tox <https://tox.readthedocs.io/en/latest/install.html>`_ one command::
+4. When you're done making changes run all the checks and docs builder with `tox <https://tox.readthedocs.io/en/latest/install.html>`_ one command::
 
     tox
 
@@ -84,6 +85,6 @@ To run a subset of tests::
 
     tox -e envname -- pytest -k test_myfeature
 
-To run all the test environments in *parallel* (you need to ``pip install detox``)::
+To run all the test environments in *parallel*::
 
-    detox
+    tox -p auto

LICENSE

@@ -1,7 +1,6 @@
 BSD 2-Clause License
 
-Copyright (c) 2015-2019, Ionel Cristian Mărieș
-All rights reserved.
+Copyright (c) 2015-2021, Ionel Cristian Mărieș. All rights reserved.
 
 Redistribution and use in source and binary forms, with or without modification, are permitted provided that the
 following conditions are met:

README.rst

@@ -10,16 +10,18 @@ Overview
     * - docs
       - |docs|
     * - tests
-      - | |travis| |appveyor| |requires| |codecov|
+      - | |travis| |appveyor| |requires|
+        | |codecov|
     * - package
-      - | |version| |wheel| |supported-versions| |supported-implementations| |commits-since|
+      - | |version| |wheel| |supported-versions| |supported-implementations|
+        | |commits-since|
 .. |docs| image:: https://readthedocs.org/projects/python-hunter/badge/?style=flat
     :target: https://readthedocs.org/projects/python-hunter
     :alt: Documentation Status
 
-.. |travis| image:: https://api.travis-ci.org/ionelmc/python-hunter.svg?branch=master
+.. |travis| image:: https://api.travis-ci.com/ionelmc/python-hunter.svg?branch=master
     :alt: Travis-CI Build Status
-    :target: https://travis-ci.org/ionelmc/python-hunter
+    :target: https://travis-ci.com/github/ionelmc/python-hunter
 
 .. |appveyor| image:: https://ci.appveyor.com/api/projects/status/github/ionelmc/python-hunter?branch=master&svg=true
     :alt: AppVeyor Build Status
@@ -29,7 +31,7 @@ Overview
     :alt: Requirements Status
     :target: https://requires.io/github/ionelmc/python-hunter/requirements/?branch=master
 
-.. |codecov| image:: https://codecov.io/github/ionelmc/python-hunter/coverage.svg?branch=master
+.. |codecov| image:: https://codecov.io/gh/ionelmc/python-hunter/branch/master/graphs/badge.svg?branch=master
     :alt: Coverage Status
     :target: https://codecov.io/github/ionelmc/python-hunter
 

ci/requirements.txt

@@ -1,3 +1,4 @@
 virtualenv>=16.6.0
 pip>=19.1.1
 setuptools>=18.0.1
+six>=1.14.0

ci/templates/.appveyor.yml

@@ -1,5 +1,6 @@
 version: '{branch}-{build}'
 build: off
+image: Visual Studio 2019
 environment:
   global:
     TWINE_USERNAME: ionel

docs/conf.py

@@ -20,15 +20,10 @@
     'sphinx.ext.todo',
     'sphinx.ext.viewcode',
 ]
-if os.getenv('SPELLCHECK'):
-    extensions += 'sphinxcontrib.spelling',
-    spelling_show_suggestions = True
-    spelling_lang = 'en_US'
-
 source_suffix = '.rst'
 master_doc = 'index'
 project = 'Hunter'
-year = '2015-2019'
+year = '2015-2021'
 author = 'Ionel Cristian Mărieș'
 copyright = '{0}, {1}'.format(year, author)
 try: