Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 6 additions & 5 deletions _core_upgrader.py
Original file line number Diff line number Diff line change
Expand Up @@ -51,11 +51,12 @@

# get yaml and our shotgun API from the local install
# which comes with the upgrader. This is the code we are about to upgrade TO.
Comment thread
julien-lang marked this conversation as resolved.
vendor = os.path.abspath(
os.path.join(os.path.dirname(__file__), "python", "tank_vendor")
)
sys.path.append(vendor)
import yaml
python_folder = os.path.abspath(os.path.join(os.path.dirname(__file__), "python"))
# Insert at the beginning to ensure local tk-core takes precedence over
# any installed version in site-packages
sys.path.insert(0, python_folder)

from tank_vendor import yaml

###################################################################################################
# migration utilities
Expand Down