diff options
author | bors-servo <lbergstrom+bors@mozilla.com> | 2016-09-01 16:47:10 -0500 |
---|---|---|
committer | GitHub <noreply@github.com> | 2016-09-01 16:47:10 -0500 |
commit | e4362356d29ab5b18cb6316a3a510dfa31f9ba7c (patch) | |
tree | bfbc411709b409efaf1f7941000c37d63bf9e569 | |
parent | 6c68680581afbdd59034cb1535bfd4439cfa7394 (diff) | |
parent | 95e3f8333a116f9bd62fb071d08fcef269697804 (diff) | |
download | servo-e4362356d29ab5b18cb6316a3a510dfa31f9ba7c.tar.gz servo-e4362356d29ab5b18cb6316a3a510dfa31f9ba7c.zip |
Auto merge of #13097 - crypto-universe:mako_task, r=SimonSapin
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 -->
-rw-r--r-- | components/style/properties/Mako-0.9.1.zip | bin | 469500 -> 0 bytes | |||
-rw-r--r-- | components/style/properties/build.py | 1 | ||||
-rw-r--r-- | python/requirements.txt | 1 | ||||
-rw-r--r-- | tests/unit/style/properties/scaffolding.rs | 4 |
4 files changed, 5 insertions, 1 deletions
diff --git a/components/style/properties/Mako-0.9.1.zip b/components/style/properties/Mako-0.9.1.zip Binary files differdeleted file mode 100644 index b7450e30012..00000000000 --- a/components/style/properties/Mako-0.9.1.zip +++ /dev/null diff --git a/components/style/properties/build.py b/components/style/properties/build.py index daa9140fd02..6f5550c7103 100644 --- a/components/style/properties/build.py +++ b/components/style/properties/build.py @@ -7,7 +7,6 @@ import os.path 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 diff --git a/python/requirements.txt b/python/requirements.txt index 97487c76aff..dd05d2f7694 100644 --- a/python/requirements.txt +++ b/python/requirements.txt @@ -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 diff --git a/tests/unit/style/properties/scaffolding.rs b/tests/unit/style/properties/scaffolding.rs index f4fb064301a..b2225225201 100644 --- a/tests/unit/style/properties/scaffolding.rs +++ b/tests/unit/style/properties/scaffolding.rs @@ -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(); } |