Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Develop #157

Merged
merged 7 commits into from
Dec 26, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -312,3 +312,7 @@
## Version 4.0.3

- hotfix of conditional dependency

## Version 4.0.4

- hotfix of calling get on env vars
2 changes: 1 addition & 1 deletion mmpm/__version__.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#!/usr/bin/env python3
major = 4
minor = 0
patch = 3
patch = 4

version = f"{major}.{minor}.{patch}"
2 changes: 1 addition & 1 deletion mmpm/api/endpoints/ep_mmpm.py
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ def upgrade() -> Response:
Returns:
Response: A Flask Response object indicating success or failure of the upgrade operation.
"""
if self.env.MMPM_IS_DOCKER_IMAGE:
if self.env.MMPM_IS_DOCKER_IMAGE.get():
self.failure("MMPM is a Docker image. MMPM must be upgraded using the Docker CLI.")
if mmpm.utils.upgrade():
return self.success("Upgrade MMPM")
Expand Down
2 changes: 1 addition & 1 deletion mmpm/subcommands/_sub_cmd_ui.py
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,7 @@ def exec(self, args, extra):
if not self.database.is_initialized():
self.database.load()

if self.env.MMPM_IS_DOCKER_IMAGE:
if self.env.MMPM_IS_DOCKER_IMAGE.get():
logger.error("MMPM is a Docker image. Unable to interact with MMPM UI from CLI.")
return

Expand Down
2 changes: 1 addition & 1 deletion mmpm/subcommands/_sub_cmd_upgrade.py
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ def exec(self, args, extra):
upgradable["MagicMirror"] = upgradable["MagicMirror"] and self.magicmirror.upgrade()

if upgradable["mmpm"]:
if self.env.MMPM_IS_DOCKER_IMAGE:
if self.env.MMPM_IS_DOCKER_IMAGE.get():
logger.warning("Cannot perform self-upgrade because MMPM is a Docker image. Stop MMPM and run `docker pull karsten13/mmpm:latest`")
else:
upgradable["mmpm"] = utils.upgrade()
Expand Down
2 changes: 1 addition & 1 deletion pyproject.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[project]
name = "mmpm"
version = "4.0.3"
version = "4.0.4"
description = "MMPM, the MagicMirror Package Manager CLI simplifies the installation, removal, and general maintenance of MagicMirror packages"
authors = [
{ name = "Brandon Marlowe", email = "bpmarlowe-software@protonmail.com" },
Expand Down
Loading