GitLab

This reverts commit 333407cb.

Reason for revert: Re-landing with fixes.

Specifically, this makes dependency_manager in catapult handle
importing six directly, rather than relying on clients to do it.

Also, this updates the .pydeps files to include six.py.

Original change's description:
> Revert "Roll catapult to 532e564 and update for changes in it."
>
> This reverts commit 9bdc5ccb.
>
> Reason for revert: Reverting until I can fix the `import six` issues more cleanly.
>
> Original change's description:
> > Roll catapult to 532e564 and update for changes in it.
> >
> > This CL rolls //third_party/catapult to
> > 532e564f622742fc93a7f91dd3556d711e778a7e and picks up
> >
> > https://chromium-review.googlesource.com/c/catapult/+/2450450
> >
> > which removes zipfile_2_7_13.py as a dependency. This CL
> > also updates the corresponding Chromium .pydeps files that mentioned
> > it.
> >
> > That change also added a dependency on `six`, which seems to be
> > pervasively assumed in other parts of the catapult codebase as
> > present in the environment; however, it isn't guaranteed to be
> > there in the chromium compile-time python build, so this adds
> > that as needed as well.
> >
> > TBR=bsheedy@chromium.org
> >
> > Bug: 1112471
> > Change-Id: I849355a5bdc18847dcbf39f3d3a9e9fbf428e3be
> > Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2449938
> > Commit-Queue: Dirk Pranke <dpranke@google.com>
> > Reviewed-by: Dirk Pranke <dpranke@google.com>
> > Reviewed-by: John Chen <johnchen@chromium.org>
> > Cr-Commit-Position: refs/heads/master@{#814062}
>
> TBR=dpranke@google.com,bsheedy@chromium.org,johnchen@chromium.org
>
> Change-Id: I8dc0ccc9819eb5cd7de6d9fab4ec9a23c485ca09
> No-Presubmit: true
> No-Tree-Checks: true
> No-Try: true
> Bug: 1112471, 1135502
> Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2453150
> Commit-Queue: Dirk Pranke <dpranke@google.com>
> Reviewed-by: Dirk Pranke <dpranke@google.com>
> Cr-Commit-Position: refs/heads/master@{#814255}

TBR=dpranke@google.com,bsheedy@chromium.org,johnchen@chromium.org, agrieve@chromium.org

Bug: 1112471
Bug: 1135502
Change-Id: I20d0d0a876424aefded51772ad8dc088f1a9c158
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2453444
Commit-Queue: Dirk Pranke <dpranke@google.com>
Reviewed-by: Dirk Pranke <dpranke@google.com>
Cr-Commit-Position: refs/heads/master@{#814499}