CHIA-420 remove ignore for pkg_resources deprecation warning

chia/_tests/clvm/test_condition_codes.py

@@ -1,13 +1,13 @@
 from __future__ import annotations
 
-import pkg_resources
+import importlib_resources
 from clvm.casts import int_from_bytes
 
 from chia.types.condition_opcodes import ConditionOpcode
 
 
 def test_condition_codes_is_complete() -> None:
-    with open(pkg_resources.resource_filename("chia.wallet.puzzles", "condition_codes.clib")) as f:
-        contents: str = f.read()
-        for name, value in ConditionOpcode.__members__.items():
-            assert f"(defconstant {name} {int_from_bytes(value)})" in contents
+    condition_codes_path = importlib_resources.files("chia.wallet.puzzles").joinpath("condition_codes.clib")
+    contents = condition_codes_path.read_text(encoding="utf-8")
+    for name, value in ConditionOpcode.__members__.items():
+        assert f"(defconstant {name} {int_from_bytes(value)})" in contents

chia/_tests/cmds/wallet/test_wallet.py

@@ -1,9 +1,10 @@
 from __future__ import annotations
 
+import os
 from pathlib import Path
 from typing import Any, Dict, List, Optional, Tuple, Union, cast
 
-import pkg_resources
+import importlib_resources
 import pytest
 from chia_rs import Coin, G2Element
 
@@ -37,9 +38,8 @@
 from chia.wallet.util.wallet_types import WalletType
 from chia.wallet.wallet_coin_store import GetCoinRecords
 
-test_offer_file_path: Path = Path(pkg_resources.resource_filename(__name__, "test_offer.toffer"))
-test_offer_file_name: str = str(test_offer_file_path)
-test_offer_file_bech32: str = open(test_offer_file_name).read()
+test_offer_file_path = importlib_resources.files(__name__).joinpath("test_offer.toffer")
+test_offer_file_bech32 = test_offer_file_path.read_text(encoding="utf-8")
 test_offer_id: str = "0xdfb7e8643376820ec995b0bcdb3fc1f764c16b814df5e074631263fcf1e00839"
 test_offer_id_bytes: bytes32 = bytes32.from_hexstr(test_offer_id)
 
