loggerhead

Merge lp:~jelmer/loggerhead/python3-default into lp:loggerhead

  1. python3-default
  2. Merge into trunk-rich
Proposed by Jelmer Vernooij
Status: Merged
Merged at revision: 501
Proposed branch: lp:~jelmer/loggerhead/python3-default
Merge into: lp:loggerhead
Diff against target: 66 lines (+6/-6)
6 files modified
.travis.yml (+1/-1)
Makefile (+1/-1)
loggerhead-serve (+1/-1)
loggerhead.wsgi (+1/-1)
loggerheadd (+1/-1)
setup.py (+1/-1)
To merge this branch: bzr merge lp:~jelmer/loggerhead/python3-default
Reviewer Review Type Date Requested Status
Colin Watson (community) Approve
Review via email: mp+385146@code.launchpad.net

Description of the change

Use python3 for running loggerhead by default.

To post a comment you must log in.
Revision history for this message
Colin Watson (cjwatson) :
review: Approve

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 2018-11-01 22:25:03 +0000
3+++ .travis.yml 2020-06-04 20:29:13 +0000
4@@ -20,7 +20,7 @@
5 - python -m coverage run -p -m unittest loggerhead.tests.test_suite
6
7 install:
8- - sudo apt install python-all subunit python-testtools adduser libjs-yui3-min
9+ - sudo apt install subunit adduser libjs-yui3-min
10 - travis_retry pip install -U setuptools
11 - travis_retry pip install -U pip coverage codecov flake8 testtools configobj cython testscenarios six docutils python-subunit dulwich bzr+lp:brz pygments simplejson paste http://www.owlfish.com/software/simpleTAL/downloads/SimpleTAL-$TAL_VERSION.tar.gz bleach
12
13
14=== modified file 'Makefile'
15--- Makefile 2017-10-14 14:33:57 +0000
16+++ Makefile 2020-06-04 20:29:13 +0000
17@@ -1,5 +1,5 @@
18
19-PYTHON ?= python
20+PYTHON ?= python3
21
22 dist:
23 $(PYTHON) ./setup.py sdist
24
25=== modified file 'loggerhead-serve'
26--- loggerhead-serve 2018-10-20 17:34:46 +0000
27+++ loggerhead-serve 2020-06-04 20:29:13 +0000
28@@ -1,4 +1,4 @@
29-#!/usr/bin/env python
30+#!/usr/bin/env python3
31 #
32 # Copyright (C) 2008, 2009 Canonical Ltd
33 #
34
35=== modified file 'loggerhead.wsgi'
36--- loggerhead.wsgi 2018-11-01 21:49:07 +0000
37+++ loggerhead.wsgi 2020-06-04 20:29:13 +0000
38@@ -1,4 +1,4 @@
39-#!/usr/bin/python -tt
40+#!/usr/bin/python3 -tt
41 # This program is free software; you can redistribute it and/or modify
42 # it under the terms of the GNU General Public License as published by
43 # the Free Software Foundation; either version 2 of the License, or
44
45=== modified file 'loggerheadd'
46--- loggerheadd 2018-10-20 17:34:46 +0000
47+++ loggerheadd 2020-06-04 20:29:13 +0000
48@@ -71,7 +71,7 @@
49 $SUDO mkdir -p $LOG_FOLDER
50 fi
51 echo "" > $LOG_FILE
52- $SUDO python $START_CMD > $LOG_FILE 2>&1 &
53+ $SUDO python3 $START_CMD > $LOG_FILE 2>&1 &
54
55 #wait a little while of some logging to appear
56 log=""
57
58=== modified file 'setup.py'
59--- setup.py 2019-10-01 12:31:50 +0000
60+++ setup.py 2020-06-04 20:29:13 +0000
61@@ -1,4 +1,4 @@
62-#!/usr/bin/env python
63+#!/usr/bin/env python3
64 #
65 # Copyright (C) 2008 Canonical Ltd.
66 # (Authored by Martin Albisetti <argentina@gmail.com>)

Subscribers

People subscribed via source and target branches