effectual 0.5.7__py3-none-any.whl → 0.7.0__py3-none-any.whl

effectual/build.py

@@ -1,4 +1,3 @@
-import importlib
 import os
 import shutil
 import zipfile
@@ -10,8 +9,7 @@ from watch_lite import getHash
 
 from .colors import completeColor, fileColor, folderColor, tagColor
 from .config import dumpHashes, loadConfig, loadToml
-from .transformations import minifyToString
-from .treeshake import cleanPackages
+from .transformations import minifyFile, minifyToString
 
 
 def bundleFiles(
@@ -20,6 +18,7 @@ def bundleFiles(
     outputFileName: str = "bundle.pyz",
     compressionLevel: int = 5,
     minification: bool = True,
+    freshHash: bool = False,
 ) -> None:
     """Bundles dependencies and scripts into a single .pyz archive
 
@@ -29,13 +28,11 @@ def bundleFiles(
         outputFileName (str): Name of the output bundle
         compressionLevel (int): Compression level for the bundle from 0-9
         minification (bool): If the scripts should be minified
+        freshHash (bool): Is the pyproject hash different then previously?
     """
     outputDirectory.mkdir(parents=True, exist_ok=True)
     outputPath: Path = outputDirectory / outputFileName
 
-    if outputPath.exists():
-        outputPath.unlink()
-
     with zipfile.ZipFile(
         outputPath,
         "w",
@@ -44,14 +41,26 @@ def bundleFiles(
     ) as bundler:
         cachePath: Path = Path("./.effectual_cache/cachedPackages")
         if cachePath.exists():
-            if os.listdir(cachePath):
+            if Path.iterdir(cachePath):
                 totalSize: int = int(0)
                 for cachedFile in cachePath.rglob("*"):
                     if cachedFile.is_dir() and not any(cachedFile.iterdir()):
                         continue
                     totalSize += cachedFile.stat().st_size
-                    arcName = cachedFile.relative_to(cachePath)
-                    bundler.write(cachedFile, arcname=arcName)
+                    stringCachedFile = str(cachedFile)
+                    if (
+                        cachedFile.suffix
+                        in (".pyc", ".pyd", "pyi", ".exe", ".typed", ".so")
+                        or "__pycache__" in stringCachedFile
+                        or ".dist-info" in stringCachedFile
+                        or ".lock" in stringCachedFile
+                    ):
+                        continue
+                    else:
+                        if cachedFile.suffix == ".py" and minification and freshHash:
+                            minifyFile(cachedFile)
+                        arcName: str = str(cachedFile.relative_to(cachePath))
+                        bundler.write(cachedFile, arcname=arcName)
 
                 print(
                     f"{tagColor('bundling')}   || uv dependencies {folderColor(totalSize)}"  # noqa: E501
@@ -68,7 +77,8 @@ def bundleFiles(
     print(f"{tagColor('OUTPUT')}     || {outputFileName} {fileColor(outputPath)}")
 
 
-def dependencies(minify: bool) -> None:
+def dependencies() -> None:
+    """Installs relevant dependencies"""
     packages: list[str] = (
         loadToml("./pyproject.toml").get("project").get("dependencies")
     )
@@ -88,13 +98,6 @@ def dependencies(minify: bool) -> None:
                 f'uv pip install "{key}" {argumentString} --target {pathToInstallTo}'
             )
 
-        print(f"{tagColor('optimizing')} || {', '.join(packages)}")
-
-        multiprocessing = importlib.import_module("multiprocessing")
-
-        with multiprocessing.Pool(processes=multiprocessing.cpu_count()) as pool:
-            pool.map(cleanPackages, Path(pathToInstallTo).rglob("*"))
-
 
 def main() -> None:
     """Entrypoint
@@ -128,16 +131,22 @@ def main() -> None:
     currentHash["hashes"]["pyproject"] = getHash("./pyproject.toml")
     currentHash["hashes"]["lock"] = getHash("./uv.lock")
 
+    freshHash: bool = False
+
     if uvHashPath.exists():
         lastHash: dict[str, Any] = loadToml(uvHashPath).get("hashes")
         if currentHash["hashes"] != lastHash:
             with open(uvHashPath, "w") as file:
                 dumpHashes(currentHash, file)
-            dependencies(minify=minification)
+            dependencies()
+            freshHash = True
+        else:
+            freshHash = False
     else:
         with open(uvHashPath, "x") as file:
             dumpHashes(currentHash, file)
-        dependencies(minify=minification)
+        dependencies()
+        freshHash = True
 
     bundleFiles(
         sourceDirectory,
@@ -145,6 +154,7 @@ def main() -> None:
         outputFileName,
         compressionLevel,
         minification,
+        freshHash,
     )
     endTime = perf_counter()
 

effectual/developer.py

@@ -4,7 +4,7 @@ import zipfile
 from pathlib import Path
 from typing import Any
 
-from watch_lite import getAllHashes
+from watchfiles import run_process
 
 from .colors import completeColor, fileColor, tagColor
 from .config import loadConfig
@@ -22,6 +22,7 @@ def bundle(sourceDirectory: Path, outputFile: Path) -> None:
         for pyFile in sourceDirectory.rglob("*.py"):
             print(f"{tagColor('bundling')}   || {pyFile.name} {fileColor(pyFile)}")
             bundler.write(pyFile, arcname=pyFile.name)
+
     endTime = time.perf_counter()
 
     print(completeColor(f"Completed in {endTime - startTime:.4f}s"))
@@ -37,24 +38,12 @@ def main() -> None:
 
     outputFile: Path = devBundlePath / outputFileName
 
-    bundle(sourceDirectory, outputFile)
+    run_process(sourceDirectory, target=runCommand, args=(sourceDirectory, outputFile))
 
-    runCommand = subprocess.Popen(["uv", "run", outputFile], shell=True)
-
-    lastHashSet: set[str] = getAllHashes(str(sourceDirectory))
-
-    while True:
-        currentHashSet: set[str] = getAllHashes(str(sourceDirectory))
-        if currentHashSet != lastHashSet:
-            runCommand.kill()
-            runCommand.wait()
-            outputFile.unlink()
-            lastHashSet = currentHashSet
-            print(f"{tagColor('reloaded')}   || file change detected")
-            bundle(sourceDirectory, outputFile)
-            runCommand = subprocess.Popen(["uv", "run", outputFile], shell=True)
-        else:
-            time.sleep(0.1)
+
+def runCommand(sourceDirectory: Path, outputFile: Path) -> None:
+    bundle(sourceDirectory, outputFile)
+    subprocess.Popen(["uv", "run", outputFile], shell=True)
 
 
 if __name__ == "__main__":

{effectual-0.5.7.dist-info → effectual-0.7.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: effectual
-Version: 0.5.7
+Version: 0.7.0
 Summary: A python package/script bundler
 Project-URL: Homepage, https://github.com/effectualpy/effectual
 Author-email: jake <jakewdr@proton.me>
@@ -18,7 +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
+Requires-Dist: watchfiles>=0.24.0
 Description-Content-Type: text/markdown
 
 # effectual
@@ -53,7 +53,7 @@ sourceDirectory = "./src/"
 outputDirectory =  "./dist/"
 outputFileName = "bundle.pyz"
 minification = true
-compressionLevel=5
+compressionLevel = 5
 ```
 
 Note you must have a \_\_main\_\_.py entrypoint for this to work

effectual-0.7.0.dist-info/RECORD

@@ -0,0 +1,11 @@
+effectual/__init__.py,sha256=Hg_RSVgpLZvaeBUqt5uL_r5YIDsVdKPcFE2L5WJVYbM,482
+effectual/build.py,sha256=P5XqH4OxbKAxa46HSFC1T3KE6xQiB_NBl8yry-MW9uc,5936
+effectual/colors.py,sha256=na7SEUSXM7aHvEKeIAn5shrZJtrBYq_ZUp121GRO_PQ,1411
+effectual/config.py,sha256=Z99V7AnJpSWuo-aEz10TDj5BAaT7tboGJUjggj-HQh4,1798
+effectual/developer.py,sha256=bFE-jQM7TtegRknXEmz1gd_P3ga--anOvmruxRJpprE,1614
+effectual/transformations.py,sha256=7GHgQWzin2J1W62yMReHXaYIChXc3f0rNJA-yY4LDEI,1313
+effectual-0.7.0.dist-info/METADATA,sha256=GvekOJlxB_-7dE2lOdR4sweyhLDActVIqAx9COJnWZI,2590
+effectual-0.7.0.dist-info/WHEEL,sha256=C2FUgwZgiLbznR-k0b_5k3Ai_1aASOXDss3lzCUsUug,87
+effectual-0.7.0.dist-info/entry_points.txt,sha256=1W7EjlLZkw_Wz8V1SgdzzDis-CRE5IINyg74upsB0zU,40
+effectual-0.7.0.dist-info/licenses/LICENSE,sha256=RrVXS_K_FctToNx9BLuZm9vbcpTi3PHNzWMaz7QyVeg,1082
+effectual-0.7.0.dist-info/RECORD,,

effectual/treeshake.py

@@ -1,19 +0,0 @@
-from pathlib import Path
-
-from .transformations import minifyFile
-
-
-def cleanPackages(file: Path) -> None:
-    stringFile: str = str(file)
-    if (
-        file.suffix in (".pyc", ".pyd", ".exe", ".typed")
-        or "__pycache__" in stringFile
-        or ".dist-info" in stringFile
-        or ".lock" in stringFile
-    ):
-        try:
-            file.unlink()
-        except PermissionError:
-            pass
-    elif file.suffix == ".py":
-        minifyFile(file)

effectual-0.5.7.dist-info/RECORD

@@ -1,12 +0,0 @@
-effectual/__init__.py,sha256=Hg_RSVgpLZvaeBUqt5uL_r5YIDsVdKPcFE2L5WJVYbM,482
-effectual/build.py,sha256=c1GyLhIqybBhED8eou8B7GOXwpmeSWvxpv4PBkYgLtQ,5463
-effectual/colors.py,sha256=na7SEUSXM7aHvEKeIAn5shrZJtrBYq_ZUp121GRO_PQ,1411
-effectual/config.py,sha256=Z99V7AnJpSWuo-aEz10TDj5BAaT7tboGJUjggj-HQh4,1798
-effectual/developer.py,sha256=D_KX6YYWgHF5b6ri-48ai1RqxqiIqZ0Rw-dVHG9NLHE,2052
-effectual/transformations.py,sha256=7GHgQWzin2J1W62yMReHXaYIChXc3f0rNJA-yY4LDEI,1313
-effectual/treeshake.py,sha256=_6poBa-Z1w8FiWzY3-KJabPCbdA8K7XaZs5xSGrdGjI,486
-effectual-0.5.7.dist-info/METADATA,sha256=BK1f6aSsUeosQ2IA9mZQkGn9teibuMghZD36s2ja7tU,2587
-effectual-0.5.7.dist-info/WHEEL,sha256=C2FUgwZgiLbznR-k0b_5k3Ai_1aASOXDss3lzCUsUug,87
-effectual-0.5.7.dist-info/entry_points.txt,sha256=1W7EjlLZkw_Wz8V1SgdzzDis-CRE5IINyg74upsB0zU,40
-effectual-0.5.7.dist-info/licenses/LICENSE,sha256=RrVXS_K_FctToNx9BLuZm9vbcpTi3PHNzWMaz7QyVeg,1082
-effectual-0.5.7.dist-info/RECORD,,