lp:~aaron-whitehouse/duplicity/fix_2to3_issues

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp:~duplicity-team/duplicity/0.7-series at revision 1115

duplicity-team: Pending requested 2015-08-01

Diff: 127 lines (+34/-8)

7 files modified

README-REPO (+23/-3)
po/duplicity.pot (+1/-1)
testing/__init__.py (+5/-1)
testing/test_code.py (+1/-0)
testing/unit/test_backend.py (+1/-1)
testing/unit/test_diffdir.py (+2/-1)
testing/unit/test_tempdir.py (+1/-1)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

1114. By Aaron Whitehouse <email address hidden> on 2015-08-01

Fixed 2to3 issues. Updated README-REPO with more test information. Updated pylint and test_diff2 descriptions to make it clear these require packages to be installed on the system to pass. All tests pass on Python 2.6 and Python 2.7 as at this revision.

1113. By Kenneth Loafman on 2015-07-31

* Merged in lp:~aaron-whitehouse/duplicity/improve_tox_and_python2-6_testing
  - Testing improvements, particularly in relation to testing against Python version 2.6:
    * tox.ini fixed so that it is possible to run individual tests against both Python 2.6 and 2.7;
    * updated test_code.py to use unittest2 for Python versions < 2.7 (instead of failing);
    * ./run-tests now correctly runs all tests against both Python 2.6 and 2.7; and
    * improved testing directions in README-REPO.

1112. By Kenneth Loafman on 2015-07-31

* Merged in lp:~aaron-whitehouse/duplicity/trailing_slash_match_dirs
  - Made globs with trailing slashes only match directories, not files, fixing Bug #1479545.

1111. By Kenneth Loafman on 2015-07-29

* Merged in lp:~aaron-whitehouse/duplicity/reenable_tests
  - Re-enable unit.test_selection tests that had been temporarily commented out.

1110. By Kenneth Loafman on 2015-07-29

* Merged in lp:~aaron-whitehouse/duplicity/bug_884371
  - Fixed Bug #884371 - Stopped an exclude glob trumping an earlier scan glob, but also
    ensured that an exclude glob is not trumped by a later include. This fix is important,
    as without it files that are specified to be included are not being backed up as expected.
  - Fixed Bug #932482 - a trailing slash at the end of globs no longer prevents them working
    as expected.

1109. By Kenneth Loafman on 2015-07-04

* Fixed bug 1471348 Multi back-end doesn't work with hubiC (again)
   - hubiC should reach up to duplicity.backend.__init__

1108. By Kenneth Loafman on 2015-07-04

* Fixed bug 1471348 Multi back-end doesn't work with hubiC
  - added init of appropriate superclass in both cases.

1107. By Kenneth Loafman on 2015-07-03

* Merged in lp:~aaron-whitehouse/duplicity/reactivate_progress_test
  - Re-enable the test of the --progress option (test_exclude_filelist_progress_option),
    which was marked as an expected failure. The issue causing this test to fail was
    fixed in revision 1095 and the test now passes.

1106. By Kenneth Loafman on 2015-07-03

* Merged in lp:~aaron-whitehouse/duplicity/fix_POTFILES.in_and_run-tests
  - Fixed two filename references in po/POTFILES.in, a mistake which crept in in
    rev 1093 and caused testing/run-tests to fail with "IndexError: list index
    out of range".

1105. By Kenneth Loafman on 2015-06-21

* Merged in lp:~ed.so/duplicity/gpg.binary
  - new parameter --gpg-binary allows user to point to a different gpg binary,
    not necessarily in path