diff --git a/LICENSE b/LICENSE new file mode 100644 index 0000000000000000000000000000000000000000..a10227bd0b7540a7e2ec5980d5f6ed081112cdd3 --- /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 1d106a4c182e13acda2427b5a175d88ced9f31be..471fdb257639115ada486b26901a035515912ba6 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 0000000000000000000000000000000000000000..d52156cf64946fe4d9d101eafd8782e83369c5d6 --- /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 84bdf89ce865b8c883dfec37c66428b60482514a..a12054b8c7e1ec8489438093c2d469f1e08ac227 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)"