Axom + Conduit updates (#17863)

* Loosen Axom's variants, add shared variant for axom, fix clang/xlf rpath'ing problem on blueos

* Fix flake8

* Add main branch to list of known git branches
This commit is contained in:
Chris White
2020-08-12 18:15:59 -07:00
committed by GitHub
parent fa216e5f15
commit 105caa7297
3 changed files with 28 additions and 11 deletions

View File

@@ -40,7 +40,7 @@
VALID_VERSION = r'[A-Za-z0-9_.-]'
# Infinity-like versions. The order in the list implies the comparison rules
infinity_versions = ['develop', 'master', 'head', 'trunk']
infinity_versions = ['develop', 'main', 'master', 'head', 'trunk']
def int_if_int(string):