Merge branch 'minor' into topic/callbacks

cropsinsilico · Sep 15, 2023 · b5e0f36 · b5e0f36
2 parents 451808f + 86c8e31
commit b5e0f36
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/yggdrasil/languages/R/install.py b/yggdrasil/languages/R/install.py
@@ -183,6 +183,7 @@ def install_packages(package_list, update=False, repos=None, **kwargs):
                     f'  install.packages("devtools", repos="{repos}", '
                     f'dependencies=TRUE)',
                     "}",
+                    "library(devtools)",
                     # ('packageurl <- \"http://cran.r-project.org/src/contrib/Archive/%s/'
                     #  '%s_%s.tar.gz\"') % (x['name'], x['name'], x['ver'])
                 ]
@@ -399,7 +400,8 @@ def install(args=None, with_sudo=None, skip_requirements=None,
             requirements = requirements_from_description()
             if os.environ.get('BUILDDOCS', '') == '1':
                 requirements += ['roxygen2', 'Rd2md']
-            requirements.insert(0, 'vdiffr (<= 1.0.5)')
+            if 'linux' in sys.platform:
+                requirements.insert(0, 'vdiffr (<= 1.0.5)')
             if not install_packages(requirements, update=update_requirements,
                                     R_exe=Rscript_exe, **kwargs):
                 logger.error("Failed to install dependencies")