From 08b8c07b80f0526f86b4517a7a06e494370f24fd Mon Sep 17 00:00:00 2001
From: lsetiawan <landungs@uw.edu>
Date: Fri, 16 Feb 2018 12:22:05 -0800
Subject: [PATCH 1/4] Refactor ODM2

---
 odm2api/ODM2/__init__.py                     | 8 --------
 odm2api/__init__.py                          | 3 ++-
 odm2api/{ODM2 => }/models.py                 | 0
 odm2api/{ODM2 => }/services/__init__.py      | 0
 odm2api/{ODM2 => }/services/createService.py | 0
 odm2api/{ODM2 => }/services/deleteService.py | 0
 odm2api/{ODM2 => }/services/readService.py   | 0
 odm2api/{ODM2 => }/services/updateService.py | 0
 8 files changed, 2 insertions(+), 9 deletions(-)
 delete mode 100644 odm2api/ODM2/__init__.py
 rename odm2api/{ODM2 => }/models.py (100%)
 rename odm2api/{ODM2 => }/services/__init__.py (100%)
 rename odm2api/{ODM2 => }/services/createService.py (100%)
 rename odm2api/{ODM2 => }/services/deleteService.py (100%)
 rename odm2api/{ODM2 => }/services/readService.py (100%)
 rename odm2api/{ODM2 => }/services/updateService.py (100%)

diff --git a/odm2api/ODM2/__init__.py b/odm2api/ODM2/__init__.py
deleted file mode 100644
index 96c3005..0000000
--- a/odm2api/ODM2/__init__.py
+++ /dev/null
@@ -1,8 +0,0 @@
-from __future__ import (absolute_import, division, print_function)
-
-from odm2api.base import modelBase, serviceBase
-
-__all__ = [
-    'serviceBase',
-    'modelBase',
-]
diff --git a/odm2api/__init__.py b/odm2api/__init__.py
index 830dc2e..ce6da51 100644
--- a/odm2api/__init__.py
+++ b/odm2api/__init__.py
@@ -1,12 +1,13 @@
 from __future__ import (absolute_import, division, print_function)
 
 from odm2api.ODMconnection import SessionFactory, dbconnection
-from odm2api.base import serviceBase
+from odm2api.base import serviceBase, modelBase
 
 __all__ = [
     'SessionFactory',
     'dbconnection',
     'serviceBase',
+    'modelBase'
 ]
 
 from ._version import get_versions
diff --git a/odm2api/ODM2/models.py b/odm2api/models.py
similarity index 100%
rename from odm2api/ODM2/models.py
rename to odm2api/models.py
diff --git a/odm2api/ODM2/services/__init__.py b/odm2api/services/__init__.py
similarity index 100%
rename from odm2api/ODM2/services/__init__.py
rename to odm2api/services/__init__.py
diff --git a/odm2api/ODM2/services/createService.py b/odm2api/services/createService.py
similarity index 100%
rename from odm2api/ODM2/services/createService.py
rename to odm2api/services/createService.py
diff --git a/odm2api/ODM2/services/deleteService.py b/odm2api/services/deleteService.py
similarity index 100%
rename from odm2api/ODM2/services/deleteService.py
rename to odm2api/services/deleteService.py
diff --git a/odm2api/ODM2/services/readService.py b/odm2api/services/readService.py
similarity index 100%
rename from odm2api/ODM2/services/readService.py
rename to odm2api/services/readService.py
diff --git a/odm2api/ODM2/services/updateService.py b/odm2api/services/updateService.py
similarity index 100%
rename from odm2api/ODM2/services/updateService.py
rename to odm2api/services/updateService.py

From 67f208c4c3f0f30a8d30fa9ee9cfc9ef6f5b5fc2 Mon Sep 17 00:00:00 2001
From: lsetiawan <landungs@uw.edu>
Date: Fri, 16 Feb 2018 12:25:48 -0800
Subject: [PATCH 2/4] Make new ODM2 to use the refractored ODM2

