Merge branch 'master' into mm-project-setup

posit-dev · Oct 20, 2023 · 31af51f · 31af51f
2 parents 91fcc46 + 439c1a4
commit 31af51f
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 0 deletions.
diff --git a/rsconnect/bundle.py b/rsconnect/bundle.py
@@ -1590,6 +1590,7 @@ def inspect_environment(
     if len(flags) > 0:
         args.append("-" + "".join(flags))
     args.append(directory)
+
     try:
         environment_json = check_output(args, universal_newlines=True)
     except subprocess.CalledProcessError as e:

diff --git a/rsconnect/environment.py b/rsconnect/environment.py
@@ -49,6 +49,7 @@ def MakeEnvironment(
     pip: Optional[str] = None,
     python: Optional[str] = None,
     source: Optional[str] = None,
+    **kwargs,  # provides compatibility where we no longer support some older properties
 ):
     return Environment(contents, error, filename, locale, package_manager, pip, python, source)