Aaron Whitehouse has proposed merging lp:~aaron-whitehouse/duplicity/remove-python26 into lp:duplicity.
Requested reviews: duplicity-team (duplicity-team) For more details, see: https://code.launchpad.net/~aaron-whitehouse/duplicity/remove-python26/+merge/298983 Remove Python 2.6 support references and tests. -- Your team duplicity-team is requested to review the proposed merge of lp:~aaron-whitehouse/duplicity/remove-python26 into lp:duplicity.
=== modified file 'README' --- README 2015-10-26 15:19:02 +0000 +++ README 2016-07-02 19:56:38 +0000 @@ -19,7 +19,7 @@ REQUIREMENTS: - * Python v2.6 or later + * Python v2.7 or later * librsync v0.9.6 or later * GnuPG v1.x for encryption * python-lockfile v0.9 or later for concurrency locking === modified file 'README-REPO' --- README-REPO 2016-06-13 11:33:36 +0000 +++ README-REPO 2016-07-02 19:56:38 +0000 @@ -47,35 +47,18 @@ Please run all tests on your branch (run-tests) before proposing a merge, to ensure that all tests pass. The decorator @unittest.expectedFailure can be used to commit a known-failing test case without breaking the test suite, for -example to exhibit the behaviour in a bug report before it has been fixed: - -if sys.version_info < (2, 7): - import unittest2 as unittest -else: - import unittest - - -class TestClass(unittest.TestCase): - """Test class to show expectedFailure""" - - @unittest.expectedFailure - def test_expected_failure(self): - """Test behaviour of expectedFailure""" - self.assertEqual(1, 2) +example to exhibit the behaviour in a bug report before it has been fixed. ----------------------------------------- Testing against multiple Python versions: ----------------------------------------- -Duplicity currently supports Python versions v2.6 or later. Duplicity uses tox -to make it easy to test your code against multiple Python versions. Running -tests using the commands above will automatically test code against both -Python v2.6 and v2.7, if you have both installed on your system. It will also -test against the versions of dependencies used by the Launchpad build system. +Duplicity uses tox to make it easy to test your code against multiple +environments. Running tests using the commands above will automatically test +code against different supported environments, including the versions of +dependencies used by the Launchpad build system. + You can test against a single environment, e.g. -tox -e py26 +tox -e py27 for example if you are working on fixing a bug, but please do a full run-tests before submitting a merge request. - -For instructions on installing Python v2.6 on newer versions of Ubuntu, see -https://launchpad.net/~fkrull/+archive/ubuntu/deadsnakes === modified file 'testing/__init__.py' --- testing/__init__.py 2015-08-01 12:05:34 +0000 +++ testing/__init__.py 2016-07-02 19:56:38 +0000 @@ -21,11 +21,7 @@ import os import sys import time - -if sys.version_info < (2, 7): - import unittest2 as unittest -else: - import unittest +import unittest from duplicity import backend from duplicity import globals === modified file 'testing/test_code.py' --- testing/test_code.py 2016-07-02 12:53:12 +0000 +++ testing/test_code.py 2016-07-02 19:56:38 +0000 @@ -22,10 +22,7 @@ import sys import subprocess -if sys.version_info < (2, 7): - import unittest2 as unittest # @UnresolvedImport @UnusedImport -else: - import unittest # @Reimport +import unittest from . import _top_dir, DuplicityTestCase # @IgnorePep8 === modified file 'tox.ini' --- tox.ini 2016-01-04 11:54:50 +0000 +++ tox.ini 2016-07-02 19:56:38 +0000 @@ -1,14 +1,5 @@ [tox] -envlist=py26,py27,lpbuildd-precise - -[testenv:py26] -setenv= - RUN_CODE_TESTS=0 -deps= - mock==0.7.2 - pexpect==2.4 - ptyprocess==0.4 - unittest2 +envlist=py27,lpbuildd-precise [testenv:py27] setenv= @@ -29,5 +20,5 @@ {envpython} {toxinidir}/setup.py test {posargs} [pep8] -ignore=E402,E501,E731,W503 +ignore=E402,E731 max-line-length=120
_______________________________________________ Mailing list: https://launchpad.net/~duplicity-team Post to : [email protected] Unsubscribe : https://launchpad.net/~duplicity-team More help : https://help.launchpad.net/ListHelp
