Merge "Bump molecule to fix testing" into stable/ussuri

2021-06-10 11:21:02 +00:00 · 2021-06-10 11:21:02 +00:00 · 62331bd182
parent 33637b4ddf 6c6a79ec4c
commit 62331bd182
3 changed files with 15 additions and 2 deletions
--- a/doc/requirements.txt
+++ b/doc/requirements.txt
@ -1 +0,0 @@
-../molecule-requirements.txt
--- a/doc/requirements.txt
+++ b/doc/requirements.txt
@ -0,0 +1,10 @@
+# this is required for the docs build jobs
+ruamel.yaml
+ansible>=2.8,!=2.8.9,!=2.9.12,<2.10.0
+sphinx>=2.0.0,!=2.1.0 # BSD
+openstackdocstheme
+reno
+doc8
+bashate
+metalsmith
+jsonschema  # MIT
--- a/molecule-requirements.txt
+++ b/molecule-requirements.txt
@ -8,7 +8,8 @@ pytest-cov
 pytest-html
 pytest-xdist
 mock
-molecule>=3.0,<3.1
+molecule>=3.3.4,<3.4
+molecule-podman>=0.3.0
 ruamel.yaml
 testinfra
 netaddr
--- a/tox.ini
+++ b/tox.ini
@ -91,6 +91,9 @@ skip_install = True
 sitepackages = False

 [testenv:role-addition]
+setenv =
+  UPPER_CONSTRAINTS_FILE=file:///dev/null
+install_command = pip install {opts} {packages}
 basepython = python3
 deps =
    {[testenv:linters]deps}