1
=== modified file 'README'
2
--- README	2015-10-26 15:19:02 +0000
3
+++ README	2016-07-02 19:56:38 +0000
4
@@ -19,7 +19,7 @@
5
19
19
6
20
REQUIREMENTS:
20
REQUIREMENTS:
7
21
21
9
22
 * Python v2.6 or later
22
 * Python v2.7 or later
10
23
 * librsync v0.9.6 or later
23
 * librsync v0.9.6 or later
11
24
 * GnuPG v1.x for encryption
24
 * GnuPG v1.x for encryption
12
25
 * python-lockfile v0.9 or later for concurrency locking
25
 * python-lockfile v0.9 or later for concurrency locking
13
26
26
14
=== modified file 'README-REPO'
15
--- README-REPO	2016-06-13 11:33:36 +0000
16
+++ README-REPO	2016-07-02 19:56:38 +0000
17
@@ -47,35 +47,18 @@
18
47
Please run all tests on your branch (run-tests) before proposing a merge, to
47
Please run all tests on your branch (run-tests) before proposing a merge, to
19
48
ensure that all tests pass. The decorator @unittest.expectedFailure can be used
48
ensure that all tests pass. The decorator @unittest.expectedFailure can be used
20
49
to commit a known-failing test case without breaking the test suite, for
49
to commit a known-failing test case without breaking the test suite, for
36
50
example to exhibit the behaviour in a bug report before it has been fixed:
50
example to exhibit the behaviour in a bug report before it has been fixed.
22
51
23
52
if sys.version_info < (2, 7):
24
53
    import unittest2 as unittest
25
54
else:
26
55
    import unittest
27
56
28
57
29
58
class TestClass(unittest.TestCase):
30
59
    """Test class to show expectedFailure"""
31
60
32
61
    @unittest.expectedFailure
33
62
    def test_expected_failure(self):
34
63
        """Test behaviour of expectedFailure"""
35
64
        self.assertEqual(1, 2)
37
65
51
38
66
-----------------------------------------
52
-----------------------------------------
39
67
Testing against multiple Python versions:
53
Testing against multiple Python versions:
40
68
-----------------------------------------
54
-----------------------------------------
41
69
55
47
70
Duplicity currently supports Python versions v2.6 or later. Duplicity uses tox
56
Duplicity uses tox to make it easy to test your code against multiple
48
71
to make it easy to test your code against multiple Python versions. Running
57
environments. Running tests using the commands above will automatically test
49
72
tests using the commands above will automatically test code against both
58
code against different supported environments, including the versions of
50
73
Python v2.6 and v2.7, if you have both installed on your system. It will also
59
dependencies used by the Launchpad build system.
51
74
test against the versions of dependencies used by the Launchpad build system.
60
52
75
You can test against a single environment, e.g.
61
You can test against a single environment, e.g.
54
76
tox -e py26
62
tox -e py27
55
77
for example if you are working on fixing a bug, but please do a full run-tests
63
for example if you are working on fixing a bug, but please do a full run-tests
56
78
before submitting a merge request.
64
before submitting a merge request.
57
79
58
80
For instructions on installing Python v2.6 on newer versions of Ubuntu, see
59
81
https://launchpad.net/~fkrull/+archive/ubuntu/deadsnakes
60
82
65
61
=== modified file 'testing/__init__.py'
62
--- testing/__init__.py	2015-08-01 12:05:34 +0000
63
+++ testing/__init__.py	2016-07-02 19:56:38 +0000
64
@@ -21,11 +21,7 @@
65
21
import os
21
import os
66
22
import sys
22
import sys
67
23
import time
23
import time
73
24
24
import unittest
69
25
if sys.version_info < (2, 7):
70
26
    import unittest2 as unittest
71
27
else:
72
28
    import unittest
