Skip to content

Commit 1499016

Browse files
committed
Merge remote-tracking branch 'origin/master' into sphinx
2 parents 3d4a545 + 4089157 commit 1499016

File tree

14 files changed

+2448
-45
lines changed

14 files changed

+2448
-45
lines changed

.gitattributes

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
src/vws/_version.py export-subst

.pydocstyle

Lines changed: 0 additions & 17 deletions
This file was deleted.

MANIFEST.in

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
include versioneer.py
2+
include src/vws/_version.py

Makefile

Lines changed: 19 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,14 +14,30 @@ lint:
1414
pylint *.py src tests
1515
pyroma --min 10 .
1616
vulture . --min-confidence 100
17-
yapf --diff --recursive src/ tests/
17+
yapf \
18+
--diff \
19+
--recursive \
20+
--exclude versioneer.py \
21+
--exclude src/vws/_version.py \
22+
.
1823

1924
.PHONY: fix-lint
2025
fix-lint:
2126
# Move imports to a single line so that autoflake can handle them.
2227
# See https://github.com/myint/autoflake/issues/8.
2328
# Then later we put them back.
2429
isort --force-single-line --recursive --apply
25-
autoflake --in-place --recursive --remove-all-unused-imports --remove-unused-variables .
26-
yapf --in-place --recursive .
30+
autoflake \
31+
--in-place \
32+
--recursive \
33+
--remove-all-unused-imports \
34+
--remove-unused-variables \
35+
--exclude src/vws/_version.py,versioneer.py \
36+
.
37+
yapf \
38+
--in-place \
39+
--recursive \
40+
--exclude versioneer.py \
41+
--exclude src/vws/_version.py \
42+
.
2743
isort --recursive --apply

dev-requirements.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,5 +19,6 @@ pylint==2.1.1 # Lint
1919
pyroma==2.4 # Packaging best practices checker
2020
pytest-cov==2.6.0 # Measure code coverage
2121
pytest==3.8.2 # Test runners
22+
versioneer==0.18
2223
vulture==0.29
2324
yapf==0.24.0 # Automatic formatting for Python

doc8.ini

Lines changed: 0 additions & 4 deletions
This file was deleted.

mypy.ini

Lines changed: 0 additions & 16 deletions
This file was deleted.

pylintrc

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,9 @@
99

1010
# Add files or directories to the blacklist. They should be base names, not
1111
# paths.
12-
ignore=CVS
12+
ignore=CVS,
13+
versioneer.py,
14+
_version.py,
1315

1416
# Add files or directories matching the regex patterns to the blacklist. The
1517
# regex matches against base names, not paths.
@@ -96,6 +98,8 @@ disable=
9698
bad-whitespace,
9799
# Too difficult to please
98100
duplicate-code,
101+
# Let isort handle imports
102+
wrong-import-order,
99103

100104
[REPORTS]
101105

pytest.ini

Lines changed: 0 additions & 3 deletions
This file was deleted.

setup.cfg

Lines changed: 69 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,3 +30,72 @@ ignore =
3030
tests-pylintrc
3131
tests/*
3232
vuforia_secrets.env.example
33+
34+
[flake8]
35+
exclude=./versioneer.py,
36+
./src/vws/_version.py,
37+
./build/,
38+
39+
# See the docstring in versioneer.py for instructions. Note that you must
40+
# re-run 'versioneer.py setup' after changing this section, and commit the
41+
# resulting files.
42+
[versioneer]
43+
VCS = git
44+
style = pep440
45+
versionfile_source = src/vws/_version.py
46+
versionfile_build = vws/_version.py
47+
tag_prefix =
48+
parentdir_prefix = vws
49+
50+
[bdist_wheel]
51+
universal = 1
52+
53+
[metadata]
54+
license_file = LICENSE
55+
56+
[doc8]
57+
max-line-length = 2000
58+
ignore-path = ./src/*.egg-info/SOURCES.txt,./docs/build/spelling/output.txt
59+
60+
[tool:pytest]
61+
xfail_strict=true
62+
log_cli=true
63+
64+
[mypy]
65+
check_untyped_defs = True
66+
disallow_incomplete_defs = True
67+
disallow_subclassing_any = True
68+
disallow_untyped_calls = True
69+
disallow_untyped_decorators = False
70+
disallow_untyped_defs = True
71+
follow_imports = silent
72+
ignore_missing_imports = True
73+
no_implicit_optional = True
74+
strict_optional = True
75+
warn_no_return = True
76+
warn_redundant_casts = True
77+
warn_return_any = True
78+
warn_unused_configs = True
79+
warn_unused_ignores = True
80+
81+
[mypy-vws/_version]
82+
ignore_errors = True
83+
84+
[pydocstyle]
85+
# No summary lines
86+
# - D200
87+
# - D205
88+
# - D400
89+
# We don't want blank lines before class docstrings
90+
# - D203
91+
# We don't need docstrings to start at the first line
92+
# - D212
93+
# Allow blank lines after function docstrings
94+
# - D202
95+
# Section names do not need to end in newlines
96+
# - D406
97+
# Section names do not need dashed underlines
98+
# - D407
99+
# No blank line is needed after the last section
100+
ignore = D200,D202,D203,D205,D212,D400,D406,D407,D413
101+
match=(?!.*(versioneer|test_|_version)).*\.py

0 commit comments

Comments
 (0)