daktari 0.0.236__tar.gz → 0.0.254__tar.gz

{daktari-0.0.236/daktari.egg-info → daktari-0.0.254}/PKG-INFO

@@ -1,16 +1,41 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.2
 Name: daktari
-Version: 0.0.236
+Version: 0.0.254
 Summary: Assist in setting up and maintaining developer environments
-Home-page: https://github.com/sonocent/daktari
-Author: Matt Russell
-Author-email: matthew.russell@sonocent.com
-License: MIT
-Classifier: License :: OSI Approved :: MIT License
-Classifier: Programming Language :: Python
+Author-email: Matt Russell <matthew.russell@sonocent.com>
+License: Copyright 2021 Sonocent Ltd
+        
+        Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+        
+        The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+        
+        THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+Project-URL: Homepage, https://github.com/sonocent/daktari
 Requires-Python: >=3.9
 Description-Content-Type: text/markdown
 License-File: LICENSE.txt
+Requires-Dist: ansicolors==1.1.8
+Requires-Dist: distro==1.9.0
+Requires-Dist: pyfiglet==1.0.2
+Requires-Dist: importlib_resources==6.5.2
+Requires-Dist: packaging==24.2
+Requires-Dist: setuptools==76.0.0
+Requires-Dist: requests==2.32.3
+Requires-Dist: responses==0.25.6
+Requires-Dist: semver==3.0.4
+Requires-Dist: python-hosts==1.0.7
+Requires-Dist: tabulate==0.9.0
+Requires-Dist: types-tabulate==0.9.0.20241207
+Requires-Dist: PyYAML==6.0.2
+Requires-Dist: types-PyYAML==6.0.12.20241230
+Requires-Dist: pyobjc-core==11.0; sys_platform == "darwin"
+Requires-Dist: pyobjc-framework-Cocoa==11.0; sys_platform == "darwin"
+Requires-Dist: requests-unixsocket==0.4.1
+Requires-Dist: dpath==2.2.0
+Requires-Dist: pyOpenSSL==25.0.0
+Requires-Dist: types-pyOpenSSL==24.1.0.20240722
+Requires-Dist: pyclip==0.7.0
+Requires-Dist: urllib3==2.3.0
 
 **Daktari** is a tool to help the initial setup and ongoing maintenance of developer environments. It runs a series of checks (for example, that required software is installed) and provides suggestions on how to fix the issue if the check fails.
 
@@ -21,7 +46,7 @@ In the root of the project repository, create a `.daktari.py` configuration file
 ```python
 from daktari.checks.git import *
 
-version = "0.0.236"
+version = "0.0.254"
 title = "My Project"
 
 checks = [
@@ -83,7 +108,7 @@ In case of a need to manually release, the steps are:
 
 ```
 bumpversion --verbose patch
