diff --git a/bump-version b/bump-version index 210f214a..afeb379d 100755 --- a/bump-version +++ b/bump-version @@ -23,7 +23,7 @@ sed -i "s,version = \"${current_version}\",version = \"${new_version}\"," health sed -i "s,version = \"${current_version}\",version = \"${new_version}\"," worker-daemon/pvcworkerd/Daemon.py sed -i "s,version = \"${current_version}\",version = \"${new_version}\"," api-daemon/pvcapid/Daemon.py sed -i "s,version = \"${current_version}\",version = \"${new_version}\"," client-cli/pyproject.toml -sed -i "s,VERSION = \"${current_version}\",VERSION = \"${new_version}\"," client-cli/pvc/cli/cli.py +sed -i "s,VERSION = \"${current_version}\",VERSION = \"${new_version}\"," client-cli/pvc/cli/helpers.py echo ${new_version} > .version changelog_tmpdir=$( mktemp -d ) @@ -48,7 +48,7 @@ echo -e "${deb_changelog_new}" >> ${deb_changelog_file} echo -e "${deb_changelog_orig}" >> ${deb_changelog_file} mv ${deb_changelog_file} debian/changelog -git add node-daemon/pvcnoded/Daemon.py health-daemon/pvchealthd/Daemon.py worker-daemon/pvcworkerd/Daemon.py api-daemon/pvcapid/Daemon.py client-cli/pyproject.toml debian/changelog CHANGELOG.md .version +git add node-daemon/pvcnoded/Daemon.py health-daemon/pvchealthd/Daemon.py worker-daemon/pvcworkerd/Daemon.py api-daemon/pvcapid/Daemon.py client-cli/pvc/cli/helpers.py client-cli/pyproject.toml debian/changelog CHANGELOG.md .version git commit -v popd &>/dev/null diff --git a/client-cli/pvc/cli/cli.py b/client-cli/pvc/cli/cli.py index fea38a9f..338c1f2a 100644 --- a/client-cli/pvc/cli/cli.py +++ b/client-cli/pvc/cli/cli.py @@ -51,8 +51,6 @@ import click ############################################################################### -VERSION = "0.9.107" - CONTEXT_SETTINGS = dict( help_option_names=["-h", "--help"], max_content_width=MAX_CONTENT_WIDTH ) diff --git a/client-cli/pvc/cli/helpers.py b/client-cli/pvc/cli/helpers.py index 06988306..0cbb8576 100644 --- a/client-cli/pvc/cli/helpers.py +++ b/client-cli/pvc/cli/helpers.py @@ -30,6 +30,8 @@ from yaml import load as yload from yaml import SafeLoader +VERSION = "1.0" + DEFAULT_STORE_DATA = {"cfgfile": "/etc/pvc/pvc.conf"} DEFAULT_STORE_FILENAME = "pvc.json" DEFAULT_API_PREFIX = "/api/v1" diff --git a/client-cli/pvc/lib/common.py b/client-cli/pvc/lib/common.py index 967958e1..6c7b9be0 100644 --- a/client-cli/pvc/lib/common.py +++ b/client-cli/pvc/lib/common.py @@ -27,7 +27,7 @@ from requests import get, post, put, patch, delete, Response from requests.exceptions import ConnectionError from time import time from urllib3 import disable_warnings -from pvc.cli.cli import VERSION +from pvc.cli.helpers import VERSION def format_bytes(size_bytes):