Skip to content

Commit

Permalink
Update skel.
Browse files Browse the repository at this point in the history
  • Loading branch information
ionelmc committed Nov 20, 2020
1 parent bf481c2 commit 62382b4
Show file tree
Hide file tree
Showing 11 changed files with 25 additions and 25 deletions.
1 change: 1 addition & 0 deletions .appveyor.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
version: '{branch}-{build}'
build: off
image: Visual Studio 2019
environment:
global:
TWINE_USERNAME: ionel
Expand Down
5 changes: 1 addition & 4 deletions .cookiecutterrc
Original file line number Diff line number Diff line change
@@ -1,9 +1,6 @@
# Generated by cookiepatcher, a small shim around cookiecutter (pip install cookiepatcher)

cookiecutter:
_extensions:
- jinja2_time.TimeExtension
_template: /home/ionel/open-source/cookiecutter-pylibrary
default_context:
allow_tests_inside_package: no
appveyor: yes
c_extension_function: '-'
Expand Down
6 changes: 5 additions & 1 deletion .editorconfig
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,11 @@
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

Expand All @@ -14,3 +15,6 @@ end_of_line = crlf

[*.{yml,yaml}]
indent_size = 2

[*.tsv]
indent_style = tab
5 changes: 4 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -39,11 +39,14 @@ htmlcov
# Translations
*.mo

# Mr Developer
# Buildout
.mr.developer.cfg

# IDE project files
.project
.pydevproject
.idea
.vscode
*.iml
*.komodoproject

Expand Down
2 changes: 1 addition & 1 deletion .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# pre-commit install
# To update the pre-commit hooks run:
# pre-commit install-hooks
exclude: '^(.tox|ci/templates|.bumpversion.cfg)(/|$)'
exclude: '^(\.tox|ci/templates|\.bumpversion\.cfg)(/|$)'
repos:
- repo: https://github.com/pre-commit/pre-commit-hooks
rev: master
Expand Down
14 changes: 3 additions & 11 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,7 @@
language: python
dist: xenial
virt: lxd
cache: false
env:
global:
- LD_PRELOAD=libSegFault.so
Expand Down Expand Up @@ -91,11 +94,6 @@ matrix:
- WHEEL_MANYLINUX="1 cp37"
python: '3.7'
arch: amd64
- os: osx
osx_image: xcode11
language: generic
env:
- TOXENV=py38-cover
- env:
- TOXENV=py38-cover,codecov,extension-coveralls,coveralls
python: '3.8'
Expand All @@ -104,12 +102,6 @@ matrix:
- TOXENV=py38-cover,codecov,extension-coveralls,coveralls
python: '3.8'
arch: amd64
- os: osx
osx_image: xcode11
language: generic
env:
- TOXENV=py38-nocov
- WHEEL_PATH=.tox/dist
- env:
- TOXENV=py38-nocov
- WHEEL_MANYLINUX="2014-arm cp38"
Expand Down
4 changes: 2 additions & 2 deletions CONTRIBUTING.rst
Original file line number Diff line number Diff line change
Expand Up @@ -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
1 change: 1 addition & 0 deletions ci/templates/.appveyor.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
version: '{branch}-{build}'
build: off
image: Visual Studio 2019
environment:
global:
TWINE_USERNAME: ionel
Expand Down
5 changes: 4 additions & 1 deletion ci/templates/.travis.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,7 @@
language: python
dist: xenial
virt: lxd
cache: false
env:
global:
- LD_PRELOAD=libSegFault.so
Expand All @@ -14,7 +17,7 @@ matrix:
env:
- TOXENV=docs
{%- for env in tox_environments %}{{ '' }}
{%- if 'py38' in env or 'py27' in env %}{{ '' }}
{%- if 'py39' in env or 'py27' in env %}{{ '' }}
- os: osx
osx_image: xcode11
language: generic
Expand Down
5 changes: 2 additions & 3 deletions setup.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ setup_requires =

[flake8]
max-line-length = 140
exclude = .tox,.eggs,ci/templates
exclude = .tox,.eggs,ci/templates,build,dist

[tool:pytest]
# If a pytest section is found in one of the possible config files
Expand Down Expand Up @@ -45,5 +45,4 @@ line_length = 120
known_first_party = lazy_object_proxy
default_section = THIRDPARTY
forced_separate = test_lazy_object_proxy
not_skip = __init__.py
skip = .tox,.eggs,ci/templates
skip = .tox,.eggs,ci/templates,build,dist
2 changes: 1 addition & 1 deletion tox.ini
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ skip_install = true
commands =
python setup.py check --strict --metadata --restructuredtext
flake8
isort --verbose --check-only --diff --recursive
isort --verbose --check-only --diff --filter-files .

[testenv:docs]
usedevelop = true
Expand Down

0 comments on commit 62382b4

Please sign in to comment.