Duplicity

Merge lp:~aaron-whitehouse/duplicity/remove-python26 into lp:~duplicity-team/duplicity/0.8-series

  1. remove-python26
  2. Merge into 0.8-series
Proposed by Aaron Whitehouse
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
Reviewer Review Type Date Requested Status
duplicity-team Pending
Review via email: mp+298983@code.launchpad.net

Description of the change

Remove Python 2.6 support references and tests.

To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
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
6 REQUIREMENTS:
7
8- * Python v2.6 or later
9+ * Python v2.7 or later
10 * librsync v0.9.6 or later
11 * GnuPG v1.x for encryption
12 * python-lockfile v0.9 or later for concurrency locking
13
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 Please run all tests on your branch (run-tests) before proposing a merge, to
19 ensure that all tests pass. The decorator @unittest.expectedFailure can be used
20 to commit a known-failing test case without breaking the test suite, for
21-example to exhibit the behaviour in a bug report before it has been fixed:
22-
23-if sys.version_info < (2, 7):
24- import unittest2 as unittest
25-else:
26- import unittest
27-
28-
29-class TestClass(unittest.TestCase):
30- """Test class to show expectedFailure"""
31-
32- @unittest.expectedFailure
33- def test_expected_failure(self):
34- """Test behaviour of expectedFailure"""
35- self.assertEqual(1, 2)
36+example to exhibit the behaviour in a bug report before it has been fixed.
37
38 -----------------------------------------
39 Testing against multiple Python versions:
40 -----------------------------------------
41
42-Duplicity currently supports Python versions v2.6 or later. Duplicity uses tox
43-to make it easy to test your code against multiple Python versions. Running
44-tests using the commands above will automatically test code against both
45-Python v2.6 and v2.7, if you have both installed on your system. It will also
46-test against the versions of dependencies used by the Launchpad build system.
47+Duplicity uses tox to make it easy to test your code against multiple
48+environments. Running tests using the commands above will automatically test
49+code against different supported environments, including the versions of
50+dependencies used by the Launchpad build system.
51+
52 You can test against a single environment, e.g.
53-tox -e py26
54+tox -e py27
55 for example if you are working on fixing a bug, but please do a full run-tests
56 before submitting a merge request.
57-
58-For instructions on installing Python v2.6 on newer versions of Ubuntu, see
59-https://launchpad.net/~fkrull/+archive/ubuntu/deadsnakes
60
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 import os
66 import sys
67 import time
68-
69-if sys.version_info < (2, 7):
70- import unittest2 as unittest
71-else:
72- import unittest
73+import unittest
74
75 from duplicity import backend
76 from duplicity import globals
77
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 import sys
83 import subprocess
84
85-if sys.version_info < (2, 7):
86- import unittest2 as unittest # @UnresolvedImport @UnusedImport
87-else:
88- import unittest # @Reimport
89+import unittest
90
91 from . import _top_dir, DuplicityTestCase # @IgnorePep8
92
93
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 [tox]
99-envlist=py26,py27,lpbuildd-precise
100-
101-[testenv:py26]
102-setenv=
103- RUN_CODE_TESTS=0
104-deps=
105- mock==0.7.2
106- pexpect==2.4
107- ptyprocess==0.4
108- unittest2
109+envlist=py27,lpbuildd-precise
110
111 [testenv:py27]
112 setenv=
113@@ -29,5 +20,5 @@
114 {envpython} {toxinidir}/setup.py test {posargs}
115
116 [pep8]
117-ignore=E402,E501,E731,W503
118+ignore=E402,E731
119 max-line-length=120

Subscribers

People subscribed via source and target branches