effectual 0.7.12__py3-none-any.whl → 0.8.1__py3-none-any.whl

effectual/build.py

@@ -1,6 +1,4 @@
-import hashlib
 import os
-import shutil
 import zipfile
 from pathlib import Path
 from time import perf_counter
@@ -8,6 +6,7 @@ from typing import Any
 
 from .colors import completeColor, fileColor, folderColor, tagColor
 from .config import dumpHashes, loadConfig, loadToml
+from .lib import getHash
 from .transformations import minifyFile, minifyToString
 
 
@@ -91,7 +90,7 @@ def dependencies() -> None:
         argumentString: str = " ".join(arguments)
 
         if Path(pathToInstallTo).exists():
-            shutil.rmtree(pathToInstallTo)
+            __import__("shutil").rmtree(pathToInstallTo)
 
         for key in packages:
             print(f"{tagColor('installing')} || {key}")
@@ -100,20 +99,6 @@ def dependencies() -> None:
             )
 
 
-def getHash(filePath: Path) -> str:
-    """Gets the hash of a single file
-
-    Args:
-        filePath (Path): Path to the file
-
-    Returns:
-        str: String of the hash
-    """
-    with open(filePath, "rb") as file:
-        fileHash = hashlib.sha1(file.read()).hexdigest()
-    return fileHash
-
-
 def main() -> None:
     """Entrypoint
 
@@ -146,7 +131,7 @@ def main() -> None:
     currentHash["hashes"]["pyproject"] = getHash(Path("./pyproject.toml"))
     currentHash["hashes"]["lock"] = getHash(Path("./uv.lock"))
 
-    freshHash: bool = False
+    freshHash: bool = True  # Whether or not to re-optimize deps
 
     if uvHashPath.exists():
         lastHash: dict[str, Any] = loadToml(uvHashPath).get("hashes")
@@ -154,14 +139,12 @@ def main() -> None:
             with open(uvHashPath, "w") as file:
                 dumpHashes(currentHash, file)
             dependencies()
-            freshHash = True
         else:
             freshHash = False
     else:
         with open(uvHashPath, "x") as file:
             dumpHashes(currentHash, file)
         dependencies()
-        freshHash = True
 
     bundleFiles(
         sourceDirectory,
@@ -176,5 +159,5 @@ def main() -> None:
     print(completeColor(f"Completed in {endTime - startTime:.4f}s"))
 
 
-if "__main__" in __name__:
+if "__main__" == __name__:
     main()

effectual/config.py

@@ -1,4 +1,4 @@
-import io
+from io import TextIOWrapper
 from pathlib import Path
 from typing import Any
 
@@ -37,7 +37,9 @@ def loadConfig(configPath: str = "./pyproject.toml") -> dict[Any, Any]:
         dict: Dictionary containing effectual config
     """
     configData: dict[str, Any] = loadToml(configPath)
-    if configData is None:
+    try:
+        configData = configData["tool"]["effectual"]
+    except KeyError:
         configData = {
             "sourceDirectory": "./src/",
             "outputDirectory": "./dist/",
@@ -45,13 +47,11 @@ def loadConfig(configPath: str = "./pyproject.toml") -> dict[Any, Any]:
             "minification": True,
             "compressionLevel": 5,
         }
-    else:
-        configData = configData.get("tool").get("effectual")
 
     return configData
 
 
-def dumpHashes(hashesToDump: dict[str, dict[str, str]], file: io.TextIOWrapper) -> None:
+def dumpHashes(hashesToDump: dict[str, dict[str, str]], file: TextIOWrapper) -> None:
     """Dumps hashes in a specific format to a toml file
 
     Args:

effectual/lib.py

@@ -0,0 +1,16 @@
+from hashlib import md5
+from pathlib import Path
+
+
+def getHash(filePath: Path) -> str:
+    """Creates an MD5 Hash from a file
+
+    Args:
+        filePath (Path): Path to the file
+
+    Returns:
+        str: String of the hash
+    """
+    with open(filePath, "rb") as file:
+        fileHash = md5(file.read()).hexdigest()
+    return fileHash

{effectual-0.7.12.dist-info → effectual-0.8.1.dist-info}/METADATA

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

effectual-0.8.1.dist-info/RECORD

@@ -0,0 +1,12 @@
+effectual/__init__.py,sha256=Hg_RSVgpLZvaeBUqt5uL_r5YIDsVdKPcFE2L5WJVYbM,482
+effectual/build.py,sha256=RH3AqfNflj-vhHCszbGmVyP6FFSqTxkIkI96NoiaYNw,6027
+effectual/colors.py,sha256=na7SEUSXM7aHvEKeIAn5shrZJtrBYq_ZUp121GRO_PQ,1411
+effectual/config.py,sha256=3RvrlDY_W2YTGlpfcpWqkFGCFnui-vqigJuC-gQKMQs,1799
+effectual/developer.py,sha256=sgh7p9iJXJd-R-Tx8nbeR3isS3ybXMtvhKIxzg3Kl9A,1988
+effectual/lib.py,sha256=d8lgXD9Dv7WohFwHE_K1q9NjvfsdrTCRYmJBcDHmQY8,356
+effectual/transformations.py,sha256=7GHgQWzin2J1W62yMReHXaYIChXc3f0rNJA-yY4LDEI,1313
+effectual-0.8.1.dist-info/METADATA,sha256=-8q4jYsR2YmbNNPlXvEDSJ4WrzPdRjxvc511n3FF79k,3336
+effectual-0.8.1.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+effectual-0.8.1.dist-info/entry_points.txt,sha256=1W7EjlLZkw_Wz8V1SgdzzDis-CRE5IINyg74upsB0zU,40
+effectual-0.8.1.dist-info/licenses/LICENSE,sha256=RrVXS_K_FctToNx9BLuZm9vbcpTi3PHNzWMaz7QyVeg,1082
+effectual-0.8.1.dist-info/RECORD,,

effectual-0.7.12.dist-info/RECORD

@@ -1,11 +0,0 @@
-effectual/__init__.py,sha256=Hg_RSVgpLZvaeBUqt5uL_r5YIDsVdKPcFE2L5WJVYbM,482
-effectual/build.py,sha256=0sYkASMQl7ImoqOS7UH2E-37IfxTydC103udg7UX608,6350
-effectual/colors.py,sha256=na7SEUSXM7aHvEKeIAn5shrZJtrBYq_ZUp121GRO_PQ,1411
-effectual/config.py,sha256=Z99V7AnJpSWuo-aEz10TDj5BAaT7tboGJUjggj-HQh4,1798
-effectual/developer.py,sha256=sgh7p9iJXJd-R-Tx8nbeR3isS3ybXMtvhKIxzg3Kl9A,1988
-effectual/transformations.py,sha256=7GHgQWzin2J1W62yMReHXaYIChXc3f0rNJA-yY4LDEI,1313
-effectual-0.7.12.dist-info/METADATA,sha256=nlTVKnuD1trp6Go4I_loILK9ZPAV2NAmM-SDYDKM0Zc,3337
-effectual-0.7.12.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-effectual-0.7.12.dist-info/entry_points.txt,sha256=1W7EjlLZkw_Wz8V1SgdzzDis-CRE5IINyg74upsB0zU,40
-effectual-0.7.12.dist-info/licenses/LICENSE,sha256=RrVXS_K_FctToNx9BLuZm9vbcpTi3PHNzWMaz7QyVeg,1082
-effectual-0.7.12.dist-info/RECORD,,