eth-portfolio-temp 0.2.13__cp312-cp312-win32.whl → 0.2.14__cp312-cp312-win32.whl

eth_portfolio_scripts/docker/check.py

@@ -1,5 +1,6 @@
 from functools import lru_cache
 from subprocess import CalledProcessError, check_output
+from typing import List
 
 
 def check_docker() -> None:
@@ -9,48 +10,58 @@ def check_docker() -> None:
     Raises:
         RuntimeError: If docker is not installed.
     """
+    print("    🔍 checking your computer for docker")
     try:
         check_output(["docker", "--version"])
-        print("docker found!")
     except (CalledProcessError, FileNotFoundError):
-        print("checking your computer for docker")
         raise RuntimeError(
             "Docker is not installed. You must install Docker before using dao-treasury."
         ) from None
+    else:
+        print("    ✔️ eth-portfolio found docker!")
 
 
-def check_docker_compose() -> None:
+def check_docker_compose() -> List[str]:
     """
-    Check that docker-compose is installed on the user's system.
+    Check that either `docker-compose` or `docker compose` is installed on the user's system.
+
+    Returns:
+        A valid compose command.
 
     Raises:
         RuntimeError: If docker-compose is not installed.
     """
-    try:
-        check_output(["docker-compose", "--version"])
-        print("docker-compose found!")
-    except (CalledProcessError, FileNotFoundError):
-        print("checking your computer for docker-compose")
+    for cmd in ["docker-compose", "docker compose"]:
+        print(f"    🔍 checking your computer for {cmd}")
+
         try:
-            check_output(["docker", "compose", "--version"])
-            print("docker compose found!")
+            check_output([*cmd.split(" "), "--version"])
         except (CalledProcessError, FileNotFoundError):
-            print("docker-compose not found, checking your computer for docker compose")
-            raise RuntimeError(
-                "Docker Compose is not installed. You must install Docker Compose before using dao-treasury."
-            ) from None
+            print(f"    ❌ {cmd} not found")
+            continue
+        else:
+            print(f"    ✔️ eth-portfolio found {cmd}!")
+            return cmd.split(" ")
+
+    raise RuntimeError(
+        "Docker Compose is not installed. You must install Docker Compose before using dao-treasury."
+    ) from None
 
 
 @lru_cache(maxsize=None)
-def check_system() -> None:
+def check_system() -> List[str]:
     """
     Check that docker and docker-compose is installed on the user's system.
 
