Skip to content

Commit cda26c3

Browse files
committed
Merge remote-tracking branch 'origin/master' into client
2 parents d492612 + 6960ef2 commit cda26c3

36 files changed

+3488
-97
lines changed

.coveragerc

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

.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

.isort.cfg

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

.pydocstyle

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

.readthedocs.yml

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
build:
2+
image: latest
3+
4+
python:
5+
pip_install: true
6+
version: 3.6
7+
extra_requirements:
8+
- dev

.style.yapf

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

CHANGELOG.rst

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
Changelog
2+
=========
3+
4+
.. contents::
5+
6+
Next
7+
----
8+
9+
2018.10.05.0
10+
------------

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: 35 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,12 @@
11
SHELL := /bin/bash -euxo pipefail
22

3+
# Treat Sphinx warnings as errors
4+
SPHINXOPTS := -W
5+
36
.PHONY: lint
47
lint:
58
check-manifest .
9+
doc8 .
610
dodgy
711
flake8 .
812
isort --recursive --check-only
@@ -13,14 +17,42 @@ lint:
1317
pylint *.py src tests
1418
pyroma --min 10 .
1519
vulture . --min-confidence 100
16-
yapf --diff --recursive src/ tests/
20+
$(MAKE) -C docs spelling SPHINXOPTS=$(SPHINXOPTS)
21+
$(MAKE) -C docs linkcheck SPHINXOPTS=$(SPHINXOPTS)
22+
yapf \
23+
--diff \
24+
--recursive \
25+
--exclude versioneer.py \
26+
--exclude src/vws/_version.py \
27+
.
1728

1829
.PHONY: fix-lint
1930
fix-lint:
2031
# Move imports to a single line so that autoflake can handle them.
2132
# See https://github.com/myint/autoflake/issues/8.
2233
# Then later we put them back.
2334
isort --force-single-line --recursive --apply
24-
autoflake --in-place --recursive --remove-all-unused-imports --remove-unused-variables .
25-
yapf --in-place --recursive .
35+
autoflake \
36+
--in-place \
37+
--recursive \
38+
--remove-all-unused-imports \
39+
--remove-unused-variables \
40+
--exclude src/vws/_version.py,versioneer.py \
41+
.
42+
yapf \
43+
--in-place \
44+
--recursive \
45+
--exclude versioneer.py \
46+
--exclude src/vws/_version.py \
47+
.
2648
isort --recursive --apply
49+
50+
.PHONY: docs
51+
docs:
52+
make -C docs clean html SPHINXOPTS=$(SPHINXOPTS)
53+
54+
.PHONY: open-docs
55+
open-docs:
56+
xdg-open docs/build/html/index.html >/dev/null 2>&1 || \
57+
open docs/build/html/index.html >/dev/null 2>&1 || \
58+
echo "Requires 'xdg-open' or 'open' but neither is available."

README.rst

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,33 +1,33 @@
1-
|Build Status| |codecov| |Updates|
1+
|Build Status| |codecov| |Updates| |PyPI| |Documentation Status|
22

33
vws-python
44
==========
55

66
Python library for the Vuforia Web Services (VWS) API and the Vuforia Web Query API.
77

8-
Contributing
9-
------------
10-
11-
See `CONTRIBUTING.rst <./CONTRIBUTING.rst>`_ for details on how to contribute to this project.
12-
138
Installation
149
------------
1510

16-
This package has not yet been uploaded to PyPI.
17-
18-
For now it is possible to install the work in progress:
19-
2011
.. code:: sh
2112
22-
pip install git+https://github.com/adamtheturtle/vws-python@master
13+
pip install vws-python
2314
24-
This requires Python 3.6+.
15+
This is tested on Python 3.7+.
2516
Get in touch with ``adamdangoor@gmail.com`` if you would like to use this with another language.
2617

18+
Full Documentation
19+
------------------
20+
21+
See the `full documentation <https://vws-python.readthedocs.io/en/latest>`__.
2722

2823
.. |Build Status| image:: https://travis-ci.org/adamtheturtle/vws-python.svg?branch=master
2924
:target: https://travis-ci.org/adamtheturtle/vws-python
3025
.. |codecov| image:: https://codecov.io/gh/adamtheturtle/vws-python/branch/master/graph/badge.svg
3126
:target: https://codecov.io/gh/adamtheturtle/vws-python
3227
.. |Updates| image:: https://pyup.io/repos/github/adamtheturtle/vws-python/shield.svg
3328
:target: https://pyup.io/repos/github/adamtheturtle/vws-python/
29+
.. |Documentation Status| image:: https://readthedocs.org/projects/vws-python/badge/?version=latest
30+
:target: https://vws-python.readthedocs.io/en/latest/?badge=latest
31+
:alt: Documentation Status
32+
.. |PyPI| image:: https://badge.fury.io/py/VWS-Python.svg
33+
:target: https://badge.fury.io/py/VWS-Python

0 commit comments

Comments
 (0)