[ambari] branch trunk updated: [AMBARI-24706] Fix issues in ambari common python package publishing utility. (#2394)

[av...@apache.org]

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

avijayan pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/ambari.git


The following commit(s) were added to refs/heads/trunk by this push:
     new ece44a9  [AMBARI-24706] Fix issues in ambari common python package publishing utility. (#2394)
ece44a9 is described below

commit ece44a9a217423f54f8eb01a3fd17dbe53c1ee93
Author: avijayanhwx <av...@hortonworks.com>
AuthorDate: Thu Sep 27 12:11:59 2018 -0700

    [AMBARI-24706] Fix issues in ambari common python package publishing utility. (#2394)
---
 install-ambari-python.sh | 2 +-
 setup.py                 | 6 ++++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/install-ambari-python.sh b/install-ambari-python.sh
index eb7e853..c5d9e99 100755
--- a/install-ambari-python.sh
+++ b/install-ambari-python.sh
@@ -97,7 +97,7 @@ function deploy() {
   local version="$2"
   local repo_id="$3"
   local repo_url="$4"
-  mvn deploy:deploy-file -Dfile=$artifact_file -Dpackaging=tar.gz -DgeneratePom=true -Dversion=$version -DartifactId=ambari-python -DgroupId=org.apache.ambari -Durl="$repo_url" -DrepositoryId="$repo_url"
+  mvn gpg:sign-and-deploy-file -Dfile=$artifact_file -Dpackaging=tar.gz -DgeneratePom=true -Dversion=$version -DartifactId=ambari-python -DgroupId=org.apache.ambari -Durl="$repo_url" -DrepositoryId="$repo_url"
 }
 
 function run_setup_py() {
diff --git a/setup.py b/setup.py
index 0b7f2eb..47fc82d 100755
--- a/setup.py
+++ b/setup.py
@@ -23,6 +23,7 @@ from setuptools import find_packages, setup
 
 AMBARI_COMMON_PYTHON_FOLDER = "ambari-common/src/main/python"
 AMBARI_SERVER_TEST_PYTHON_FOLDER = "ambari-server/src/test/python"
+AMBARI_COMMON_TEST_PYTHON_FOLDER = "ambari-common/src/test/python"
 
 def get_ambari_common_packages():
   return find_packages(AMBARI_COMMON_PYTHON_FOLDER, exclude=["*.tests", "*.tests.*", "tests.*", "tests"])
@@ -31,7 +32,7 @@ def get_ambari_server_stack_package():
   return ["stacks.utils"]
 
 def get_extra_common_packages():
-  return ["urlinfo_processor", "ambari_jinja2", "ambari_jinja2._markupsafe"]
+  return ["urlinfo_processor", "ambari_jinja2", "ambari_jinja2._markupsafe", "mock", "mock.test"]
 
 def create_package_dir_map():
   package_dirs = {}
@@ -45,6 +46,8 @@ def create_package_dir_map():
   package_dirs["ambari_jinja2"] = AMBARI_COMMON_PYTHON_FOLDER + "/ambari_jinja2/ambari_jinja2"
   package_dirs["ambari_jinja2._markupsafe"] = AMBARI_COMMON_PYTHON_FOLDER + "/ambari_jinja2/ambari_jinja2/_markupsafe"
   package_dirs["urlinfo_processor"] = AMBARI_COMMON_PYTHON_FOLDER + "/urlinfo_processor"
+  package_dirs["mock"] = AMBARI_COMMON_TEST_PYTHON_FOLDER + "/mock"
+  package_dirs["mock.test"] = AMBARI_COMMON_TEST_PYTHON_FOLDER + "/mock/tests"
 
   return package_dirs
 
@@ -102,7 +105,6 @@ setup(
   packages = get_ambari_common_packages() + get_ambari_server_stack_package() + get_extra_common_packages(),
   package_dir = create_package_dir_map(),
   install_requires=[
-   'mock==1.0.1',
    'coilmq==1.0.1'
   ],
   include_package_data = True,