---
 odm2api/ODM2/__init__.py               |  8 ++++++++
 odm2api/ODM2/models.py                 |  9 +++++++++
 odm2api/ODM2/services/__init__.py      | 15 +++++++++++++++
 odm2api/ODM2/services/createService.py | 19 +++++++++++++++++++
 odm2api/ODM2/services/deleteService.py | 21 +++++++++++++++++++++
 odm2api/ODM2/services/readService.py   | 19 +++++++++++++++++++
 odm2api/ODM2/services/updateService.py | 18 ++++++++++++++++++
 odm2api/ODMconnection.py               |  2 +-
 odm2api/services/__init__.py           |  8 ++++----
 odm2api/services/createService.py      |  4 ++--
 odm2api/services/deleteService.py      |  4 ++--
 odm2api/services/readService.py        |  4 ++--
 odm2api/services/updateService.py      |  4 ++--
 13 files changed, 122 insertions(+), 13 deletions(-)
 create mode 100644 odm2api/ODM2/__init__.py
 create mode 100644 odm2api/ODM2/models.py
 create mode 100644 odm2api/ODM2/services/__init__.py
 create mode 100644 odm2api/ODM2/services/createService.py
 create mode 100644 odm2api/ODM2/services/deleteService.py
 create mode 100644 odm2api/ODM2/services/readService.py
 create mode 100644 odm2api/ODM2/services/updateService.py