74
29
25
75
30
from duplicity import backend
26
from duplicity import backend
76
31
from duplicity import globals
27
from duplicity import globals
77
32
28
78
=== modified file 'testing/test_code.py'
79
--- testing/test_code.py	2016-07-02 12:53:12 +0000
80
+++ testing/test_code.py	2016-07-02 19:56:38 +0000
81
@@ -22,10 +22,7 @@
82
22
import sys
22
import sys
83
23
import subprocess
23
import subprocess
84
24
24
89
25
if sys.version_info < (2, 7):
25
import unittest
86
26
    import unittest2 as unittest  # @UnresolvedImport @UnusedImport
87
27
else:
88
28
    import unittest  # @Reimport
90
29
26
91
30
from . import _top_dir, DuplicityTestCase  # @IgnorePep8
27
from . import _top_dir, DuplicityTestCase  # @IgnorePep8
92
31
28
93
32
29
94
=== modified file 'tox.ini'
95
--- tox.ini	2016-01-04 11:54:50 +0000
96
+++ tox.ini	2016-07-02 19:56:38 +0000
97
@@ -1,14 +1,5 @@
98
1
[tox]
1
[tox]
109
2
envlist=py26,py27,lpbuildd-precise
2
envlist=py27,lpbuildd-precise
100
3
101
4
[testenv:py26]
102
5
setenv=
103
6
    RUN_CODE_TESTS=0
104
7
deps=
105
8
    mock==0.7.2
106
9
    pexpect==2.4
107
10
    ptyprocess==0.4
108
11
    unittest2
110
12
3
111
13
[testenv:py27]
4
[testenv:py27]
112
14
setenv=
5
setenv=
113
@@ -29,5 +20,5 @@
114
29
    {envpython} {toxinidir}/setup.py test {posargs}
20
    {envpython} {toxinidir}/setup.py test {posargs}
