lp:~mterry/duplicity/drop-pexpect

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp:duplicity/0.6 at revision 974

duplicity-team: Pending requested 2014-04-17

Diff: 2000 lines (+13/-1853)

8 files modified

bin/duplicity.1 (+3/-0)
duplicity/backends/_ssh_pexpect.py (+2/-1)
duplicity/backends/~par2wrapperbackend.py (+5/-4)
duplicity/pexpect.py (+0/-1845)
po/POTFILES.in (+0/-1)
setup.py (+1/-1)
testing/helpers/helper.py (+1/-1)
tox.ini (+1/-0)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

975. By Michael Terry on 2014-04-17

fix typo

974. By Michael Terry on 2014-04-17

Drop local copy of pexpect -- only used by one of our ssh backends and our tests

973. By Michael Terry on 2014-04-17

Fix drop-u1 merge

972. By Kenneth Loafman on 2014-04-17

* Merged in lp:~mterry/duplicity/drop-u1
  - Ubuntu One is closing shop. So no need to support a u1 backend anymore.

971. By Kenneth Loafman on 2014-04-17

* Merged in lp:~mterry/duplicity/require-2.6
  - Require at least Python 2.6.
  - Our code base already requires 2.6, because 2.6-isms have crept in. Usually
    because we or a contributor didn't think to test with 2.4. And frankly,
    I'm not even sure how to test with 2.4 on a modern system.

970. By Kenneth Loafman on 2014-04-17

* Merged in lp:~mterry/duplicity/modern-testing
  - Enable/use more modern testing tools like nosetests and tox as well as more
    common setup.py hooks like test and sdist.
  - Specifically:
    * move setup.py to toplevel where most tools and users expect it
    * Move and adjust test files to work when running "nosetests" in toplevel
      directory. Specifically, do a lot more of the test setup in
      tests/__init__.py rather than the run-tests scripts
    * Add small tox.ini file for using tox, which is a wrapper for using
      virtualenv. Only enable for py26 and py27 right now, since modern
      setuptools dropped support for <2.6 (and tox 1.7 recently dropped <2.6)
    * Add setup.py hooks for test and sdist which are both standard targets
      (sdist just outsources to dist/makedist right now)

969. By Kenneth Loafman on 2014-04-17

* Merged in lp:~mterry/duplicity/consolidate-tests
  - Consolidate all the duplicity-running code in the test framework.
  - This takes the four test files [1] that run duplicity itself (i.e. the
    high-level functional test files) and consolidates their code. Before, it
    was madness. Each one had its own run_duplicity method, with its own
    slightly tweaked features. This should reduce a lot of duplication.
  - [1] cleanuptest.py, finaltest.py, restarttest.py, and badupload.py

968. By Kenneth Loafman on 2014-04-17

* Merged in lp:~fredrik-loch/duplicity/duplicity-S3-SSE
  - Adds support for server side encryption as requested in Bug #996660

967. By Kenneth Loafman on 2014-03-10

* Merged in lp:~germer/duplicity/par2
  - This branch adds Par2 recovery files to duplicity. It is a wrapper backend
    which will create the recovery files and upload them all together with the
    wrapped backend. Corrupt archives will be detected and repaired (if
    possible) on the fly during restore.
  - It can be used with url-string par2+webdavs://USER@HOST/PATH
  - Fixes https://bugs.launchpad.net/duplicity/+bug/426282

966. By Kenneth Loafman on 2014-03-06

* Merged in lp:~prateek/duplicity/botoimportfix
  - Switches the boto backend back to using lazy imports so there are no
    complaints during the importing of backends.