diff --git a/gerritlib/gerrit.py b/gerritlib/gerrit.py index 965b55b..1a4e853 100644 --- a/gerritlib/gerrit.py +++ b/gerritlib/gerrit.py @@ -17,8 +17,8 @@ import json import logging import platform import pprint +import queue import select -import six.moves import threading import time @@ -236,7 +236,7 @@ class Gerrit(object): def startWatching( self, connection_attempts=-1, retry_delay=5, ignore_events=None): - self.event_queue = six.moves.queue.Queue() + self.event_queue = queue.Queue() watcher = GerritWatcher(self, connection_attempts=connection_attempts, retry_delay=retry_delay, diff --git a/playbooks/jeepyb-integration/run.yaml b/playbooks/jeepyb-integration/run.yaml index 1efea3e..fa9dc43 100644 --- a/playbooks/jeepyb-integration/run.yaml +++ b/playbooks/jeepyb-integration/run.yaml @@ -21,8 +21,9 @@ # Run a gerrit - name: Install docker-compose - package: + pip: name: + - requests<2.30.0 - docker-compose state: present become: true diff --git a/requirements.txt b/requirements.txt index 9a7fcbf..31e2ab8 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,3 +1,2 @@ pbr>=0.11 paramiko>=2.0.0 -six>=1.7.0 diff --git a/tox.ini b/tox.ini index 9653942..9ab2e34 100644 --- a/tox.ini +++ b/tox.ini @@ -1,14 +1,11 @@ [tox] minversion = 1.6 -skipsdist = True skip_missing_interpreters = false # https://docs.python.org/devguide/#status-of-python-branches envlist = pep8, py{310,39,38,py} [testenv] setenv = VIRTUAL_ENV={envdir} -usedevelop = True -install_command = pip install {opts} {packages} deps = -r{toxinidir}/test-requirements.txt commands = stestr run --slowest {posargs}