lp:~aaron-whitehouse/duplicity/08-docker-local-import

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp:~duplicity-team/duplicity/0.8-series at revision 1452

duplicity-team: Pending requested 2019-08-26

Diff: 420 lines (+99/-144)

8 files modified

AUTHORS (+1/-1)
README-TESTING (+53/-92)
testing/infrastructure/build-duplicity_test.sh (+5/-20)
testing/infrastructure/duplicity_test/Dockerfile (+12/-7)
testing/infrastructure/duplicity_test/Dockerfile-18.04 (+10/-6)
testing/infrastructure/duplicity_test/Dockerfile-18.10 (+6/-6)
testing/infrastructure/duplicity_test/Dockerfile-19.04 (+6/-6)
testing/infrastructure/duplicity_test/Dockerfile-19.10 (+6/-6)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

1393. By Aaron Whitehouse on 2019-08-26

Simplify README-TESTING and change this to recommend using the Docker images to test local branches in a known-good environment.

1392. By Aaron Whitehouse on 2019-08-26

* Convert Dockerfile-19.10 to new approach (using local folder instead of remote repo)
* run-tests passes on 19.10 Docker (clean: commands succeeded; py27: commands succeeded; SKIPPED: py36: InterpreterNotFound: python3.6; py37: commands succeeded; report: commands succeeded)

1391. By Aaron Whitehouse on 2019-08-26

* Convert Dockerfile-19.04 to new approach (using local folder instead of remote repo)
* run-tests passes on 19.04 Docker (clean: commands succeeded; py27: commands succeeded; SKIPPED: py36: InterpreterNotFound: python3.6; py37: commands succeeded; report: commands succeeded)

1390. By Aaron Whitehouse on 2019-08-26

* Edit Dockerfile-18.10 to use the local folder.
* Tests all pass on 18.10 except for the same failures as trunk (4 failures on python 3.6: TestUnicode.test_unicode_filelist; TestUnicode.test_unicode_paths_asterisks; TestUnicode.test_unicode_paths_non_globbing; TestUnicode.test_unicode_paths_square_brackets)

1389. By Aaron Whitehouse on 2019-08-26

* Use local folder instead of bzr revision, so remove the revision arguments in the setup script.
* Modify Dockerfile and Dockerfile-18.04 to copy the local folder rather than the remote repository.
* Tests all pass on 18.04 except for the same failures as trunk (4 failures on python 3.6: TestUnicode.test_unicode_filelist; TestUnicode.test_unicode_paths_asterisks; TestUnicode.test_unicode_paths_non_globbing; TestUnicode.test_unicode_paths_square_brackets)

1388. By Aaron Whitehouse on 2019-08-26

Merge with trunk

1387. By Aaron Whitehouse on 2019-07-02

Convert the docker duplicity_test image to pull the local branch into the container, rather than lp:duplicity. This allows the use of the duplicity Docker testing containers to test local changes in a known-good environment before they are merged into trunk. The equivalent of the old behaviour can be achieved by starting with a clean branch from lp:duplicity.
* Expand Docker context to parent branch folder and use -f in the docker build command to point to the Dockerfile.
* Simplify build-duplicity_test.sh now that the whole folder is copied (individual files no longer need to be copied)

1386. By Kenneth Loafman on 2019-06-29

* Fix reimport problem where "from future.builtins" was being treated
  the differently than "from builtins". They are both the same, so
  converted to shorter form "from builtins" and removed duplicates.

1385. By Kenneth Loafman on 2019-06-29

* Merged in lp:~mterry/duplicity/s3fsdecode
  - Fix s3 backups by encoding remote filenames

1384. By Kenneth Loafman on 2019-06-29

* Merged in lp:~aaron-whitehouse/duplicity/08-dockerfixes
  - Update duplicity_test Dockerfile:
    * Use 18.04 instead of 16.04
    * Use Ubuntu 18.04 version of pip
    * Add Python3 and 2to3 as a dependencies
    * Set docker locale as UTF-8