fix zuul tests

remove python 2.7, 3.5, 3.6 & 3.7
replace opendev-tox-docs by openstack-tox-docs (hopping this is equivalent)

Change-Id: Ib9dc836f3fbbdd2d1246d4bb0f24cb7dffa14cf2

.zuul.yaml

@@ -1,4 +1,3 @@
----
 - job:
     name: jjb-tox-cross-jenkins-job-builder
     description: Tests compatibility with master branch of jenkins-job-builder
@@ -14,19 +13,12 @@
       jobs:
         # Only in check:
         - tox-cover:
-            nodeset: ubuntu-xenial
+            nodeset: ubuntu-jammy
         # Jobs common to gate pipeline
-        - tox-linters
+        - tox-linters:
-        - opendev-tox-docs:
+            nodeset: ubuntu-jammy
-            nodeset: ubuntu-xenial
+        - openstack-tox-docs:
-        - tox-py27:
+            nodeset: ubuntu-jammy
-            nodeset: ubuntu-xenial
-        - tox-py35:
-            nodeset: ubuntu-xenial
-        - tox-py36:
-            nodeset: ubuntu-bionic
-        - tox-py37:
-            nodeset: ubuntu-bionic
         - tox-py38:
             nodeset: ubuntu-focal
         - tox-py39:
@@ -38,17 +30,10 @@
         - jjb-tox-cross-jenkins-job-builder
     gate:
       jobs:
-        - tox-linters
+        - tox-linters:
-        - opendev-tox-docs:
+            nodeset: ubuntu-jammy
-            nodeset: ubuntu-xenial
+        - openstack-tox-docs:
-        - tox-py27:
+            nodeset: ubuntu-jammy
-            nodeset: ubuntu-xenial
-        - tox-py35:
-            nodeset: ubuntu-xenial
-        - tox-py36:
-            nodeset: ubuntu-bionic
-        - tox-py37:
-            nodeset: ubuntu-bionic
         - tox-py38:
             nodeset: ubuntu-focal
         - tox-py39:

doc/source/examples.rst

@@ -122,7 +122,7 @@ This is an example showing how to retrieve Jenkins plugins information.
 
 The above example will print a dictionary containing all the plugins that
 are installed on the Jenkins server.  An example of what you can expect
-from the :func:`get_plugins_info` method is documented in the :doc:`api`
+from the `get_plugins_info` method is documented in the :doc:`api`
 doc.
 
 

jenkins/__init__.py

@@ -83,8 +83,8 @@ except ImportError:
 
 logging.getLogger(__name__).addHandler(NullHandler())
 
-if sys.version_info < (2, 7, 0):
+if sys.version_info < (3, 8, 0):
-    warnings.warn("Support for python 2.6 is deprecated and will be removed.")
+    warnings.warn("Support for python 3.7 is deprecated and will be removed.")
 
 
 LAUNCHER_SSH = 'hudson.plugins.sshslaves.SSHLauncher'

test-requirements.txt

@@ -1,14 +1,11 @@
-cmd2!=0.8.3,<0.9.0;python_version<'3.0'  # MIT
+cmd2!=0.8.3
-cmd2!=0.8.3;python_version>='3.0'  # MIT
 coverage>=3.6
 mock
 unittest2
 python-subunit
 requests-mock>=1.11.0
-requests-kerberos<=0.12.0;python_version<'3.6'
+requests-kerberos
-requests-kerberos;python_version>='3.6'
+sphinx>=4.4.0
-sphinx>=1.6.0,<2.0.0;python_version=='2.7'  # BSD
-sphinx>=1.6.0;python_version>='3.4'  # BSD
 stestr>=2.0.0,!=3.0.0
 testscenarios
 testtools

tox.ini

@@ -1,7 +1,6 @@
 [tox]
 minversion = 2.0
-skipsdist = True
+envlist = py{38,39,310,311}, linters
-envlist = py{34,27,35,36,37,38,39,310,311}, linters
 
 [testenv]
 setenv =
@@ -53,7 +52,7 @@ commands =
 
 [testenv:docs]
 basepython = python3
-commands = python setup.py build_sphinx -W
+commands = sphinx-build -n -W -b html -d doc/build/doctrees doc/source doc/build/html
 
 [testenv:venv]
 basepython = python3