From 321d87ff28acd1f5b80a19b2368699e4a182f8e6 Mon Sep 17 00:00:00 2001
From: Sinisa Veseli <sveseli@aps.anl.gov>
Date: Fri, 4 Jan 2019 17:33:47 +0000
Subject: [PATCH] add license file

---
 LICENSE                   | 42 +++++++++++++++++++++++++++++++++++++++
 Makefile                  |  2 +-
 README.md                 |  1 +
 src/python/dm/__init__.py |  3 +--
 4 files changed, 45 insertions(+), 3 deletions(-)
 create mode 100644 LICENSE
 create mode 100644 README.md

diff --git a/LICENSE b/LICENSE
new file mode 100644
index 00000000..a10227bd
--- /dev/null
+++ b/LICENSE
@@ -0,0 +1,42 @@
+Copyright (c) UChicago Argonne, LLC. All rights reserved.
+
+Copyright UChicago Argonne, LLC. This software was produced 
+under U.S. Government contract DE-AC02-06CH11357 for Argonne National 
+Laboratory (ANL), which is operated by UChicago Argonne, LLC for the 
+U.S. Department of Energy. The U.S. Government has rights to use, 
+reproduce, and distribute this software.  NEITHER THE GOVERNMENT NOR 
+UChicago Argonne, LLC MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
+ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE.  If software is 
+modified to produce derivative works, such modified software should 
+be clearly marked, so as not to confuse it with the version available 
+from ANL.
+
+Additionally, redistribution and use in source and binary forms, with 
+or without modification, are permitted provided that the following 
+conditions are met:
+
+    * Redistributions of source code must retain the above copyright 
+      notice, this list of conditions and the following disclaimer. 
+
+    * Redistributions in binary form must reproduce the above copyright 
+      notice, this list of conditions and the following disclaimer in 
+      the documentation and/or other materials provided with the 
+      distribution. 
+
+    * Neither the name of UChicago Argonne, LLC, Argonne National 
+      Laboratory, ANL, the U.S. Government, nor the names of its 
+      contributors may be used to endorse or promote products derived 
+      from this software without specific prior written permission. 
+
+THIS SOFTWARE IS PROVIDED BY UChicago Argonne, LLC AND CONTRIBUTORS 
+AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT 
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS 
+FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL UChicago 
+Argonne, LLC OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, 
+INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, 
+BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; 
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER 
+CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT 
+LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN 
+ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE 
+POSSIBILITY OF SUCH DAMAGE.
diff --git a/Makefile b/Makefile
index 1d106a4c..471fdb25 100644
--- a/Makefile
+++ b/Makefile
@@ -34,7 +34,7 @@ backup:
 	$(TOP)/sbin/dm_backup.sh 
 
 api-doc:
-	make -C doc/sphinx html
+	export PYTHONPATH=../../src/python ; make -C doc/sphinx html
 
 configure-web-portal: dist
 	$(TOP)/sbin/dm_configure_web_portal.sh
diff --git a/README.md b/README.md
new file mode 100644
index 00000000..d52156cf
--- /dev/null
+++ b/README.md
@@ -0,0 +1 @@
+APS Data Management Software
diff --git a/src/python/dm/__init__.py b/src/python/dm/__init__.py
index 84bdf89c..a12054b8 100644
--- a/src/python/dm/__init__.py
+++ b/src/python/dm/__init__.py
@@ -5,7 +5,6 @@ from dm.common.exceptions.communicationError import CommunicationError
 from dm.common.exceptions.configurationError import ConfigurationError
 from dm.common.exceptions.dbError import DbError
 from dm.common.exceptions.dmException import DmException
-from dm.common.exceptions.dmHttpError import DmHttpError
 from dm.common.exceptions.fileProcessingError import FileProcessingError
 from dm.common.exceptions.internalError import InternalError
 from dm.common.exceptions.invalidObjectState import InvalidObjectState
@@ -41,5 +40,5 @@ from dm.aps_db_web_service.api.bssApsDbApi import BssApsDbApi
 from dm.aps_db_web_service.api.esafApsDbApi import EsafApsDbApi
 from dm.aps_db_web_service.api.serviceMonitorApsDbApi import ServiceMonitorApsDbApi
 
-__version__ = "2.2.0 (2019/01/03)"
+__version__ = "2.2.0 (2019/01/04)"
 
-- 
GitLab