Skip to content

Commit

Permalink
Auto merge of #13097 - crypto-universe:mako_task, r=SimonSapin
Browse files Browse the repository at this point in the history
Mako task

<!-- Please describe your changes on the following line: -->
Remove mako zip

---
<!-- Thank you for contributing to Servo! Please replace each `[ ]` by `[X]` when the step is complete, and replace `__` with appropriate data: -->
- [X] `./mach build -d` does not report any errors
- [x] `./mach test-tidy` does not report any errors
- [X] These changes fix #12958 (github issue number if applicable).

<!-- Either: -->
- [ ] There are tests for these changes OR
- [ ] These changes do not require tests because _____

<!-- Pull requests that do not address these steps are welcome, but they will require additional verification as part of the review process. -->

r? @SimonSapin

<!-- Reviewable:start -->
---
This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/13097)
<!-- Reviewable:end -->
  • Loading branch information
bors-servo committed Sep 1, 2016
2 parents 6c68680 + 95e3f83 commit e436235
Show file tree
Hide file tree
Showing 4 changed files with 5 additions and 1 deletion.
Binary file removed components/style/properties/Mako-0.9.1.zip
Binary file not shown.
1 change: 0 additions & 1 deletion components/style/properties/build.py
Expand Up @@ -7,7 +7,6 @@
import sys

BASE = os.path.dirname(__file__.replace('\\', '/'))
sys.path.insert(0, os.path.join(BASE, "Mako-0.9.1.zip"))
sys.path.insert(0, BASE) # For importing `data.py`

from mako import exceptions
Expand Down
1 change: 1 addition & 0 deletions python/requirements.txt
Expand Up @@ -10,6 +10,7 @@ toml == 0.9.1
flake8 == 2.4.1
pep8 == 1.5.7
pyflakes == 0.8.1
mako == 0.9.1

# For test-webidl
ply == 3.8
Expand Down
4 changes: 4 additions & 0 deletions tests/unit/style/properties/scaffolding.rs
Expand Up @@ -32,6 +32,10 @@ fn properties_list_json() {

#[cfg(windows)]
fn find_python() -> String {
if Command::new("python2.7.exe").arg("--version").output().is_ok() {
return "python2.7.exe".to_owned();
}

if Command::new("python27.exe").arg("--version").output().is_ok() {
return "python27.exe".to_owned();
}
Expand Down

0 comments on commit e436235

Please sign in to comment.