diff --git a/.zuul.yaml b/.zuul.yaml index 7de2166..0069005 100644 --- a/.zuul.yaml +++ b/.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 - - opendev-tox-docs: - nodeset: ubuntu-xenial - - tox-py27: - nodeset: ubuntu-xenial - - tox-py35: - nodeset: ubuntu-xenial - - tox-py36: - nodeset: ubuntu-bionic - - tox-py37: - nodeset: ubuntu-bionic + - tox-linters: + nodeset: ubuntu-jammy + - openstack-tox-docs: + nodeset: ubuntu-jammy - tox-py38: nodeset: ubuntu-focal - tox-py39: @@ -38,17 +30,10 @@ - jjb-tox-cross-jenkins-job-builder gate: jobs: - - tox-linters - - opendev-tox-docs: - nodeset: ubuntu-xenial - - tox-py27: - nodeset: ubuntu-xenial - - tox-py35: - nodeset: ubuntu-xenial - - tox-py36: - nodeset: ubuntu-bionic - - tox-py37: - nodeset: ubuntu-bionic + - tox-linters: + nodeset: ubuntu-jammy + - openstack-tox-docs: + nodeset: ubuntu-jammy - tox-py38: nodeset: ubuntu-focal - tox-py39: diff --git a/doc/source/examples.rst b/doc/source/examples.rst index 346165a..6f180f5 100644 --- a/doc/source/examples.rst +++ b/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. diff --git a/jenkins/__init__.py b/jenkins/__init__.py index 009f4da..e411c31 100755 --- a/jenkins/__init__.py +++ b/jenkins/__init__.py @@ -83,8 +83,8 @@ except ImportError: logging.getLogger(__name__).addHandler(NullHandler()) -if sys.version_info < (2, 7, 0): - warnings.warn("Support for python 2.6 is deprecated and will be removed.") +if sys.version_info < (3, 8, 0): + warnings.warn("Support for python 3.7 is deprecated and will be removed.") LAUNCHER_SSH = 'hudson.plugins.sshslaves.SSHLauncher' diff --git a/test-requirements.txt b/test-requirements.txt index 2b8c26f..6658b7c 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -1,14 +1,11 @@ -cmd2!=0.8.3,<0.9.0;python_version<'3.0' # MIT -cmd2!=0.8.3;python_version>='3.0' # MIT +cmd2!=0.8.3 coverage>=3.6 mock unittest2 python-subunit requests-mock>=1.11.0 -requests-kerberos<=0.12.0;python_version<'3.6' -requests-kerberos;python_version>='3.6' -sphinx>=1.6.0,<2.0.0;python_version=='2.7' # BSD -sphinx>=1.6.0;python_version>='3.4' # BSD +requests-kerberos +sphinx>=4.4.0 stestr>=2.0.0,!=3.0.0 testscenarios testtools diff --git a/tox.ini b/tox.ini index 9c56498..7a36df0 100644 --- a/tox.ini +++ b/tox.ini @@ -1,7 +1,6 @@ [tox] minversion = 2.0 -skipsdist = True -envlist = py{34,27,35,36,37,38,39,310,311}, linters +envlist = py{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