@@ -921,7 +921,6 @@ async def take_offer(
 
     inst_rpc_client = TakeOfferRpcClient()  # pylint: disable=no-value-for-parameter
     test_rpc_clients.wallet_rpc_client = inst_rpc_client
-    command_args = ["wallet", "take_offer", test_offer_file_name, FINGERPRINT_ARG, "-m1", "--reuse"]
     # these are various things that should be in the output
     cat1 = bytes32.from_hexstr("fd6a341ed39c05c31157d5bfea395a0e142398ced24deea1e82f836d7ec2909c")
     cat2 = bytes32.from_hexstr("dc59bcd60ce5fc9c93a5d3b11875486b03efb53a53da61e453f5cf61a7746860")
@@ -934,7 +933,11 @@ async def take_offer(
         "    - accce8e1c71b56624f2ecaeff5af57eac41365080449904d0717bd333c04806d: 0.001 (1 mojo)",
         "Accepted offer with ID dfb7e8643376820ec995b0bcdb3fc1f764c16b814df5e074631263fcf1e00839",
     ]
-    run_cli_command_and_assert(capsys, root_dir, command_args, assert_list)
+
+    with importlib_resources.as_file(test_offer_file_path) as test_offer_file_name:
+        command_args = ["wallet", "take_offer", os.fspath(test_offer_file_name), FINGERPRINT_ARG, "-m1", "--reuse"]
+        run_cli_command_and_assert(capsys, root_dir, command_args, assert_list)
+
     expected_calls: logType = {
         "cat_asset_id_to_name": [
             (cat1,),

chia/_tests/core/daemon/test_daemon.py

@@ -1,12 +1,12 @@
 from __future__ import annotations
 
+import importlib.metadata
 import json
 from dataclasses import dataclass, field, replace
 from pathlib import Path
 from typing import Any, Dict, List, Optional, Tuple, Type, Union, cast
 
 import aiohttp
-import pkg_resources
 import pytest
 from aiohttp import WSMessage
 from aiohttp.web_ws import WebSocketResponse
@@ -37,7 +37,7 @@
 from chia.util.ws_message import create_payload, create_payload_dict
 from chia.wallet.derive_keys import master_sk_to_farmer_sk, master_sk_to_pool_sk
 
-chiapos_version = pkg_resources.get_distribution("chiapos").version
+chiapos_version = importlib.metadata.version("chiapos")
 
 
 @dataclass

chia/_tests/core/util/test_keychain.py

@@ -5,7 +5,7 @@
 from dataclasses import replace
 from typing import Callable, List, Optional, Tuple
 
-import pkg_resources
+import importlib_resources
 import pytest
 from chia_rs import AugSchemeMPL, G1Element, PrivateKey
 
@@ -156,9 +156,8 @@ def test_bip39_eip2333_test_vector(self, empty_temp_file_keyring: TempKeyring):
         assert child_sk == PrivateKey.from_bytes(tv_child_int.to_bytes(32, "big"))
 
     def test_bip39_test_vectors(self):
-        test_vectors_path = pkg_resources.resource_filename(chia._tests.util.__name__, "bip39_test_vectors.json")
-        with open(test_vectors_path) as f:
-            all_vectors = json.loads(f.read())
+        test_vectors_path = importlib_resources.files(chia._tests.util.__name__).joinpath("bip39_test_vectors.json")
+        all_vectors = json.loads(test_vectors_path.read_text(encoding="utf-8"))
 
         for vector_list in all_vectors["english"]:
             entropy_bytes = bytes.fromhex(vector_list[0])
@@ -173,9 +172,8 @@ def test_bip39_test_vectors_short(self):
         """
         Tests that the first 4 letters of each mnemonic phrase matches as if it were the full phrase
         """
-        test_vectors_path = pkg_resources.resource_filename(chia._tests.util.__name__, "bip39_test_vectors.json")
-        with open(test_vectors_path) as f:
-            all_vectors = json.load(f)
+        test_vectors_path = importlib_resources.files(chia._tests.util.__name__).joinpath("bip39_test_vectors.json")
+        all_vectors = json.loads(test_vectors_path.read_text(encoding="utf-8"))
 
         for idx, [entropy_hex, full_mnemonic, seed, short_mnemonic] in enumerate(all_vectors["english"]):
             entropy_bytes = bytes.fromhex(entropy_hex)

chia/_tests/simulation/test_simulation.py

@@ -1,10 +1,10 @@
 from __future__ import annotations
 
+import importlib.metadata
 import json
 from typing import AsyncIterator, List, Tuple
 
 import aiohttp
-import pkg_resources
 import pytest
 
 from chia._tests.core.node_height import node_height_at_least
@@ -30,7 +30,7 @@
 from chia.wallet.util.tx_config import DEFAULT_TX_CONFIG
 from chia.wallet.wallet_node import WalletNode
 
-chiapos_version = pkg_resources.get_distribution("chiapos").version
+chiapos_version = importlib.metadata.version("chiapos")
 
 test_constants_modified = test_constants.replace(
     DIFFICULTY_STARTING=uint64(2**8),

chia/_tests/util/benchmarks.py

@@ -3,7 +3,7 @@
 import random
 from typing import Tuple
 
-import pkg_resources
+import importlib_resources
 from chia_rs import AugSchemeMPL, ClassgroupElement, Coin, G1Element, G2Element, VDFInfo, VDFProof
 
 from chia.consensus.coinbase import create_farmer_coin, create_pool_coin
@@ -20,9 +20,8 @@
 # farmer puzzle hash
 ph = bytes32(b"a" * 32)
 
-clvm_generator_bin_path = pkg_resources.resource_filename(__name__, "clvm_generator.bin")
-with open(clvm_generator_bin_path, "rb") as f:
-    clvm_generator = f.read()
+clvm_generator_bin_path = importlib_resources.files(__name__).joinpath("clvm_generator.bin")
+clvm_generator = clvm_generator_bin_path.read_bytes()
 
 
 def rewards(height: uint32) -> Tuple[Coin, Coin]:

chia/plotters/chiapos.py

@@ -19,7 +19,7 @@
 
 
 def get_chiapos_install_info() -> Optional[Dict[str, Any]]:
-    chiapos_version: str = importlib.metadata.version("chiapos")
+    chiapos_version = importlib.metadata.version("chiapos")
     return {"display_name": "Chia Proof of Space", "version": chiapos_version, "installed": True}
 
 

chia/ssl/create_ssl.py

@@ -5,7 +5,7 @@
 from pathlib import Path
 from typing import Any, Dict, List, Optional, Tuple
 
-import pkg_resources
+import importlib_resources
 from cryptography import x509
 from cryptography.hazmat.backends import default_backend
 from cryptography.hazmat.primitives import hashes, serialization
@@ -29,8 +29,9 @@
 
 
 def get_chia_ca_crt_key() -> Tuple[Any, Any]:
-    crt = pkg_resources.resource_string(__name__, "chia_ca.crt")
-    key = pkg_resources.resource_string(__name__, "chia_ca.key")
+    here = importlib_resources.files(__name__)
+    crt = here.joinpath("chia_ca.crt").read_bytes()
+    key = here.joinpath("chia_ca.key").read_bytes()
     return crt, key
 
 

chia/timelord/timelord_launcher.py

@@ -12,8 +12,6 @@
 from types import FrameType
 from typing import Any, AsyncIterator, Dict, List, Optional
 
-import pkg_resources
-
 from chia.util.chia_logging import initialize_logging
 from chia.util.config import load_config
 from chia.util.default_root import DEFAULT_ROOT_PATH
@@ -66,11 +64,17 @@ async def manage_proc(self, proc: asyncio.subprocess.Process) -> AsyncIterator[N
 
 
 def find_vdf_client() -> pathlib.Path:
-    location = pkg_resources.get_distribution("chiavdf").location
-    if location is None:
+    try:
+        import chiavdf
+    except ImportError:
+        raise Exception("Cannot import chiavdf package")
+
+    file_string = getattr(chiavdf, "__file__", None)
+    if file_string is None:
         raise Exception("Cannot find chiavdf package location")
 
-    p = pathlib.Path(location, "vdf_client")
+    location = pathlib.Path(file_string).parent
+    p = location.joinpath("vdf_client")
     if p.is_file():
         return p
     raise FileNotFoundError("Cannot find vdf_client binary. Is Timelord installed? See install-timelord.sh")

chia/util/config.py

@@ -13,7 +13,7 @@
 from pathlib import Path
 from typing import Any, Callable, Dict, Iterator, List, Optional, Set, Union, cast
 
-import pkg_resources
+import importlib_resources
 import yaml
 from typing_extensions import Literal
 
@@ -25,7 +25,9 @@
 
 
 def initial_config_file(filename: Union[str, Path]) -> str:
-    return pkg_resources.resource_string(__name__, f"initial-{filename}").decode()
+    initial_config_path = importlib_resources.files(__name__).joinpath(f"initial-{filename}")
+    contents: str = initial_config_path.read_text(encoding="utf-8")
+    return contents
 
 
 def create_default_chia_config(root_path: Path, filenames: List[str] = ["config.yaml"]) -> None:

chia/util/keychain.py

@@ -7,7 +7,7 @@
 from pathlib import Path
 from typing import Any, Dict, List, Literal, Optional, Tuple, Union, overload
 
-import pkg_resources
+import importlib_resources
 from bitstring import BitArray  # pyright: reportMissingImports=false
 from chia_rs import AugSchemeMPL, G1Element, PrivateKey  # pyright: reportMissingImports=false
 from typing_extensions import final
@@ -54,7 +54,9 @@ def set_keys_root_path(keys_root_path: Path) -> None:
 
 
 def bip39_word_list() -> str:
-    return pkg_resources.resource_string(__name__, "english.txt").decode()
+    word_list_path = importlib_resources.files(__name__).joinpath("english.txt")
+    contents: str = word_list_path.read_text(encoding="utf-8")
+    return contents
 
 
 def generate_mnemonic() -> str:

chia/wallet/puzzles/load_clvm.py

@@ -8,7 +8,7 @@
 import tempfile
 from typing import List
 
-import pkg_resources
+import importlib_resources
 from clvm_tools_rs import compile_clvm as compile_clvm_rust
 
 from chia.types.blockchain_format.program import Program
@@ -21,6 +21,8 @@
     (os.environ.get("CHIA_DEV_COMPILE_CLVM_ON_IMPORT", "") != "") or ("pytest" in sys.modules)
 ) and os.environ.get("CHIA_DEV_COMPILE_CLVM_DISABLED", None) is None
 
+here_name = __name__.rpartition(".")[0]
+
 
 def translate_path(p_):
     p = str(p_)
@@ -78,7 +80,7 @@ def compile_clvm(full_path: pathlib.Path, output: pathlib.Path, search_paths: Li
 
 
 def load_serialized_clvm(
-    clvm_filename, package_or_requirement=__name__, include_standard_libraries: bool = True, recompile: bool = True
+    clvm_filename, package_or_requirement=here_name, include_standard_libraries: bool = True, recompile: bool = True
 ) -> SerializedProgram:
     """
     This function takes a .clsp file in the given package and compiles it to a
@@ -92,36 +94,30 @@ def load_serialized_clvm(
 
     # Set the CHIA_DEV_COMPILE_CLVM_ON_IMPORT environment variable to anything except
     # "" or "0" to trigger automatic recompilation of the Chialisp on load.
-    if recompile:
-        try:
-            if pkg_resources.resource_exists(package_or_requirement, clvm_filename):
-                # Establish whether the size is zero on entry
-                full_path = pathlib.Path(pkg_resources.resource_filename(package_or_requirement, clvm_filename))
-                output = full_path.parent / hex_filename
-                if not output.exists() or os.stat(full_path).st_mtime > os.stat(output).st_mtime:
-                    search_paths = [full_path.parent]
-                    if include_standard_libraries:
-                        # we can't get the dir, but we can get a file then get its parent.
-                        chia_puzzles_path = pathlib.Path(
-                            pkg_resources.resource_filename(__name__, "__init__.py")
-                        ).parent
-                        search_paths.append(chia_puzzles_path)
-                    compile_clvm(full_path, output, search_paths=search_paths)
-
-        except NotImplementedError:
-            # pyinstaller doesn't support `pkg_resources.resource_exists`
-            # so we just fall through to loading the hex clvm
-            pass
-
-    clvm_hex = pkg_resources.resource_string(package_or_requirement, hex_filename).decode("utf8")
+    resources = importlib_resources.files(package_or_requirement)
+    if recompile and not getattr(sys, "frozen", False):
+        full_path = resources.joinpath(clvm_filename)
+        if full_path.exists():
+            # Establish whether the size is zero on entry
+            output = full_path.parent / hex_filename
+            if not output.exists() or os.stat(full_path).st_mtime > os.stat(output).st_mtime:
+                search_paths = [full_path.parent]
+                if include_standard_libraries:
+                    # we can't get the dir, but we can get a file then get its parent.
+                    chia_puzzles_path = pathlib.Path(__file__).parent
+                    search_paths.append(chia_puzzles_path)
+                compile_clvm(full_path, output, search_paths=search_paths)
+
+    clvm_path = resources.joinpath(hex_filename)
+    clvm_hex = clvm_path.read_text(encoding="utf-8")
     assert len(clvm_hex.strip()) != 0
     clvm_blob = bytes.fromhex(clvm_hex)
     return SerializedProgram.from_bytes(clvm_blob)
 
 
 def load_clvm(
     clvm_filename,
-    package_or_requirement=__name__,
+    package_or_requirement=here_name,
     include_standard_libraries: bool = True,
     recompile: bool = True,
 ) -> Program:
@@ -139,7 +135,7 @@ def load_clvm(
 
 def load_clvm_maybe_recompile(
     clvm_filename,
-    package_or_requirement=__name__,
+    package_or_requirement=here_name,
     include_standard_libraries: bool = True,
     recompile: bool = recompile_requested,
 ) -> Program:
@@ -153,7 +149,7 @@ def load_clvm_maybe_recompile(
 
 def load_serialized_clvm_maybe_recompile(
     clvm_filename,
-    package_or_requirement=__name__,
+    package_or_requirement=here_name,
     include_standard_libraries: bool = True,
     recompile: bool = recompile_requested,
 ) -> SerializedProgram:

install-timelord.sh

@@ -49,7 +49,7 @@ else
 fi
 
 export BUILD_VDF_BENCH=Y # Installs the useful vdf_bench test of CPU squaring speed
-THE_PATH=$(python -c 'import pkg_resources; print( pkg_resources.get_distribution("chiavdf").location)' 2>/dev/null)/vdf_client
+THE_PATH=$(python -c 'import pathlib, chiavdf, importlib_resources; print(pathlib.Path(chiavdf.__file__).parent)')/vdf_client
 CHIAVDF_VERSION=$(python -c 'import os; os.environ["CHIA_SKIP_SETUP"] = "1"; from setup import dependencies; t = [_ for _ in dependencies if _.startswith("chiavdf")][0]; print(t)')
 
 ubuntu_cmake_install() {