[incubator-liminal] branch master updated: fix broken package

[li...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

lior pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-liminal.git


The following commit(s) were added to refs/heads/master by this push:
     new e898439  fix broken package
e898439 is described below

commit e8984394d9d29962dafa513ff747901d616a866a
Author: aviemzur <av...@gmail.com>
AuthorDate: Sun Jul 4 12:40:47 2021 +0300

    fix broken package
---
 liminal/core/config/defaults/__init__.py | 17 +++++++++++++++++
 scripts/liminal                          |  5 +++--
 setup.py                                 |  3 ++-
 3 files changed, 22 insertions(+), 3 deletions(-)

diff --git a/liminal/core/config/defaults/__init__.py b/liminal/core/config/defaults/__init__.py
new file mode 100644
index 0000000..217e5db
--- /dev/null
+++ b/liminal/core/config/defaults/__init__.py
@@ -0,0 +1,17 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
diff --git a/scripts/liminal b/scripts/liminal
index 3949744..48282cf 100755
--- a/scripts/liminal
+++ b/scripts/liminal
@@ -66,7 +66,7 @@ def build(path):
         liminal_apps_builder.build_liminal_apps(path)
 
 
-def deploy_liminal_core_internal(clean):
+def deploy_liminal_core_internal(liminal_home, clean):
     # noinspection PyTypeChecker
     with pkg_resources.path(dag, 'liminal_dags.py') as p:
         dags_path = p
@@ -85,6 +85,7 @@ def deploy_liminal_core_internal(clean):
         logging.info(
             f'Liminal was installed locally, changing the LIMINAL_VERSION parameter to {full_path}')
         os.environ[environment.LIMINAL_VERSION_PARAM_NAME] = full_path
+        shutil.copyfile(liminal_version[7:], os.path.join(liminal_home, local_file_name))
     if clean:
         docker_compose_command('down', ['--remove-orphans', '--rmi', 'local'])
         docker_compose_command('build', ['--no-cache'])
@@ -124,7 +125,7 @@ def deploy_liminal_apps(path, clean):
     liminal_home = environment.get_liminal_home()
     os.makedirs(liminal_home, exist_ok=True)
     os.makedirs(environment.get_dags_dir(), exist_ok=True)
-    deploy_liminal_core_internal(clean)
+    deploy_liminal_core_internal(liminal_home, clean)
     config_files = files_util.find_config_files(path)
     for config_file in config_files:
         click.echo(f"deploying liminal file: {config_file}")
diff --git a/setup.py b/setup.py
index f0fd02e..eae8d43 100644
--- a/setup.py
+++ b/setup.py
@@ -50,6 +50,7 @@ setuptools.setup(
     scripts=['scripts/liminal'],
     include_package_data=True,
     package_data={
-        'liminal': ['../DISCLAIMER', '../LICENSE', '../NOTICE', '../README.md']
+        'liminal': ['../DISCLAIMER', '../LICENSE', '../NOTICE', '../README.md',
+                    '../liminal/core/config/defaults/base/liminal.yml'],
     }
 )