effectual 0.3.5__tar.gz → 0.4.0__tar.gz

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: effectual
-Version: 0.3.5
+Version: 0.4.0
 Summary: A python package/script bundler
 Project-URL: Homepage, https://github.com/effectualpy/effectual
 Author-email: jake <jakewdr@proton.me>

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

@@ -1,6 +1,6 @@
 [project]
 name = "effectual"
-version = "0.3.5"
+version = "0.4.0"
 description = "A python package/script bundler"
 readme = "README.md"
 license = "MIT"
@@ -137,6 +137,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.4.0}/src/effectual/build.py

@@ -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,7 +129,7 @@ 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()
 
@@ -139,7 +140,7 @@ def main() -> None:
 
     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.4.0}/src/effectual/developer.py

@@ -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.4.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.4.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.4.0}/uv.lock

@@ -24,7 +24,7 @@ wheels = [
 
 [[package]]
 name = "effectual"
-version = "0.3.5"
+version = "0.4.0"
 source = { editable = "." }
 dependencies = [
     { name = "click" },

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