From 5d559eb202917191a47e895065bcfcf2c2a7030a Mon Sep 17 00:00:00 2001 From: Paul Talbot Date: Mon, 3 Aug 2020 13:39:33 -0600 Subject: [PATCH] relocated heron to new open repo (#1288) * relocated heron to new open repo * python2 install all plugins compatability * all caps for heron * more capitalization things * updated to windows-friendly solvers --- .gitmodules | 6 +++--- plugins/HERON | 1 + plugins/heron | 1 - scripts/plugin_handler.py | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) create mode 160000 plugins/HERON delete mode 160000 plugins/heron diff --git a/.gitmodules b/.gitmodules index 52869f2bfd..9964c42498 100644 --- a/.gitmodules +++ b/.gitmodules @@ -10,6 +10,6 @@ [submodule "plugins/SRAW"] path = plugins/SRAW url = git@hpcgitlab.hpc.inl.gov:RAVEN_PLUGINS/SRAW.git -[submodule "plugins/heron"] - path = plugins/heron - url = git@hpcgitlab.hpc.inl.gov:RAVEN_PLUGINS/heron.git +[submodule "plugins/HERON"] + path = plugins/HERON + url = git@github.com:idaholab/HERON.git diff --git a/plugins/HERON b/plugins/HERON new file mode 160000 index 0000000000..5ffd43435e --- /dev/null +++ b/plugins/HERON @@ -0,0 +1 @@ +Subproject commit 5ffd43435e360d07ef5a9c01a1dcb377d54b9bb0 diff --git a/plugins/heron b/plugins/heron deleted file mode 160000 index cee70f43f4..0000000000 --- a/plugins/heron +++ /dev/null @@ -1 +0,0 @@ -Subproject commit cee70f43f4884f0bbb8f9c0c9bb61ca9ae2bdb21 diff --git a/scripts/plugin_handler.py b/scripts/plugin_handler.py index 9e4fae7015..81a39710d9 100755 --- a/scripts/plugin_handler.py +++ b/scripts/plugin_handler.py @@ -99,7 +99,7 @@ def updatePluginXML(root, name, location): @ In, location, str, location of plugin on disk @ Out, match, xml.etree.ElementTree.Element, updated element """ - match = root.findall('./plugin/name[.=\'{}\']/..'.format(name))[0] + match = root.findall('./plugin/[name=\'{}\']'.format(name))[0] oldPath = match.find('location').text # nothing to do if old path and new path are the same! if oldPath != location: