Adding upstream version 10.0.0+dfsg.upstream/10.0.0+dfsg

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

1 files changed, 17 insertions, 28 deletions

diff --git a/ansible_collections/vmware/vmware_rest/tox.ini b/ansible_collections/vmware/vmware_rest/tox.ini
index 5282ce308..82bfe491b 100644
--- a/ansible_collections/vmware/vmware_rest/tox.ini
+++ b/ansible_collections/vmware/vmware_rest/tox.ini
@@ -8,31 +8,10 @@ deps = -r{toxinidir}/requirements.txt
        -r{toxinidir}/test-requirements.txt
 install_command = pip install {opts} {packages}
 
-[testenv:black]
-deps =
-  black==19.10b0
-  click==8.0.2
-commands =
-  black {toxinidir}/plugins {toxinidir}/tests
-
 [testenv:add_docs]
 deps = git+https://github.com/ansible-network/collection_prep
 commands = collection_prep_add_docs -p .
 
-[testenv:refresh_modules]
-deps =
-  git+https://github.com/ansible-collections/gouttelette
-  git+https://github.com/ansible-collections/vmware_rest_code_generator
-  black==19.10b0
-  click==8.0.2
-commands =
-  gouttelette-refresh-modules --target-dir . --collection vmware_rest {posargs}
-  gouttelette-refresh-ignore-files --target-dir .
-  black {toxinidir}/plugins {toxinidir}/tests
-  echo "now you can update the RETURN block, see https://github.com/ansible-collections/vmware_rest_code_generator#how-to-refresh-the-vmwarevmware_rest-content"
-allowlist_externals =
-  echo
-
 [testenv:build_manual]
 deps = -r{toxinidir}/docs-requirements.txt
 changedir = {toxinidir}/manual/source
@@ -57,15 +36,31 @@ setenv =
     ESXI2_PASSWORD = {env:ESXI2_PASSWORD}
     VMWARE_VALIDATE_CERTS = {env:VMWARE_VALIDATE_CERTS}
 
+[testenv:black]
+depends =
+  isort
+deps =
+  black >=23.0, <24.0
+commands =
+  black -v {toxinidir}/plugins {toxinidir}/tests
+
+[testenv:isort]
+deps =
+  isort
+commands =
+  isort --profile black {toxinidir}/plugins {toxinidir}/tests
+
 [testenv:linters]
 deps =
-  black==19.10b0
+  black
   click==8.0.2
   flake8
   antsibull-changelog
   antsibull-docs
+  {[testenv:isort]deps}
 commands =
   black -v --check {toxinidir}/plugins {toxinidir}/tests
+  isort --profile black --check-only --diff {toxinidir}/plugins {toxinidir}/tests
   flake8 {posargs} {toxinidir}/plugins {toxinidir}/tests
   antsibull-changelog lint-changelog-yaml changelogs/changelog.yaml
   antsibull-docs lint-collection-docs .
@@ -104,9 +99,3 @@ ignore = E123,E125,E203,E402,E501,E741,F401,F811,F841,W503
 max-line-length = 160
 builtins = _
 exclude = .git,.tox,tests/unit/compat/
-
-[testenv:refresh-examples]
-deps =
-  git+https://github.com/ansible-collections/gouttelette
-commands =
-  gouttelette-refresh-examples --target-dir {toxinidir}