loggerhead

Merge lp:~cjwatson/loggerhead/pin-breezy-py35 into lp:loggerhead

  1. pin-breezy-py35
  2. Merge into trunk-rich
Proposed by Colin Watson
Status: Merged
Approved by: Colin Watson
Approved revision: 519
Merge reported by: Otto Co-Pilot
Merged at revision: not available
Proposed branch: lp:~cjwatson/loggerhead/pin-breezy-py35
Merge into: lp:loggerhead
Diff against target: 41 lines (+13/-3)
3 files modified
requirements.txt (+5/-3)
tox-scripts/py27-install (+5/-0)
tox.ini (+3/-0)
To merge this branch: bzr merge lp:~cjwatson/loggerhead/pin-breezy-py35
Reviewer Review Type Date Requested Status
Tom Wardill (community) Approve
Review via email: mp+406290@code.launchpad.net

Commit message

Pin breezy to < 3.2 when using Python 3.5.

Description of the change

breezy 3.2 uses variable annotations, which were only introduced in Python 3.6.

To post a comment you must log in.
Revision history for this message
Tom Wardill (twom) :
review: Approve
Revision history for this message
Otto Co-Pilot (otto-copilot) wrote :

Running landing tests failed
https://jenkins.ols.canonical.com/online-services/job/loggerhead/16/

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

Running landing tests failed
https://jenkins.ols.canonical.com/online-services/job/loggerhead/17/

lp:~cjwatson/loggerhead/pin-breezy-py35 updated
517. By Colin Watson

On Python 2.7, install pbr before other requirements.

518. By Colin Watson

Pin packaging < 21.0 on Python < 3.6.

519. By Colin Watson

Pin testtools < 2.5.0 on Python 2.

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 2021-06-11 16:47:20 +0000
3+++ requirements.txt 2021-07-28 12:28:27 +0000
4@@ -1,10 +1,12 @@
5 setuptools < 45; python_version < "3"
6+packaging < 21.0; python_version < "3.6"
7 Paste >= 1.6
8 dulwich < 0.20; python_version < "3"
9 dulwich; python_version >= "3"
10-testtools
11-breezy < 3.2; python_version < "3"
12-breezy ; python_version >= "3"
13+testtools < 2.5.0; python_version < "3"
14+testtools; python_version >= "3"
15+breezy < 3.2; python_version < "3.6"
16+breezy ; python_version >= "3.6"
17 bleach
18 https://www.owlfish.com/software/simpleTAL/downloads/SimpleTAL-4.3.tar.gz; python_version < "3"
19 https://www.owlfish.com/software/simpleTAL/downloads/SimpleTAL-5.2.tar.gz; python_version >= "3"
20
21=== added directory 'tox-scripts'
22=== added file 'tox-scripts/py27-install'
23--- tox-scripts/py27-install 1970-01-01 00:00:00 +0000
24+++ tox-scripts/py27-install 2021-07-28 12:28:27 +0000
25@@ -0,0 +1,5 @@
26+#! /bin/sh
27+set -e
28+
29+python -m pip install pbr
30+python -m pip install "$@"
31
32=== modified file 'tox.ini'
33--- tox.ini 2021-04-16 21:37:37 +0000
34+++ tox.ini 2021-07-28 12:28:27 +0000
35@@ -9,3 +9,6 @@
36 py27,py35: VIRTUALENV_DOWNLOAD = 0
37 py27,py35: VIRTUALENV_PIP = 20.3.4
38 BRZ_PLUGINS_AT = loggerhead@{toxinidir}
39+
40+[testenv:py27]
41+install_command = {toxinidir}/tox-scripts/py27-install {opts} {packages}

Subscribers

People subscribed via source and target branches