Skip to content

Commit

Permalink
Merge pull request #177 from zabuldon/dev
Browse files Browse the repository at this point in the history
2021-03-30
  • Loading branch information
alandtse committed Mar 30, 2021
2 parents cfe37c6 + a788e9b commit e3eb7ba
Show file tree
Hide file tree
Showing 36 changed files with 1,736 additions and 1,499 deletions.
3 changes: 2 additions & 1 deletion .github/workflows/semantic_release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,9 @@ jobs:
- name: Install dependencies
run: |
python -m pip install --upgrade pip
pip install python-semantic-release pipenv
pip install python-semantic-release poetry
make init
make sync_deps
- name: Make documentation
run: |
make docs
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/test_and_lint.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,8 @@ jobs:
- name: Install dependencies
run: |
python -m pip install --upgrade pip
python -m pip install pipenv
pipenv install --three --dev
python -m pip install poetry
poetry install
- name: Lint
run: |
make lint
Expand Down
31 changes: 14 additions & 17 deletions Makefile
Original file line number Diff line number Diff line change
@@ -1,31 +1,28 @@
# SPDX-License-Identifier: WTFPL
# Based on code from https://github.com/bachya/simplisafe-python/blob/dev/Makefile
black:
pipenv run black teslajsonpy
poetry run black teslajsonpy
coverage:
pipenv run pytest -s --verbose --cov-report term-missing --cov-report xml --cov=teslajsonpy tests -Wi -Wd:::teslajsonpy
poetry run pytest -s --verbose --cov-report term-missing --cov-report xml --cov=teslajsonpy tests -Wi -Wd:::teslajsonpy
clean:
rm -rf dist/ build/ .egg teslajsonpy.egg-info/
init:
pip3 install --upgrade pip pipenv
pipenv lock
pipenv install --three --dev
pip3 install --upgrade pip poetry
poetry lock
poetry install
lint: flake8 docstyle pylint
flake8:
pipenv run flake8 teslajsonpy
poetry run flake8 teslajsonpy
docstyle:
pipenv run pydocstyle teslajsonpy
poetry run pydocstyle teslajsonpy
pylint:
pipenv run pylint teslajsonpy
publish:
pipenv run python setup.py sdist bdist_wheel
pipenv run twine upload dist/*
rm -rf dist/ build/ .egg teslajsonpy.egg-info/
poetry run pylint teslajsonpy
publish:
poetry publish
test:
pipenv run pytest -s --verbose tests -Wi -Wd:::teslajsonpy
poetry run pytest -s --verbose tests -Wi -Wd:::teslajsonpy
typing:
pipenv run mypy --ignore-missing-imports teslajsonpy
poetry run mypy --ignore-missing-imports teslajsonpy
docs: docstyle
pipenv lock -r --dev > docs/requirements.txt
echo "teslajsonpy" >> docs/requirements.txt
pipenv run sphinx-build -b html docs docs/html
poetry export --dev --without-hashes -f requirements.txt --output docs/requirements.txt
poetry run sphinx-build -b html docs docs/html
35 changes: 0 additions & 35 deletions Pipfile

This file was deleted.

1,198 changes: 0 additions & 1,198 deletions Pipfile.lock

This file was deleted.

Binary file modified docs/html/.doctrees/environment.pickle
Binary file not shown.
Binary file modified docs/html/.doctrees/index.doctree
Binary file not shown.
Binary file modified docs/html/.doctrees/teslajsonpy/teslajsonpy.__version__.doctree
Binary file not shown.
Binary file modified docs/html/.doctrees/teslajsonpy/teslajsonpy.connection.doctree
Binary file not shown.
Binary file modified docs/html/.doctrees/teslajsonpy/teslajsonpy.const.doctree
Binary file not shown.
Binary file modified docs/html/.doctrees/teslajsonpy/teslajsonpy.controller.doctree
Binary file not shown.
Binary file modified docs/html/.doctrees/teslajsonpy/teslajsonpy.doctree
Binary file not shown.
Binary file modified docs/html/.doctrees/teslajsonpy/teslajsonpy.exceptions.doctree
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file modified docs/html/.doctrees/teslajsonpy/teslajsonpy.teslaproxy.doctree
Binary file not shown.
2 changes: 1 addition & 1 deletion docs/html/_sources/teslajsonpy/teslajsonpy.rst.txt
Original file line number Diff line number Diff line change
Expand Up @@ -280,4 +280,4 @@ Variables

.. code-block:: text
'0.11.5'
'0.14.0'
10 changes: 8 additions & 2 deletions docs/html/genindex.html
Original file line number Diff line number Diff line change
Expand Up @@ -566,6 +566,8 @@ <h2 id="P">P</h2>
</ul></li>
</ul></td>
<td style="width: 33%; vertical-align: top;"><ul>
<li><a href="teslajsonpy/teslajsonpy.html#teslajsonpy.TeslaProxy.prepend_i18n_path">prepend_i18n_path() (teslajsonpy.TeslaProxy method)</a>
</li>
<li><a href="teslajsonpy/teslajsonpy.html#teslajsonpy.TeslaProxy.prepend_relative_urls">prepend_relative_urls() (teslajsonpy.TeslaProxy method)</a>
</li>
<li><a href="teslajsonpy/teslajsonpy.html#teslajsonpy.Climate.preset_mode">preset_mode() (teslajsonpy.Climate property)</a>
Expand Down Expand Up @@ -623,6 +625,8 @@ <h2 id="R">R</h2>
<li><a href="teslajsonpy/teslajsonpy.html#teslajsonpy.Connection.refresh_access_token">refresh_access_token() (teslajsonpy.Connection method)</a>
</li>
<li><a href="teslajsonpy/teslajsonpy.html#teslajsonpy.Controller.register_websocket_callback">register_websocket_callback() (teslajsonpy.Controller method)</a>
</li>
<li><a href="teslajsonpy/teslajsonpy.html#teslajsonpy.TeslaProxy.reset_data">reset_data() (teslajsonpy.TeslaProxy method)</a>
</li>
<li><a href="teslajsonpy/teslajsonpy.html#teslajsonpy.RetryLimitError">RetryLimitError</a>
</li>
Expand All @@ -635,15 +639,17 @@ <h2 id="S">S</h2>
<li><a href="teslajsonpy/teslajsonpy.html#teslajsonpy.SentryModeSwitch">SentryModeSwitch (class in teslajsonpy)</a>
</li>
<li><a href="teslajsonpy/teslajsonpy.html#teslajsonpy.Controller.set_authorization_code">set_authorization_code() (teslajsonpy.Controller method)</a>
</li>
<li><a href="teslajsonpy/teslajsonpy.html#teslajsonpy.Controller.set_authorization_domain">set_authorization_domain() (teslajsonpy.Controller method)</a>
</li>
<li><a href="teslajsonpy/teslajsonpy.html#teslajsonpy.RangeSwitch.set_max">set_max() (teslajsonpy.RangeSwitch method)</a>
</li>
<li><a href="teslajsonpy/teslajsonpy.html#teslajsonpy.Climate.set_preset_mode">set_preset_mode() (teslajsonpy.Climate method)</a>
</li>
<li><a href="teslajsonpy/teslajsonpy.html#teslajsonpy.RangeSwitch.set_standard">set_standard() (teslajsonpy.RangeSwitch method)</a>
</li>
</ul></td>
<td style="width: 33%; vertical-align: top;"><ul>
<li><a href="teslajsonpy/teslajsonpy.html#teslajsonpy.RangeSwitch.set_standard">set_standard() (teslajsonpy.RangeSwitch method)</a>
</li>
<li><a href="teslajsonpy/teslajsonpy.html#teslajsonpy.Climate.set_status">set_status() (teslajsonpy.Climate method)</a>
</li>
<li><a href="teslajsonpy/teslajsonpy.html#teslajsonpy.Climate.set_temperature">set_temperature() (teslajsonpy.Climate method)</a>
Expand Down
Binary file modified docs/html/objects.inv
Binary file not shown.
Loading

0 comments on commit e3eb7ba

Please sign in to comment.