Merge lp:~jelmer/loggerhead/fix-tox into lp:loggerhead

[Jelmer Vernooij]

Fix use of tox for loggerhead, and test with py39.

Fix use of tox for loggerhead, and test with py39.

[Colin Watson (cjwatson)]

review: Approve

[Jelmer Vernooij (jelmer)]

Thanks for the r=approve. Can you mark the entire MP as approved as well so that the bot can land it? I don't have permission to do so.

[Colin Watson (cjwatson)]

This was effectively merged via https://code.launchpad.net/~jelmer/loggerhead/drop-python3/+merge/411875.

=== modified file '.bzrignore'
--- .bzrignore	2018-09-08 15:16:32 +0000
+++ .bzrignore	2021-12-15 18:38:30 +0000
@@ -12,3 +12,4 @@
 .pydevproject
 .testrepository
 MANIFEST
+.tox

=== modified file 'loggerhead/load_test.py'
--- loggerhead/load_test.py	2020-07-08 17:14:19 +0000
+++ loggerhead/load_test.py	2021-12-15 18:38:30 +0000
@@ -211,7 +211,7 @@
             # And join the controlling thread
             for i in range(10):
                 t.join(self.blocking_timeout / 10.0)
-                if not t.isAlive():
+                if not t.is_alive():
                     break
 
     def _full_url(self, relpath):

=== modified file 'tox.ini'
--- tox.ini	2021-07-28 12:27:53 +0000
+++ tox.ini	2021-12-15 18:38:30 +0000
@@ -1,5 +1,5 @@
 [tox]
-envlist = py27,py35,py36,py37,py38
+envlist = py27,py35,py36,py37,py38,py39
 skipsdist=True
 
 [testenv]
@@ -8,6 +8,7 @@
 setenv =
     py27,py35: VIRTUALENV_DOWNLOAD = 0
     py27,py35: VIRTUALENV_PIP = 20.3.4
+    BRZ_PLUGIN_PATH=-user:-site
     BRZ_PLUGINS_AT = loggerhead@{toxinidir}
 
 [testenv:py27]