Update skel.

.cookiecutterrc

@@ -1,41 +1,52 @@
 # 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: no
     c_extension_function: '-'
     c_extension_module: '-'
     c_extension_optional: no
     c_extension_support: no
+    c_extension_test_pypi: no
+    c_extension_test_pypi_username: ionelmc
     codacy: no
+    codacy_projectid: '[Get ID from https://app.codacy.com/app/ionelmc/python-holdup/settings]'
     codeclimate: no
     codecov: no
     command_line_interface: argparse
     command_line_interface_bin_name: holdup
     coveralls: yes
+    coveralls_token: '[Required for Appveyor, take it from https://coveralls.io/github/ionelmc/python-holdup]'
     distribution_name: holdup
     email: contact@ionelmc.ro
     full_name: Ionel Cristian Mărieș
-    github_username: ionelmc
     landscape: no
     license: BSD 2-Clause License
     linter: flake8
     package_name: holdup
+    pre_commit: yes
     project_name: Holdup
     project_short_description: A tool to wait for services and execute command. Useful for Docker containers that depend on slow to start services (like almost everything).
+    pypi_badge: yes
+    pypi_disable_upload: no
     release_date: '2018-11-24'
+    repo_hosting: github.com
+    repo_hosting_domain: github.com
     repo_name: python-holdup
+    repo_username: ionelmc
     requiresio: yes
     scrutinizer: no
+    setup_py_uses_setuptools_scm: no
+    setup_py_uses_test_runner: no
     sphinx_docs: yes
+    sphinx_docs_hosting: https://python-holdup.readthedocs.io/
     sphinx_doctest: no
     sphinx_theme: sphinx-py3doc-enhanced-theme
     test_matrix_configurator: no
     test_matrix_separate_coverage: no
     test_runner: pytest
     travis: yes
+    travis_osx: no
     version: 1.7.0
     website: https://blog.ionelmc.ro
     year_from: '2016'

.editorconfig

@@ -1,13 +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,yaml}]
+indent_size = 2
+
+[*.tsv]
+indent_style = tab

.gitignore

@@ -1,4 +1,5 @@
 *.py[cod]
+__pycache__
 
 # C extensions
 *.so
@@ -21,6 +22,7 @@ lib
 lib64
 venv*/
 pyvenv*/
+pip-wheel-metadata/
 
 # Installer logs
 pip-log.txt
@@ -37,11 +39,14 @@ htmlcov
 # Translations
 *.mo
 
-# Mr Developer
+# Buildout
 .mr.developer.cfg
+
+# IDE project files
 .project
 .pydevproject
 .idea
+.vscode
 *.iml
 *.komodoproject
 
@@ -60,6 +65,7 @@ docs/_build
 .env
 .cache
 .pytest
+.benchmarks
 .bootstrap
 .appveyor.token
 *.bak

.pre-commit-config.yaml

@@ -0,0 +1,20 @@
+# To install the git pre-commit hook run:
+#   pre-commit install
+# To update the pre-commit hooks run:
+#   pre-commit install-hooks
+exclude: '^(\.tox|ci/templates|\.bumpversion\.cfg)(/|$)'
+repos:
+  - repo: https://github.com/pre-commit/pre-commit-hooks
+    rev: master
+    hooks:
+      - id: trailing-whitespace
+      - id: end-of-file-fixer
+      - id: debug-statements
+  - repo: https://github.com/timothycrosley/isort
+    rev: master
+    hooks:
+      - id: isort
+  - repo: https://gitlab.com/pycqa/flake8
+    rev: master
+    hooks:
+      - id: flake8

.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

@@ -1,63 +1,60 @@
 language: python
 dist: xenial
-services:
-  - docker
+virt: lxd
+cache: false
 env:
   global:
     - LD_PRELOAD=/lib/x86_64-linux-gnu/libSegFault.so
     - SEGFAULT_SIGNALS=all
-stages:
-  - lint
-  - unit
-  - func
-jobs:
+    - LANG=en_US.UTF-8
+matrix:
   include:
-    - stage: lint
-      env: TOXENV=check
-    - env: TOXENV=docs
-    - stage: unit
-      python: '2.7'
-      env:
-        - TOXENV=py27,coveralls
-    - python: '3.5'
+    - python: '3.6'
       env:
