Skip to content

Commit

Permalink
Merge pull request #417 from rstudio/bcwu-fix-write-manifest-extra
Browse files Browse the repository at this point in the history
fix extra files not being included in write-manifest
  • Loading branch information
bcwu authored May 10, 2023
2 parents 6edf6ec + 7a46fde commit 4accf4c
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 20 deletions.
21 changes: 6 additions & 15 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,31 +3,22 @@ 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.17.0] - 2023-XX-XX

### Added
- `deploy html` and `deploy manifest` now support deployment to Posit Cloud.

- Added `system caches list` and `system caches delete` commands which allow administrators to enumerate and delete R and Python runtime caches from Connect servers [#384](https://github.com/rstudio/rsconnect-python/pull/384). Read more about the feature in our [docs](https://docs.posit.co/connect/admin/server-management/runtime-caches/).

### Changed
- Cloud deployments accept the content id instead of application id in the --app-id field.
- The `app_id` field in application store files also stores the content id instead of the application id.
- Application store files include a `version` field, set to 1 for this release.

## Unreleased

### Fixed
- getdefaultlocale deprecated

## Unreleased

### Fixed

- cacert read error when adding/updating a server.

## Unreleased

### Added
- Added `system caches list` and `system caches delete` commands which allow administrators to enumerate and delete R and Python runtime caches from Connect servers.
- cacert read error when adding/updating a server [#403](https://github.com/rstudio/rsconnect-python/issues/403).
- getdefaultlocale no longer work with newer versions of Python [#397](https://github.com/rstudio/rsconnect-python/issues/397) [#399](https://github.com/rstudio/rsconnect-python/issues/399).
- extra files not being included in write-manifest [#416](https://github.com/rstudio/rsconnect-python/issues/416).

## [1.16.0] - 2023-03-27

Expand Down
4 changes: 3 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -1004,7 +1004,7 @@ A full description on how to use `rsconnect bootstrap` in a provisioning workflo
## Server Administration Tasks
Starting with the 2023.04 edition of Posit Connect, `rsconnect-python` can be
Starting with the 2023.05 edition of Posit Connect, `rsconnect-python` can be
used to perform certain server administration tasks, such as instance managing
runtime caches. For more information on runtime caches in Posit Connect, see the
Connect Admin Guide's section on [runtime
Expand All @@ -1015,6 +1015,7 @@ server information. See [Managing Server
Information](#managing-server-information) above for more details.
### Enumerate Runtime Caches
*New in Connect 2023.05*
Use the command below to enumerate runtime caches on a Connect server. The
command will output a JSON object containing a list of runtime caches . Each
Expand Down Expand Up @@ -1059,6 +1060,7 @@ rsconnect system caches list --name myserver
> of names.
### Delete Runtime Caches
*New in Connect 2023.05*
When Connect's execution environment changes, runtime caches may be invalidated.
In these cases, you will need to delete the affected runtime caches using the
Expand Down
4 changes: 0 additions & 4 deletions rsconnect/main.py
Original file line number Diff line number Diff line change
Expand Up @@ -1436,7 +1436,6 @@ def write_manifest_notebook(
validate_file_is_notebook(file)

base_dir = dirname(file)
extra_files = validate_extra_files(base_dir, extra_files)
manifest_path = join(base_dir, "manifest.json")

if exists(manifest_path) and not overwrite:
Expand Down Expand Up @@ -1536,7 +1535,6 @@ def write_manifest_voila(
set_verbosity(verbose)
with cli_feedback("Checking arguments"):
base_dir = dirname(path)
extra_files = validate_extra_files(base_dir, extra_files)
manifest_path = join(base_dir, "manifest.json")

if exists(manifest_path) and not overwrite:
Expand Down Expand Up @@ -1646,7 +1644,6 @@ def write_manifest_quarto(
base_dir = dirname(file_or_directory)

with cli_feedback("Checking arguments"):
extra_files = validate_extra_files(base_dir, extra_files)
manifest_path = join(base_dir, "manifest.json")

if exists(manifest_path) and not overwrite:
Expand Down Expand Up @@ -1820,7 +1817,6 @@ def _write_framework_manifest(

with cli_feedback("Checking arguments"):
entrypoint = validate_entry_point(entrypoint, directory)
extra_files = validate_extra_files(directory, extra_files)
manifest_path = join(directory, "manifest.json")

if exists(manifest_path) and not overwrite:
Expand Down

0 comments on commit 4accf4c

Please sign in to comment.