Merge branch 'master' into loadUi-layout-fix

Author: mottosso

.travis.yml

@@ -1,6 +1,24 @@
 matrix:
   include:
 
+  # VFX Platform 2018
+  - os: linux
+    env:
+    - VFXPLATFORM=2018
+    - PYTHON=2.7
+  - os: linux
+    env:
+    - VFXPLATFORM=2018
+    - PYTHON=3.4
+  - os: linux
+    env:
+    - VFXPLATFORM=2018
+    - PYTHON=3.5
+  - os: linux
+    env:
+    - VFXPLATFORM=2018
+    - PYTHON=3.6
+
   # VFX Platform 2017
   - os: linux
     env:

CAVEATS.md

@@ -321,8 +321,10 @@ True
 
 `QtCompat.wrapInstance` differs across `sip` and `shiboken` in subtle ways.
 
+**Note**: This is not included on our tests, as we cannot reproduce this using PySide2 (build commit date `2017-08-25`), CY2018. It's likely that this issue persists in e.g. Maya version < 2018.
+
 ```python
-# PySide2
+# PySide2, untested
 >>> from Qt import QtCompat, QtWidgets
 >>> app = QtWidgets.QApplication(sys.argv)
 >>> button = QtWidgets.QPushButton("Hello world")

DOCKER.md

@@ -36,9 +36,9 @@ The Docker images follow the [VFX Reference Platform specifications](http://www.
 
 **Software versions**
 
-We use source code from around the time of [SIGGRAPH](http://www.siggraph.org) (usually July/August) each year. This is usually when the VFX Reference Platform is updated.
+We create new Docker containers when the VFX Reference Platform is updated; around the time of [SIGGRAPH](http://www.siggraph.org) (usually July/August) each year.
 
-In order to be able to re-build our images from a certain point in time, we checkout specific commit SHAs or source archives rather than going for the always-latest version of software. We then set up new images as required and add them to our continous integration tests.
+We abide the software versions stipulated by the VFX Platform reference. But for other software required by Qt.py, we checkout specific commit SHAs or source archives rather than going for the always-latest version of software. This also helps to re-build Docker images later, if needed.
 
 There are non-strict rules (guidelines) for choosing software versions to build:
 
@@ -50,6 +50,7 @@ Other noteworthy things:
 - PySide cannot be built with anything newer than Python 3.4.
 - SIP is used by both PyQt4 and PyQt5 and its version must therefore be chosen carefully.
 - PySide2 does not have a maintained `__version__` string as of Qt.py v1.1.0.b3.
+- All Qt bindings and Qt itself are built using their respective 5.6.x branch.
 
 <br>
 <br>
@@ -64,6 +65,46 @@ If there happens to be an update inbetween VFX Platform specifications, a revisi
 <br>
 
 
+**Enter the container**
+
+For debugging reasons, you can enter the container like this:
+
+```bash
+docker run --rm --interactive --tty --entrypoint=bash fredrikaverpil/qt.py:2017
+```
+
+You can then run `python2.7`, `python3.4`, `python3.5`, `python3.6` and so on (depending on which Python versions were built).
+
+<br>
+<br>
+
+
+**Dockerfile.vfxplatform2018**
+
+| Software | Date | Details |
+| -------- | ---- | --------------- |
+| PySide2 | 2017-08-24 | [commit](http://code.qt.io/cgit/pyside/pyside-setup.git/commit/?h=5.6&id=117e0ff91275b4bc06dd5383f19e7028c5ef6ff8) |
+| PySide | 2015-10-15 | [commit](https://github.com/pyside/pyside-setup/commit/7860bda363438e96fa9e810def0858635a9766cc) |
+| SIP | 2016-07-25 | [v4.18.1](https://sourceforge.net/projects/pyqt/files/sip/) |
+| PyQt5 | 2016-04-25 | [v5.6](https://sourceforge.net/projects/pyqt/files/PyQt5/) |
+| PyQt4 | 2015-08-01 | [v4.11.4](https://sourceforge.net/projects/pyqt/files/PyQt4/) |
+| Python 2.7 | 2015-12-05 | [v2.7.11](https://www.python.org/downloads/source/) |
+| Python 3.4 | 2017-08-09 | [v3.4.7](https://www.python.org/downloads/source/) |
+| Python 3.5 | 2017-08-08 | [v3.5.4](https://www.python.org/downloads/source/) |
+| Python 3.6 | 2017-07-17 | [v3.6.2](https://www.python.org/downloads/source/) |
+| Qt5 | 2016-06-16 | [commit](http://code.qt.io/cgit/qt/qt5.git/commit/?h=5.6&id=4566f0ac50e5ea143943c1251028fb01c70289ce) |
+| Adsk Qt5 `qtbase` | 2017-06-07 | [commit](https://github.com/autodesk-forks/qtbase/commit/c4e51d0162f7619c83e25e623ecd3bc549932040) |
+| Adsk Qt5 `qtx11extras` | 2017-02-24 | [commit](https://github.com/autodesk-forks/qtx11extras/commit/c6c59d5d902db8be3661cab929be85a38fda0faa) |
+| Qt5 Creator | 2017-08-09 | [commit](http://code.qt.io/cgit/qt-creator/qt-creator.git/commit/?h=4.3&id=a094841bdda5461ebeaeab4620dde8222fa8312d) |
+| Qt4 | 2015-10-23 | [commit](http://code.qt.io/cgit/qt/qt.git/commit/?id=0a2f2382541424726168804be2c90b91381608c6) |
+| cmake | 2017-07-18 | [v3.9.0](https://cmake.org/files/) |
+| glibc | 2012 (installed via yum) | 2.17 |
+| gcc | 2015 (installed via devtoolset-4) | [v5.3.1] |
+
+<br>
+<br>
+
+
 **Dockerfile.vfxplatform2017**
 
 | Software | Date | Details |

Dockerfile.vfxplatform2017

@@ -703,6 +703,9 @@ ENV LD_LIBRARY_PATH="/usr/local/Qt-${QT5_VER}/lib:${LD_LIBRARY_PATH}"
 # http://www.torkwrench.com/2011/12/16/d-bus-library-appears-to-be-incorrectly-set-up-failed-to-read-machine-uuid-failed-to-open-varlibdbusmachine-id/
 RUN dbus-uuidgen > /var/lib/dbus/machine-id
 
+# VFX Platform
+ENV VFXPLATFORM 2017
+
 # Enable additional output from Qt.py
 ENV QT_VERBOSE true
 ENV QT_TESTING true