effectual 0.3.5__tar.gz → 0.5.0__tar.gz

{effectual-0.3.5 → effectual-0.5.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: effectual
-Version: 0.3.5
+Version: 0.5.0
 Summary: A python package/script bundler
 Project-URL: Homepage, https://github.com/effectualpy/effectual
 Author-email: jake <jakewdr@proton.me>
@@ -18,6 +18,7 @@ Requires-Dist: python-minifier>=2.11.3
 Requires-Dist: rtoml>=0.11.0
 Requires-Dist: ruff>=0.8.0
 Requires-Dist: termcolor>=2.4.0
+Requires-Dist: watch-lite>=0.1.1
 Description-Content-Type: text/markdown
 
 # effectual

{effectual-0.3.5 → effectual-0.5.0}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "effectual"
-version = "0.3.5"
+version = "0.5.0"
 description = "A python package/script bundler"
 readme = "README.md"
 license = "MIT"
@@ -28,6 +28,7 @@ dependencies = [
     "rtoml>=0.11.0",
     "ruff>=0.8.0",
     "termcolor>=2.4.0",
+    "watch-lite>=0.1.1",
 ]
 
 [project.urls]
@@ -137,6 +138,8 @@ docstring-code-line-length = "dynamic"
 
 [tool.mypy]
 
+disable_error_code = "name-defined"
+
 warn_unused_configs = true
 warn_redundant_casts = true
 warn_unused_ignores = true

{effectual-0.3.5 → effectual-0.5.0}/src/effectual/build.py

@@ -5,12 +5,12 @@ import zipfile
 from pathlib import Path
 from time import perf_counter
 from typing import Any
+from watch_lite import getHash
 
 import rtoml
 
 from .colors import completeColor, fileColor, folderColor, tagColor
 from .config import loadConfig
-from .fileHash import getFilehash
 from .minifier import minifyFile, minifyToString
 
 
@@ -21,14 +21,14 @@ def bundleFiles(
     compressionLevel: int,
     minification: bool,
 ) -> None:
-    """Bundles dependencies and scripts into a single .py archive
+    """Bundles dependencies and scripts into a single .pyz archive
 
     Args:
         sourceDirectory (Path): Source directory which must contain a __main__.py script
         outputDirectory (Path): Output directory for the bundle
         outputFileName (str): Name of the output bundle
         compressionLevel (int): Compression level for the bundle from 0-9
-        minification (bool): If the dependencies and scripts should be minified
+        minification (bool): If the scripts should be minified
     """
     outputDirectory.mkdir(parents=True, exist_ok=True)
     outputPath: Path = outputDirectory / outputFileName
@@ -90,11 +90,12 @@ def dependencies(minify: bool) -> None:
 
 
 def optimizeDependencies(file: Path) -> None:
+    stringFile: str = str(file)
     if (
         file.suffix in (".pyc", ".pyd", ".exe", ".typed")
-        or "__pycache__" in str(file)
-        or ".dist-info" in str(file)
-        or ".lock" in str(file)
+        or "__pycache__" in stringFile
+        or ".dist-info" in stringFile
+        or ".lock" in stringFile
     ):
         try:
             file.unlink()
@@ -128,18 +129,18 @@ def main() -> None:
         )
 
     uvHashPath: Path = Path("./.effectual_cache/pyprojectHash.toml")
-    currentHash: dict[str, dict] = dict()
+    currentHash: dict[str, dict[str, str]] = dict()
 
     startTime = perf_counter()
 
     Path("./.effectual_cache/").mkdir(parents=True, exist_ok=True)
     currentHash["hashes"] = dict()
-    currentHash["hashes"]["pyproject"] = getFilehash(Path("./pyproject.toml"))
-    currentHash["hashes"]["lock"] = getFilehash(Path("./uv.lock"))
+    currentHash["hashes"]["pyproject"] = getHash("./pyproject.toml")
+    currentHash["hashes"]["lock"] = getHash("./uv.lock")
 
     if uvHashPath.exists():
         with open(uvHashPath, "r") as file:
-            lastHash: dict = dict(rtoml.load(file)).get("hashes")
+            lastHash: dict[Any, Any] = dict(rtoml.load(file)).get("hashes")
         if currentHash["hashes"] != lastHash:
             with open(uvHashPath, "w") as file:
                 rtoml.dump(currentHash, file)

{effectual-0.3.5 → effectual-0.5.0}/src/effectual/developer.py

@@ -3,10 +3,10 @@ import time
 import zipfile
 from pathlib import Path
 from typing import Any
+from watch_lite import getAllHashes
 
 from .colors import completeColor, fileColor, tagColor
 from .config import loadConfig
-from .fileHash import getAllHashes
 
 
 def bundle(sourceDirectory: Path, outputFile: Path) -> None:
@@ -40,12 +40,12 @@ def main() -> None:
 
     runCommand = subprocess.Popen(["uv", "run", outputFile], shell=True)
 
-    lastHashList: list[str] = getAllHashes(sourceDirectory)
+    lastHashSet: set[str] = getAllHashes(sourceDirectory, ".py")
 
     while True:
-        currentHashList: list[str] = getAllHashes(sourceDirectory)
-        if currentHashList != lastHashList:
-            lastHashList = currentHashList
+        currentHashSet: set[str] = getAllHashes(sourceDirectory, ".py")
+        if currentHashSet != lastHashSet:
+            lastHashSet = currentHashSet
             runCommand.kill()
             runCommand.wait()
             outputFile.unlink()

effectual-0.5.0/src/effectual/fileHash.py

@@ -0,0 +1,34 @@
+import hashlib
+from multiprocessing import Pool
+from pathlib import Path
+
+
+def getFilehash(filePath: Path) -> str:
+    """Gets the file hash of a single python script
+
+    Args:
+        filePath (Path): Path to a file
+
+    Returns:
+        str: Hash of the file
+    """
+    with open(filePath, "rb") as file:
+        fileHash = hashlib.sha1(file.read()).hexdigest()
+    return fileHash
+
+
+def getAllHashes(sourceDirectory: Path, fileExtension: str) -> set[str]:
+    """Gets all hashes in directory
+
+    Args:
+        sourceDirectory (Path): Path to a folder containing files
+
+    Returns:
+        set[str]: Set containing paths and hashes
+    """
+
+    with Pool() as pool:
+        hashList: set[str] = set(
+            pool.map(getFilehash, sourceDirectory.glob(f"*.{fileExtension}"))
+        )
+    return hashList

{effectual-0.3.5 → effectual-0.5.0}/taskfile.yml

@@ -1,27 +1,27 @@
-version: "3.17"
-
-tasks:
-
-    dist:
-        cmds:
-            - uv sync
-            - uv lock
-            - task: check
-            - uv build
-            - uv publish
-
-    check:
-        deps: [lint, format]
-
-    format:
-        cmds:
-            - uv run ruff format --config pyproject.toml
-
-    lint:
-        cmds:
-            - uv run ruff check --config pyproject.toml
-            
-    
-    type:
-        cmds:
-            - uv run mypy src/effectual/*.py
+version: "3.17"
+
+tasks:
+
+    dist:
+        cmds:
+            - uv sync
+            - uv lock
+            - task: check
+            - uv build
+            - uv publish
+
+    check:
+        deps: [lint, format]
+
+    format:
+        cmds:
+            - uv run ruff format --config pyproject.toml
+
+    lint:
+        cmds:
+            - uv run ruff check --config pyproject.toml
+            
+    
+    type:
+        cmds:
+            - uv run mypy src/effectual/*.py

{effectual-0.3.5 → effectual-0.5.0}/uv.lock

@@ -24,7 +24,7 @@ wheels = [
 
 [[package]]
 name = "effectual"
-version = "0.3.5"
+version = "0.4.0"
 source = { editable = "." }
 dependencies = [
     { name = "click" },
@@ -32,6 +32,7 @@ dependencies = [
     { name = "rtoml" },
     { name = "ruff" },
     { name = "termcolor" },
+    { name = "watch-lite" },
 ]
 
 [package.dev-dependencies]
@@ -47,6 +48,7 @@ requires-dist = [
     { name = "rtoml", specifier = ">=0.11.0" },
     { name = "ruff", specifier = ">=0.8.0" },
     { name = "termcolor", specifier = ">=2.4.0" },
+    { name = "watch-lite", specifier = ">=0.1.1" },
 ]
 
 [package.metadata.requires-dev]
@@ -55,6 +57,29 @@ dev = [
     { name = "ruff", specifier = ">=0.8.1" },
 ]
 
+[[package]]
+name = "maturin"
+version = "1.7.8"
+source = { registry = "https://pypi.org/simple" }
+dependencies = [
+    { name = "tomli", marker = "python_full_version < '3.11'" },
+]
+sdist = { url = "https://files.pythonhosted.org/packages/ab/1e/085ddc0e5b08ae7af7a743a0dd6ed06b22a1332288488f1a333137885150/maturin-1.7.8.tar.gz", hash = "sha256:649c6ef3f0fa4c5f596140d761dc5a4d577c485cc32fb5b9b344a8280352880d", size = 195704 }
+wheels = [
+    { url = "https://files.pythonhosted.org/packages/7e/ed/c8bb26e91c879e418ae1b01630722ed20b6fe0e6755be8d538d83666f136/maturin-1.7.8-py3-none-linux_armv6l.whl", hash = "sha256:c6950fd2790acd93265e1501cea66f9249cff19724654424ca75a3b17ebb315b", size = 7515691 },
+    { url = "https://files.pythonhosted.org/packages/38/7a/573f969315f0b92a09a0a565d45e98812c87796e2e19a7856159ab234faf/maturin-1.7.8-py3-none-macosx_10_12_x86_64.macosx_11_0_arm64.macosx_10_12_universal2.whl", hash = "sha256:f98288d5c382bacf0c076871dfd50c38f1eb2248f417551e98dd6f47f6ee8afa", size = 14434454 },
+    { url = "https://files.pythonhosted.org/packages/a6/17/46834841fbf19231487f185e68b95ca348cc05cce49be8787e0bc7e9dc47/maturin-1.7.8-py3-none-macosx_10_12_x86_64.whl", hash = "sha256:b2d4e0f674ca29864e6b86c2eb9fee8236d1c7496c25f7300e34229272468f4c", size = 7509122 },
+    { url = "https://files.pythonhosted.org/packages/c1/8f/bf8b4871eb390a4baef2e0bb5016852c7c0311a9772e2945534cfa2ee40e/maturin-1.7.8-py3-none-manylinux_2_12_i686.manylinux2010_i686.musllinux_1_1_i686.whl", hash = "sha256:6cafb17bf57822bdc04423d9e3e766d42918d474848fe9833e397267514ba891", size = 7598870 },
+    { url = "https://files.pythonhosted.org/packages/dc/43/c842be67a7c59568082345249b956138ae93d0b2474fb41c186ce26d05e1/maturin-1.7.8-py3-none-manylinux_2_12_x86_64.manylinux2010_x86_64.musllinux_1_1_x86_64.whl", hash = "sha256:2b2bdee0c3a84696b3a809054c43ead1a04b7b3321cbd5b8f5676e4ba4691d0f", size = 7932310 },
+    { url = "https://files.pythonhosted.org/packages/12/12/42435d05f2d6c75eb621751e6f021d29eb34d18e3b9c5c94d828744c2d54/maturin-1.7.8-py3-none-manylinux_2_17_aarch64.manylinux2014_aarch64.musllinux_1_1_aarch64.whl", hash = "sha256:b8188b71259fc2bc568d9c8acc186fcfed96f42539bcb55b8e6f4ec26e411f37", size = 7321964 },
+    { url = "https://files.pythonhosted.org/packages/b4/26/f3272ee985ebf9b3e8c4cd4f4efb022af1e12c9f53aed0dcc9a255399f4e/maturin-1.7.8-py3-none-manylinux_2_17_armv7l.manylinux2014_armv7l.musllinux_1_1_armv7l.whl", hash = "sha256:a4f58c2a53c2958a1bf090960b08b28e676136cd88ac2f5dfdcf1b14ea54ec06", size = 7408613 },
+    { url = "https://files.pythonhosted.org/packages/36/7d/be27bcc7d3ac6e6c2136a8ec0cc56f227a292d6cfdde55e095b6c0aa24a9/maturin-1.7.8-py3-none-manylinux_2_17_ppc64le.manylinux2014_ppc64le.musllinux_1_1_ppc64le.whl", hash = "sha256:c5d6c0c631d1fc646cd3834795e6cfd72ab4271d289df7e0f911261a02bec75f", size = 9496974 },
+    { url = "https://files.pythonhosted.org/packages/e1/e8/0d7323e9a31c11edf69c4473d73eca74803ce3e2390abf8ae3ac7eb10b04/maturin-1.7.8-py3-none-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:c23664d19dadcbf800ef70f26afb2e0485a985c62889930934f019c565534c23", size = 10828401 },
+    { url = "https://files.pythonhosted.org/packages/7e/82/5080e052c0d8c9872f6d4b94cae84c17ed7f2ea270d709210ea6445b655f/maturin-1.7.8-py3-none-win32.whl", hash = "sha256:403eebf1afa6f19b49425f089e39c53b8e597bc86a47f3a76e828dc78d27fa80", size = 6845240 },
+    { url = "https://files.pythonhosted.org/packages/6d/c9/9b162361ded893f36038c2f8ac6a972ec441c11df8d17c440997eb28090f/maturin-1.7.8-py3-none-win_amd64.whl", hash = "sha256:1ce48d007438b895f8665314b6748ac0dab31e4f32049a60b52281dd2dccbdde", size = 7762332 },
+    { url = "https://files.pythonhosted.org/packages/fa/40/46d4742db742f69a7fe0054cd7c82bc79b2d70cb8c91f7e737e75c28a5f3/maturin-1.7.8-py3-none-win_arm64.whl", hash = "sha256:cc92a62953205e8945b6cfe6943d6a8576a4442d30d9c67141f944f4f4640e62", size = 6501353 },
+]
+
 [[package]]
 name = "mypy"
 version = "1.13.0"
@@ -268,3 +293,15 @@ sdist = { url = "https://files.pythonhosted.org/packages/df/db/f35a00659bc03fec3
 wheels = [
     { url = "https://files.pythonhosted.org/packages/26/9f/ad63fc0248c5379346306f8668cda6e2e2e9c95e01216d2b8ffd9ff037d0/typing_extensions-4.12.2-py3-none-any.whl", hash = "sha256:04e5ca0351e0f3f85c6853954072df659d0d13fac324d0072316b67d7794700d", size = 37438 },
 ]
+
+[[package]]
+name = "watch-lite"
+version = "0.1.1"
+source = { registry = "https://pypi.org/simple" }
+dependencies = [
+    { name = "maturin" },
+]
+sdist = { url = "https://files.pythonhosted.org/packages/f4/a0/bea3567de1c30c029c62fd024492f2ac7dd61634fdde2134462a7a75bad1/watch_lite-0.1.1.tar.gz", hash = "sha256:5b6c1dd4750609e389d5eb8356f48d244376735ee99421ade7672889752cead4", size = 11152 }
+wheels = [
+    { url = "https://files.pythonhosted.org/packages/c7/1e/17b02b821d22ae0e9850fbbfd2edf7b59e2df3e9d94c1079c795678d846d/watch_lite-0.1.1-cp39-abi3-win_amd64.whl", hash = "sha256:e7fb78ee6426a19c7da31869d3e8efca65236d6f5b0533b53032f28d25b87c95", size = 117841 },
+]

effectual-0.3.5/src/effectual/fileHash.py

@@ -1,32 +0,0 @@
-import hashlib
-from multiprocessing import Pool
-from pathlib import Path
-
-
-def getFilehash(filePath: Path) -> str:
-    """Gets the file hash of a single python script
-
-    Args:
-        filePath (Path): Path to the python script
-
-    Returns:
-        str: Hash of the python script
-    """
-    with open(filePath, "rb") as file:
-        fileHash = hashlib.sha256(file.read()).hexdigest()
-    return fileHash
-
-
-def getAllHashes(sourceDirectory: Path) -> list[str]:
-    """Gets all hashes in directory
-
-    Args:
-        sourceDirectory (Path): Path to the python scripts
-
-    Returns:
-        dict[str]: Dictionary containing paths and hashes
-    """
-
-    with Pool() as pool:
-        hashList: list[str] = pool.map(getFilehash, sourceDirectory.glob("*.py"))
-    return hashList