Closed Bug 1464088 Opened 2 years ago Closed 2 years ago

Vendor six via |mach vendor python|

Categories

(Firefox Build System :: General, defect)

3 Branch
defect
Not set

Tracking

(firefox62 fixed)

RESOLVED FIXED
mozilla62
Tracking Status
firefox62 --- fixed

People

(Reporter: davehunt, Assigned: davehunt)

References

(Blocks 1 open bug)

Details

Attachments

(1 file)

The new |mach vendor python| command ensures that packages are vendored consistently.

For this bug, you will need to clone mozilla-central and run the following:

$ mach vendor python six==1.10.0

This will vendor the six package that matches the existing vendored package (at the time of writing) introduced in bug 1388340.
Comment on attachment 8980331 [details]
Bug 1464088 - Vendor six via |mach vendor python|;

https://reviewboard.mozilla.org/r/246480/#review252574

You could probably do everything under `third_party/python` at once if you wanted.
Attachment #8980331 - Flags: review?(ahal) → review+
We're sorry, Autoland could not rebase your commits for you automatically. Please manually rebase your commits and try again.

hg error in cmd: hg rebase -s db31eac8f390af67012cca3b30e9187e60e1c299 -d 7c12d4b98d22: rebasing 465028:db31eac8f390 "Bug 1464088 - Vendor six via |mach vendor python|; r=ahal" (tip)
merging Pipfile
merging Pipfile.lock
warning: conflicts while merging Pipfile! (edit, then use 'hg resolve --mark')
warning: conflicts while merging Pipfile.lock! (edit, then use 'hg resolve --mark')
unresolved conflicts (see hg resolve, then hg rebase --continue)
We're sorry, Autoland could not rebase your commits for you automatically. Please manually rebase your commits and try again.

hg error in cmd: hg rebase -s db31eac8f390af67012cca3b30e9187e60e1c299 -d df956fa60b54: rebasing 465095:db31eac8f390 "Bug 1464088 - Vendor six via |mach vendor python|; r=ahal" (tip)
merging Pipfile
merging Pipfile.lock
warning: conflicts while merging Pipfile! (edit, then use 'hg resolve --mark')
warning: conflicts while merging Pipfile.lock! (edit, then use 'hg resolve --mark')
unresolved conflicts (see hg resolve, then hg rebase --continue)
Pushed by dhunt@mozilla.com:
https://hg.mozilla.org/integration/autoland/rev/dda7def4ada4
Vendor six via |mach vendor python|; r=ahal
https://hg.mozilla.org/mozilla-central/rev/dda7def4ada4
Status: ASSIGNED → RESOLVED
Closed: 2 years ago
Resolution: --- → FIXED
Target Milestone: --- → mozilla62
Version: Version 3 → 3 Branch
You need to log in before you can comment on or make changes to this bug.