diff options
| author | bors-servo <lbergstrom+bors@mozilla.com> | 2016-04-20 02:00:16 +0530 |
|---|---|---|
| committer | bors-servo <lbergstrom+bors@mozilla.com> | 2016-04-20 02:00:16 +0530 |
| commit | a129ce1bccf313db85547a5c32ecf8cd7aac489b (patch) | |
| tree | ba704a0135e1414ca1aa0cb12fa19eb72c8cb0bc | |
| parent | 4d5fa963fdcf9ec9287eac762bf6afafdbee5f41 (diff) | |
| parent | eb198d76e7f755d11585158115a0354acd875682 (diff) | |
| download | servo-a129ce1bccf313db85547a5c32ecf8cd7aac489b.tar.gz servo-a129ce1bccf313db85547a5c32ecf8cd7aac489b.zip | |
Auto merge of #10715 - edunham:tidy-licenses, r=larsbergstrom
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 -->
| -rw-r--r-- | python/tidy/servo_tidy/licenseck.py | 11 | ||||
| -rw-r--r-- | python/tidy/setup.py | 2 |
2 files changed, 12 insertions, 1 deletions
diff --git a/python/tidy/servo_tidy/licenseck.py b/python/tidy/servo_tidy/licenseck.py index 705faf8bcb6..a67713b4421 100644 --- a/python/tidy/servo_tidy/licenseck.py +++ b/python/tidy/servo_tidy/licenseck.py @@ -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 diff --git a/python/tidy/setup.py b/python/tidy/setup.py index 86aae654b3c..a1af7d88465 100644 --- a/python/tidy/setup.py +++ b/python/tidy/setup.py @@ -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", |