Merge branch 'master' into zack-jwt-env-var-changelog

Author: bcwu

CHANGELOG.md

@@ -4,10 +4,16 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
-## [Unreleased]
+## [1.13.0] - 2022-12-02
 
+### Added
 - When running rsconnect bootstrap, you can now specify the jwt secret using the CONNECT_BOOTSTRAP_SECRETKEY environment variable. 
 
+### Changed
+- Update pip_freeze to use `pip freeze` since Connect filters for valid package paths in the backend and it no longer depends on the undocumented behavior of `pip list --format=freeze`. This reverts the change made in 1.5.2.
+
+- Renamed the deploy_html `excludes` flag to `exclude` for consistency with other deploy commands.
+
 ## [1.12.1] - 2022-11-07
 
 ### Changed

rsconnect/bundle.py

@@ -190,8 +190,8 @@ def write_manifest(
     nb_name: str,
     environment: Environment,
     output_dir: str,
-    hide_all_input: bool,
-    hide_tagged_input: bool,
+    hide_all_input: bool = False,
+    hide_tagged_input: bool = False,
     image: str = None,
 ) -> typing.Tuple[list, list]:
     """Create a manifest for source publishing the specified notebook.

rsconnect/environment.py

@@ -43,15 +43,15 @@
 
 
 def MakeEnvironment(
-    conda=None,  # type: Optional[str]
-    contents="",  # type: Optional[str]
-    error=None,  # type: Optional[str]
-    filename="",  # type: Optional[str]
-    locale="",  # type: Optional[str]
-    package_manager="",  # type: Optional[str]
-    pip=None,  # type: Optional[str]
-    python=None,  # type: Optional[str]
-    source=None,  # type: Optional[str]
+    conda: Optional[str] = None,
+    contents: Optional[str] = None,
+    error: Optional[str] = None,
+    filename: Optional[str] = None,
+    locale: Optional[str] = None,
+    package_manager: Optional[str] = None,
+    pip: Optional[str] = None,
+    python: Optional[str] = None,
+    source: Optional[str] = None,
 ):
     return Environment(conda, contents, error, filename, locale, package_manager, pip, python, source)
 
@@ -218,7 +218,7 @@ def pip_freeze():
     """
     try:
         proc = subprocess.Popen(
-            [sys.executable, "-m", "pip", "list", "--format=freeze"],
+            [sys.executable, "-m", "pip", "freeze"],
             stdout=subprocess.PIPE,
             stderr=subprocess.PIPE,
             universal_newlines=True,

rsconnect/main.py

@@ -245,8 +245,9 @@ def cli(future):
     certificate file to use for TLS.  The last two items are only relevant if the
     URL specifies the "https" protocol.
 
-    For RStudio Cloud and shinyapps.io, the information needed to connect includes
-    the account, auth token, auth secret, and server ('rstudio.cloud' or 'shinyapps.io').
+    For RStudio Cloud, the information needed to connect includes the auth token, auth
+    secret, and server ('rstudio.cloud'). For shinyapps.io, the auth token, auth secret,
+    server ('shinyapps.io'), and account are needed.
     """
     global future_enabled
     future_enabled = future
@@ -292,6 +293,7 @@ def _test_rstudio_creds(server: api.RStudioServer):
 @cli.command(
     short_help="Create an initial admin user to bootstrap a Connect instance.",
     help="Creates an initial admin user to bootstrap a Connect instance. Returns the provisionend API key.",
+    no_args_is_help=True,
 )
 @click.option(
     "--server",
@@ -376,6 +378,7 @@ def bootstrap(
         "Specifying an existing nickname will cause its stored information to be replaced by what is given "
         "on the command line."
     ),
+    no_args_is_help=True,
 )
 @click.option("--name", "-n", required=True, help="The nickname of the Posit Connect server to deploy to.")
 @click.option(
@@ -505,6 +508,7 @@ def list_servers(verbose):
         "API key is valid for authentication for that server.  It may also be used to verify that the "
         "information stored as a nickname is still valid."
     ),
+    no_args_is_help=True,
 )
 @server_args
 @cli_exception_handler
@@ -547,6 +551,7 @@ def details(name, server, api_key, insecure, cacert, verbose):
         "Remove the information about a Posit Connect server by nickname or URL. "
         "One of --name or --server is required."
     ),
+    no_args_is_help=True,
 )
 @click.option("--name", "-n", help="The nickname of the Posit Connect server to remove.")
 @click.option("--server", "-s", help="The URL of the Posit Connect server to remove.")
@@ -602,6 +607,7 @@ def _get_names_to_check(file_or_directory):
         "information about it"
         "s deployments are saved on a per-server basis."
     ),
+    no_args_is_help=True,
 )
 @click.argument("file", type=click.Path(exists=True, dir_okay=True, file_okay=True))
 def info(file):
@@ -724,6 +730,7 @@ def _warn_on_ignored_requirements(directory, requirements_file_name):
         "page. If the notebook is deployed as a static HTML page (--static), it cannot be scheduled or "
         "rerun on the Connect server."
     ),
+    no_args_is_help=True,
 )
 @server_args
 @content_args
@@ -845,6 +852,7 @@ def deploy_notebook(
         'file.  The specified file must either be named "manifest.json" or '
         'refer to a directory that contains a file named "manifest.json".'
     ),
+    no_args_is_help=True,
 )
 @server_args
 @content_args
@@ -899,6 +907,7 @@ def deploy_manifest(
         "\n\n"
         "FILE_OR_DIRECTORY is the path to a single-file Quarto document or the directory containing a Quarto project."
     ),
+    no_args_is_help=True,
 )
 @server_args
 @content_args
@@ -1021,6 +1030,7 @@ def deploy_quarto(
     name="html",
     short_help="Deploy html content to Posit Connect.",
     help=("Deploy an html file, or directory of html files with entrypoint, to Posit Connect."),
+    no_args_is_help=True,
 )
 @server_args
 @content_args
@@ -1030,7 +1040,7 @@ def deploy_quarto(
     help=("The name of the html file that is the landing page."),
 )
 @click.option(
-    "--excludes",
+    "--exclude",
     "-x",
     multiple=True,
     help=(
@@ -1051,7 +1061,7 @@ def deploy_html(
     path: str = None,
     entrypoint: str = None,
     extra_files=None,
-    excludes=None,
+    exclude=None,
     title: str = None,
     env_vars: typing.Dict[str, str] = None,
     verbose: bool = False,
@@ -1079,7 +1089,7 @@ def deploy_html(
             path,
             entrypoint,
             extra_files,
-            excludes,
+            exclude,
         )
         .deploy_bundle()
         .save_deployed_info()
@@ -1092,12 +1102,14 @@ def generate_deploy_python(app_mode, alias, min_version):
     @deploy.command(
         name=alias,
         short_help="Deploy a {desc} to Posit Connect [v{version}+], Posit Cloud, or shinyapps.io.".format(
-            desc=app_mode.desc(), version=min_version
+            desc=app_mode.desc(),
+            version=min_version,
         ),
         help=(
             "Deploy a {desc} module to Posit Connect, Posit Cloud, or shinyapps.io (if supported by the platform). "
             'The "directory" argument must refer to an existing directory that contains the application code.'
         ).format(desc=app_mode.desc()),
+        no_args_is_help=True,
     )
     @server_args
     @content_args
@@ -1224,6 +1236,7 @@ def deploy_app(
     name="other-content",
     short_help="Describe deploying other content to Posit Connect.",
     help="Show help on how to deploy other content to Posit Connect.",
+    no_args_is_help=True,
 )
 def deploy_help():
     text = (