lp:~techalchemy/mojo/python3-fixes

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp:mojo at revision 528

Stuart Bishop (community): Approve on 2020-02-24

Canonical IS Reviewers: Pending requested 2020-02-24

Diff: 1158 lines (+346/-241)

22 files modified

Makefile (+4/-4)
mojo/cli.py (+78/-70)
mojo/contain.py (+0/-1)
mojo/juju/__init__.py (+1/-1)
mojo/juju/check.py (+1/-1)
mojo/juju/checks.py (+1/-1)
mojo/juju/debuglogs.py (+3/-3)
mojo/juju/parse_status.py (+1/-1)
mojo/juju/status.py (+9/-14)
mojo/juju/utils.py (+1/-8)
mojo/juju/wait.py (+3/-0)
mojo/phase.py (+4/-7)
mojo/project.py (+3/-0)
mojo/shutil_which.py (+140/-0)
mojo/tests/test_cli.py (+2/-2)
mojo/tests/test_debuglogs.py (+2/-1)
mojo/tests/test_juju1.py (+7/-3)
mojo/tests/test_juju2.py (+4/-4)
mojo/tests/test_phase.py (+2/-1)
mojo/tests/utils.py (+1/-8)
mojo/utils.py (+77/-110)
setup.py (+2/-1)

api

Superseded for merging into lp:~techalchemy/mojo/python3-updates

Stuart Bishop (community): Approve on 2020-02-24

Diff: 1158 lines (+346/-241)

22 files modified

Makefile (+4/-4)
mojo/cli.py (+78/-70)
mojo/contain.py (+0/-1)
mojo/juju/__init__.py (+1/-1)
mojo/juju/check.py (+1/-1)
mojo/juju/checks.py (+1/-1)
mojo/juju/debuglogs.py (+3/-3)
mojo/juju/parse_status.py (+1/-1)
mojo/juju/status.py (+9/-14)
mojo/juju/utils.py (+1/-8)
mojo/juju/wait.py (+3/-0)
mojo/phase.py (+4/-7)
mojo/project.py (+3/-0)
mojo/shutil_which.py (+140/-0)
mojo/tests/test_cli.py (+2/-2)
mojo/tests/test_debuglogs.py (+2/-1)
mojo/tests/test_juju1.py (+7/-3)
mojo/tests/test_juju2.py (+4/-4)
mojo/tests/test_phase.py (+2/-1)
mojo/tests/utils.py (+1/-8)
mojo/utils.py (+77/-110)
setup.py (+2/-1)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

532. By Dan Ryan on 2020-02-20

Add six to install_requires

531. By Dan Ryan on 2020-02-20

- Drop usage of `distutils.spawn`
- Document modifications to path normalization
- Revert deletion of comment from `juju/wait.py`
- Add module-level attributes with juju path in tests to avoid invoking (likely) non-existent snap
- Fix broken `juju.utils` import in `phase.py`
- Remove extraneous behavior changing error handling
- Restore 0-indexing of list created by `.split("\n")` rather than invoking `next(iter())`

530. By Dan Ryan on 2020-02-20

- Move `get_prog` to argument parser `__init__` method
- Add comments arround error handling in CLI
- Undo accidental formatting changes

529. By Dan Ryan on 2020-02-20

- Backport `shutil.which` and supporting functionality for python 2
- Remove global declaration of preferred encoding
- Document `subprocess_run` functionality
- Document `encode_for_stream` function
- Simplify reimplementation of `dist` function as the code is meant to be ubuntu specific

528. By Dan Ryan on 2020-02-20

Fix makefile variables

527. By Dan Ryan on 2020-02-10

Use full command paths for comparison points in tests

526. By Dan Ryan on 2020-02-10

Drop encoding argument from `NamedTemporaryFile` for python 2 compatibility and remove stray import

525. By Dan Ryan on 2020-02-10

Fix re compatibility for python 2

524. By Dan Ryan on 2020-02-06

Merge in latest changes

523. By Dan Ryan on 2020-02-06

Update snapcraft.yaml to pull in latest codetree revision