Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Upgrade mach to 0.6; stop vendoring mach. #10976

Merged
merged 1 commit into from May 3, 2016

Conversation

frewsxcv
Copy link
Contributor

@frewsxcv frewsxcv commented May 2, 2016

When I originally rewrote Servo's mach bootstrapping (using virtualenv
w/ requirements.txt in #7103), I didn't specify mach as a requirement
because a new version hadn't been published in a while. Now that 0.6
is out, I asked the mach maintainers to publish a new version on PyPI,
so now we can fetch it like the other Python dependencies.

Fixes #10728.


This change is Reviewable

@highfive
Copy link

highfive commented May 2, 2016

Heads up! This PR modifies the following files:

  • @wafflespeanut: python/mach/docs/logging.rst, python/mach/README.rst, python/mach_bootstrap.py, python/mach/mach/commands/commandinfo.py, python/mach/setup.py, python/mach/mach/init.py, python/mach/docs/index.rst, python/mach/mach/commands/settings.py, python/mach/mach/test/providers/conditions_invalid.py, python/mach/mach/test/providers/throw.py, python/mach/mach/mixin/logging.py, python/mach/mach/commands/init.py, python/mach/docs/commands.rst, python/mach/mach/base.py, python/mach/mach/test/test_logger.py, python/mach/docs/driver.rst, python/mach/mach/test/providers/conditions.py, python/requirements.txt, python/mach/mach/registrar.py, python/mach/mach/test/test_error_output.py, python/mach/mach/test/test_conditions.py, python/mach/mach/decorators.py, python/mach/mach/test/providers/throw2.py, python/mach/mach/test/providers/basic.py, python/mach/mach/mixin/process.py, python/mach/mach/logging.py, python/mach/mach/test/test_config.py, python/mach/mach/main.py, python/mach/mach/test/init.py, python/mach/mach/test/providers/init.py, python/mach/mach/dispatcher.py, python/mach/mach/terminal.py, python/mach/mach/config.py, python/mach/bash-completion.sh, python/mach/mach/test/test_entry_point.py, python/mach/mach/mixin/init.py, python/mach/mach/test/common.py

@highfive highfive added the S-awaiting-review There is new code that needs to be reviewed. label May 2, 2016
@frewsxcv
Copy link
Contributor Author

frewsxcv commented May 2, 2016

cc @metajack

When I originally rewrote Servo's mach bootstrapping (using virtualenv
w/ requirements.txt in servo#7103), I didn't specify mach as a requirement
because a new version hadn't been published in a while. Now that 0.6
is out, I asked the mach maintainers to publish a new version on PyPI,
so now we can fetch it like the other Python dependencies.

Fixes servo#10728.
@frewsxcv frewsxcv changed the title Upgrade mach (0.3 -> 0.6); stop vendoring mach. Upgrade mach to 0.6; stop vendoring mach. May 2, 2016
@mbrubeck mbrubeck assigned mbrubeck and unassigned asajeffrey May 2, 2016
@mbrubeck
Copy link
Contributor

mbrubeck commented May 2, 2016

@bors-servo r+

@bors-servo
Copy link
Contributor

📌 Commit 7725e64 has been approved by mbrubeck

@highfive highfive added S-awaiting-merge The PR is in the process of compiling and running tests on the automated CI. and removed S-awaiting-review There is new code that needs to be reviewed. labels May 2, 2016
@bors-servo
Copy link
Contributor

⌛ Testing commit 7725e64 with merge 7a7ed33...

bors-servo pushed a commit that referenced this pull request May 2, 2016
Upgrade mach to 0.6; stop vendoring mach.

When I originally rewrote Servo's mach bootstrapping (using virtualenv
w/ requirements.txt in #7103), I didn't specify mach as a requirement
because a new version hadn't been published in a while. Now that 0.6
is out, I asked the mach maintainers to publish a new version on PyPI,
so now we can fetch it like the other Python dependencies.

Fixes #10728.

<!-- Reviewable:start -->
---
This change is [<img src="https://reviewable.io/review_button.svg" height="35" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/10976)
<!-- Reviewable:end -->
@frewsxcv
Copy link
Contributor Author

frewsxcv commented May 2, 2016

From what I can tell there is no mach changelog, so I made a diff of the changes in the upgrade:

https://gist.github.com/frewsxcv/67c19788508225df88c558194f1c29e5

@bors-servo
Copy link
Contributor

💔 Test failed - windows

@highfive highfive added S-tests-failed The changes caused existing tests to fail. and removed S-awaiting-merge The PR is in the process of compiling and running tests on the automated CI. labels May 2, 2016
@KiChjang
Copy link
Contributor

KiChjang commented May 2, 2016

@bors-servo retry

  • the annoying git

@frewsxcv
Copy link
Contributor Author

frewsxcv commented May 2, 2016

  • the annoying git

@bors-servo
Copy link
Contributor

⌛ Testing commit 7725e64 with merge e39ed93...

bors-servo pushed a commit that referenced this pull request May 3, 2016
Upgrade mach to 0.6; stop vendoring mach.

When I originally rewrote Servo's mach bootstrapping (using virtualenv
w/ requirements.txt in #7103), I didn't specify mach as a requirement
because a new version hadn't been published in a while. Now that 0.6
is out, I asked the mach maintainers to publish a new version on PyPI,
so now we can fetch it like the other Python dependencies.

Fixes #10728.

<!-- Reviewable:start -->
---
This change is [<img src="https://reviewable.io/review_button.svg" height="35" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/10976)
<!-- Reviewable:end -->
@highfive highfive added S-awaiting-merge The PR is in the process of compiling and running tests on the automated CI. and removed S-tests-failed The changes caused existing tests to fail. labels May 3, 2016
@bors-servo
Copy link
Contributor

☀️ Test successful - android, arm32, arm64, linux-dev, linux-rel, mac-dev-unit, mac-rel-css, mac-rel-wpt, windows

@bors-servo bors-servo merged commit 7725e64 into servo:master May 3, 2016
@highfive highfive removed the S-awaiting-merge The PR is in the process of compiling and running tests on the automated CI. label May 3, 2016
frewsxcv added a commit to frewsxcv/servo that referenced this pull request May 3, 2016
@metajack
Copy link
Contributor

metajack commented May 3, 2016

Great work @frewsxcv!

@frewsxcv frewsxcv deleted the novendor-mach branch May 3, 2016 03:21
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

7 participants