From f8b9a86e9588839fb03d88351d7abba29549bc9d Mon Sep 17 00:00:00 2001 From: Dave Page Date: Thu, 7 Mar 2019 15:12:12 +0000 Subject: [PATCH] Include the license in the docs, and ensure it gets updated each year. --- LICENSE | 2 +- docs/en_US/licence.rst | 27 ++++++++++++++++++++++++++- tools/copyright_updater.py | 4 ++-- 3 files changed, 29 insertions(+), 4 deletions(-) diff --git a/LICENSE b/LICENSE index ad8627291..02193a258 100644 --- a/LICENSE +++ b/LICENSE @@ -1,6 +1,6 @@ pgAdmin 4 -Copyright (C) 2013 - 2018, The pgAdmin Development Team +Copyright (C) 2013 - 2019, The pgAdmin Development Team Permission to use, copy, modify, and distribute this software and its documentation for any purpose, without fee, and without a written agreement is diff --git a/docs/en_US/licence.rst b/docs/en_US/licence.rst index 93140098c..b6a835575 100644 --- a/docs/en_US/licence.rst +++ b/docs/en_US/licence.rst @@ -4,4 +4,29 @@ `Licence`:index: **************** -pgAdmin is released under the `PostgreSQL Licence `_, which is a liberal Open Source licence similar to BSD or MIT, and approved by the Open Source Initiative. The copyright for the project source code, website and documentation is attributed to the `pgAdmin Development Team `_. \ No newline at end of file +pgAdmin is released under the +`PostgreSQL Licence `_, which is a +liberal Open Source licence similar to BSD or MIT, and approved by the Open +Source Initiative. The copyright for the project source code, website and +documentation is attributed to the +`pgAdmin Development Team `_ + +.. topic:: pgAdmin 4 + + Copyright (C) 2013 - 2019, The pgAdmin Development Team + + Permission to use, copy, modify, and distribute this software and its + documentation for any purpose, without fee, and without a written agreement is + hereby granted, provided that the above copyright notice and this paragraph and + the following two paragraphs appear in all copies. + + IN NO EVENT SHALL THE PGADMIN DEVELOPMENT TEAM BE LIABLE TO ANY PARTY FOR + DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES, INCLUDING LOST + PROFITS, ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN IF + THE PGADMIN DEVELOPMENT TEAM HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + + THE PGADMIN DEVELOPMENT TEAM SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING, + BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A + PARTICULAR PURPOSE. THE SOFTWARE PROVIDED HEREUNDER IS ON AN "AS IS" BASIS, AND + THE PGADMIN DEVELOPMENT TEAM HAS NO OBLIGATIONS TO PROVIDE MAINTENANCE, SUPPORT, + UPDATES, ENHANCEMENTS, OR MODIFICATIONS. \ No newline at end of file diff --git a/tools/copyright_updater.py b/tools/copyright_updater.py index a1f2c3fc1..9f4e84fb7 100644 --- a/tools/copyright_updater.py +++ b/tools/copyright_updater.py @@ -19,8 +19,8 @@ import re import codecs ALLOWED_FILE_EXTENSIONS = ( - ".py", ".js", ".sql", ".cpp", ".h", ".rc", ".am", ".wsgi", "pro", "plist", - ".rst", ".sh", ".in", ".mako", ".ini", ".jsx", ".rtf" + ".py", ".js", ".sql", ".cpp", ".h", ".rc", ".am", ".wsgi", ".pro", ".plist", + ".rst", ".sh", ".in", ".mako", ".ini", ".jsx", ".rtf", ".rst", "LICENSE" ) EXCLUDE_DIR = ("node_modules")