diff --git a/odm2api/ODM2/__init__.py b/odm2api/ODM2/__init__.py
new file mode 100644
index 0000000..96c3005
--- /dev/null
+++ b/odm2api/ODM2/__init__.py
@@ -0,0 +1,8 @@
+from __future__ import (absolute_import, division, print_function)
+
+from odm2api.base import modelBase, serviceBase
+
+__all__ = [
+    'serviceBase',
+    'modelBase',
+]
diff --git a/odm2api/ODM2/models.py b/odm2api/ODM2/models.py
new file mode 100644
index 0000000..0e6445e
--- /dev/null
+++ b/odm2api/ODM2/models.py
@@ -0,0 +1,9 @@
+from __future__ import (absolute_import, division, print_function)
+
+import warnings
+
+from odm2api.models import *  # noqa
+
+warnings.warn('The module odm2api.ODM2.models will be deprecated. '
+              'Please use odm2api.models instead.',
+              FutureWarning, stacklevel=2)
diff --git a/odm2api/ODM2/services/__init__.py b/odm2api/ODM2/services/__init__.py
new file mode 100644
index 0000000..ecdd49a
--- /dev/null
+++ b/odm2api/ODM2/services/__init__.py
@@ -0,0 +1,15 @@
+from __future__ import (absolute_import, division, print_function)
+
+from odm2api.ODM2.services.createService import CreateODM2
+from odm2api.ODM2.services.deleteService import DeleteODM2
+from odm2api.ODM2.services.readService import ReadODM2
+from odm2api.ODM2.services.updateService import UpdateODM2
+
+__author__ = 'jmeline'
+
+__all__ = [
+    'CreateODM2',
+    'DeleteODM2',
+    'ReadODM2',
+    'UpdateODM2'
+]
diff --git a/odm2api/ODM2/services/createService.py b/odm2api/ODM2/services/createService.py
new file mode 100644
index 0000000..158a14c
--- /dev/null
+++ b/odm2api/ODM2/services/createService.py
@@ -0,0 +1,19 @@
+from __future__ import (absolute_import, division, print_function)
+
+import warnings
+
+from odm2api.services import CreateODM2 as newClass
+
+warnings.warn('The module odm2api.ODM2.services.createService will be deprecated. '
+              'Please use odm2api.services.createService instead.',
+              FutureWarning, stacklevel=2)
+
+
+__author__ = 'sreeder'
+
+
+def CreateODM2(*args, **kwargs):
+    warnings.warn('The class odm2api.ODM2.services.readService.CreateODM2 will be deprecated. '
+                  'Please use odm2api.services.readService.CreateODM2 instead.',
+                  FutureWarning, stacklevel=2)
+    return newClass(*args, **kwargs)
diff --git a/odm2api/ODM2/services/deleteService.py b/odm2api/ODM2/services/deleteService.py
new file mode 100644
index 0000000..ff5a06a
--- /dev/null
+++ b/odm2api/ODM2/services/deleteService.py
@@ -0,0 +1,21 @@
+from __future__ import (absolute_import, division, print_function)
+
+import warnings
+
+from odm2api.services.deleteService import DeleteODM2 as newClass
+
+warnings.warn('The module odm2api.ODM2.services.deleteService will be deprecated. '
+              'Please use odm2api.services.deleteService instead.',
+              FutureWarning, stacklevel=2)
+
+
+__author__ = 'jmeline'
+
+# Annotations
+
+
+def DeleteODM2(*args, **kwargs):
+    warnings.warn('The class odm2api.ODM2.services.readService.DeleteODM2 will be deprecated. '
+                  'Please use odm2api.services.readService.DeleteODM2 instead.',
+                  FutureWarning, stacklevel=2)
+    return newClass(*args, **kwargs)
diff --git a/odm2api/ODM2/services/readService.py b/odm2api/ODM2/services/readService.py
new file mode 100644
index 0000000..177f784
--- /dev/null
+++ b/odm2api/ODM2/services/readService.py
@@ -0,0 +1,19 @@
+from __future__ import (absolute_import, division, print_function)
+
+import warnings
+
+from odm2api.services.readService import ReadODM2 as newClass
+
+warnings.warn('The module odm2api.ODM2.services.readService will be deprecated. '
+              'Please use odm2api.services.readService instead.',
+              FutureWarning, stacklevel=2)
+
+
+__author__ = 'sreeder'
+
+
+def ReadODM2(*args, **kwargs):
+    warnings.warn('The class odm2api.ODM2.services.readService.ReadODM2 will be deprecated. '
+                  'Please use odm2api.services.readService.ReadODM2 instead.',
+                  FutureWarning, stacklevel=2)
+    return newClass(*args, **kwargs)
diff --git a/odm2api/ODM2/services/updateService.py b/odm2api/ODM2/services/updateService.py
new file mode 100644
index 0000000..6b70c82
--- /dev/null
+++ b/odm2api/ODM2/services/updateService.py
@@ -0,0 +1,18 @@
+from __future__ import (absolute_import, division, print_function)
+
+import warnings
+
+from odm2api.services import UpdateODM2 as newClass
+
+warnings.warn('The module odm2api.ODM2.services.updateService will be deprecated. '
+              'Please use odm2api.services.updateService instead.',
+              FutureWarning, stacklevel=2)
+
+__author__ = 'jmeline'
+
+
+def UpdateODM2(*args, **kwargs):
+    warnings.warn('The class odm2api.ODM2.services.readService.CreateODM2 will be deprecated. '
+                  'Please use odm2api.services.readService.CreateODM2 instead.',
+                  FutureWarning, stacklevel=2)
+    return newClass(*args, **kwargs)
diff --git a/odm2api/ODMconnection.py b/odm2api/ODMconnection.py
index c3c1833..1a10b74 100644
--- a/odm2api/ODMconnection.py
+++ b/odm2api/ODMconnection.py
@@ -7,7 +7,7 @@
 except ImportError:
     from urllib.parse import quote_plus
 
-from odm2api.ODM2.models import setSchema
+from odm2api.models import setSchema
 
 from sqlalchemy import create_engine
 from sqlalchemy.orm import scoped_session, sessionmaker
diff --git a/odm2api/services/__init__.py b/odm2api/services/__init__.py
index ecdd49a..620afca 100644
--- a/odm2api/services/__init__.py
+++ b/odm2api/services/__init__.py
@@ -1,9 +1,9 @@
 from __future__ import (absolute_import, division, print_function)
 
-from odm2api.ODM2.services.createService import CreateODM2
-from odm2api.ODM2.services.deleteService import DeleteODM2
-from odm2api.ODM2.services.readService import ReadODM2
-from odm2api.ODM2.services.updateService import UpdateODM2
+from odm2api.services.createService import CreateODM2
+from odm2api.services.deleteService import DeleteODM2
+from odm2api.services.readService import ReadODM2
+from odm2api.services.updateService import UpdateODM2
 
 __author__ = 'jmeline'
 
