Merge tag '0.60.0.0' into hy-master

.github/workflows/main.yml

@@ -29,35 +29,33 @@ jobs:
         # and then use `include` to define their settings.
 
         name: [
-          linux,
-          linux-debug,
+          linux-python2,
+          linux-python2-debug,
           linux-python3,
-          macos,
+          macos-python2,
         ]
 
         include:
 
-          - name: linux
+          - name: linux-python2
             os: ubuntu-16.04
             buildType: RELEASE
-            variant: linux-python2
             publish: true
             containerImage: gafferhq/build:1.2.0
-            dependenciesURL: https://github.com/GafferHQ/dependencies/releases/download/2.3.0/gafferDependencies-2.3.0-Python2-linux.tar.gz
+            dependenciesURL: https://github.com/GafferHQ/dependencies/releases/download/3.0.0/gafferDependencies-3.0.0-Python2-linux.tar.gz
             # GitHub container builds run as root. This causes failures for tests that
             # assert that filesystem permissions are respected, because root doesn't
             # respect permissions. So we run the final test suite as a dedicated
             # test user rather than as root.
             testRunner: su testUser -c
             sconsCacheMegabytes: 400
 
-          - name: linux-debug
+          - name: linux-python2-debug
             os: ubuntu-16.04
             buildType: DEBUG
-            variant: linux-python2
             publish: false
             containerImage: gafferhq/build:1.2.0
-            dependenciesURL: https://github.com/GafferHQ/dependencies/releases/download/2.3.0/gafferDependencies-2.3.0-Python2-linux.tar.gz
+            dependenciesURL: https://github.com/GafferHQ/dependencies/releases/download/3.0.0/gafferDependencies-3.0.0-Python2-linux.tar.gz
             testRunner: su testUser -c
             # Debug builds are ludicrously big, so we must use a larger cache
             # limit. In practice this compresses down to 4-500Mb.
@@ -66,20 +64,18 @@ jobs:
           - name: linux-python3
             os: ubuntu-16.04
             buildType: RELEASE
-            variant: linux-python3
             publish: true
             containerImage: gafferhq/build:1.2.0
-            dependenciesURL: https://github.com/GafferHQ/dependencies/releases/download/2.3.0/gafferDependencies-2.3.0-Python3-linux.tar.gz
+            dependenciesURL: https://github.com/GafferHQ/dependencies/releases/download/3.0.0/gafferDependencies-3.0.0-Python3-linux.tar.gz
             testRunner: su testUser -c
             sconsCacheMegabytes: 400
 
-          - name: macos
+          - name: macos-python2
             os: macos-10.15
             buildType: RELEASE
-            variant: macos-python2
             publish: true
             containerImage:
-            dependenciesURL: https://github.com/GafferHQ/dependencies/releases/download/2.3.0/gafferDependencies-2.3.0-Python2-osx.tar.gz
+            dependenciesURL: https://github.com/GafferHQ/dependencies/releases/download/3.0.0/gafferDependencies-3.0.0-Python2-osx.tar.gz
             testRunner: bash -c
             sconsCacheMegabytes: 400
 
@@ -129,7 +125,7 @@ jobs:
         echo GAFFER_SPHINX=`which sphinx-build` >> $GITHUB_ENV
       env:
        GITHUB_ACCESS_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-       GAFFER_BUILD_VARIANT: ${{ matrix.variant }}
+       GAFFER_BUILD_VARIANT: ${{ matrix.name }}
 
     - name: Disable macOS PR Docs
       run: |
@@ -161,6 +157,10 @@ jobs:
        scons -j 2 build BUILD_TYPE=${{ matrix.buildType }} OPTIONS=.github/workflows/main/sconsOptions
 
     - name: Test
+      # Tests should complete in well under an hour. If they don't it's most likely because
+      # of a hang, in which case we'd like to know more quickly than the default 6hr timeout
+      # allows.
+      timeout-minutes: 60
       run: |
         echo "::add-matcher::./.github/workflows/main/problemMatchers/unittest.json"
         ${{ matrix.testRunner }} "${{ env.GAFFER_BUILD_DIR }}/bin/gaffer test"

.github/workflows/main/installDependencies.py

@@ -37,13 +37,17 @@
 import os
 import sys
 import argparse
-import urllib
 import hashlib
 
+if sys.version_info[0] < 3 :
+	from urllib import urlretrieve
+else :
+	from urllib.request import urlretrieve
+
 # Determine default archive URL.
 
 platform = "osx" if sys.platform == "darwin" else "linux"
-defaultURL = "https://github.com/GafferHQ/dependencies/releases/download/2.1.1/gafferDependencies-2.1.1-Python2-" + platform + ".tar.gz"
+defaultURL = "https://github.com/ImageEngine/cortex/releases/download/10.2.0.0-a2/cortex-10.2.0.0-a2-" + platform + "-python2.tar.gz"
 
 # Parse command line arguments.
 
@@ -74,7 +78,7 @@
 # Download and unpack the archive.
 
 sys.stderr.write( "Downloading dependencies \"%s\"\n" % args.archiveURL )
-archiveFileName, headers = urllib.urlretrieve( args.archiveURL )
+archiveFileName, headers = urlretrieve( args.archiveURL )
 
 os.makedirs( args.dependenciesDir )
 os.system( "tar xf %s -C %s --strip-components=1" % ( archiveFileName, args.dependenciesDir ) )

.github/workflows/main/setBuildVars.py

@@ -118,7 +118,6 @@
 # We have a couple of naming conventions for builds, depending on the nature of the trigger.
 
 formatVars = {
-	"buildTypeSuffix" : "-debug" if os.environ.get( "BUILD_TYPE", "" ) == "DEBUG" else "",
 	"variant" : os.environ["GAFFER_BUILD_VARIANT"],
 	"timestamp" : datetime.datetime.now().strftime( "%Y_%m_%d_%H%M" ),
 	"pullRequest" : pullRequest,
@@ -128,9 +127,9 @@
 }
 
 nameFormats = {
-	"default" : "gaffer-{timestamp}-{shortCommit}-{variant}{buildTypeSuffix}",
-	"pull_request" : "gaffer-pr{pullRequest}-{branch}-{timestamp}-{shortCommit}-{variant}{buildTypeSuffix}",
-	"release" : "gaffer-{tag}-{variant}{buildTypeSuffix}"
+	"default" : "gaffer-{timestamp}-{shortCommit}-{variant}",
+	"pull_request" : "gaffer-pr{pullRequest}-{branch}-{timestamp}-{shortCommit}-{variant}",
+	"release" : "gaffer-{tag}-{variant}"
 }
 
 trigger = os.environ.get( 'GITHUB_EVENT_NAME', '' )

.github/workflows/whitespaceCheck.yml

@@ -0,0 +1,13 @@
+name: Whitespace check
+on: [ pull_request ]
+jobs:
+  check:
+    runs-on: ubuntu-16.04
+    steps:
+    - uses: actions/checkout@v2
+      with:
+        # So that we get the branch for `base_ref`.
+        fetch-depth: 0
+    - name: Check whitespace
+      run: |
+        git -c core.whitespace=indent-with-non-tab,tabwidth=1 diff --check refs/remotes/origin/${{ github.base_ref }} include src python

.gitignore

@@ -5,6 +5,8 @@
 *.swp
 *.so
 *.tmp
+*.desktop
+*.code-workspace
 .gafferBackups
 .idea
 .sconf_temp