Merge pull request #176 from alandtse/poetry

build: swap to poetry

.github/workflows/semantic_release.yml

@@ -20,7 +20,7 @@ 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

.github/workflows/test_and_lint.yaml

@@ -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

Makefile

@@ -1,33 +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/
-sync_deps:
-	pipenv-setup sync --pipfile
 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: sync_deps
-	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

docs/requirements.txt

@@ -1,123 +1,78 @@
-#
-# These requirements were autogenerated by pipenv
-# To regenerate from the project's Pipfile, run:
-#
-#    pipenv lock --requirements --dev
-#
-
-# Note: in pipenv 2020.x, "--dev" changed to emit both default and development
-# requirements. To emit only development requirements, pass "--dev-only".
-
--i https://pypi.python.org/simple
-aiohttp==3.7.4.post0
-alabaster==0.7.12
-appdirs==1.4.4
-astroid==2.5.2; python_version >= '3.6'
-async-timeout==3.0.1; python_full_version >= '3.5.3'
-attrs==20.3.0; python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3'
-authcaptureproxy==0.7.1
+aiohttp==3.7.4.post0; python_version >= "3.6"
+alabaster==0.7.12; python_version >= "3.5"
+appdirs==1.4.4; python_version >= "3.6" and python_full_version < "3.0.0" or python_full_version >= "3.5.0" and python_version >= "3.6"
+astroid==2.5.2; python_version >= "3.6" and python_version < "4.0"
+async-timeout==3.0.1; python_full_version >= "3.6.1" and python_version >= "3.6" and python_full_version < "4.0.0"
+atomicwrites==1.4.0; python_version >= "3.6" and python_full_version < "3.0.0" and sys_platform == "win32" or sys_platform == "win32" and python_version >= "3.6" and python_full_version >= "3.4.0"
+attrs==20.3.0; python_full_version >= "3.6.1" and python_version >= "3.6" and python_full_version < "4.0.0" and (python_version >= "3.6" and python_full_version < "3.0.0" or python_full_version >= "3.4.0" and python_version >= "3.6")
+authcaptureproxy==0.7.1; python_full_version >= "3.6.1" and python_full_version < "4.0.0"
 autoapi==2.0.1
-babel==2.9.0; python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3'
-backoff==1.10.0
-bandit==1.7.0
+babel==2.9.0; python_version >= "3.5" and python_full_version < "3.0.0" or python_full_version >= "3.4.0" and python_version >= "3.5"
+backoff==1.10.0; (python_version >= "2.7" and python_full_version < "3.0.0") or (python_full_version >= "3.5.0")
 beautifulsoup4==4.9.3
-black==19.10b0
-bleach==3.3.0; python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4'
-cached-property==1.5.2
-cerberus==1.3.2
-certifi==2020.12.5
-chardet==4.0.0; python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4'
-click==7.1.2; python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4'
-colorama==0.4.4; python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4'
-coverage==5.5; python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4' and python_version < '4.0'
-detox==0.19
-distlib==0.3.1
-dnspython==1.16.0; python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3'
-docutils==0.16; python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4'
-eventlet==0.30.2
-filelock==3.0.12
-flake8==3.9.0
-gitdb==4.0.7; python_version >= '3.4'
-gitpython==3.1.14; python_version >= '3.4'
-greenlet==1.0.0; python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4'
-idna==3.1; python_version >= '3.4'
-imagesize==1.2.0; python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3'
-importlib-metadata==3.10.0; python_version >= '3.6'
-iniconfig==1.1.1
-isort==5.8.0; python_version >= '3.6' and python_version < '4.0'
-jinja2==2.11.3; python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4'
-keyring==23.0.1; python_version >= '3.6'
-lazy-object-proxy==1.6.0; python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4, 3.5'
+black==20.8b1; python_version >= "3.6"
+chardet==4.0.0; python_full_version >= "3.6.1" and python_version >= "3.6" and python_full_version < "4.0.0"
+click==7.1.2; python_full_version >= "3.6.1" and python_version >= "3.6" and python_full_version < "4.0.0"
+colorama==0.4.4; python_version >= "3.6" and python_full_version < "3.0.0" and sys_platform == "win32" and platform_system == "Windows" and python_version < "4.0" or sys_platform == "win32" and python_version >= "3.6" and python_full_version >= "3.5.0" and platform_system == "Windows" and python_version < "4.0"
+coverage==5.5; (python_version >= "2.7" and python_full_version < "3.0.0") or (python_full_version >= "3.5.0" and python_version < "4")
+dataclasses==0.8; python_version >= "3.6" and python_version < "3.7"
+distlib==0.3.1; python_version >= "2.7" and python_full_version < "3.0.0" or python_full_version >= "3.5.0"
+docutils==0.16; python_version >= "3.5" and python_full_version < "3.0.0" or python_full_version >= "3.5.0" and python_version >= "3.5"
+filelock==3.0.12; python_version >= "2.7" and python_full_version < "3.0.0" or python_full_version >= "3.5.0"
+flake8==3.9.0; (python_version >= "2.7" and python_full_version < "3.0.0") or (python_full_version >= "3.5.0")
+idna-ssl==1.1.0; python_version < "3.7" and python_version >= "3.6" and python_full_version >= "3.6.1" and python_full_version < "4.0.0"
+idna==3.1; python_version < "3.7" and python_version >= "3.6"
+imagesize==1.2.0; python_version >= "3.5" and python_full_version < "3.0.0" or python_full_version >= "3.4.0" and python_version >= "3.5"
+importlib-metadata==3.10.0; python_full_version >= "3.6.1" and python_full_version < "4.0.0" and python_version >= "3.6" and (python_version >= "3.6" and python_full_version < "3.0.0" and python_version < "3.8" or python_full_version >= "3.5.0" and python_version < "3.8" and python_version >= "3.6") and python_version < "3.8" and (python_version >= "3.6" and python_full_version < "3.0.0" and python_version < "3.8" or python_full_version >= "3.4.0" and python_version >= "3.6" and python_version < "3.8")
+importlib-resources==5.1.2; python_version >= "3.6" and python_full_version < "3.0.0" and python_version < "3.7" or python_full_version >= "3.5.0" and python_version < "3.7" and python_version >= "3.6"
+iniconfig==1.1.1; python_version >= "3.6"
+isort==5.8.0; python_version >= "3.6" and python_version < "4.0"
+jinja2==2.11.3; python_version >= "3.6" and python_full_version < "3.0.0" or python_full_version >= "3.5.0" and python_version >= "3.6"
+lazy-object-proxy==1.6.0; python_version >= "3.6" and python_full_version < "3.0.0" or python_full_version >= "3.6.0" and python_version >= "3.6"
 m2r2==0.2.7
