Repository: incubator-systemml Updated Branches: refs/heads/master 9802c4b0b -> 5dd4d44ec
[SYSTEMML-1614] Updated python pre_setup and classloader for TLP jar names Removed '-incubating' from file pattern matching expression for python pre_setup and classloader so the renamed jar is found. Closes #510. Project: http://git-wip-us.apache.org/repos/asf/incubator-systemml/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-systemml/commit/5dd4d44e Tree: http://git-wip-us.apache.org/repos/asf/incubator-systemml/tree/5dd4d44e Diff: http://git-wip-us.apache.org/repos/asf/incubator-systemml/diff/5dd4d44e Branch: refs/heads/master Commit: 5dd4d44ecb44ab4fff4db3954fa09ff137e4b8ba Parents: 9802c4b Author: Glenn Weidner <gweid...@us.ibm.com> Authored: Tue May 23 12:22:52 2017 -0700 Committer: Glenn Weidner <gweid...@us.ibm.com> Committed: Tue May 23 12:22:53 2017 -0700 ---------------------------------------------------------------------- src/main/python/pre_setup.py | 6 ++++-- src/main/python/systemml/classloader.py | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/5dd4d44e/src/main/python/pre_setup.py ---------------------------------------------------------------------- diff --git a/src/main/python/pre_setup.py b/src/main/python/pre_setup.py index cb421a9..0b7d7b5 100644 --- a/src/main/python/pre_setup.py +++ b/src/main/python/pre_setup.py @@ -30,9 +30,11 @@ if os.path.exists(java_dir_full_path): os.mkdir(java_dir_full_path) root_dir = os.path.dirname(os.path.dirname(os.path.dirname(os.getcwd()))) for file in os.listdir(os.path.join(root_dir, 'target')): - if fnmatch.fnmatch(file, 'systemml-*-incubating-SNAPSHOT.jar') or fnmatch.fnmatch(file, 'systemml-*-incubating.jar'): + if (fnmatch.fnmatch(file, 'systemml-*-SNAPSHOT.jar') or fnmatch.fnmatch(file, 'systemml-*.jar') + and not (fnmatch.fnmatch(file, 'systemml-*javadoc.jar') + or fnmatch.fnmatch(file, 'systemml-*sources.jar'))): shutil.copyfile(os.path.join(root_dir, 'target', file), os.path.join(java_dir_full_path, file)) - if fnmatch.fnmatch(file, 'systemml-*-incubating-SNAPSHOT-extra.jar') or fnmatch.fnmatch(file, 'systemml-*-incubating-extra.jar'): + if fnmatch.fnmatch(file, 'systemml-*-SNAPSHOT-extra.jar') or fnmatch.fnmatch(file, 'systemml-*-extra.jar'): shutil.copyfile(os.path.join(root_dir, 'target', file), os.path.join(java_dir_full_path, file)) http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/5dd4d44e/src/main/python/systemml/classloader.py ---------------------------------------------------------------------- diff --git a/src/main/python/systemml/classloader.py b/src/main/python/systemml/classloader.py index 45fe4de..8738dc5 100644 --- a/src/main/python/systemml/classloader.py +++ b/src/main/python/systemml/classloader.py @@ -43,7 +43,7 @@ def _getJarFileName(sc, suffix): jar_file_name = '_ignore.jar' java_dir = os.path.join(imp.find_module("systemml")[1], "systemml-java") for file in os.listdir(java_dir): - if fnmatch.fnmatch(file, 'systemml-*-incubating-SNAPSHOT' + suffix + '.jar') or fnmatch.fnmatch(file, 'systemml-*-incubating' + suffix + '.jar'): + if fnmatch.fnmatch(file, 'systemml-*-SNAPSHOT' + suffix + '.jar') or fnmatch.fnmatch(file, 'systemml-*' + suffix + '.jar'): jar_file_name = os.path.join(java_dir, file) return jar_file_name