Skip to content

Commit 599f841

Browse files
committed
Merge branch 'master' into HEAD
2 parents 58274f6 + 6dcb7b7 commit 599f841

File tree

12 files changed

+57
-42
lines changed

12 files changed

+57
-42
lines changed

CHANGELOG.rst

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,5 +6,8 @@ Changelog
66
Next
77
----
88

9+
2018.12.10.0
10+
------------
11+
912
2018.10.05.0
1013
------------

MANIFEST.in

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

dev-requirements.txt

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,29 +1,29 @@
1-
autoflake==1.2
2-
check-manifest==0.37
1+
autoflake==1.3
2+
check-manifest==0.39
33
codecov==2.0.15 # Upload coverage data
44
doc8==0.8.0
55
dodgy==0.1.9 # Look for uploaded secrets
6-
dulwich==0.19.6
6+
dulwich==0.19.11
77
flake8-commas==2.0.0 # Require silicon valley commas
8-
flake8-quotes==1.0.0 # Require single quotes
9-
flake8==3.5.0 # Lint
10-
isort==4.3.4 # Lint imports
11-
mypy==0.630 # Type checking
8+
flake8-quotes==2.0.1 # Require single quotes
9+
flake8==3.7.7 # Lint
10+
isort==4.3.21 # Lint imports
11+
mypy==0.711 # Type checking
1212
pip_check_reqs==2.0.3
13-
pydocstyle==2.1.1 # Lint docstrings
13+
pydocstyle==3.0.0 # Lint docstrings
1414
pyenchant==2.0.0 # Bindings for a spellchecking sytem
15-
pygithub==1.43.2
16-
Pygments==2.2.0
17-
pylint==2.1.1 # Lint
18-
pyroma==2.4 # Packaging best practices checker
19-
pytest-cov==2.6.0 # Measure code coverage
20-
pytest==3.8.2 # Test runners
21-
PyYAML==3.13
22-
Sphinx==1.8.1
23-
sphinx-autodoc-typehints==1.3.0
24-
sphinxcontrib-spelling==4.2.0
25-
twine==1.12.1
15+
pygithub==1.43.8
16+
Pygments==2.4.2
17+
pylint==2.3.1 # Lint
18+
pyroma==2.5 # Packaging best practices checker
19+
pytest-cov==2.7.1 # Measure code coverage
20+
pytest==5.0.1 # Test runners
21+
PyYAML==5.1.1
22+
Sphinx==2.1.2
23+
sphinx-autodoc-typehints==1.7.0
24+
sphinxcontrib-spelling==4.3.0
25+
twine==1.13.0
2626
versioneer==0.18
27-
vulture==0.29
28-
VWS-Python-Mock==2018.10.02.0
29-
yapf==0.24.0 # Automatic formatting for Python
27+
vulture==1.0
28+
VWS-Python-Mock==2018.12.1.0
29+
yapf==0.28.0 # Automatic formatting for Python

docs/source/contributing.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ Install Python dependencies in a virtual environment.
1414

1515
.. code:: sh
1616
17-
pip install --editable .[dev]
17+
pip install --editable '.[dev]'
1818
1919
Spell checking requires ``enchant``.
2020
This can be installed on macOS, for example, with `Homebrew <https://brew.sh>`__:

requirements.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
requests==2.19.1
2-
timeout-decorator==0.4.0
1+
requests==2.22.0
2+
timeout-decorator==0.4.1

setup.cfg

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -73,6 +73,7 @@ disallow_untyped_defs = True
7373
follow_imports = silent
7474
ignore_missing_imports = True
7575
no_implicit_optional = True
76+
strict_equality = True
7677
strict_optional = True
7778
warn_no_return = True
7879
warn_redundant_casts = True
@@ -116,3 +117,4 @@ omit =
116117

117118
[yapf]
118119
DEDENT_CLOSING_BRACKETS = true
120+
BLANK_LINE_BEFORE_NESTED_CLASS_OR_DEF = true

setup.py

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
11
"""Setup script for VWS Python, a wrapper for Vuforia's Web Services APIs."""
22

3-
import versioneer
43
from setuptools import find_packages, setup
54

5+
import versioneer
6+
67
# We use requirements.txt instead of just declaring the requirements here
78
# because this helps with Docker package caching.
89
with open('requirements.txt') as requirements:
@@ -39,5 +40,6 @@
3940
'Environment :: Web Environment',
4041
'License :: OSI Approved :: MIT License',
4142
'Programming Language :: Python :: 3.7',
43+
'Development Status :: 3 - Alpha',
4244
],
4345
)

src/vws/__init__.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
A library for Vuforia Web Services.
33
"""
44

5+
from ._version import get_versions
56
from .vws import VWS
67
from .query import CloudRecoService
78

@@ -10,6 +11,5 @@
1011
'VWS',
1112
]
1213

13-
from ._version import get_versions
1414
__version__ = get_versions()['version'] # type: ignore
1515
del get_versions

src/vws/py.typed

Whitespace-only changes.

src/vws/vws.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -516,7 +516,8 @@ def update_target(
516516
image: The image of the target.
517517
active_flag: Whether or not the target is active for query.
518518
application_metadata: The application metadata of the target.
519-
This will be base64 encoded.
519+
This will be base64 encoded. Giving ``None`` will not change
520+
the application metadata.
520521
521522
Raises:
522523
~vws.exceptions.AuthenticationFailure: The secret key is not

0 commit comments

Comments
 (0)