Drop tox for pytest

hvac · Feb 1, 2021 · 721aa1e · 721aa1e
1 parent 07b254c
commit 721aa1e
Show file tree

Hide file tree

Showing 7 changed files with 43 additions and 92 deletions.
diff --git a/.github/workflows/python-package.yml b/.github/workflows/python-package.yml
@@ -46,15 +46,17 @@ jobs:
       run: |
         tests/scripts/install-consul.sh
         tests/scripts/install-vault.sh ${HVAC_VAULT_VERSION} ${HVAC_VAULT_LICENSE}
-        python -m pip install tox
+        pip install -r requirements-dev.txt
       env:
         HVAC_VAULT_VERSION: ${{ matrix.vault_version }}
         HVAC_VAULT_LICENSE: ${{ matrix.vault_license }}
 
     - name: Lint with flake8
-      run: tox
-      env:
-        TOXENV: flake8
+      run: |
+        # stop the build if there are Python syntax errors or undefined names
+        flake8 . --count --select=E9,F63,F7,F82 --show-source --statistics
+        # exit-zero treats all errors as warnings. The GitHub editor is 127 chars wide
+        flake8 . --count --exit-zero --max-complexity=10 --max-line-length=127 --statistics
 
-    - name: Test with tox
-      run: tox
+    - name: Test with pytest
+      run: pytest --cov=hvac tests/
diff --git a/.gitignore b/.gitignore
@@ -5,7 +5,6 @@
 /build
 /dist
 /*.egg-info
-/.tox
 test/*.log
 /.coverage
 /cover

diff --git a/Makefile b/Makefile
@@ -4,13 +4,13 @@ REQUIREMENTS_FILES	:= requirements requirements-dev
 .PHONY: clean package publish test update-all-requirements $(addsuffix .txt, $(REQUIREMENTS_FILES)) docs/requirements.txt
 
 test:
-	tox
+	pytest --cov=hvac tests/
 
 clean:
 	rm -rf dist hvac.egg-info
 
 distclean: clean
-	rm -rf build .tox
+	rm -rf build
 
 package:
 	python setup.py sdist bdist_wheel

diff --git a/docs/requirements.txt b/docs/requirements.txt
@@ -5,59 +5,53 @@
 #    pip-compile --output-file=docs/requirements.txt docs/requirements.in
 #
 alabaster==0.7.12         # via sphinx
-appdirs==1.4.4            # via -r docs/../requirements-dev.txt, virtualenv
+attrs==20.3.0             # via -r docs/../requirements-dev.txt, pytest
 authlib==0.14.3           # via -r docs/../requirements-dev.txt
 autodocsumm==0.1.13       # via -r docs/requirements.in
 babel==2.8.0              # via sphinx
-certifi==2020.6.20        # via -r docs/../requirements-dev.txt, -r docs/../requirements.txt, requests
+certifi==2020.6.20        # via -r docs/../requirements-dev.txt, requests
 cffi==1.14.0              # via -r docs/../requirements-dev.txt, cryptography
-chardet==3.0.4            # via -r docs/../requirements-dev.txt, -r docs/../requirements.txt, requests
+chardet==3.0.4            # via -r docs/../requirements-dev.txt, requests
 click==7.1.2              # via -r docs/../requirements-dev.txt, flask
 codecov==2.1.8            # via -r docs/../requirements-dev.txt
-configparser==4.0.2       # via -r docs/../requirements-dev.txt
-contextlib2==0.6.0.post1  # via -r docs/../requirements-dev.txt
 coverage==5.2.1           # via -r docs/../requirements-dev.txt, codecov
-cryptography==1.7.2       # via -r docs/../requirements-dev.txt, authlib, jwcrypto
-distlib==0.3.1            # via -r docs/../requirements-dev.txt, virtualenv
+cryptography==3.3.1       # via -r docs/../requirements-dev.txt, authlib, jwcrypto
 docutils==0.16            # via m2r2, sphinx
-enum34==1.1.10            # via -r docs/../requirements-dev.txt
-filelock==3.0.12          # via -r docs/../requirements-dev.txt, tox, virtualenv
+flake8==3.8.4             # via -r docs/../requirements-dev.txt
 flask-sqlalchemy==2.4.4   # via -r docs/../requirements-dev.txt
 flask==1.1.2              # via -r docs/../requirements-dev.txt, flask-sqlalchemy
-funcsigs==1.0.2           # via -r docs/../requirements-dev.txt
-idna==2.10                # via -r docs/../requirements-dev.txt, -r docs/../requirements.txt, cryptography, requests
+idna==2.10                # via -r docs/../requirements-dev.txt, requests
 imagesize==1.2.0          # via sphinx
-importlib-metadata==1.7.0  # via -r docs/../requirements-dev.txt
-importlib-resources==3.0.0  # via -r docs/../requirements-dev.txt
+iniconfig==1.1.1          # via -r docs/../requirements-dev.txt, pytest
 ipaddress==1.0.23         # via -r docs/../requirements-dev.txt
 itsdangerous==1.1.0       # via -r docs/../requirements-dev.txt, flask
 jinja2==2.11.2            # via -r docs/../requirements-dev.txt, flask, sphinx
 jwcrypto==0.7             # via -r docs/../requirements-dev.txt, python-jwt
 m2r2==0.2.5               # via -r docs/requirements.in
 markupsafe==1.1.1         # via -r docs/../requirements-dev.txt, jinja2
+mccabe==0.6.1             # via -r docs/../requirements-dev.txt, flake8
 mistune==0.8.4            # via m2r2
 mock==3.0.5               # via -r docs/../requirements-dev.txt
 nose==1.3.7               # via -r docs/../requirements-dev.txt
-packaging==20.4           # via -r docs/../requirements-dev.txt, sphinx, tox
+packaging==20.4           # via -r docs/../requirements-dev.txt, pytest, sphinx
 parameterized==0.7.4      # via -r docs/../requirements-dev.txt
-pathlib2==2.3.5           # via -r docs/../requirements-dev.txt
-pluggy==0.13.1            # via -r docs/../requirements-dev.txt, tox
+pluggy==0.13.1            # via -r docs/../requirements-dev.txt, pytest
 py4j==0.10.9              # via -r docs/../requirements-dev.txt, python-ldap-test
-py==1.9.0                 # via -r docs/../requirements-dev.txt, tox
-pyasn1==0.4.8             # via -r docs/../requirements-dev.txt, cryptography
+py==1.9.0                 # via -r docs/../requirements-dev.txt, pytest
+pycodestyle==2.6.0        # via -r docs/../requirements-dev.txt, flake8
 pycparser==2.20           # via -r docs/../requirements-dev.txt, cffi
+pyflakes==2.2.0           # via -r docs/../requirements-dev.txt, flake8
 pygments==2.6.1           # via sphinx
-pyhcl==0.4.4              # via -r docs/../requirements.txt
+pyhcl==0.4.4              # via -r docs/../requirements-dev.txt
 pyparsing==2.4.7          # via -r docs/../requirements-dev.txt, packaging
+pytest==6.2.2             # via -r docs/../requirements-dev.txt
 python-jwt==3.2.6         # via -r docs/../requirements-dev.txt
 python-ldap-test==0.3.1   # via -r docs/../requirements-dev.txt
 pytz==2020.1              # via babel
 requests-mock==1.8.0      # via -r docs/../requirements-dev.txt
-requests==2.24.0          # via -r docs/../requirements-dev.txt, -r docs/../requirements.txt, codecov, requests-mock, sphinx
-scandir==1.10.0           # via -r docs/../requirements-dev.txt
+requests==2.24.0          # via -r docs/../requirements-dev.txt, codecov, requests-mock, sphinx
 semantic-version==2.8.5   # via -r docs/../requirements-dev.txt
-singledispatch==3.4.0.3   # via -r docs/../requirements-dev.txt
-six==1.15.0               # via -r docs/../requirements-dev.txt, -r docs/../requirements.txt, cryptography, mock, packaging, pathlib2, requests-mock, singledispatch, tox, virtualenv
+six==1.15.0               # via -r docs/../requirements-dev.txt, cryptography, mock, packaging, requests-mock
 snowballstemmer==2.0.0    # via sphinx
 sphinx-rtd-theme==0.5.0   # via -r docs/requirements.in
 sphinx==3.1.2             # via -r docs/requirements.in, autodocsumm, sphinx-rtd-theme
@@ -68,13 +62,9 @@ sphinxcontrib-jsmath==1.0.1  # via sphinx
 sphinxcontrib-qthelp==1.0.3  # via sphinx
 sphinxcontrib-serializinghtml==1.1.4  # via sphinx
 sqlalchemy==1.3.18        # via -r docs/../requirements-dev.txt, flask-sqlalchemy
-toml==0.10.1              # via -r docs/../requirements-dev.txt, tox
-tox==3.18.0               # via -r docs/../requirements-dev.txt
-typing==3.5.3.0           # via -r docs/../requirements-dev.txt
-urllib3==1.25.10          # via -r docs/../requirements-dev.txt, -r docs/../requirements.txt, requests
-virtualenv==20.0.28       # via -r docs/../requirements-dev.txt, tox
+toml==0.10.1              # via -r docs/../requirements-dev.txt, pytest
+urllib3==1.25.10          # via -r docs/../requirements-dev.txt, requests
 werkzeug==1.0.1           # via -r docs/../requirements-dev.txt, flask
-zipp==1.2.0               # via -r docs/../requirements-dev.txt, importlib-metadata
 
 # The following packages are considered to be unsafe in a requirements file:
 # setuptools
diff --git a/requirements-dev.in b/requirements-dev.in
@@ -1,5 +1,6 @@
 -r ./requirements.txt
 Authlib
+flake8
 Flask
 Flask-SQLAlchemy
 codecov
@@ -8,9 +9,9 @@ ipaddress
 mock
 nose
 parameterized
+pytest
 python-ldap-test
 python_jwt
 requests_mock
 semantic_version
-tox
 Werkzeug
diff --git a/requirements-dev.txt b/requirements-dev.txt
@@ -4,7 +4,7 @@
 #
 #    pip-compile --output-file=requirements-dev.txt requirements-dev.in
 #
-appdirs==1.4.4            # via virtualenv
+attrs==20.3.0             # via pytest
 authlib==0.14.3           # via -r requirements-dev.in
 certifi==2020.6.20        # via -r ./requirements.txt, requests
 cffi==1.14.0              # via cryptography
@@ -13,35 +13,37 @@ click==7.1.2              # via flask
 codecov==2.1.8            # via -r requirements-dev.in
 coverage==5.2.1           # via -r requirements-dev.in, codecov
 cryptography==3.3.1       # via authlib, jwcrypto
-distlib==0.3.1            # via virtualenv
-filelock==3.0.12          # via tox, virtualenv
+flake8==3.8.4             # via -r requirements-dev.in
 flask-sqlalchemy==2.4.4   # via -r requirements-dev.in
 flask==1.1.2              # via -r requirements-dev.in, flask-sqlalchemy
 idna==2.10                # via -r ./requirements.txt, requests
+iniconfig==1.1.1          # via pytest
 ipaddress==1.0.23         # via -r requirements-dev.in
 itsdangerous==1.1.0       # via flask
 jinja2==2.11.2            # via flask
 jwcrypto==0.7             # via python-jwt
 markupsafe==1.1.1         # via jinja2
+mccabe==0.6.1             # via flake8
 mock==3.0.5               # via -r requirements-dev.in
 nose==1.3.7               # via -r requirements-dev.in
-packaging==20.4           # via tox
+packaging==20.4           # via pytest
 parameterized==0.7.4      # via -r requirements-dev.in
-pluggy==0.13.1            # via tox
+pluggy==0.13.1            # via pytest
 py4j==0.10.9              # via python-ldap-test
-py==1.9.0                 # via tox
+py==1.9.0                 # via pytest
+pycodestyle==2.6.0        # via flake8
 pycparser==2.20           # via cffi
+pyflakes==2.2.0           # via flake8
 pyhcl==0.4.4              # via -r ./requirements.txt
 pyparsing==2.4.7          # via packaging
+pytest==6.2.2             # via -r requirements-dev.in
 python-jwt==3.2.6         # via -r requirements-dev.in
 python-ldap-test==0.3.1   # via -r requirements-dev.in
 requests-mock==1.8.0      # via -r requirements-dev.in
 requests==2.24.0          # via -r ./requirements.txt, codecov, requests-mock
 semantic-version==2.8.5   # via -r requirements-dev.in
-six==1.15.0               # via -r ./requirements.txt, cryptography, mock, packaging, requests-mock, tox, virtualenv
+six==1.15.0               # via -r ./requirements.txt, cryptography, mock, packaging, requests-mock
 sqlalchemy==1.3.18        # via flask-sqlalchemy
-toml==0.10.1              # via tox
-tox==3.18.0               # via -r requirements-dev.in
+toml==0.10.1              # via pytest
 urllib3==1.25.10          # via -r ./requirements.txt, requests
-virtualenv==20.0.28       # via tox
 werkzeug==1.0.1           # via -r requirements-dev.in, flask
diff --git a/tox.ini b/tox.ini