Breezy

Merge lp:~jelmer/brz/fix-travis into lp:brz

  1. fix-travis
  2. Merge into trunk
Proposed by Jelmer Vernooij
Status: Merged
Approved by: Jelmer Vernooij
Approved revision: no longer in the source branch.
Merge reported by: The Breezy Bot
Merged at revision: not available
Proposed branch: lp:~jelmer/brz/fix-travis
Merge into: lp:brz
Diff against target: 29 lines (+4/-2)
2 files modified
.travis.yml (+3/-1)
Makefile (+1/-1)
To merge this branch: bzr merge lp:~jelmer/brz/fix-travis
Reviewer Review Type Date Requested Status
Jelmer Vernooij Approve
Review via email: mp+378632@code.launchpad.net

Commit message

Actually run the python2 tests in 'check-ci', specify python to use in travis.

Description of the change

Actually run the python2 tests in 'check-ci', specify python to use in travis.

To post a comment you must log in.
Revision history for this message
Jelmer Vernooij (jelmer) :
review: Approve
Revision history for this message
The Breezy Bot (the-breezy-bot) wrote :

There was nothing to merge
https://ci.breezy-vcs.org/job/brz/job/brz-land/686/

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file '.travis.yml'
2--- .travis.yml 2019-06-15 13:39:46 +0000
3+++ .travis.yml 2020-02-06 01:09:10 +0000
4@@ -15,9 +15,11 @@
5 env: SELFTEST_OPTIONS="--coverage"
6 - python: 3.7
7 dist: xenial
8+ - python: 3.8
9+ dist: xenial
10
11 script:
12- - make docs extensions
13+ - make docs extensions PYTHON=python
14 - BRZ_PLUGIN_PATH=-site:-user python -Werror -Wignore::ImportWarning -Wignore::PendingDeprecationWarning -Wignore::DeprecationWarning -Wignore::ResourceWarning -Wignore::UserWarning ./brz selftest --parallel=fork $SELFTEST_OPTIONS
15
16 install:
17
18=== modified file 'Makefile'
19--- Makefile 2020-01-31 17:43:44 +0000
20+++ Makefile 2020-02-06 01:09:10 +0000
21@@ -81,7 +81,7 @@
22 # https://github.com/paramiko/paramiko/issues/713 is not a concern
23 # anymore -- vila 2017-05-24
24 set -o pipefail; \
25- BRZ_PLUGIN_PATH=$(BRZ_PLUGIN_PATH) $(PYTHON) -Werror -Wignore::FutureWarning -Wignore::DeprecationWarning -Wignore::ImportWarning -Wignore::ResourceWarning -O \
26+ BRZ_PLUGIN_PATH=$(BRZ_PLUGIN_PATH) $(PYTHON2) -Werror -Wignore::FutureWarning -Wignore::DeprecationWarning -Wignore::ImportWarning -Wignore::ResourceWarning -O \
27 ./brz selftest -v --parallel=fork -Oselftest.timeout=120 --subunit2 \
28 | subunit-filter -s --passthrough --rename "^" "python2."; \
29 BRZ_PLUGIN_PATH=$(BRZ_PLUGIN_PATH) $(PYTHON3) -Werror -Wignore::FutureWarning -Wignore::DeprecationWarning -Wignore::PendingDeprecationWarning -Wignore::ImportWarning -Wignore::ResourceWarning -O \

Subscribers

People subscribed via source and target branches