Skip to content

Commit

Permalink
Fix python interpreter of tests
Browse files Browse the repository at this point in the history
  • Loading branch information
LucaScheller committed Mar 21, 2024
1 parent 970a25e commit cfeb491
Show file tree
Hide file tree
Showing 4 changed files with 5 additions and 5 deletions.
6 changes: 3 additions & 3 deletions .github/scripts/maya.py
Original file line number Diff line number Diff line change
Expand Up @@ -179,11 +179,11 @@ def install_autodesk_product(product, version, install_dir_path):
os.chmod(python_configure_file_path, 0o777)
logging.info("Configuring Python Build")
command = [python_configure_file_path, "--enable-shared", "--prefix", python_install_dir_path]
process = subprocess.check_call(command, stdout=subprocess.PIPE, stderr=subprocess.PIPE, cwd=python_version_dir_path)
process = subprocess.check_call(command, stdout=subprocess.PIPE, stderr=subprocess.PIPE, cwd=python_version_dir_path)
logging.info("Building Python")
process = subprocess.check_call(["make"], stdout=subprocess.DEVNULL, stderr=subprocess.PIPE, cwd=python_version_dir_path)
logging.info("Installing Python")
process = subprocess.check_call(["make", "install"], stdout=subprocess.DEVNULL, stderr=subprocess.PIPE, cwd=python_version_dir_path)
process = subprocess.check_call(["make", "install"], stdout=subprocess.DEVNULL, stderr=subprocess.PIPE, cwd=python_version_dir_path)
# Maya USD SDK
maya_usd_sdk_releases = get_autodesk_maya_usd_sdk_releases(autodesk_platform, autodesk_maya_version)
maya_usd_sdk_latest_release = maya_usd_sdk_releases[0]
Expand All @@ -202,7 +202,7 @@ def install_autodesk_product(product, version, install_dir_path):
# command = ["rpm", "-e", maya_usd_sdk_extract_rpm_file_name.replace(".rpm", "")]
# process = subprocess.check_call(command, cwd=maya_usd_sdk_extract_dir_path)
command = ["rpm", "-i", "--nodeps","--prefix", maya_usd_sdk_extract_dir_path, maya_usd_sdk_extract_rpm_file_path]
process = subprocess.check_call(command, cwd=maya_usd_sdk_extract_dir_path)
process = subprocess.check_call(command, stdout=subprocess.DEVNULL, stderr=subprocess.PIPE, cwd=maya_usd_sdk_extract_dir_path)
maya_usd_sdk_extract_usd_dir_path = glob.glob("{root_dir}{sep}**{sep}mayausd{sep}USD".format(root_dir=maya_usd_sdk_extract_dir_path, sep=os.path.sep), recursive=True)[0]
maya_usd_sdk_extract_usd_dir_path = os.path.join(maya_usd_sdk_extract_dir_path, maya_usd_sdk_extract_usd_dir_path)
os.rename(maya_usd_sdk_extract_usd_dir_path, maya_usd_sdk_install_dir_path)
Expand Down
Empty file modified build.sh
100644 → 100755
Empty file.
2 changes: 1 addition & 1 deletion setup.sh
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ then
export REPO_SOURCED=1
export REPO_ROOT=$(cd "$(dirname "${BASH_SOURCE[0]}")" &> /dev/null && (pwd -W 2> /dev/null || pwd))
# Define Resolver > Has to be one of 'fileResolver'/'pythonResolver'/'cachedResolver'/'httpResolver'
export AR_RESOLVER_NAME=cachedResolver
export AR_RESOLVER_NAME=pythonResolver
export AR_RESOLVER_NAME_UPPERCASE=$(echo ${AR_RESOLVER_NAME} | tr '[:lower:]' '[:upper:]')
# DCC
export AR_DCC_NAME=HOUDINI
Expand Down
2 changes: 1 addition & 1 deletion src/PythonResolver/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,7 @@ set(TESTS_ENV_LD_LIBRARY_PATH "LD_LIBRARY_PATH=${CMAKE_INSTALL_PREFIX}/${AR_PYTH
set(TESTS_ENV_AR_SEARCH_PATHS "AR_SEARCH_PATHS=/env/search/pathA:/env/search/pathB")
set(TESTS_ENV_AR_SEARCH_REGEX_EXPRESSION "AR_SEARCH_REGEX_EXPRESSION=(v\\d\\d\\d)")
set(TESTS_ENV_AR_SEARCH_REGEX_FORMAT "AR_SEARCH_REGEX_FORMAT=v000")
set(TESTS_PYTHON_COMMAND $ENV{HFS}/python/bin/python -B -m unittest discover ${TESTS_SOURCE_DIR})
set(TESTS_PYTHON_COMMAND ${AR_PYTHON_EXECUTABLE} -B -m unittest discover ${TESTS_SOURCE_DIR})

add_test(
NAME testPythonResolver
Expand Down

0 comments on commit cfeb491

Please sign in to comment.