Merge branch 'master' into stable

whole-tale · Dec 21, 2022 · eae80ce · eae80ce
2 parents 58d890a + ad3bd51
commit eae80ce
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/gwvolman/build_utils.py b/gwvolman/build_utils.py
@@ -176,13 +176,13 @@ def run_r2d(self, tag, build_dir, dry_run=False, task=None):
             extra_args = " --build-arg FILE_INSTALLATION_KEY={} ".format(
                 os.environ.get("MATLAB_FILE_INSTALLATION_KEY")
             )
-        elif self.container_config.buildpack == "StataBuildPack":
+        elif self.container_config.buildpack == "StataBuildPack" and not dry_run:
             # License is also needed at build time but can't easily
             # be mounted. Pass it as a build arg
 
             source_path = os.path.join(
                 os.environ.get("HOSTDIR", "/host"),
-                _get_stata_license_path()
+                _get_stata_license_path()[1:]  # it's absolute
             )
             with open(source_path, "r") as license_file:
                 stata_license = license_file.read()

diff --git a/setup.py b/setup.py
@@ -2,7 +2,7 @@
 
 setup(
     name='gwvolman',
-    version='1.2rc2',
+    version='1.2rc3',
     description='An example girder worker extension',
     author='Kacper Kowalik',
     author_email='[email protected]',