From c805412d471b7fbd3863f63aea0def00632176c1 Mon Sep 17 00:00:00 2001 From: Raphael Pierzina Date: Tue, 16 Feb 2016 19:12:22 +0000 Subject: [PATCH 1/7] Grab official MIT license text from opensource.org --- LICENSE | 24 +++++++----------------- 1 file changed, 7 insertions(+), 17 deletions(-) diff --git a/LICENSE b/LICENSE index 31ecdfb1d..45ee6cbe3 100644 --- a/LICENSE +++ b/LICENSE @@ -1,19 +1,9 @@ +The MIT License (MIT) - 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. +Copyright (c) +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. From baabde76ae50c0f3ba25013b560727853e6f77bd Mon Sep 17 00:00:00 2001 From: Raphael Pierzina Date: Tue, 16 Feb 2016 19:13:39 +0000 Subject: [PATCH 2/7] Insert copyright holders and year as mentioned in README --- LICENSE | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/LICENSE b/LICENSE index 45ee6cbe3..1efa1dcf5 100644 --- a/LICENSE +++ b/LICENSE @@ -1,6 +1,6 @@ The MIT License (MIT) -Copyright (c) +Copyright (c) 2004-2016 Holger Krekel and others 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: From 3ef003f0ffbd98600175941822b2ba97d5889940 Mon Sep 17 00:00:00 2001 From: Raphael Pierzina Date: Tue, 16 Feb 2016 19:14:55 +0000 Subject: [PATCH 3/7] Wrap lines at 79 characters --- LICENSE | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/LICENSE b/LICENSE index 1efa1dcf5..9e27bd784 100644 --- a/LICENSE +++ b/LICENSE @@ -2,8 +2,20 @@ The MIT License (MIT) Copyright (c) 2004-2016 Holger Krekel and others -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: +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 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. +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. From b2f837acd817ca9a2c9c06023cfc4258ff30e754 Mon Sep 17 00:00:00 2001 From: Raphael Pierzina Date: Tue, 16 Feb 2016 19:26:30 +0000 Subject: [PATCH 4/7] Add a reference to LICENSE file to README --- README.rst | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/README.rst b/README.rst index 2a4d7839f..1f12e5141 100644 --- a/README.rst +++ b/README.rst @@ -96,4 +96,7 @@ License ------- Copyright Holger Krekel and others, 2004-2016. -Licensed under the MIT license. + +Distributed under the terms of the `MIT`_ license, pytest is free and open source software. + +.. _`MIT`: https://github.com/pytest-dev/pytest/blob/master/LICENSE From 25aed0dca88b50c13aa27b09801bfad3ef243f0d Mon Sep 17 00:00:00 2001 From: Raphael Pierzina Date: Tue, 16 Feb 2016 19:42:16 +0000 Subject: [PATCH 5/7] Add a license section to the docs toc --- doc/en/_templates/globaltoc.html | 1 + doc/en/license.rst | 8 ++++++++ 2 files changed, 9 insertions(+) create mode 100644 doc/en/license.rst diff --git a/doc/en/_templates/globaltoc.html b/doc/en/_templates/globaltoc.html index f764729fd..af427198a 100644 --- a/doc/en/_templates/globaltoc.html +++ b/doc/en/_templates/globaltoc.html @@ -9,6 +9,7 @@
  • Contact
  • Talks/Posts
  • Changelog
    • +
  • License
    • {%- if display_toc %} diff --git a/doc/en/license.rst b/doc/en/license.rst new file mode 100644 index 000000000..75b6c64f5 --- /dev/null +++ b/doc/en/license.rst @@ -0,0 +1,8 @@ +License +------- + +Copyright Holger Krekel and others, 2004-2016. + +Distributed under the terms of the `MIT`_ license, pytest is free and open source software. + +.. _`MIT`: https://github.com/pytest-dev/pytest/blob/master/LICENSE From e4c1b9c1c457dd651cf306af176f2426df97f84b Mon Sep 17 00:00:00 2001 From: Raphael Pierzina Date: Wed, 17 Feb 2016 00:47:49 +0000 Subject: [PATCH 6/7] Add link to license page to index.rst --- doc/en/index.rst | 1 + doc/en/license.rst | 2 ++ 2 files changed, 3 insertions(+) diff --git a/doc/en/index.rst b/doc/en/index.rst index 09e342e22..04b4512da 100644 --- a/doc/en/index.rst +++ b/doc/en/index.rst @@ -7,6 +7,7 @@ pytest: helps you write better programs **a mature full-featured Python testing tool** - runs on Posix/Windows, Python 2.6-3.5, PyPy and (possibly still) Jython-2.5.1 + - free and open source software, distributed under the terms of the :ref:`MIT license ` - **well tested** with more than a thousand tests against itself - **strict backward compatibility policy** for safe pytest upgrades - :ref:`comprehensive online ` and `PDF documentation `_ diff --git a/doc/en/license.rst b/doc/en/license.rst index 75b6c64f5..dca7e8dfe 100644 --- a/doc/en/license.rst +++ b/doc/en/license.rst @@ -1,3 +1,5 @@ +.. _license: + License ------- From 19536c9f05f5fbdd3b8fa5378c40cce8e03c47c4 Mon Sep 17 00:00:00 2001 From: Raphael Pierzina Date: Wed, 17 Feb 2016 00:54:54 +0000 Subject: [PATCH 7/7] Add full MIT license text to the docs section --- doc/en/license.rst | 26 ++++++++++++++++++++++++-- 1 file changed, 24 insertions(+), 2 deletions(-) diff --git a/doc/en/license.rst b/doc/en/license.rst index dca7e8dfe..3fc1dad52 100644 --- a/doc/en/license.rst +++ b/doc/en/license.rst @@ -3,8 +3,30 @@ License ------- -Copyright Holger Krekel and others, 2004-2016. - Distributed under the terms of the `MIT`_ license, pytest is free and open source software. +:: + + The MIT License (MIT) + + Copyright (c) 2004-2016 Holger Krekel and others + + 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. + .. _`MIT`: https://github.com/pytest-dev/pytest/blob/master/LICENSE