[SEBA-545]
Update 3.0.x versions of libraries to have 3.0.x dependencies
Sort and add missing dependencies for xosmigrate
Narrow set of directories searched for models in xosmigrate
Change-Id: I70dc6a8bbf0c891e9142ae7acf6afd107d8e79ae
diff --git a/lib/xos-migrate/xosmigrate/main.py b/lib/xos-migrate/xosmigrate/main.py
index e7be104..8aab313 100644
--- a/lib/xos-migrate/xosmigrate/main.py
+++ b/lib/xos-migrate/xosmigrate/main.py
@@ -107,8 +107,8 @@
"""
xprotos = []
for fn in os.listdir(path):
- # skip hidden files and folders. plus other useless things
- if fn.startswith(".") or fn == "venv-xos" or fn == "htmlcov":
+ # skip hidden files and folders
+ if fn.startswith("."):
continue
full_path = os.path.join(path, fn)
if fn.endswith(".xproto"):
@@ -127,8 +127,8 @@
"""
decls = []
for fn in os.listdir(path):
- # skip hidden files and folders. plus other useless things
- if fn.startswith(".") or fn == "venv-xos" or fn == "htmlcov":
+ # skip hidden files and folders
+ if fn.startswith("."):
continue
full_path = os.path.join(path, fn)
if fn == "models.py":
@@ -160,8 +160,9 @@
:param service_name: string (name of the service)
:return: void
"""
- xprotos = find_xproto_in_folder(service_dir)
- decls = find_decls_models(service_dir)
+ sync_dir = os.path.join(service_dir, "xos/synchronizer/models")
+ xprotos = find_xproto_in_folder(sync_dir)
+ decls = find_decls_models(sync_dir)
log.debug("Generating models for %s from files %s" % (service_name, ", ".join(xprotos)))
out_dir = os.path.join(service_dest_dir, service_name)
if not os.path.isdir(out_dir):