-        - TOXENV=py35,coveralls
+        - TOXENV=check
     - python: '3.6'
       env:
+        - TOXENV=docs
+    - env:
+        - TOXENV=py27,coveralls
+      python: '2.7'
+    - env:
+        - TOXENV=py35,coveralls
+      python: '3.5'
+    - env:
         - TOXENV=py36,coveralls
-    - python: '3.7'
-      env:
+      python: '3.6'
+    - env:
         - TOXENV=py37,coveralls
-    - python: 'pypy2.7-6.0'
-      env:
+      python: '3.7'
+    - env:
+        - TOXENV=py38,coveralls
+      python: '3.8'
+    - env:
+        - TOXENV=py39,coveralls
+      python: '3.9'
+    - env:
         - TOXENV=pypy,coveralls
-        - TOXPYTHON=pypy
-    - python: 'pypy3.5-6.0'
-      env:
+      python: 'pypy'
+    - env:
         - TOXENV=pypy3,coveralls
         - TOXPYTHON=pypy3
-    - stage: func
-      python: '3.6'
-      env:
-        - TOXENV=func
-  allow_failures:
-    - stage: func
-
+      python: 'pypy3'
 before_install:
   - python --version
   - uname -a
-  - lsb_release -a
+  - lsb_release -a || true
 install:
-  - pip install tox
+  - python -mpip install --progress-bar=off tox -rci/requirements.txt
   - virtualenv --version
   - easy_install --version
   - pip --version
   - tox --version
 script:
   - tox -v
 after_failure:
-  - more .tox/log/* | cat
-  - more .tox/*/log/* | cat
+  - cat .tox/log/*
+  - cat .tox/*/log/*
 notifications:
   email:
     on_success: never

CONTRIBUTING.rst

@@ -41,15 +41,15 @@ To set up `python-holdup` for local development:
    (look for the "Fork" button).
 2. Clone your fork locally::
 
-    git clone git@github.com:your_name_here/python-holdup.git
+    git clone git@github.com:YOURGITHUBNAME/python-holdup.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 <http://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
 
@@ -85,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

MANIFEST.in

@@ -15,6 +15,6 @@ include CONTRIBUTING.rst
 include LICENSE
 include README.rst
 
-include tox.ini .travis.yml appveyor.yml
+include tox.ini .travis.yml .appveyor.yml .readthedocs.yml .pre-commit-config.yaml
 
-global-exclude *.py[cod] __pycache__ *.so *.dylib
+global-exclude *.py[cod] __pycache__/* *.so *.dylib

README.rst

@@ -19,7 +19,7 @@ Overview
     :target: https://readthedocs.org/projects/python-holdup
     :alt: Documentation Status
 
-.. |travis| image:: https://travis-ci.org/ionelmc/python-holdup.svg?branch=master
+.. |travis| image:: https://api.travis-ci.org/ionelmc/python-holdup.svg?branch=master
     :alt: Travis-CI Build Status
     :target: https://travis-ci.org/ionelmc/python-holdup
 
@@ -35,10 +35,6 @@ Overview
     :alt: PyPI Package latest release
     :target: https://pypi.org/project/holdup
 
-.. |commits-since| image:: https://img.shields.io/github/commits-since/ionelmc/python-holdup/v1.8.0.svg
-    :alt: Commits since latest release
-    :target: https://github.com/ionelmc/python-holdup/compare/v1.8.0...master
-
 .. |wheel| image:: https://img.shields.io/pypi/wheel/holdup.svg
     :alt: PyPI Wheel
     :target: https://pypi.org/project/holdup
@@ -51,6 +47,11 @@ Overview
     :alt: Supported implementations
     :target: https://pypi.org/project/holdup
 
+.. |commits-since| image:: https://img.shields.io/github/commits-since/ionelmc/python-holdup/v1.7.0.svg
+    :alt: Commits since latest release
+    :target: https://github.com/ionelmc/python-holdup/compare/v1.7.0...master
+
+
 
 .. end-badges
 
@@ -136,7 +137,7 @@ Skipping SSL Certificate verification requires a minimum of Python-2.7.9 or Pyth
 Development
 ===========
 
-To run the all tests run::
+To run all the tests run::
 
     tox