Merge lp:~jelmer/brz/skip-python3.5 into lp:brz/3.1

Proposed by Jelmer Vernooij
Status: Merged
Approved by: Jelmer Vernooij
Approved revision: 7651
Merge reported by: The Breezy Bot
Merged at revision: not available
Proposed branch: lp:~jelmer/brz/skip-python3.5
Merge into: lp:brz/3.1
Diff against target: 19 lines (+8/-1)
1 file modified
breezy/tests/test_source.py (+8/-1)
To merge this branch: bzr merge lp:~jelmer/brz/skip-python3.5
Reviewer Review Type Date Requested Status
Jelmer Vernooij Approve
Review via email: mp+394603@code.launchpad.net

Commit message

Fix support for Python 3.5; skip flake8.

Description of the change

Fix support for Python 3.5.

To post a comment you must log in.
Revision history for this message
Jelmer Vernooij (jelmer) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'breezy/tests/test_source.py'
2--- breezy/tests/test_source.py 2020-05-30 01:48:46 +0000
3+++ breezy/tests/test_source.py 2020-11-28 04:19:05 +0000
4@@ -325,7 +325,14 @@
5 self.fail('\n\n'.join(problems))
6
7 def test_flake8(self):
8- self.requireFeature(features.flake8)
9+ try:
10+ self.requireFeature(features.flake8)
11+ except NameError:
12+ # importlib_metadata uses ModuleNotFoundError, which is
13+ # python 3.6 only
14+ if sys.version_info[:2] <= (3, 5):
15+ self.skipTest('python version too old')
16+ raise
17 # Older versions of flake8 don't support the 'paths'
18 # variable
19 new_path = list(sys.path)

Subscribers

People subscribed via source and target branches