Skip to content

Commit

Permalink
Licensing and code fixing
Browse files Browse the repository at this point in the history
* Re-issued under the Apache 2.0 only.
* Ran foad.py through Yapf.
* Made some slight changes for PEP8 compliance, but there's still a
  lot more to go.
  • Loading branch information
Hasimir committed Aug 12, 2018
1 parent af5cd9e commit d3a6bc8
Show file tree
Hide file tree
Showing 2 changed files with 662 additions and 331 deletions.
6 changes: 4 additions & 2 deletions COPYING.rst
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,10 @@ contributions or other uses are detailed in the docs.
Original releases (2013-2014) were dual licensed under the GPLv3 and
the WTFNMFPLv1. From 2015 onward the software continued to be
licensed this way, but also licensed under the three clause BSD
license to account for using it as a library. The LGPL 2.1 and Apache
2.0 licenses are also under consideration, but can wait for now.
license to account for using it as a library.

From August, 2018 onward all the multi-licensing was dropped in favour
of theApache 2.0 license as it is both GPL compatible and permissive.

Users may accept any one or combination of these licenses, but
contributors (in the unlikely event that there are any) must
Expand Down
Loading

0 comments on commit d3a6bc8

Please sign in to comment.