Skip to content

Commit a5d1bd1

Browse files
committed
Update skel.
1 parent b728a86 commit a5d1bd1

18 files changed

+217
-157
lines changed

.cookiecutterrc

+16-5
Original file line numberDiff line numberDiff line change
@@ -1,41 +1,52 @@
11
# Generated by cookiepatcher, a small shim around cookiecutter (pip install cookiepatcher)
22

3-
cookiecutter:
4-
_extensions:
5-
- jinja2_time.TimeExtension
6-
_template: cookiecutter-pylibrary
3+
default_context:
4+
allow_tests_inside_package: no
75
appveyor: no
86
c_extension_function: '-'
97
c_extension_module: '-'
108
c_extension_optional: no
119
c_extension_support: no
10+
c_extension_test_pypi: no
11+
c_extension_test_pypi_username: ionelmc
1212
codacy: no
13+
codacy_projectid: '[Get ID from https://app.codacy.com/app/ionelmc/python-holdup/settings]'
1314
codeclimate: no
1415
codecov: no
1516
command_line_interface: argparse
1617
command_line_interface_bin_name: holdup
1718
coveralls: yes
19+
coveralls_token: '[Required for Appveyor, take it from https://coveralls.io/github/ionelmc/python-holdup]'
1820
distribution_name: holdup
1921
2022
full_name: Ionel Cristian Mărieș
21-
github_username: ionelmc
2223
landscape: no
2324
license: BSD 2-Clause License
2425
linter: flake8
2526
package_name: holdup
27+
pre_commit: yes
2628
project_name: Holdup
2729
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).
30+
pypi_badge: yes
31+
pypi_disable_upload: no
2832
release_date: '2018-11-24'
33+
repo_hosting: github.com
34+
repo_hosting_domain: github.com
2935
repo_name: python-holdup
36+
repo_username: ionelmc
3037
requiresio: yes
3138
scrutinizer: no
39+
setup_py_uses_setuptools_scm: no
40+
setup_py_uses_test_runner: no
3241
sphinx_docs: yes
42+
sphinx_docs_hosting: https://python-holdup.readthedocs.io/
3343
sphinx_doctest: no
3444
sphinx_theme: sphinx-py3doc-enhanced-theme
3545
test_matrix_configurator: no
3646
test_matrix_separate_coverage: no
3747
test_runner: pytest
3848
travis: yes
49+
travis_osx: no
3950
version: 1.7.0
4051
website: https://blog.ionelmc.ro
4152
year_from: '2016'

.editorconfig

+9-2
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,20 @@
1-
# see http://editorconfig.org
1+
# see https://editorconfig.org/
22
root = true
33

44
[*]
5+
# Use Unix-style newlines for most files (except Windows files, see below).
56
end_of_line = lf
67
trim_trailing_whitespace = true
7-
insert_final_newline = true
88
indent_style = space
9+
insert_final_newline = true
910
indent_size = 4
1011
charset = utf-8
1112

1213
[*.{bat,cmd,ps1}]
1314
end_of_line = crlf
15+
16+
[*.{yml,yaml}]
17+
indent_size = 2
18+
19+
[*.tsv]
20+
indent_style = tab

.gitignore

+7-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
*.py[cod]
2+
__pycache__
23

34
# C extensions
45
*.so
@@ -21,6 +22,7 @@ lib
2122
lib64
2223
venv*/
2324
pyvenv*/
25+
pip-wheel-metadata/
2426

2527
# Installer logs
2628
pip-log.txt
@@ -37,11 +39,14 @@ htmlcov
3739
# Translations
3840
*.mo
3941

40-
# Mr Developer
42+
# Buildout
4143
.mr.developer.cfg
44+
45+
# IDE project files
4246
.project
4347
.pydevproject
4448
.idea
49+
.vscode
4550
*.iml
4651
*.komodoproject
4752

@@ -60,6 +65,7 @@ docs/_build
6065
.env
6166
.cache
6267
.pytest
68+
.benchmarks
6369
.bootstrap
6470
.appveyor.token
6571
*.bak

.pre-commit-config.yaml

+20
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
# To install the git pre-commit hook run:
2+
# pre-commit install
3+
# To update the pre-commit hooks run:
4+
# pre-commit install-hooks
5+
exclude: '^(\.tox|ci/templates|\.bumpversion\.cfg)(/|$)'
6+
repos:
7+
- repo: https://github.com/pre-commit/pre-commit-hooks
8+
rev: master
9+
hooks:
10+
- id: trailing-whitespace
11+
- id: end-of-file-fixer
12+
- id: debug-statements
13+
- repo: https://github.com/timothycrosley/isort
14+
rev: master
15+
hooks:
16+
- id: isort
17+
- repo: https://gitlab.com/pycqa/flake8
18+
rev: master
19+
hooks:
20+
- id: flake8

.readthedocs.yml

+10
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
# See https://docs.readthedocs.io/en/stable/config-file/v2.html for details
2+
version: 2
3+
sphinx:
4+
configuration: docs/conf.py
5+
formats: all
6+
python:
7+
install:
8+
- requirements: docs/requirements.txt
9+
- method: pip
10+
path: .

.travis.yml

