Merge pull request GafferHQ#5605 from johnhaddon/arnoldAuth

CI : Authenticate for Arnold downloads

.github/workflows/main.yml

@@ -206,6 +206,8 @@ jobs:
             f.write( 'ARNOLD_ROOT=%s\n' % arnoldRoot )
       env:
         PYTHONUTF8: 1
+        ARNOLD_DOWNLOAD_USER: ${{ secrets.ARNOLD_DOWNLOAD_USER }}
+        ARNOLD_DOWNLOAD_PASSWORD: ${{ secrets.ARNOLD_DOWNLOAD_PASSWORD }}
       shell: python
 
     - name: Build Docs and Package

.github/workflows/main/installArnold.py

@@ -36,15 +36,12 @@
 import sys
 import argparse
 import os
+import pathlib
+import shutil
 import subprocess
-import urllib
+import urllib.request
 import zipfile
 
-if sys.version_info[0] < 3 :
-    from urllib import urlretrieve
-else:
-    from urllib.request import urlretrieve
-
 platform = { "darwin" : "darwin", "win32" : "windows" }.get( sys.platform, "linux" )
 format = { "win32" : "zip" }.get( sys.platform, "tgz" )
 
@@ -65,15 +62,27 @@
 
 url="https://forgithubci.solidangle.com/arnold/{}".format( archive )
 
-installDir = os.path.join( "arnoldRoot", args.version )
-os.makedirs( installDir )
-os.chdir( installDir )
+installDir = pathlib.Path.cwd() / "arnoldRoot" / args.version
+installDir.mkdir( parents = True, exist_ok = True )
+archiveFile = installDir /  archive
 
 print( "Downloading Arnold \"{}\"".format( url ) )
-archiveFile, headers = urlretrieve( url )
+
+authHandler = urllib.request.HTTPBasicAuthHandler()
+authHandler.add_password(
+    realm = None,
+    uri = url,
+    user = os.environ["ARNOLD_DOWNLOAD_USER"],
+    passwd = os.environ["ARNOLD_DOWNLOAD_PASSWORD"]
+)
+
+urllib.request.install_opener( urllib.request.build_opener( authHandler ) )
+with urllib.request.urlopen( url ) as inFile :
+    with open( archiveFile, "wb" ) as outFile :
+        shutil.copyfileobj( inFile, outFile )
 
 if format == "tgz" :
-    subprocess.check_call( [ "tar", "-xzf", archiveFile ] )
+    subprocess.check_call( [ "tar", "-xzf", archiveFile, "-C", installDir ] )
 elif format == "zip":
     with zipfile.ZipFile( archiveFile ) as f :
-        f.extractall()
+        f.extractall( path = installDir )