Skip to content
This repository has been archived by the owner on Jul 21, 2022. It is now read-only.

adds RX_TILE_VRAY to fileutils path expressions #322

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
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
2 changes: 2 additions & 0 deletions conductor/lib/file_utils.py
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
RX_UDIM_MUDBOX = r"<UVTILE>" # image.<UVTILE>.exr
RX_UDIM_VRAY = r"\$\d*U.*\$\d*V" # image.u$2U_v$2V.exr or image.u$Uv$V.exr, etc
RX_TILE_REF_VRAY = r"<TileRef>" # image.<A30>.0001.exr
RX_TILE_VRAY = r"<Tile>" # image.<A30>.0001.exr
RX_HOUDINI = r"\$F\d*" # image.$F.exr
RX_ASTERISK = r"\*+" # image.*.exr
RX_UDIM_ZBRUSH = r"u<U>_v<V>" # image.u<U>_v<V>.exr
Expand All @@ -37,6 +38,7 @@
RX_UDIM_MUDBOX,
RX_UDIM_VRAY,
RX_TILE_REF_VRAY,
RX_TILE_VRAY,
RX_HOUDINI,
RX_FRAME_SEQ,
RX_ASTERISK,
Expand Down
2 changes: 1 addition & 1 deletion installers/rpm/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ curl -s -o python.tgz "https://www.python.org/ftp/python/2.7.11/Python-2.7.11.tg
tar zxf python.tgz
Python*/configure --prefix=${RPM_BUILDROOT}/opt/conductor/python && \
make && make install
curl -O "https://bootstrap.pypa.io/2.7/get-pip.py"
curl -O "https://bootstrap.pypa.io/pip/2.7/get-pip.py"
${RPM_BUILDROOT}/opt/conductor/python/bin/python get-pip.py
${RPM_BUILDROOT}/opt/conductor/python/bin/pip install -r ${SRC_DIR}/requirements.txt
popd
Expand Down