-python setup.py sdist bdist_wheel
+python -m build
 twine check dist/*
 twine upload dist/*
 ```

{daktari-0.0.236 → daktari-0.0.254}/README.md

@@ -7,7 +7,7 @@ In the root of the project repository, create a `.daktari.py` configuration file
 ```python
 from daktari.checks.git import *
 
-version = "0.0.236"
+version = "0.0.254"
 title = "My Project"
 
 checks = [
@@ -69,7 +69,7 @@ In case of a need to manually release, the steps are:
 
 ```
 bumpversion --verbose patch
-python setup.py sdist bdist_wheel
+python -m build
 twine check dist/*
 twine upload dist/*
 ```

daktari-0.0.254/daktari/__init__.py

@@ -0,0 +1 @@
+__version__ = "0.0.254"

{daktari-0.0.236 → daktari-0.0.254/daktari.egg-info}/PKG-INFO

@@ -1,16 +1,41 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.2
 Name: daktari
-Version: 0.0.236
+Version: 0.0.254
 Summary: Assist in setting up and maintaining developer environments
-Home-page: https://github.com/sonocent/daktari
-Author: Matt Russell
-Author-email: matthew.russell@sonocent.com
-License: MIT
-Classifier: License :: OSI Approved :: MIT License
-Classifier: Programming Language :: Python
+Author-email: Matt Russell <matthew.russell@sonocent.com>
+License: Copyright 2021 Sonocent Ltd
+        
+        Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+        
+        The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+        
+        THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+Project-URL: Homepage, https://github.com/sonocent/daktari
 Requires-Python: >=3.9
 Description-Content-Type: text/markdown
 License-File: LICENSE.txt
+Requires-Dist: ansicolors==1.1.8
+Requires-Dist: distro==1.9.0
+Requires-Dist: pyfiglet==1.0.2
+Requires-Dist: importlib_resources==6.5.2
+Requires-Dist: packaging==24.2
+Requires-Dist: setuptools==76.0.0
+Requires-Dist: requests==2.32.3
+Requires-Dist: responses==0.25.6
+Requires-Dist: semver==3.0.4
+Requires-Dist: python-hosts==1.0.7
+Requires-Dist: tabulate==0.9.0
+Requires-Dist: types-tabulate==0.9.0.20241207
+Requires-Dist: PyYAML==6.0.2
+Requires-Dist: types-PyYAML==6.0.12.20241230
+Requires-Dist: pyobjc-core==11.0; sys_platform == "darwin"
+Requires-Dist: pyobjc-framework-Cocoa==11.0; sys_platform == "darwin"
+Requires-Dist: requests-unixsocket==0.4.1
+Requires-Dist: dpath==2.2.0
+Requires-Dist: pyOpenSSL==25.0.0
+Requires-Dist: types-pyOpenSSL==24.1.0.20240722
+Requires-Dist: pyclip==0.7.0
+Requires-Dist: urllib3==2.3.0
 
 **Daktari** is a tool to help the initial setup and ongoing maintenance of developer environments. It runs a series of checks (for example, that required software is installed) and provides suggestions on how to fix the issue if the check fails.
 
@@ -21,7 +46,7 @@ In the root of the project repository, create a `.daktari.py` configuration file
 ```python
 from daktari.checks.git import *
 
-version = "0.0.236"
+version = "0.0.254"
 title = "My Project"
 
 checks = [
@@ -83,7 +108,7 @@ In case of a need to manually release, the steps are:
 
 ```
 bumpversion --verbose patch
-python setup.py sdist bdist_wheel
+python -m build
 twine check dist/*
 twine upload dist/*
 ```

{daktari-0.0.236 → daktari-0.0.254}/daktari.egg-info/SOURCES.txt

@@ -3,7 +3,6 @@ MANIFEST.in
 README.md
 pyproject.toml
 requirements.txt
-setup.py
 daktari/__init__.py
 daktari/__main__.py
 daktari/asdf.py
@@ -36,35 +35,6 @@ daktari.egg-info/dependency_links.txt
 daktari.egg-info/entry_points.txt
 daktari.egg-info/requires.txt
 daktari.egg-info/top_level.txt
-daktari/checks/__init__.py
-daktari/checks/android.py
-daktari/checks/aws.py
-daktari/checks/certs.py
-daktari/checks/conan.py
-daktari/checks/direnv.py
-daktari/checks/docker.py
-daktari/checks/files.py
-daktari/checks/flutter.py
-daktari/checks/git.py
-daktari/checks/google.py
-daktari/checks/intellij_idea.py
-daktari/checks/java.py
-daktari/checks/kubernetes.py
-daktari/checks/misc.py
-daktari/checks/nodejs.py
-daktari/checks/onepassword.py
-daktari/checks/python.py
-daktari/checks/ssh.py
-daktari/checks/terraform.py
-daktari/checks/test_certs.py
-daktari/checks/test_intellij_idea.py
-daktari/checks/test_java.py
-daktari/checks/test_misc.py
-daktari/checks/test_onepassword.py
-daktari/checks/test_ssh.py
-daktari/checks/test_yarn.py
-daktari/checks/xml.py
-daktari/checks/yarn.py
 daktari/resources/__init__.py
 daktari/resources/daktari-local-template.yaml
 daktari/resources/mock_cert.pem

{daktari-0.0.236 → daktari-0.0.254}/daktari.egg-info/requires.txt

@@ -1,28 +1,24 @@
-PyYAML==5.3.1
 ansicolors==1.1.8
 distro==1.9.0
-dpath==2.2.0
+pyfiglet==1.0.2
 importlib_resources==6.5.2
-packaging==20.9
-pyOpenSSL==25.0.0
-pyclip==0.7.0
-pyfiglet==0.8.post1
-python-hosts==1.0.7
-requests-unixsocket==0.3.0
+packaging==24.2
+setuptools==76.0.0
 requests==2.32.3
 responses==0.25.6
-semver==3.0.2
-setuptools==70.3.0
+semver==3.0.4
+python-hosts==1.0.7
 tabulate==0.9.0
+types-tabulate==0.9.0.20241207
+PyYAML==6.0.2
 types-PyYAML==6.0.12.20241230
+requests-unixsocket==0.4.1
+dpath==2.2.0
+pyOpenSSL==25.0.0
 types-pyOpenSSL==24.1.0.20240722
-types-tabulate==0.9.0.20241207
-urllib3<1.27
-
-[:python_version < "3.7"]
-dataclasses==0.8
-types-dataclasses==0.1.5
+pyclip==0.7.0
+urllib3==2.3.0
 
 [:sys_platform == "darwin"]
-pyobjc-core==10.3.2
+pyobjc-core==11.0
 pyobjc-framework-Cocoa==11.0

daktari-0.0.254/pyproject.toml

@@ -0,0 +1,34 @@
+[build-system]
+requires = ["setuptools", "wheel"]
+build-backend = "setuptools.build_meta"
+
+[project]
+name = "daktari"
+version = "0.0.254"
+description = "Assist in setting up and maintaining developer environments"
+readme = "README.md"
+license = { file = "LICENSE.txt" }
+authors = [
+    { name = "Matt Russell", email = "matthew.russell@sonocent.com" }
+]
+requires-python = ">=3.9"
+dynamic = ["dependencies"]
+
+[project.urls]
+Homepage = "https://github.com/sonocent/daktari"
+
+[project.scripts]
+daktari = "daktari.__main__:main"
+
+[tool.setuptools.packages.find]
+where = ["."]
+include = ["daktari"]
+
+[tool.setuptools.package-data]
+"daktari" = ["*"]
+
+[tool.setuptools.dynamic]
+dependencies = {file = ["requirements.txt"]}
+
+[tool.black]
+line-length = 120

daktari-0.0.254/requirements.txt

@@ -0,0 +1,22 @@
+ansicolors==1.1.8
+distro==1.9.0
+pyfiglet==1.0.2
+importlib_resources==6.5.2
+packaging==24.2
+setuptools==76.0.0
+requests==2.32.3
+responses==0.25.6
+semver==3.0.4
+python-hosts==1.0.7
+tabulate==0.9.0
+types-tabulate==0.9.0.20241207
+PyYAML==6.0.2
+types-PyYAML==6.0.12.20241230
+pyobjc-core==11.0; sys_platform == 'darwin'
+pyobjc-framework-Cocoa==11.0; sys_platform == 'darwin'
+requests-unixsocket==0.4.1
+dpath==2.2.0
+pyOpenSSL==25.0.0
+types-pyOpenSSL==24.1.0.20240722
+pyclip==0.7.0
+urllib3==2.3.0

daktari-0.0.236/daktari/__init__.py

@@ -1 +0,0 @@
-__version__ = "0.0.236"

daktari-0.0.236/daktari/checks/android.py

@@ -1,26 +0,0 @@
-from daktari.check import Check, CheckResult
-from daktari.os import OS, get_env_var_value
-
-
-class AndroidNdkHomeSet(Check):
-    name = "android.ndkHomeSet"
-
-    def __init__(self, expected_version):
-        self.variable_name = "ANDROID_NDK_HOME"
-        self.expected_version = expected_version
-        self.suggestions = {
-            OS.GENERIC: f"""
-            Export {self.variable_name} in your shell config.
-            The expected value is ANDROID_SDK_HOME/ndk/{self.expected_version}.
-            If you manage your android sdk using Android Studio, you can find your ANDROID_SDK_HOME by going to
-            Tools > SDK Manager and copying the Android SDK location.
-            You may need to check under SDK Tools that you have the NDK installed.
-            """
-        }
-
-    def check(self) -> CheckResult:
-        expected_substring = f"ndk/{self.expected_version}"
-        return self.verify(
-            expected_substring in get_env_var_value(self.variable_name),
-            f"{self.variable_name} is <not/> set with expected version {self.expected_version}",
-        )

daktari-0.0.236/daktari/checks/aws.py

@@ -1,34 +0,0 @@
-from daktari.check import Check, CheckResult
-from daktari.command_utils import can_run_command, get_stdout
-from daktari.os import OS
-
-
-class AWSCLIInstalled(Check):
-    name = "aws.cliInstalled"
-
-    suggestions = {
-        OS.OS_X: """<cmd>curl "https://awscli.amazonaws.com/AWSCLIV2.pkg" -o "AWSCLIV2.pkg" && \
-    sudo installer -pkg AWSCLIV2.pkg -target /</cmd>""",
-        OS.UBUNTU: """"<cmd>curl "https://awscli.amazonaws.com/awscli-exe-linux-x86_64.zip" -o "awscliv2.zip" && \
-    unzip awscliv2.zip && \
-    sudo ./aws/install</cmd>""",
-    }
-
-    def check(self) -> CheckResult:
-        return self.verify(can_run_command("aws --version"), "AWS CLI is <not/> installed and on $PATH")
-
-
-class AWSProfileExists(Check):
-    depends_on = [AWSCLIInstalled]
-
-    def __init__(self, profile_name: str, suggestions: dict[str, str]):
-        self.profile_name = profile_name
-        self.name = f"aws.profileExists.{profile_name}"
-        self.suggestions = suggestions
-
-    def check(self) -> CheckResult:
-        output = get_stdout("aws configure list-profiles")
-        passed = bool(output and self.profile_name in output)
-        if not passed:
-            return self.failed(f"{self.profile_name} is not configured for the current user")
-        return self.passed(f"{self.profile_name} is configured for the current user")

daktari-0.0.236/daktari/checks/certs.py

@@ -1,34 +0,0 @@
-import logging
-import os
-from datetime import datetime
-from OpenSSL import crypto
-
-from daktari.check import Check, CheckResult
-from daktari.os import OS
-
-
-class CertificateIsNotExpired(Check):
-    name = "certificate.isNotExpired"
-
-    def __init__(self, certificate_path: str):
-        self.certificate_path = certificate_path
-        self.suggestions = {
-            OS.GENERIC: f"Regenerate the certificate at {certificate_path}",
-        }
-
-    def check(self) -> CheckResult:
-        with open(self.certificate_path, "rb") as f:
-            cert = crypto.load_certificate(crypto.FILETYPE_PEM, f.read())
-            logging.debug(f"Raw expiry: {cert.get_notAfter()!r}")
-
-            expiry_bytes = cert.get_notAfter()
-            if expiry_bytes is None:
-                return self.passed_with_warning(
-                    f"Unable to determine expiry date of {os.path.basename(self.certificate_path)}"
-                )
-
-            expiry = datetime.strptime(expiry_bytes.decode(), "%Y%m%d%H%M%SZ")
-            if expiry > datetime.now():
-                return self.passed(f"{os.path.basename(self.certificate_path)} is not expired")
-            else:
-                return self.failed(f"{os.path.basename(self.certificate_path)} expired on {expiry}")

daktari-0.0.236/daktari/checks/conan.py

@@ -1,96 +0,0 @@
-import json
-import logging
-from typing import Optional
-
-from daktari.check import Check, CheckResult
-from daktari.command_utils import get_stdout
-from daktari.os import OS
-
-
-class ConanInstalled(Check):
-    name = "conan.installed"
-
-    def __init__(self, required_version: Optional[str] = None, recommended_version: Optional[str] = None):
-        self.required_version = required_version
-        self.recommended_version = recommended_version
-        self.suggestions = {OS.GENERIC: "Install conan: <cmd>pip install conan</cmd>"}
-
-    def check(self) -> CheckResult:
-        return self.verify_install("conan")
-
-
-class ConanProfileDetected(Check):
-    name = "conan.profileDetected"
-
-    def __init__(self, expected_string: str):
-        self.suggestions = {OS.GENERIC: "<cmd>conan profile detect</cmd>"}
-        self.expected_string = expected_string
-        self.depends_on = [ConanInstalled]
-
-    def check(self) -> CheckResult:
-        output = get_stdout("conan profile list")
-        expected_profile_detected = output is not None and self.expected_string in output
-        return self.verify(expected_profile_detected, f"conan profile {self.expected_string} <not/> detected")
-
-
-class ConanRemoteDetected(Check):
-    name = "conan.remoteDetected"
-
-    def __init__(self, remote_name: str, remote_url: str):
-        self.suggestions = {OS.GENERIC: f"<cmd>conan remote add {remote_name} {remote_url}</cmd>"}
-        self.remote_name = remote_name
-        self.remote_url = remote_url
-        self.depends_on = [ConanInstalled]
-
-    def check(self) -> CheckResult:
-        output = get_stdout("conan remote list -f json")
-        if output is None:
-            return self.failed("No conan remotes configured for the current user.")
-        remote_json = json.loads(output)
-        remote = next(filter(lambda remote_details: remote_details.get("name") == self.remote_name, remote_json), None)
-        if remote is None:
-            return self.failed(f"{self.remote_name} conan remote is not configured for the current user.")
-
-        configured_url = remote["url"].strip("/")
-        logging.debug(f"{self.remote_name} conan remote is configured with URL {configured_url}.")
-
-        if configured_url != self.remote_url:
-            self.suggestions = {
-                OS.GENERIC: f"<cmd>conan remote update --url {self.remote_url} {self.remote_name}</cmd>"
-            }
-            return self.failed(
-                f"{self.remote_name} conan remote is configured with URL {configured_url}, expected {self.remote_url}"
-            )
-
-        if not remote["enabled"]:
-            self.suggestions = {OS.GENERIC: f"<cmd>conan remote enable {self.remote_name}</cmd>"}
-            return self.failed(f"{self.remote_name} conan remote is not enabled.")
-
-        return self.passed(f"{self.remote_name} conan remote is configured for the current user.")
-
-
-class ConanRemoteAuthenticated(Check):
-    name = "conan.remoteAuthenticated"
-
-    def __init__(self, remote_name: str, authentication_command: Optional[str] = None):
-        self.suggestions = (
-            {OS.GENERIC: authentication_command}
-            if authentication_command
-            else {OS.GENERIC: f"<cmd>conan remote login {remote_name}</cmd>"}
-        )
-        self.remote_name = remote_name
-        self.depends_on = [ConanRemoteDetected]
-
-    def check(self) -> CheckResult:
-        output = get_stdout("conan remote list-users -f json")
-        if output is None:
-            return self.failed("No conan remotes configured for the current user.")
-        remote_json = json.loads(output)
-        remote = next(filter(lambda remote_details: remote_details.get("name") == self.remote_name, remote_json), None)
-        if remote is None:
-            return self.failed(f"{self.remote_name} conan remote is not configured for the current user.")
-
-        if not remote["authenticated"]:
-            return self.failed(f"{self.remote_name} conan remote is not authenticated.")
-
-        return self.passed(f"{self.remote_name} conan remote is authenticated for the current user.")

daktari-0.0.236/daktari/checks/direnv.py

@@ -1,59 +0,0 @@
-import re
-
-from daktari.command_utils import get_stdout
-
-from daktari.os import OS
-from daktari.check import Check, CheckResult
-from daktari.version_utils import get_simple_cli_version
-from daktari.file_utils import file_contains_text
-from typing import Optional
-from os import getcwd
-
-
-class DirenvInstalled(Check):
-    name = "direnv.installed"
-
-    def __init__(self, required_version: Optional[str] = None, recommended_version: Optional[str] = None):
-        self.required_version = required_version
-        self.recommended_version = recommended_version
-        self.suggestions = {
-            OS.GENERIC: "Install direnv: https://direnv.net/#getting-started",
-            OS.OS_X: "Install direnv using brew: <cmd>brew install direnv</cmd>",
-            OS.UBUNTU: "Install direnv using apt-get: <cmd>sudo apt-get install direnv</cmd>",
-        }
-
-    def check(self) -> CheckResult:
-        installed_version = get_simple_cli_version("direnv")
-        return self.validate_semver_expression(
-            "direnv", installed_version, self.required_version, self.recommended_version
-        )
-
-
-class EnvrcContainsText(Check):
-    name = "direnv.envrc.containsText"
-
-    def __init__(self, expected_string: str, suggestion: str):
-        self.file_path = f"{getcwd()}/.envrc"
-        self.expected_string = expected_string
-        self.pass_fail_message = f"{self.file_path} does <not/> contain '{expected_string}'"
-        self.suggestions = {OS.GENERIC: suggestion}
-
-    def check(self) -> CheckResult:
-        return self.verify(file_contains_text(self.file_path, self.expected_string), self.pass_fail_message)
-
-
-class DirenvAllowed(Check):
-    name = "direnv.allowed"
-    depends_on = [DirenvInstalled, EnvrcContainsText]
-
-    def __init__(self):
-        self.suggestions = {OS.GENERIC: "<cmd>direnv allow .</cmd>"}
-
-    def check(self) -> CheckResult:
-        direnv_status = get_stdout("direnv status")
-        if direnv_status is None:
-            return self.failed("direnv status returned no output")
-        cwd = getcwd()
-        query = f"Found RC path {cwd}/.envrc(\n.*)*Found RC allowed (true|0)"
-        direnv_allowed = re.search(query, direnv_status) is not None
-        return self.verify(direnv_allowed, f"{cwd} is <not/> allowed to use direnv")

daktari-0.0.236/daktari/checks/docker.py

@@ -1,50 +0,0 @@
-import logging
-import re
-from typing import Optional
-
-from semver import VersionInfo
-
-from daktari.check import Check, CheckResult
-from daktari.command_utils import get_stdout
-from daktari.os import OS
-from daktari.version_utils import try_parse_semver
-
-
-class DockerInstalled(Check):
-    name = "docker.installed"
-
-    suggestions = {
-        OS.GENERIC: "Install docker: https://docs.docker.com/get-docker/",
-        OS.OS_X: "Install docker: https://docs.docker.com/docker-for-mac/install/",
-    }
-
-    def __init__(self, required_version: Optional[str] = None):
-        self.required_version = required_version
-
-    def check(self) -> CheckResult:
-        installed_version = get_docker_version()
-        return self.validate_semver_expression("Docker", installed_version, self.required_version)
-
-
-major_version_pattern = re.compile("Docker version ([0-9.]+)")
-
-
-def get_docker_version() -> Optional[VersionInfo]:
-    raw_version = get_stdout("docker --version")
-    if raw_version:
-        match = major_version_pattern.search(raw_version)
-        if match:
-            version_string = match.group(1)
-            version = try_parse_semver(version_string)
-            logging.debug(f"Docker version - raw: {version_string}, parsed: {version}")
-            return version
-    return None
-
-
-class DockerComposeInstalled(Check):
-    name = "docker-compose.installed"
-
-    suggestions = {OS.GENERIC: "Install docker-compose: https://docs.docker.com/compose/install/"}
-
-    def check(self) -> CheckResult:
-        return self.verify_install("docker-compose")