diff --git a/odm2api/services/createService.py b/odm2api/services/createService.py
index 1fceb2f..3bae275 100644
--- a/odm2api/services/createService.py
+++ b/odm2api/services/createService.py
@@ -2,8 +2,8 @@
 
 import uuid
 
-from odm2api.ODM2 import serviceBase
-from odm2api.ODM2.models import TimeSeriesResultValues
+from odm2api import serviceBase
+from odm2api.models import TimeSeriesResultValues
 
 __author__ = 'sreeder'
 
diff --git a/odm2api/services/deleteService.py b/odm2api/services/deleteService.py
index 43f944a..0f76d9c 100644
--- a/odm2api/services/deleteService.py
+++ b/odm2api/services/deleteService.py
@@ -1,7 +1,7 @@
 from __future__ import (absolute_import, division, print_function)
 
-from odm2api.ODM2 import serviceBase
-from odm2api.ODM2.models import TimeSeriesResultValues
+from odm2api import serviceBase
+from odm2api.models import TimeSeriesResultValues
 
 
 __author__ = 'jmeline'
diff --git a/odm2api/services/readService.py b/odm2api/services/readService.py
index a7d4e4f..e93a712 100644
--- a/odm2api/services/readService.py
+++ b/odm2api/services/readService.py
@@ -2,8 +2,8 @@
 
 import warnings
 
-from odm2api.ODM2 import serviceBase
-from odm2api.ODM2.models import (
+from odm2api import serviceBase
+from odm2api.models import (
     ActionAnnotations, ActionDirectives, ActionExtensionPropertyValues, Actions,
     Affiliations, Annotations, AuthorLists, CVActionType, CVAggregationStatistic,
     CVAnnotationType, CVCensorCode, CVDataQualityType, CVDataSetType, CVDirectiveType,
diff --git a/odm2api/services/updateService.py b/odm2api/services/updateService.py
index 87e77b8..e7a46e4 100644
--- a/odm2api/services/updateService.py
+++ b/odm2api/services/updateService.py
@@ -4,8 +4,8 @@
 
 from datetime import datetime
 
-from odm2api.ODM2 import serviceBase
-from odm2api.ODM2.models import (Actions, Results)
+from odm2api import serviceBase
+from odm2api.models import (Actions, Results)
 
 
 # ################################################################################

From 23891b274691e09d50759d9863b5193d36413291 Mon Sep 17 00:00:00 2001
From: lsetiawan <landungs@uw.edu>
Date: Fri, 16 Feb 2018 12:51:05 -0800
Subject: [PATCH 3/4] Fix import flake8 error

---
 odm2api/__init__.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/odm2api/__init__.py b/odm2api/__init__.py
index ce6da51..fbb8991 100644
--- a/odm2api/__init__.py
+++ b/odm2api/__init__.py
@@ -1,13 +1,13 @@
 from __future__ import (absolute_import, division, print_function)
 
 from odm2api.ODMconnection import SessionFactory, dbconnection
-from odm2api.base import serviceBase, modelBase
+from odm2api.base import modelBase, serviceBase
 
 __all__ = [
     'SessionFactory',
     'dbconnection',
+    'modelBase',
     'serviceBase',
-    'modelBase'
 ]
 
 from ._version import get_versions

From abca232cc123131ce8f1ed3c3662aa99175121ee Mon Sep 17 00:00:00 2001
From: lsetiawan <landungs@uw.edu>
Date: Tue, 27 Feb 2018 08:59:46 -0800
Subject: [PATCH 4/4] Remove flake-print

---
 requirements-dev.txt | 1 -
 1 file changed, 1 deletion(-)

diff --git a/requirements-dev.txt b/requirements-dev.txt
index 71bb791..6abb495 100644
--- a/requirements-dev.txt
+++ b/requirements-dev.txt
@@ -4,7 +4,6 @@ flake8-builtins
 flake8-comprehensions
 flake8-import-order
 flake8-mutable
-flake8-print
 flake8-quotes
 mock
 nbsphinx