Commits

Clark C. Evans committed 7069d5b

adding appropriate legal notices as required by AGPLv3

  • Participants
  • Parent commits 3690b26

Comments (0)

Files changed (8)

File src/htsql/__init__.py

 """
 
 
-__version__ = '2.3.0.dev'
+__version__ = '2.3.0'
 __copyright__ = """Copyright (c) 2006-2012, Prometheus Research, LLC"""
-__license__ = None
-
+__license__ = """
+This is free software: you are free to change and redistribute it.
+There is NO WARRANTY, to the extent permitted by law.  This software
+is released under the AGPLv3 as well as a permissive license for use
+with open source databases.  See http://htsql.org/license/
+"""
+__credits__ = [
+"This work is developed by the HTSQL Project (http://htsql.org)",
+"This work incorporates Python Programming Language (http://python.org)",
+"This work incorporates SQLite Relational Database (http://sqlite.org)",
+"This work incorporates PyYAML Processor (http://pyyaml.org)"
+]
 
 from .core.application import Application as HTSQL
 

File src/htsql/ctl/__init__.py

         import htsql
         return trim_doc(htsql.__license__)
 
+    def get_credits(self):
+        import htsql
+        return [trim_doc(credit) for credit in htsql.__credits__]
+
+    def get_appropriate_legal_notices(self):
+        notices = []
+        version = self.get_version()
+        if version is not None:
+            notices.append(version)
+        copyright = self.get_copyright()
+        if copyright is not None:
+            notices.append(copyright)
+        license = self.get_license()
+        if license is not None:
+            notices.append(license)
+        credits = self.get_credits()
+        if credits:
+            notices.append("\nAttributions\n------------")
+        for credit in credits:
+            notices.append(credit)
+        return "\n".join(notices)
 
 def main():
     # This function is called when the `htsql-ctl` script is started.

File src/htsql/ctl/shell.py

     """
 
     def execute(self):
-        version = self.ctl.get_version()
-        if version is not None:
-            self.ctl.out(version)
-        copyright = self.ctl.get_copyright()
-        if copyright is not None:
-            self.ctl.out(copyright)
-        license = self.ctl.get_license()
-        if license is not None:
-            self.ctl.out(license)
+        self.ctl.out(self.ctl.get_appropriate_legal_notices())
+        self.ctl.out()
 
 class DescribeCmd(Cmd):
     """

File src/htsql/ctl/version.py

     """
 
     def run(self):
-        version = self.ctl.get_version()
-        if version is not None:
-            self.ctl.out(version)
-        copyright = self.ctl.get_copyright()
-        if copyright is not None:
-            self.ctl.out(copyright)
-        license = self.ctl.get_license()
-        if license is not None:
-            self.ctl.out(license)
-
-
+        self.ctl.out(self.ctl.get_appropriate_legal_notices())
+        self.ctl.out()

File src/htsql/tweak/shell/static/index.html

             <dt>CTRL+SPACE</dt>
             <dd>auto-complete table, column and link names</dd>
           </dl>
-          <p>
-            For more help about HTSQL, please read the documentation
-            at <a href="http://htsql.org/doc/" target="_blank">http://htsql.org/doc/</a>.
-          </p>
+          <p>For more information, please visit http://htsql.org</p>
+          <pre id="appropriate-legal-notices">
+Copyright (c) 2006-2012, Prometheus Research, LLC
+This is free software: you are free to change and redistribute it.
+There is NO WARRANTY, to the extent permitted by law.  This software
+is released under the AGPLv3 as well as a permissive license for use
+with open source databases.  See http://htsql.org/license/
+
+Attributions
+------------
+This work is developed by the HTSQL Project (http://htsql.org)
+This work incorporates Python Programming Language (http://python.org)
+This work incorporates SQLite Relational Database (http://sqlite.org)
+This work incorporates PyYAML Processor (http://pyyaml.org)
+          </pre>
         </div>
       </div>
     </div>

File src/htsql/tweak/shell/static/shell.css

   color: #1a1a1a;
 }
 
+#help-popup pre {
+   padding-top: 30px;
+   padding-left: 20px;
+   font-size: 80%
+}

File src/htsql_pgsql/__init__.py

 #
 # Copyright (c) 2006-2012, Prometheus Research, LLC
 #
+
+import htsql
+__credit = "This work incorporates PostgreSQL Database (http://postgresql.org)"
+if __credit not in htsql.__credits__:
+    htsql.__credits__.append(__credit)
+

File test/output/routine.yaml

 
   exit: 0
 - ctl: [--version]
-  stdout: |
-    HTSQL 2.3.0.dev
+  stdout: |+
+    HTSQL 2.3.0
     Copyright (c) 2006-2012, Prometheus Research, LLC
+    This is free software: you are free to change and redistribute it.
+    There is NO WARRANTY, to the extent permitted by law.  This software
+    is released under the AGPLv3 as well as a permissive license for use
+    with open source databases.  See http://htsql.org/license/
+
+    Attributions
+    ------------
+    This work is developed by the HTSQL Project (http://htsql.org)
+    This work incorporates Python Programming Language (http://python.org)
+    This work incorporates SQLite Relational Database (http://sqlite.org)
+    This work incorporates PyYAML Processor (http://pyyaml.org)
+
   exit: 0
 - ctl: [help]
   stdout: |+
 
   exit: 0
 - ctl: [version]
-  stdout: |
-    HTSQL 2.3.0.dev
+  stdout: |+
+    HTSQL 2.3.0
     Copyright (c) 2006-2012, Prometheus Research, LLC
+    This is free software: you are free to change and redistribute it.
+    There is NO WARRANTY, to the extent permitted by law.  This software
+    is released under the AGPLv3 as well as a permissive license for use
+    with open source databases.  See http://htsql.org/license/
+
+    Attributions
+    ------------
+    This work is developed by the HTSQL Project (http://htsql.org)
+    This work incorporates Python Programming Language (http://python.org)
+    This work incorporates SQLite Relational Database (http://sqlite.org)
+    This work incorporates PyYAML Processor (http://pyyaml.org)
+
   exit: 0