Merge pull request #49 from lsst/tickets/DM-12594

DM-12594: Remove daf::base::Citizen
lsst · Jul 1, 2019 · f8bf62c · f8bf62c
2 parents b5ca14a + d28b1c8
commit f8bf62c
Show file tree

Hide file tree

Showing 18 changed files with 13 additions and 1,115 deletions.
diff --git a/.gitignore b/.gitignore
@@ -24,4 +24,3 @@ tests/test_PropertyList
 tests/test_PropertySet_1
 tests/test_citizen
 tests/test_dateTime_1
-examples/citizen
diff --git a/examples/citizen.cc b/examples/citizen.cc
diff --git a/include/lsst/daf/base.h b/include/lsst/daf/base.h
@@ -23,7 +23,6 @@
 #ifndef LSST_DAF_BASE_H
 #define LSST_DAF_BASE_H
 
-#include "lsst/daf/base/Citizen.h"
 #include "lsst/daf/base/DateTime.h"
 #include "lsst/daf/base/Persistable.h"
 #include "lsst/daf/base/PropertySet.h"

diff --git a/include/lsst/daf/base/Citizen.h b/include/lsst/daf/base/Citizen.h
diff --git a/include/lsst/daf/base/PropertySet.h b/include/lsst/daf/base/PropertySet.h
@@ -52,7 +52,6 @@
 #include "boost/any.hpp"
 
 #include "lsst/base.h"
-#include "lsst/daf/base/Citizen.h"
 #include "lsst/daf/base/Persistable.h"
 #include "lsst/pex/exceptions.h"
 
@@ -65,7 +64,7 @@ namespace base {
 #pragma warning(disable : 444)
 #endif
 
-class LSST_EXPORT PropertySet : public Citizen {
+class LSST_EXPORT PropertySet {
 public:
     // Typedefs
     typedef std::shared_ptr<PropertySet> Ptr;

diff --git a/python/lsst/daf/base/SConscript b/python/lsst/daf/base/SConscript
@@ -1,4 +1,4 @@
 # -*- python -*-
 from lsst.sconsUtils import scripts
 scripts.BasicSConscript.pybind11(['dateTime/dateTime', 'persistable',
-	'propertyContainer/propertyList', 'propertyContainer/propertySet', 'citizen/citizen'], addUnderscore=False)
+	'propertyContainer/propertyList', 'propertyContainer/propertySet'], addUnderscore=False)
diff --git a/python/lsst/daf/base/__init__.py b/python/lsst/daf/base/__init__.py
@@ -22,7 +22,6 @@
 #
 
 from .version import *
-from .citizen import *
 from .dateTime import *
 from .propertyContainer import *
 from . import yaml
diff --git a/python/lsst/daf/base/citizen/__init__.py b/python/lsst/daf/base/citizen/__init__.py
diff --git a/python/lsst/daf/base/citizen/citizen.cc b/python/lsst/daf/base/citizen/citizen.cc