From 7435537a5dc19deeaaee8278a9c3771373386f87 Mon Sep 17 00:00:00 2001 From: nodauf Date: Wed, 10 May 2023 10:15:12 +0200 Subject: [PATCH 1/5] Fix inconsistency to enable shell logging Before the change, at the question "Do you want to disable ..." we had to enter y to enable --- exegol/model/ContainerConfig.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/exegol/model/ContainerConfig.py b/exegol/model/ContainerConfig.py index 3fc895ca..99615a69 100644 --- a/exegol/model/ContainerConfig.py +++ b/exegol/model/ContainerConfig.py @@ -272,9 +272,9 @@ def interactiveConfig(self, container_name: str) -> List[str]: # Shell logging config if self.__shell_logging: - if Confirm("Do you want to [green]enable[/green] automatic [blue]shell logging[/blue]?", False): + if Confirm("Do you want to [orange3]disable[/orange3] automatic [blue]shell logging[/blue]?", False): self.__disableShellLogging() - elif Confirm("Do you want to [orange3]disable[/orange3] automatic [blue]shell logging[/blue]?", False): + elif Confirm("Do you want to [green]enable[/green] automatic [blue]shell logging[/blue]?", False): self.enableShellLogging() # Command builder info if self.__shell_logging: From 580da774c6178f7cb855c9c876cae1325ac63810 Mon Sep 17 00:00:00 2001 From: Dramelac Date: Thu, 11 May 2023 09:06:57 +0800 Subject: [PATCH 2/5] Catch up type check --- exegol/model/ExegolImage.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/exegol/model/ExegolImage.py b/exegol/model/ExegolImage.py index 51ad3502..f5c46728 100644 --- a/exegol/model/ExegolImage.py +++ b/exegol/model/ExegolImage.py @@ -74,7 +74,7 @@ def __init__(self, self.__is_remote = True self.__setArch(MetaImages.parseArch(dockerhub_data)) self.__dl_size = self.__processSize(dockerhub_data.get("size", 0)) - if meta_img: + if meta_img and meta_img.meta_id is not None: self.__setDigest(meta_img.meta_id) self.__setLatestRemoteId(meta_img.meta_id) # Meta id is always the latest one logger.debug(f"└── {self.__name}\t→ ({self.getType()}) {self.__digest}") From 3b3eff6a6338f1d764015d85ed493c58b0b54a43 Mon Sep 17 00:00:00 2001 From: Dramelac Date: Thu, 11 May 2023 11:22:59 +0800 Subject: [PATCH 3/5] Set new beta dev version --- exegol/config/ConstantConfig.py | 2 +- tests/test_exegol.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/exegol/config/ConstantConfig.py b/exegol/config/ConstantConfig.py index 8f6a508e..5b743d8d 100644 --- a/exegol/config/ConstantConfig.py +++ b/exegol/config/ConstantConfig.py @@ -5,7 +5,7 @@ class ConstantConfig: """Constant parameters information""" # Exegol Version - version: str = "4.2.1" + version: str = "4.2.2b1" # Exegol documentation link documentation: str = "https://exegol.rtfd.io/" diff --git a/tests/test_exegol.py b/tests/test_exegol.py index 3c4824ba..6949175c 100644 --- a/tests/test_exegol.py +++ b/tests/test_exegol.py @@ -2,4 +2,4 @@ def test_version(): - assert __version__ == '4.2.1' + assert __version__ == '4.2.2' From f58c7d373bfeeee60ee6d4db39e533bc7577a125 Mon Sep 17 00:00:00 2001 From: Dramelac Date: Sat, 13 May 2023 21:57:25 +0800 Subject: [PATCH 4/5] Changing requests version constrains --- requirements.txt | 2 +- setup.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/requirements.txt b/requirements.txt index 5a7a17a8..2f34c1ea 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,5 +1,5 @@ docker~=6.0.0 -requests>=2.28.0 +requests~=2.28.2 rich~=13.3.0 GitPython~=3.1.29 PyYAML>=6.0 diff --git a/setup.py b/setup.py index fb9b90b7..0ff4002c 100644 --- a/setup.py +++ b/setup.py @@ -50,7 +50,7 @@ ], install_requires=[ 'docker~=6.0.0', - 'requests', + 'requests~=2.28.2', 'rich~=13.3.0', 'PyYAML', 'GitPython', From bf717cfe668b2055bff47a1470820a76ccf62400 Mon Sep 17 00:00:00 2001 From: Dramelac Date: Sat, 13 May 2023 22:00:00 +0800 Subject: [PATCH 5/5] Ready to release new minor version --- exegol/config/ConstantConfig.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/exegol/config/ConstantConfig.py b/exegol/config/ConstantConfig.py index 5b743d8d..b62adf74 100644 --- a/exegol/config/ConstantConfig.py +++ b/exegol/config/ConstantConfig.py @@ -5,7 +5,7 @@ class ConstantConfig: """Constant parameters information""" # Exegol Version - version: str = "4.2.2b1" + version: str = "4.2.2" # Exegol documentation link documentation: str = "https://exegol.rtfd.io/"