From 78c86217e68e5bf1f8ac8da44e22c19c0d6b576c Mon Sep 17 00:00:00 2001 From: Matthew Lynch Date: Wed, 26 Apr 2023 13:16:06 -0500 Subject: [PATCH 1/3] start setting record version on metadata records --- rsconnect/metadata.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/rsconnect/metadata.py b/rsconnect/metadata.py index 450e8d95..c2fc70cb 100644 --- a/rsconnect/metadata.py +++ b/rsconnect/metadata.py @@ -18,6 +18,7 @@ from .log import logger from .models import AppMode, AppModes +METADATA_RECORD_VERSION = 1 def config_dirname(platform=sys.platform, env=os.environ): """Get the user's configuration directory path for this platform.""" @@ -446,6 +447,7 @@ def set(self, server_url, filename, app_url, app_id, app_guid, title, app_mode): app_guid=app_guid, title=title, app_mode=app_mode.name() if isinstance(app_mode, AppMode) else app_mode, + record_version=METADATA_RECORD_VERSION, ), ) From 35633b2f604745d1ffc9d9c1545b64596b3120e3 Mon Sep 17 00:00:00 2001 From: Matthew Lynch Date: Fri, 28 Apr 2023 15:32:26 -0500 Subject: [PATCH 2/3] rename metadata version to appstore version --- rsconnect/metadata.py | 4 ++-- tests/test_metadata.py | 2 ++ 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/rsconnect/metadata.py b/rsconnect/metadata.py index c2fc70cb..e69fb1ac 100644 --- a/rsconnect/metadata.py +++ b/rsconnect/metadata.py @@ -18,7 +18,7 @@ from .log import logger from .models import AppMode, AppModes -METADATA_RECORD_VERSION = 1 +APPSTORE_VERSION = 1 def config_dirname(platform=sys.platform, env=os.environ): """Get the user's configuration directory path for this platform.""" @@ -447,7 +447,7 @@ def set(self, server_url, filename, app_url, app_id, app_guid, title, app_mode): app_guid=app_guid, title=title, app_mode=app_mode.name() if isinstance(app_mode, AppMode) else app_mode, - record_version=METADATA_RECORD_VERSION, + appstore_version=APPSTORE_VERSION, ), ) diff --git a/tests/test_metadata.py b/tests/test_metadata.py index 651d20cf..935d4bb2 100644 --- a/tests/test_metadata.py +++ b/tests/test_metadata.py @@ -199,6 +199,7 @@ def test_get(self): title="Important Title", app_mode="static", filename="/path/to/file", + appstore_version=1, ), ) @@ -212,6 +213,7 @@ def test_get(self): title="Untitled", app_mode="jupyter-static", filename="/path/to/file", + appstore_version=1, ), ) From f75817cbb2bebe21ee7d98043e725bdb529dc7b0 Mon Sep 17 00:00:00 2001 From: Bincheng Wu Date: Mon, 1 May 2023 16:41:53 +0000 Subject: [PATCH 3/3] Change appstore_version to a local variable --- rsconnect/metadata.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/rsconnect/metadata.py b/rsconnect/metadata.py index e69fb1ac..e9d867ad 100644 --- a/rsconnect/metadata.py +++ b/rsconnect/metadata.py @@ -18,7 +18,6 @@ from .log import logger from .models import AppMode, AppModes -APPSTORE_VERSION = 1 def config_dirname(platform=sys.platform, env=os.environ): """Get the user's configuration directory path for this platform.""" @@ -404,12 +403,13 @@ class AppStore(DataStore): hash is derived from the entry point file name. """ - def __init__(self, app_file): + def __init__(self, app_file, appstore_version=1): base_name = str(basename(app_file).rsplit(".", 1)[0]) + ".json" super(AppStore, self).__init__( join(dirname(app_file), "rsconnect-python", base_name), join(config_dirname(), "applications", sha1(abspath(app_file)) + ".json"), ) + self.appstore_version = appstore_version def get(self, server_url): """ @@ -447,7 +447,7 @@ def set(self, server_url, filename, app_url, app_id, app_guid, title, app_mode): app_guid=app_guid, title=title, app_mode=app_mode.name() if isinstance(app_mode, AppMode) else app_mode, - appstore_version=APPSTORE_VERSION, + appstore_version=self.appstore_version, ), )