Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-07-23 07:13:52 +01:00
Code Issues Projects Releases Packages Wiki Activity

Auto merge of #10715 - edunham:tidy-licenses, r=larsbergstrom

Browse source 
Allow another wording of apache2/MIT (used by gaol)

r? @larsbergstrom

need this for https://github.com/servo/servo/issues/10636

<!-- 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/10715)
<!-- Reviewable:end -->
This commit is contained in:
bors-servo 2016-04-20 02:00:16 +05:30
commit a129ce1bcc
2 changed files with 12 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

11
python/tidy/servo_tidy/licenseck.py
View file

@ -59,4 +59,15 @@ licenses = [
# except according to those terms.
""",
"""\
// Copyright 2015 The Rust Project Developers. See the COPYRIGHT
// file at the top-level directory of this distribution and at
// http://rust-lang.org/COPYRIGHT.
//
// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
// option. This file may not be copied, modified, or distributed
// except according to those terms.
"""
] # noqa: Indicate to flake8 that we do not want to check indentation here

2
python/tidy/setup.py
View file

@ -11,7 +11,7 @@ import os
from setuptools import setup, find_packages
VERSION = '0.0.2'
VERSION = '0.0.3'
install_requires = [
"flake8==2.4.1",