Relicense under MIT-or-Apache-2.0 (#45)

LICENSE → LICENSE-APACHE

@@ -186,7 +186,7 @@
       same "printed page" as the copyright notice for easier
       identification within third-party archives.
 
-   Copyright 2018 Michael Sanders.
+   Copyright 2018, 2019 Michael Sanders.
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.

LICENSE-MIT

@@ -0,0 +1,18 @@
+Copyright 2018, 2019 Michael Sanders.
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of
+this software and associated documentation files (the "Software"), to deal in
+the Software without restriction, including without limitation the rights to
+use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
+the Software, and to permit persons to whom the Software is furnished to do so,
+subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

MANIFEST.in

@@ -1,5 +1,6 @@
 include CHANGELOG.md
 include Cargo.toml
-include LICENSE
+include LICENSE-APACHE
+include LICENSE-MIT
 include requirements.txt
 recursive-include src *

README.md

@@ -233,3 +233,11 @@ haystack.find_bitmap(needle, rect=((10, 10), (100, 100)))
 Hope you enjoy using autopy! For a more in depth overview, see the [API
 Reference](https://www.autopy.org/documentation/api-reference/).
 
+## License
+
+This project is licensed under either the [Apache-2.0](LICENSE-APACHE) or
+[MIT](LICENSE-MIT) license, at your option.
+
+Unless you explicitly state otherwise, any contribution intentionally submitted
+for inclusion in the work by you, as defined in the Apache-2.0 license, shall be
+dual licensed as above, without any additional terms or conditions.

setup.py

@@ -69,14 +69,15 @@ def main():
         long_description=read_description(),
         long_description_content_type='text/markdown',
         url='https://www.autopy.org',
-        license='Apache-2.0',
+        license='MIT OR Apache-2.0',
         classifiers=[
             'Development Status :: 5 - Production/Stable',
             'Environment :: MacOS X',
             'Environment :: Win32 (MS Windows)',
             'Environment :: X11 Applications',
             'Intended Audience :: Developers',
             'License :: OSI Approved :: Apache Software License',
+            'License :: OSI Approved :: MIT License',
             'Natural Language :: English',
             'Operating System :: MacOS',
             'Operating System :: Microsoft :: Windows',

src/alert.rs

@@ -1,3 +1,10 @@
+// Copyright 2018, 2019 Michael Sanders
+//
+// Licensed under the Apache License, Version 2.0, <LICENSE-APACHE or
+// https://apache.org/licenses/LICENSE-2.0> or the MIT license <LICENSE-MIT or
+// https://opensource.org/licenses/MIT>, at your option. This file may not be
+// copied, modified, or distributed except according to those terms.
+
 use autopilot::alert::Response;
 use pyo3::prelude::*;
 

src/bitmap.rs

@@ -1,3 +1,10 @@
+// Copyright 2018, 2019 Michael Sanders
+//
+// Licensed under the Apache License, Version 2.0, <LICENSE-APACHE or
+// https://apache.org/licenses/LICENSE-2.0> or the MIT license <LICENSE-MIT or
+// https://opensource.org/licenses/MIT>, at your option. This file may not be
+// copied, modified, or distributed except according to those terms.
+
 use autopilot::geometry::{Point, Rect, Size};
 use image;
 use image::Pixel;

src/color.rs

@@ -1,3 +1,10 @@
+// Copyright 2018, 2019 Michael Sanders
+//
+// Licensed under the Apache License, Version 2.0, <LICENSE-APACHE or
+// https://apache.org/licenses/LICENSE-2.0> or the MIT license <LICENSE-MIT or
+// https://opensource.org/licenses/MIT>, at your option. This file may not be
+// copied, modified, or distributed except according to those terms.
+
 use internal::rgb_to_hex;
 use pyo3::prelude::*;
 

src/internal.rs

@@ -1,3 +1,10 @@
+// Copyright 2018, 2019 Michael Sanders
+//
+// Licensed under the Apache License, Version 2.0, <LICENSE-APACHE or
+// https://apache.org/licenses/LICENSE-2.0> or the MIT license <LICENSE-MIT or
+// https://opensource.org/licenses/MIT>, at your option. This file may not be
+// copied, modified, or distributed except according to those terms.
+
 use image::ImageError;
 use pyo3::prelude::*;
 

src/key.rs

@@ -1,3 +1,10 @@
+// Copyright 2018, 2019 Michael Sanders
+//
+// Licensed under the Apache License, Version 2.0, <LICENSE-APACHE or
+// https://apache.org/licenses/LICENSE-2.0> or the MIT license <LICENSE-MIT or
+// https://opensource.org/licenses/MIT>, at your option. This file may not be
+// copied, modified, or distributed except according to those terms.
+
 use either::{Either, Left, Right};
 use pyo3::prelude::*;
 use pyo3::types::{PyAny, PyString};

src/lib.rs

@@ -1,3 +1,10 @@
+// Copyright 2018, 2019 Michael Sanders
+//
+// Licensed under the Apache License, Version 2.0, <LICENSE-APACHE or
+// https://apache.org/licenses/LICENSE-2.0> or the MIT license <LICENSE-MIT or
+// https://opensource.org/licenses/MIT>, at your option. This file may not be
+// copied, modified, or distributed except according to those terms.
+
 #![feature(specialization, const_fn, custom_attribute)]
 
 extern crate autopilot;

src/mouse.rs

@@ -1,3 +1,10 @@
+// Copyright 2018, 2019 Michael Sanders
+//
+// Licensed under the Apache License, Version 2.0, <LICENSE-APACHE or
+// https://apache.org/licenses/LICENSE-2.0> or the MIT license <LICENSE-MIT or
+// https://opensource.org/licenses/MIT>, at your option. This file may not be
+// copied, modified, or distributed except according to those terms.
+
 use autopilot::geometry::Point;
 use pyo3::prelude::*;
 

src/screen.rs

@@ -1,3 +1,10 @@
+// Copyright 2018, 2019 Michael Sanders
+//
+// Licensed under the Apache License, Version 2.0, <LICENSE-APACHE or
+// https://apache.org/licenses/LICENSE-2.0> or the MIT license <LICENSE-MIT or
+// https://opensource.org/licenses/MIT>, at your option. This file may not be
+// copied, modified, or distributed except according to those terms.
+
 use autopilot::geometry::Point;
 use image::Pixel;
 use internal::{rgb_to_hex, FromImageError};