Merge lp:~cjwatson/loggerhead/py27-py35-workarounds into lp:loggerhead

Proposed by Colin Watson
Status: Merged
Approved by: Colin Watson
Approved revision: 513
Merge reported by: Otto Co-Pilot
Merged at revision: not available
Proposed branch: lp:~cjwatson/loggerhead/py27-py35-workarounds
Merge into: lp:loggerhead
Diff against target: 21 lines (+5/-1)
2 files modified
requirements.txt (+1/-0)
tox.ini (+4/-1)
To merge this branch: bzr merge lp:~cjwatson/loggerhead/py27-py35-workarounds
Reviewer Review Type Date Requested Status
Thiago F. Pappacena (community) Approve
Review via email: mp+401325@code.launchpad.net

Commit message

Fix py27 and py35 tox environments.

Description of the change

Keeping Python 2.7 and 3.5 tests working now that they're unsupported upstream and various core packages such as pip have dropped support for them is getting harder, but it's still viable with a few hacks. Loggerhead still needs to support these versions for now.

To post a comment you must log in.
Revision history for this message
Thiago F. Pappacena (pappacena) wrote :

LGTM

review: Approve
Revision history for this message
Otto Co-Pilot (otto-copilot) wrote :
Revision history for this message
Otto Co-Pilot (otto-copilot) wrote :

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'requirements.txt'
2--- requirements.txt 2020-08-04 09:35:13 +0000
3+++ requirements.txt 2021-04-16 21:42:30 +0000
4@@ -1,3 +1,4 @@
5+setuptools < 45; python_version < "3"
6 Paste >= 1.6
7 dulwich == 0.19.16; python_version < "3"
8 dulwich; python_version >= "3"
9
10=== modified file 'tox.ini'
11--- tox.ini 2020-08-04 09:26:15 +0000
12+++ tox.ini 2021-04-16 21:42:30 +0000
13@@ -5,4 +5,7 @@
14 [testenv]
15 deps = -rrequirements.txt
16 commands = brz selftest -v breezy.plugins.loggerhead --strict
17-setenv = BRZ_PLUGINS_AT = loggerhead@{toxinidir}
18+setenv =
19+ py27,py35: VIRTUALENV_DOWNLOAD = 0
20+ py27,py35: VIRTUALENV_PIP = 20.3.4
21+ BRZ_PLUGINS_AT = loggerhead@{toxinidir}

Subscribers

People subscribed via source and target branches