-markupsafe==1.1.1; python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3'
-mccabe==0.6.1
+markupsafe==1.1.1; python_version >= "3.5" and python_full_version < "3.0.0" or python_full_version >= "3.5.0" and python_version >= "3.5"
+mccabe==0.6.1; python_version >= "3.6" and python_full_version < "3.0.0" and python_version < "4.0" or python_version >= "3.6" and python_version < "4.0" and python_full_version >= "3.5.0"
 mistune==0.8.4
-multidict==5.1.0; python_version >= '3.6'
-mypy-extensions==0.4.3
-mypy==0.812
-orderedmultidict==1.0.1
-packaging==20.9; python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3'
-pathspec==0.8.1
-pbr==5.5.1; python_version >= '2.6'
-pep517==0.10.0
-pip-shims==0.5.3; python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4'
-pipenv-setup==3.1.1
-pipenv==2020.11.15; python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3'
-pipfile==0.0.2
-pkginfo==1.7.0
-plette[validation]==0.2.3; python_version >= '2.6' and python_version not in '3.0, 3.1, 3.2, 3.3'
-pluggy==0.13.1; python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3'
-py==1.10.0; python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3'
-pycodestyle==2.7.0; python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3'
-pydocstyle==6.0.0
-pyflakes==2.3.1; python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3'
-pygments==2.8.1; python_version >= '3.5'
-pylint==2.7.3
-pyparsing==2.4.7; python_version >= '2.6' and python_version not in '3.0, 3.1, 3.2, 3.3'
-pytest-asyncio==0.14.0
-pytest-cov==2.11.1
-pytest==6.2.2
-python-dateutil==2.8.1; python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3'
-pytz==2021.1
-pyyaml==5.4.1; python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4, 3.5'
-readme-renderer==29.0
-regex==2021.3.17
-requests-toolbelt==0.9.1
-requests==2.25.1; python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4'
-requirementslib==1.5.16; python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4'
-rfc3986==1.4.0
-six==1.15.0; python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3'
-smmap==4.0.0; python_version >= '3.5'
-snowballstemmer==2.1.0
-soupsieve==2.2.1; python_version >= '3.0'
-sphinx-autoapi==1.7.0
+multidict==5.1.0; python_full_version >= "3.6.1" and python_full_version < "4.0.0" and python_version >= "3.6"
+mypy-extensions==0.4.3; python_version >= "3.6"
+mypy==0.812; python_version >= "3.5"
+packaging==20.9; python_version >= "3.6" and python_full_version < "3.0.0" or python_full_version >= "3.5.0" and python_version >= "3.6"
+pathspec==0.8.1; python_version >= "3.6" and python_full_version < "3.0.0" or python_full_version >= "3.5.0" and python_version >= "3.6"
+pluggy==0.13.1; python_version >= "3.6" and python_full_version < "3.0.0" or python_full_version >= "3.5.0" and python_version >= "3.6"
+py==1.10.0; python_version >= "3.6" and python_full_version < "3.0.0" or python_full_version >= "3.5.0" and python_version >= "3.6"
+pycodestyle==2.7.0; python_version >= "2.7" and python_full_version < "3.0.0" or python_full_version >= "3.5.0"
+pydocstyle==6.0.0; python_version >= "3.6"
+pyflakes==2.3.1; python_version >= "2.7" and python_full_version < "3.0.0" or python_full_version >= "3.5.0"
+pygments==2.8.1; python_version >= "3.5"
+pylint==2.7.3; python_version >= "3.6" and python_version < "4.0"
+pyparsing==2.4.7; python_version >= "3.5" and python_full_version < "3.0.0" or python_full_version >= "3.4.0" and python_version >= "3.5"
+pytest-asyncio==0.14.0; python_version >= "3.5"
+pytest-cov==2.11.1; (python_version >= "2.7" and python_full_version < "3.0.0") or (python_full_version >= "3.5.0")
+pytest==6.2.2; python_version >= "3.6"
+pytz==2021.1; python_version >= "3.5" and python_full_version < "3.0.0" or python_full_version >= "3.4.0" and python_version >= "3.5"
+pyyaml==5.4.1; python_version >= "3.6" and python_full_version < "3.0.0" or python_full_version >= "3.6.0" and python_version >= "3.6"
+regex==2021.3.17; python_version >= "3.6"
+requests==2.15.1; python_version >= "3.5"
+six==1.15.0; python_version >= "2.7" and python_full_version < "3.0.0" or python_full_version >= "3.5.0"
+snowballstemmer==2.1.0; python_version >= "3.6"
+soupsieve==2.2.1; python_full_version >= "3.6.1" and python_full_version < "4.0.0" and python_version >= "3.6"
+sphinx-autoapi==1.7.0; python_version >= "3.6"
 sphinx-copybutton==0.3.1
 sphinx-rtd-theme==0.5.1
