lp:~aaron-whitehouse/duplicity/fix_patch_error

Branch merges

Propose for merging

No branches dependent on this one.

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

duplicity-team: Pending requested 2015-08-03

Diff: 55 lines (+16/-5)

2 files modified

po/duplicity.pot (+1/-1)
testing/unit/test_selection.py (+15/-4)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

1118. By Aaron Whitehouse <email address hidden> on 2015-08-02

Change use of mock.patch to accommodate the obsolete version of python-mock on the build server (and avoid the following error:
TypeError: patch() got an unexpected keyword argument 'return_value'
)

1117. By Kenneth Loafman on 2015-08-02

* Prep for 0.7.04

1116. By Kenneth Loafman on 2015-08-02

* Prep for 0.7.04

1115. By Kenneth Loafman on 2015-08-02

* Merged in lp:~aaron-whitehouse/duplicity/fix_2to3_issues
  - 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
    sytem to pass. All tests pass on Python 2.6 and Python 2.7 as at this revision.

1114. By Kenneth Loafman on 2015-08-02

* Merged in lp:~dag-stenstad/duplicity/swift_authversion_3_support
  - Added support for Openstack Identity v3 in the Swift backend.

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__