115
30
21
116
31
[pep8]
22
[pep8]
118
32
ignore=E402,E501,E731,W503
23
ignore=E402,E731
119
33
max-line-length=120
24
max-line-length=120
Status:	Merged
Merged at revision:	1113
Proposed branch:	lp:~aaron-whitehouse/duplicity/remove-python26
Merge into:	lp:~duplicity-team/duplicity/0.8-series
Diff against target:	119 lines (+12/-45) 5 files modified README (+1/-1) README-REPO (+7/-24) testing/__init__.py (+1/-5) testing/test_code.py (+1/-4) tox.ini (+2/-11)
To merge this branch:	bzr merge lp:~aaron-whitehouse/duplicity/remove-python26
Related bugs:	Link a bug report
Reviewer	Review Type	Date Requested	Status
duplicity-team		2016-07-02	Pending
Review via email: mp+298983@code.launchpad.net
1	=== modified file 'README'
2	--- README 2015-10-26 15:19:02 +0000
3	+++ README 2016-07-02 19:56:38 +0000
4	@@ -19,7 +19,7 @@
5	19		19
6	20	REQUIREMENTS:	20	REQUIREMENTS:
7	21		21
9	22	* Python v2.6 or later	22	* Python v2.7 or later
10	23	* librsync v0.9.6 or later	23	* librsync v0.9.6 or later
11	24	* GnuPG v1.x for encryption	24	* GnuPG v1.x for encryption
12	25	* python-lockfile v0.9 or later for concurrency locking	25	* python-lockfile v0.9 or later for concurrency locking
13	26		26
14	=== modified file 'README-REPO'
15	--- README-REPO 2016-06-13 11:33:36 +0000
16	+++ README-REPO 2016-07-02 19:56:38 +0000
17	@@ -47,35 +47,18 @@
18	47	Please run all tests on your branch (run-tests) before proposing a merge, to	47	Please run all tests on your branch (run-tests) before proposing a merge, to
19	48	ensure that all tests pass. The decorator @unittest.expectedFailure can be used	48	ensure that all tests pass. The decorator @unittest.expectedFailure can be used
20	49	to commit a known-failing test case without breaking the test suite, for	49	to commit a known-failing test case without breaking the test suite, for
36	50	example to exhibit the behaviour in a bug report before it has been fixed:	50	example to exhibit the behaviour in a bug report before it has been fixed.
22	51
23	52	if sys.version_info < (2, 7):
24	53	import unittest2 as unittest
25	54	else:
26	55	import unittest
27	56
28	57
29	58	class TestClass(unittest.TestCase):
30	59	"""Test class to show expectedFailure"""
31	60
32	61	@unittest.expectedFailure
33	62	def test_expected_failure(self):
34	63	"""Test behaviour of expectedFailure"""
35	64	self.assertEqual(1, 2)
37	65		51
38	66	-----------------------------------------	52	-----------------------------------------
39	67	Testing against multiple Python versions:	53	Testing against multiple Python versions:
40	68	-----------------------------------------	54	-----------------------------------------
41	69		55
47	70	Duplicity currently supports Python versions v2.6 or later. Duplicity uses tox	56	Duplicity uses tox to make it easy to test your code against multiple
48	71	to make it easy to test your code against multiple Python versions. Running	57	environments. Running tests using the commands above will automatically test
49	72	tests using the commands above will automatically test code against both	58	code against different supported environments, including the versions of
50	73	Python v2.6 and v2.7, if you have both installed on your system. It will also	59	dependencies used by the Launchpad build system.
51	74	test against the versions of dependencies used by the Launchpad build system.	60
52	75	You can test against a single environment, e.g.	61	You can test against a single environment, e.g.
54	76	tox -e py26	62	tox -e py27
55	77	for example if you are working on fixing a bug, but please do a full run-tests	63	for example if you are working on fixing a bug, but please do a full run-tests
56	78	before submitting a merge request.	64	before submitting a merge request.
57	79
58	80	For instructions on installing Python v2.6 on newer versions of Ubuntu, see
59	81	https://launchpad.net/~fkrull/+archive/ubuntu/deadsnakes
60	82		65
61	=== modified file 'testing/__init__.py'
62	--- testing/__init__.py 2015-08-01 12:05:34 +0000
63	+++ testing/__init__.py 2016-07-02 19:56:38 +0000
64	@@ -21,11 +21,7 @@
65	21	import os	21	import os
66	22	import sys	22	import sys
67	23	import time	23	import time
73	24		24	import unittest
69	25	if sys.version_info < (2, 7):
70	26	import unittest2 as unittest
71	27	else:
72	28	import unittest
74	29		25
75	30	from duplicity import backend	26	from duplicity import backend
76	31	from duplicity import globals	27	from duplicity import globals
77	32		28
78	=== modified file 'testing/test_code.py'
79	--- testing/test_code.py 2016-07-02 12:53:12 +0000
80	+++ testing/test_code.py 2016-07-02 19:56:38 +0000
81	@@ -22,10 +22,7 @@
82	22	import sys	22	import sys
83	23	import subprocess	23	import subprocess
84	24		24
89	25	if sys.version_info < (2, 7):	25	import unittest
86	26	import unittest2 as unittest # @UnresolvedImport @UnusedImport
87	27	else:
88	28	import unittest # @Reimport
90	29		26
91	30	from . import _top_dir, DuplicityTestCase # @IgnorePep8	27	from . import _top_dir, DuplicityTestCase # @IgnorePep8
92	31		28
93	32		29
94	=== modified file 'tox.ini'
95	--- tox.ini 2016-01-04 11:54:50 +0000
96	+++ tox.ini 2016-07-02 19:56:38 +0000
97	@@ -1,14 +1,5 @@
98	1	[tox]	1	[tox]
109	2	envlist=py26,py27,lpbuildd-precise	2	envlist=py27,lpbuildd-precise
100	3
101	4	[testenv:py26]
102	5	setenv=
103	6	RUN_CODE_TESTS=0
104	7	deps=
105	8	mock==0.7.2
106	9	pexpect==2.4
107	10	ptyprocess==0.4
108	11	unittest2
110	12		3
111	13	[testenv:py27]	4	[testenv:py27]
112	14	setenv=	5	setenv=
113	@@ -29,5 +20,5 @@
114	29	{envpython} {toxinidir}/setup.py test {posargs}	20	{envpython} {toxinidir}/setup.py test {posargs}
115	30		21
116	31	[pep8]	22	[pep8]
118	32	ignore=E402,E501,E731,W503	23	ignore=E402,E731
119	33	max-line-length=120	24	max-line-length=120