+31-34
Original file line numberDiff line numberDiff line change
@@ -1,63 +1,60 @@
11
language: python
22
dist: xenial
3-
services:
4-
- docker
3+
virt: lxd
4+
cache: false
55
env:
66
global:
77
- LD_PRELOAD=/lib/x86_64-linux-gnu/libSegFault.so
88
- SEGFAULT_SIGNALS=all
9-
stages:
10-
- lint
11-
- unit
12-
- func
13-
jobs:
9+
- LANG=en_US.UTF-8
10+
matrix:
1411
include:
15-
- stage: lint
16-
env: TOXENV=check
17-
- env: TOXENV=docs
18-
- stage: unit
19-
python: '2.7'
20-
env:
21-
- TOXENV=py27,coveralls
22-
- python: '3.5'
12+
- python: '3.6'
2313
env:
24-
- TOXENV=py35,coveralls
14+
- TOXENV=check
2515
- python: '3.6'
2616
env:
17+
- TOXENV=docs
18+
- env:
19+
- TOXENV=py27,coveralls
20+
python: '2.7'
21+
- env:
22+
- TOXENV=py35,coveralls
23+
python: '3.5'
24+
- env:
2725
- TOXENV=py36,coveralls
28-
- python: '3.7'
29-
env:
26+
python: '3.6'
27+
- env:
3028
- TOXENV=py37,coveralls
31-
- python: 'pypy2.7-6.0'
32-
env:
29+
python: '3.7'
30+
- env:
31+
- TOXENV=py38,coveralls
32+
python: '3.8'
33+
- env:
34+
- TOXENV=py39,coveralls
35+
python: '3.9'
36+
- env:
3337
- TOXENV=pypy,coveralls
34-
- TOXPYTHON=pypy
35-
- python: 'pypy3.5-6.0'
36-
env:
38+
python: 'pypy'
39+
- env:
3740
- TOXENV=pypy3,coveralls
3841
- TOXPYTHON=pypy3
39-
- stage: func
40-
python: '3.6'
41-
env:
42-
- TOXENV=func
43-
allow_failures:
44-
- stage: func
45-
42+
python: 'pypy3'
4643
before_install:
4744
- python --version
4845
- uname -a
49-
- lsb_release -a
46+
- lsb_release -a || true
5047
install:
51-
- pip install tox
48+
- python -mpip install --progress-bar=off tox -rci/requirements.txt
5249
- virtualenv --version
5350
- easy_install --version
5451
- pip --version
5552
- tox --version
5653
script:
5754
- tox -v
5855
after_failure:
59-
- more .tox/log/* | cat
60-
- more .tox/*/log/* | cat
56+
- cat .tox/log/*
57+
- cat .tox/*/log/*
6158
notifications:
6259
email:
6360
on_success: never

CONTRIBUTING.rst

+4-4
Original file line numberDiff line numberDiff line change
@@ -41,15 +41,15 @@ To set up `python-holdup` for local development:
4141
(look for the "Fork" button).
4242
2. Clone your fork locally::
4343

44-
git clone [email protected]:your_name_here/python-holdup.git
44+
git clone [email protected]:YOURGITHUBNAME/python-holdup.git
4545

4646
3. Create a branch for local development::
4747

4848
git checkout -b name-of-your-bugfix-or-feature
4949

5050
Now you can make your changes locally.
5151

52-
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::
52+
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::
5353

5454
tox
5555

@@ -85,6 +85,6 @@ To run a subset of tests::
8585

8686
tox -e envname -- pytest -k test_myfeature
8787

88-
To run all the test environments in *parallel* (you need to ``pip install detox``)::
88+
To run all the test environments in *parallel*::
8989

90-
detox
90+
tox -p auto

MANIFEST.in

+2-2
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,6 @@ include CONTRIBUTING.rst
1515
include LICENSE
1616
include README.rst
1717

18-
include tox.ini .travis.yml appveyor.yml
18+
include tox.ini .travis.yml .appveyor.yml .readthedocs.yml .pre-commit-config.yaml
1919

20-
global-exclude *.py[cod] __pycache__ *.so *.dylib
20+
global-exclude *.py[cod] __pycache__/* *.so *.dylib

README.rst

+7-6
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ Overview
1919
:target: https://readthedocs.org/projects/python-holdup
2020
:alt: Documentation Status
2121

22-
.. |travis| image:: https://travis-ci.org/ionelmc/python-holdup.svg?branch=master
22+
.. |travis| image:: https://api.travis-ci.org/ionelmc/python-holdup.svg?branch=master
2323
:alt: Travis-CI Build Status
2424
:target: https://travis-ci.org/ionelmc/python-holdup
2525

@@ -35,10 +35,6 @@ Overview
3535
:alt: PyPI Package latest release
3636
:target: https://pypi.org/project/holdup
3737

38-
.. |commits-since| image:: https://img.shields.io/github/commits-since/ionelmc/python-holdup/v1.8.0.svg
39-
:alt: Commits since latest release
40-
:target: https://github.com/ionelmc/python-holdup/compare/v1.8.0...master
41-
4238
.. |wheel| image:: https://img.shields.io/pypi/wheel/holdup.svg
4339
:alt: PyPI Wheel
4440
:target: https://pypi.org/project/holdup
@@ -51,6 +47,11 @@ Overview
5147
:alt: Supported implementations
5248
:target: https://pypi.org/project/holdup
5349

50+
.. |commits-since| image:: https://img.shields.io/github/commits-since/ionelmc/python-holdup/v1.7.0.svg
51+
:alt: Commits since latest release
52+
:target: https://github.com/ionelmc/python-holdup/compare/v1.7.0...master
53+
54+
5455

5556
.. end-badges
5657
@@ -136,7 +137,7 @@ Skipping SSL Certificate verification requires a minimum of Python-2.7.9 or Pyth
136137
Development
137138
===========
138139

139-
To run the all tests run::
140+
To run all the tests run::
140141

141142
tox
142143

0 commit comments

Comments
 (0)