-sphinx==3.5.3
-sphinxcontrib-applehelp==1.0.2; python_version >= '3.5'
-sphinxcontrib-devhelp==1.0.2; python_version >= '3.5'
-sphinxcontrib-htmlhelp==1.0.3; python_version >= '3.5'
-sphinxcontrib-jsmath==1.0.1; python_version >= '3.5'
-sphinxcontrib-qthelp==1.0.3; python_version >= '3.5'
-sphinxcontrib-serializinghtml==1.1.4; python_version >= '3.5'
-stevedore==3.3.0; python_version >= '3.6'
-toml==0.10.2; python_version >= '2.6' and python_version not in '3.0, 3.1, 3.2, 3.3'
-tomlkit==0.7.0; python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4'
-tox-pipenv==1.10.1
-tox==3.6.1
-tqdm==4.59.0; python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3'
-twine==3.4.1
-typed-ast==1.4.2
-typer==0.3.2; python_version >= '3.6'
-typing-extensions==3.7.4.3
-unidecode==1.2.0
-urllib3==1.26.4; python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4' and python_version < '4.0'
-virtualenv-clone==0.5.4; python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3'
-virtualenv==20.4.3; python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3'
-vistir==0.5.2; python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3'
-webencodings==0.5.1
-wheel==0.36.2; python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4'
+sphinx==3.5.3; python_version >= "3.5"
+sphinxcontrib-applehelp==1.0.2; python_version >= "3.5"
+sphinxcontrib-devhelp==1.0.2; python_version >= "3.5"
+sphinxcontrib-htmlhelp==1.0.3; python_version >= "3.5"
+sphinxcontrib-jsmath==1.0.1; python_version >= "3.5"
+sphinxcontrib-qthelp==1.0.3; python_version >= "3.5"
+sphinxcontrib-serializinghtml==1.1.4; python_version >= "3.5"
+toml==0.10.2; python_version >= "3.6" and python_full_version < "3.0.0" and python_version < "4.0" or python_full_version >= "3.5.0" and python_version >= "3.6" and python_version < "4.0"
+tox==3.23.0; (python_version >= "2.7" and python_full_version < "3.0.0") or (python_full_version >= "3.5.0")
+typed-ast==1.4.2; implementation_name == "cpython" and python_version < "3.8" and python_version >= "3.6"
+typer==0.3.2; python_full_version >= "3.6.1" and python_full_version < "4.0.0" and python_version >= "3.6"
+typing-extensions==3.7.4.3; python_version < "3.8" and python_version >= "3.6" and python_full_version >= "3.6.1" and python_full_version < "4.0.0"
+unidecode==1.2.0; python_version >= "3.6" and python_full_version < "3.0.0" or python_full_version >= "3.4.0" and python_version >= "3.6"
+virtualenv==20.4.3; python_version >= "2.7" and python_full_version < "3.0.0" or python_full_version >= "3.5.0"
 wrapt==1.12.1
-yarl==1.6.3; python_version >= '3.6'
-zipp==3.4.1; python_version >= '3.6'
-teslajsonpy
+yarl==1.6.3; python_full_version >= "3.6.1" and python_full_version < "4.0.0" and python_version >= "3.6"
+zipp==3.4.1; python_full_version >= "3.6.1" and python_full_version < "4.0.0" and python_version >= "3.6" and (python_version >= "3.6" and python_full_version < "3.0.0" and python_version < "3.7" or python_full_version >= "3.5.0" and python_version < "3.7" and python_version >= "3.6")