-
-
Notifications
You must be signed in to change notification settings - Fork 1.1k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #578 from alicevision/release/2019.2.0
Release 2019.2.0
- Loading branch information
Showing
6 changed files
with
52 additions
and
8 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,6 +1,6 @@ | ||
ARG CUDA_TAG=8.0 | ||
ARG OS_TAG=7 | ||
FROM alicevision/alicevision:centos${OS_TAG}-cuda${CUDA_TAG} | ||
FROM alicevision/alicevision:2.2.0-centos${OS_TAG}-cuda${CUDA_TAG} | ||
LABEL maintainer="AliceVision Team [email protected]" | ||
|
||
# Execute with nvidia docker (https://github.com/nvidia/nvidia-docker/wiki/Installation-(version-2.0)) | ||
|
@@ -46,12 +46,9 @@ COPY . "${MESHROOM_DEV}" | |
RUN source scl_source enable rh-python36 && cd "${MESHROOM_DEV}" && pip install -r dev_requirements.txt -r requirements.txt && python setup.py install_exe -d "${MESHROOM_BUNDLE}" && \ | ||
find ${MESHROOM_BUNDLE} -name "*Qt5Web*" -delete && \ | ||
find ${MESHROOM_BUNDLE} -name "*Qt5Designer*" -delete && \ | ||
rm ${MESHROOM_BUNDLE}/lib/PySide2/libclang.so* && \ | ||
rm -rf ${MESHROOM_BUNDLE}/lib/PySide2/typesystems/ ${MESHROOM_BUNDLE}/lib/PySide2/examples/ ${MESHROOM_BUNDLE}/lib/PySide2/include/ ${MESHROOM_BUNDLE}/lib/PySide2/Qt/translations/ ${MESHROOM_BUNDLE}/lib/PySide2/Qt/resources/ && \ | ||
rm ${MESHROOM_BUNDLE}/lib/PySide2/libQt5* && \ | ||
rm ${MESHROOM_BUNDLE}/lib/PySide2/QtWeb* && \ | ||
rm ${MESHROOM_BUNDLE}/lib/PySide2/libicu* && \ | ||
rm ${MESHROOM_BUNDLE}/lib/PySide2/pyside2-lupdate ${MESHROOM_BUNDLE}/lib/PySide2/pyside2-rcc ${MESHROOM_BUNDLE}/lib/PySide2/shiboken2 | ||
rm ${MESHROOM_BUNDLE}/lib/PySide2/pyside2-lupdate ${MESHROOM_BUNDLE}/lib/PySide2/pyside2-rcc | ||
|
||
# Install Qt (to build plugins) | ||
WORKDIR /tmp/qt | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,4 +1,4 @@ | ||
__version__ = "2019.1.0" | ||
__version__ = "2019.2.0" | ||
__version_name__ = __version__ | ||
|
||
import os | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,5 +1,5 @@ | ||
# Multiview pipeline version | ||
__version__ = "2.1" | ||
__version__ = "2.2" | ||
|
||
import os | ||
|
||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,5 +1,5 @@ | ||
# runtime | ||
psutil | ||
enum34;python_version<"3.4" | ||
PySide2==5.11.1 | ||
PySide2==5.13.0 | ||
markdown==2.6.11 |