+    Returns:
+        A valid compose command.
+
     Raises:
         RuntimeError: If docker-compose is not installed.
     """
+    print("eth-portfolio is checking for the required docker dependencies...")
     check_docker()
-    check_docker_compose()
+    return check_docker_compose()
 
 
 __all__ = ["check_docker", "check_docker_compose", "check_system"]

eth_portfolio_scripts/docker/docker_compose.py

@@ -12,7 +12,7 @@ from eth_portfolio_scripts.docker.check import check_system
 
 logger: Final = logging.getLogger(__name__)
 
-compose_file: Final = str(
+COMPOSE_FILE: Final = str(
     resources.files("eth_portfolio_scripts").joinpath("docker/docker-compose.yaml")
 )
 
@@ -67,12 +67,15 @@ def ensure_containers(fn: Callable[_P, _T]) -> Callable[_P, _T]:
     return compose_wrap
 
 
-def _exec_command(command: List[str], *, compose_options: Tuple[str, ...] = ()) -> None:
-    check_system()
+def _exec_command(
+    command: List[str],
+    *,
+    compose_file: str = COMPOSE_FILE,
+    compose_options: Tuple[str, ...] = (),
+) -> None:
+    compose = check_system()
+    full_command = [*compose, *compose_options, "-f", compose_file, *command]
     try:
-        check_output(["docker", "compose", *compose_options, "-f", compose_file, *command])
+        check_output(full_command)
     except (CalledProcessError, FileNotFoundError) as e:
-        try:
-            check_output(["docker-compose", *compose_options, "-f", compose_file, *command])
-        except (CalledProcessError, FileNotFoundError) as _e:
-            raise RuntimeError(f"Error occurred while running {' '.join(command)}: {_e}") from _e
+        raise RuntimeError(f"Error occurred while running `{' '.join(full_command)}`: {e}") from e

{eth_portfolio_temp-0.2.13.dist-info → eth_portfolio_temp-0.2.14.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: eth_portfolio_temp
-Version: 0.2.13
+Version: 0.2.14
 Summary: eth-portfolio makes it easy to analyze your portfolio.
 Home-page: https://github.com/BobTheBuidler/eth-portfolio
 Author: BobTheBuidler

{eth_portfolio_temp-0.2.13.dist-info → eth_portfolio_temp-0.2.14.dist-info}/RECORD

@@ -1,22 +1,22 @@
-eth_portfolio__mypyc.cp312-win32.pyd,sha256=I2194QUMiV-LhYBUHPaEWaJ01bymaLLsdajruJI5by4,260608
+eth_portfolio__mypyc.cp312-win32.pyd,sha256=Iz_X1N1NIelKsdtvIoxrkmtzaJ-2AFG53Rkke5pKvHg,260608
 eth_portfolio/__init__.py,sha256=5GmHYzhUX2gOC4MScgXnqS8x2MawbpWOuWPmqlvCotA,525
-eth_portfolio/_argspec.cp312-win32.pyd,sha256=zlpDjSY8Bx6eL4-wah2o7_8ass_cGza6DephUhOxEYI,9216
+eth_portfolio/_argspec.cp312-win32.pyd,sha256=tbo5MF5SOo4qwopof-XPpn8BDZBfd482lRo4on1CMe8,9216
 eth_portfolio/_argspec.py,sha256=au8ycJ56-7UzbQVzYUOoMX9sToH0QNi2tS1O820xB3A,1637
 eth_portfolio/_cache.py,sha256=OntwbiDOrBV5JzHHDzJlxcEVrmKK5GG0uXeLeoDDbpA,4926
-eth_portfolio/_config.cp312-win32.pyd,sha256=u9bb9L14FWagi6dY0q9HAF6uWpkDMZ9Y6h8Ktf7T6pE,9216
+eth_portfolio/_config.cp312-win32.pyd,sha256=msJZ2-Bkbmippz8dn5Utb5ZVtdTuQRX_3KB2yEzGVjg,9216
 eth_portfolio/_config.py,sha256=BSOvFS4D0oqgVTtBbtW2g2kpL8Mk6xiP0PipfXs_91A,102
 eth_portfolio/_decimal.py,sha256=DwLUg8pzeTIREG2sHgRK48hoWmjelWNvpEKj10Ra7to,5002
 eth_portfolio/_decorators.py,sha256=AvB-q69MvaFe0Ykh1os6hSewcUujURQ9onqobMaONOM,2899
 eth_portfolio/_exceptions.py,sha256=xb5VmCtBtXy9WXu_1ofoG4j9BJsMQXMVydCJNUulrNY,2500
-eth_portfolio/_shitcoins.cp312-win32.pyd,sha256=WjKg40159TvwALCG7e8i4XUEAKgU5LTzReX4qRYmhL8,9216
+eth_portfolio/_shitcoins.cp312-win32.pyd,sha256=xaEITLfswXBawzYchL1ZM9UoYQh_so-Gpe9c6q28Lac,9216
 eth_portfolio/_shitcoins.py,sha256=OZLQWpuNegNz_GXPod1yMZMLiryKY0ZL_fpq1HppnGM,17296
-eth_portfolio/_stableish.cp312-win32.pyd,sha256=MY3-WVSo9JNYsuiStNzUdUfP6luzSLg9sW-kU65COb0,9216
+eth_portfolio/_stableish.cp312-win32.pyd,sha256=tEZ8BFcmCW_qlR38HkGd1jGhzPt4fyx6cUjbHMUcdng,9216
 eth_portfolio/_stableish.py,sha256=8pdlYe2YcZ8rTzdCzg-ihRQLPtSFXBNDjtnvuTgPRcQ,2063
 eth_portfolio/_submodules.py,sha256=zne-2YyVFoKHwkLuHx8cdz5lpcwwSDw1edJ9v8G4c1A,2263
 eth_portfolio/_utils.py,sha256=iGck5SKUwpfnuZvLnKDR1A00obZNKx622Y9GY_TYiZA,7886
 eth_portfolio/address.py,sha256=RrFIWSx6jSITwh16Hqs6W6S9fz1KEaebQEk1vqL3HwI,14536
 eth_portfolio/buckets.py,sha256=c5_RLfMyJbnK_PBx5mmdL3YlIX67dD6LqnBxiAr52N0,6896
-eth_portfolio/constants.cp312-win32.pyd,sha256=Li_1jZLEIjQKPRQYSCQFpu2-MTzNcuj_ZTQwTa89s_I,9216
+eth_portfolio/constants.cp312-win32.pyd,sha256=7OyPW70PtgoLuQNYb1Z4vpmsfT5DcVL3_OMZ5NH6NgE,9216
 eth_portfolio/constants.py,sha256=rUXWFaCGrrF_qzIdDvVzakQJsLnrGtFNn2EgRbZh8fQ,3741
 eth_portfolio/portfolio.py,sha256=FSJ1_FG120dN5vWSPyhbHfyuFHdmFqTHJ5_Ci-4Rts4,24909
 eth_portfolio/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -28,13 +28,13 @@ eth_portfolio/_ledgers/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3
 eth_portfolio/_ledgers/address.py,sha256=wght92UXf6UIO9GNRzdMy3H43Em7kUk9ArtBsRF-xjw,33830
 eth_portfolio/_ledgers/portfolio.py,sha256=rAr5S1tksgLPUOK1J1FbIWgvTQNzTqrRp8oukiP2BTo,13427
 eth_portfolio/_loaders/__init__.py,sha256=YrBeRuA48cN2Bg2R2nXiNt1CsUIG_7N6ENIpY6aISPo,1735
-eth_portfolio/_loaders/_nonce.cp312-win32.pyd,sha256=cobkLYXBDHwC91cCh9-4LgjEfIn_YjQn2rZuS2PgVSU,9216
+eth_portfolio/_loaders/_nonce.cp312-win32.pyd,sha256=7JoNlThfovUJd1BHV_RgD2kU5w3zZU9nzNBKuWfA6lg,9216
 eth_portfolio/_loaders/_nonce.py,sha256=bA-5fZG8ALuADgQGrnoxt6p6j7QEwI6vIGnZRF1Zx7M,6481
-eth_portfolio/_loaders/balances.cp312-win32.pyd,sha256=z-4Sfkphu2VUY62dFrecys3x8ABw1Adoa7JQizrEtZM,9216
+eth_portfolio/_loaders/balances.cp312-win32.pyd,sha256=AjBXZT4YITBXlwqyyzqGs1an6Q9DabfBDfzE6nqMZdk,9216
 eth_portfolio/_loaders/balances.py,sha256=_v-x1M3lzDHPt8svHmCcpxZKw0BaGHfZimhkwgphY8A,3226
 eth_portfolio/_loaders/token_transfer.py,sha256=itaWVDyotG0EYPb4o94UOpxYvTdE6YIuUR2pzpXAnwI,8748
 eth_portfolio/_loaders/transaction.py,sha256=oOG3cFdLAa10k2hpN17GO7Wtq-rpUJ1oo7hLAKDjbDc,9393
-eth_portfolio/_loaders/utils.cp312-win32.pyd,sha256=K-L0FSiQWMPQ5CctVU8LWUHtgmczKiAxd_q0P8SoyoY,9216
+eth_portfolio/_loaders/utils.cp312-win32.pyd,sha256=51IyHRj_7wXqz9F6KLapet5Mv3xJ7uqazl1TiLoqZck,9216
 eth_portfolio/_loaders/utils.py,sha256=gJvIikinjCPj-elQVep55VTya9slSARApx-FJKYwnkE,2333
 eth_portfolio/_ydb/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 eth_portfolio/_ydb/token_transfers.py,sha256=HUTeWShcQD4IzocTHmBOreml0jbVttLcaed1fNiJ2qg,5297
@@ -60,24 +60,24 @@ eth_portfolio_scripts/_args.py,sha256=M33vPkja62XEJeCZAqacNSBCqbzse07wepwyBOtkvV
 eth_portfolio_scripts/_logging.py,sha256=EgW8ozQZLAgt_cUgqe5BYZLMVQwB6X-0gq0T-BvqlTY,369
 eth_portfolio_scripts/_portfolio.py,sha256=XP6fUfZfv2hBdW6PCBdpUyT3TRAU56u2QKWwhmHBTAE,7333
 eth_portfolio_scripts/_utils.py,sha256=lj2B79G8YX21ATNp_v-onsU_kNFZF3unBclCVp3AIn8,3163
-eth_portfolio_scripts/balances.cp312-win32.pyd,sha256=ijFtJvMIv7k1o6kzVE3OkfoTk-mNRVyEd7DDcYx5Ces,9216
+eth_portfolio_scripts/balances.cp312-win32.pyd,sha256=Xq_3O2juAGKwXowJg6vrzniqMEXR4LJ6_Z4pS0jnPFM,9216
 eth_portfolio_scripts/balances.py,sha256=Fr8NGCt5yhvu7LnLH27oOVKcL2XwowmAVezXUOIEzd0,1640
 eth_portfolio_scripts/main.py,sha256=VfwWEVOu4oxp5M-rQLGo-XlDKlG_Q7Y4cLiXMUSXeZg,3804
 eth_portfolio_scripts/py.typed,sha256=frcCV1k9oG9oKj3dpUqdJg1PxRT2RSN_XKdLCPjaYaY,2
-eth_portfolio_scripts/docker/__init__.cp312-win32.pyd,sha256=JHfrIuBaTsnF-zumwYHgxRuSCU6235lwqxWLhgPi4JQ,9216
+eth_portfolio_scripts/docker/__init__.cp312-win32.pyd,sha256=hYyyotQJ-q8PY2uMTY2TGDgG7hOiqLzjcHfVqRLm4SY,9216
 eth_portfolio_scripts/docker/__init__.py,sha256=R27uZPLUEK2--fb9IrxrDUk6R5_IVFJSv7s_ia7p5Xk,409
-eth_portfolio_scripts/docker/check.cp312-win32.pyd,sha256=UUgs9dsO4shiFCGxwPcsowT4vODb8V-qWfqR53vfJuE,9216
-eth_portfolio_scripts/docker/check.py,sha256=JFxUxGRSz20EgjKqCLBkCqR4N1ihzO_3ykU3jPzp_UU,1801
+eth_portfolio_scripts/docker/check.cp312-win32.pyd,sha256=7_eO7eIAVJN3tKQxm4uz-t6ST-9NgfzBOG-JKNRBpKc,9216
+eth_portfolio_scripts/docker/check.py,sha256=94Xs4RAvFhFB9oyqOtOgvzdjmatWZHTfAFVh62ONyCE,2012
 eth_portfolio_scripts/docker/docker-compose.yaml,sha256=SpvQSpll0mTgMogA_UnNQ66xcjDC_Tnzu8AElsikzDg,1870
-eth_portfolio_scripts/docker/docker_compose.cp312-win32.pyd,sha256=csHqW-5pO6tTmbtDYcj8pFeKXYSglMNCNsZ5QOE4qBY,9216
-eth_portfolio_scripts/docker/docker_compose.py,sha256=tewgCWZP6g9sVFHbQnGC1au-bTnvuvXMZgTKKgpmeOc,2304
+eth_portfolio_scripts/docker/docker_compose.cp312-win32.pyd,sha256=54o5TZNynMCiYH7vuufnFeTdg8FUYY5s_i90yq8mf4Q,9216
+eth_portfolio_scripts/docker/docker_compose.py,sha256=tOZe8AlNdrbgQUpEKLkQTkyE30QvAbfigyTU_hhMceM,2224
 eth_portfolio_scripts/docker/.grafana/dashboards/dashboards.yaml,sha256=wktTI-OAdF_khhbciZFo4Gt2V9bUjbe7GLqwdzTKf0U,212
 eth_portfolio_scripts/docker/.grafana/dashboards/Portfolio/Balances.json,sha256=XGMV8e4tDak53e9bmymwAB4uqZmAIcU5JlRT3OiwTeU,70750
 eth_portfolio_scripts/docker/.grafana/datasources/datasources.yml,sha256=8PPH_QDhfbRRh3IidskW46rifJejloa1a9I1KCw2FTk,199
 eth_portfolio_scripts/victoria/__init__.py,sha256=R0VvKiAC0e57zZNihcCptVkFO5CBHIbp2trFYuyY01M,2038
 eth_portfolio_scripts/victoria/types.py,sha256=KNq8aIiNXeiDnCKL7xycmouo0YeKI-sbQkIcTymcSYk,745
-eth_portfolio_temp-0.2.13.dist-info/METADATA,sha256=dwZaQFnQBCgvSaOSJ05a2avmyRAjZW9FhaWlZz6UD8M,840
-eth_portfolio_temp-0.2.13.dist-info/WHEEL,sha256=LwxTQZ0gyDP_uaeNCLm-ZIktY9hv6x0e22Q-hgFd-po,97
-eth_portfolio_temp-0.2.13.dist-info/entry_points.txt,sha256=yqoC6X3LU1NA_-oJ6mloEYEPNmS-0hPS9OtEwgIeDGU,66
-eth_portfolio_temp-0.2.13.dist-info/top_level.txt,sha256=4MlbY-Yj8oGBGL8piXiO4SOpk2gZFF9ZXVTObTZOzqM,57
-eth_portfolio_temp-0.2.13.dist-info/RECORD,,
+eth_portfolio_temp-0.2.14.dist-info/METADATA,sha256=KXDzxtXKa1Ykg8YejskGe36ZskbsUOId0HQzmd08AEA,840
+eth_portfolio_temp-0.2.14.dist-info/WHEEL,sha256=LwxTQZ0gyDP_uaeNCLm-ZIktY9hv6x0e22Q-hgFd-po,97
+eth_portfolio_temp-0.2.14.dist-info/entry_points.txt,sha256=yqoC6X3LU1NA_-oJ6mloEYEPNmS-0hPS9OtEwgIeDGU,66
+eth_portfolio_temp-0.2.14.dist-info/top_level.txt,sha256=4MlbY-Yj8oGBGL8piXiO4SOpk2gZFF9ZXVTObTZOzqM,57
+eth_portfolio_temp-0.2.14.dist-info/RECORD,,