update tox, pre-commit config

Author: TheBits

.pre-commit-config.yaml

@@ -1,13 +1,13 @@
 repos:
   - repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: v3.4.0
+    rev: v4.2.0
     hooks:
       - id: no-commit-to-branch
         args: [--branch, main]
+        stages: [push]
       - id: check-added-large-files
       - id: check-ast
       - id: check-builtin-literals
-      - id: check-byte-order-marker
       - id: check-case-conflict
       - id: check-docstring-first
       - id: check-executables-have-shebangs
@@ -23,81 +23,71 @@ repos:
       - id: fix-byte-order-marker
       - id: forbid-new-submodules
       - id: mixed-line-ending
+      - id: name-tests-test
       - id: trailing-whitespace
         args: ['--markdown-linebreak-ext=md']
   - repo: https://github.com/asottile/add-trailing-comma
-    rev: v2.1.0
+    rev: v2.2.3
     hooks:
       - id: add-trailing-comma
-  - repo: git://github.com/Lucas-C/pre-commit-hooks
-    rev: v1.1.9
-    hooks:
-      - id: forbid-crlf
-      - id: forbid-tabs
   - repo: https://github.com/asottile/pyupgrade
-    rev: v2.11.0
+    rev: v2.32.0
     hooks:
       - id: pyupgrade
         args: ['--py3-plus']
-  - repo: https://github.com/PyCQA/isort
-    rev: 5.8.0
-    hooks:
-      - id: isort
-  - repo: https://github.com/python/black
-    rev: 20.8b1
-    hooks:
-      - id: black
-        args: ['--target-version', 'py37', '--line-length', '128']
   - repo: https://gitlab.com/pycqa/flake8
-    rev: 3.9.0
+    rev: 3.9.2
     hooks:
       - id: flake8
-        additional_dependencies: [flake8-eradicate]
+        additional_dependencies: [flake8-eradicate, flake8-pytest-style]
         args: ["--max-line-length", "130"]
   - repo: https://github.com/pre-commit/mirrors-mypy
-    rev: v0.812
+    rev: v0.950
     hooks:
       - id: mypy
-        additional_dependencies: [tokenize-rt==4.1.0]
+        additional_dependencies: [tokenize-rt]
         types: [python]
         args: ['--follow-imports=skip', '--ignore-missing-imports']
   - repo: https://github.com/pre-commit/pygrep-hooks
-    rev: v1.8.0
+    rev: v1.9.0
     hooks:
       - id: python-check-blanket-noqa
       - id: python-check-mock-methods
       - id: python-no-eval
       - id: python-no-log-warn
       - id: python-use-type-annotations
-  - repo: https://github.com/asottile/add-trailing-comma
-    rev: v2.1.0
-    hooks:
-      - id: add-trailing-comma
   - repo: https://github.com/Lucas-C/pre-commit-hooks-safety
-    rev: v1.2.1
+    rev: v1.2.4
     hooks:
       - id: python-safety-dependencies-check
         stages: [manual]
   - repo: https://github.com/Lucas-C/pre-commit-hooks-bandit
-    rev: v1.0.4
+    rev: v1.0.6
     hooks:
       - id: python-bandit-vulnerability-check
         stages: [manual]
   - repo: https://github.com/Lucas-C/pre-commit-hooks
-    rev: v1.1.9
+    rev: v1.1.13
     hooks:
       - id: forbid-crlf
       - id: remove-crlf
       - id: forbid-tabs
       - id: remove-tabs
   - repo: https://github.com/PyCQA/isort
-    rev: 5.8.0
+    rev: 5.10.1
     hooks:
       - id: isort
         types: [python]
         args: ["--profile", "black", "--filter-files", "-l 128"]
   - repo: https://github.com/python/black
-    rev: 20.8b1
+    rev: 22.3.0
     hooks:
       - id: black
         args: ['--target-version', 'py35', '--line-length', '128']
+  - repo: https://github.com/jazzband/pip-tools
+    rev: 6.6.0
+    hooks:
+      - id: pip-compile
+        name: pip-compile requirements-dev.in
+        args: [requirements-dev.in]
+        files: ^requirements-dev\.(in|txt)$

requirements.txt renamed to requirements-dev.in

@@ -1,4 +1,3 @@
-apache-libcloud
 cryptography
 pytest
 vcrpy

requirements-dev.txt

@@ -0,0 +1,42 @@
+#
+# This file is autogenerated by pip-compile with python 3.10
+# To update, run:
+#
+#    pip-compile requirements-dev.in
+#
+attrs==21.4.0
+    # via pytest
+cffi==1.15.0
+    # via cryptography
+cryptography==37.0.1
+    # via -r requirements-dev.in
+idna==3.3
+    # via yarl
+iniconfig==1.1.1
+    # via pytest
+multidict==6.0.2
+    # via yarl
+packaging==21.3
+    # via pytest
+pluggy==1.0.0
+    # via pytest
+py==1.11.0
+    # via pytest
+pycparser==2.21
+    # via cffi
+pyparsing==3.0.8
+    # via packaging
+pytest==7.1.2
+    # via -r requirements-dev.in
+pyyaml==6.0
+    # via vcrpy
+six==1.16.0
+    # via vcrpy
+tomli==2.0.1
+    # via pytest
+vcrpy==4.1.1
+    # via -r requirements-dev.in
+wrapt==1.14.0
+    # via vcrpy
+yarl==1.7.2
+    # via vcrpy

tests/test_vdsina.py renamed to tests/vdsina_test.py

@@ -1,9 +1,25 @@
+[tox]
+envlist = libcloud{30,31,32,33,34,35}, lint
+# https://libcloud.apache.org/about.html#supported-python-versions
+# envlist = py35,py36,py37,py38,py39,py310,pypy35,pypy36,pypy37,pypy38
+
 [testenv]
 passenv =
     VDSINA_TOKEN
+description = Run pytest
 deps =
-    pytest
-    vcrpy
-    apache-libcloud>=3.0.0
+    libcloud30: apache-libcloud>=3.0.0,<3.1.0
+    libcloud31: apache-libcloud>=3.1.0,<3.2.0
+    libcloud32: apache-libcloud>=3.2.0,<3.3.0
+    libcloud33: apache-libcloud>=3.3.0,<3.4.0
+    libcloud34: apache-libcloud>=3.4.0,<3.5.0
+    libcloud35: apache-libcloud>=3.5.0,<3.6.0
+    -rrequirements-dev.txt
 commands =
-    pytest
+    pytest {posargs}
+
+[testenv:lint]
+description = Run all pre-commit hooks.
+skip_install = true
+deps = pre-commit
+commands = pre-commit run --all-files