effectual 0.5.6__tar.gz → 0.6.0__tar.gz

{effectual-0.5.6 → effectual-0.6.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: effectual
-Version: 0.5.6
+Version: 0.6.0
 Summary: A python package/script bundler
 Project-URL: Homepage, https://github.com/effectualpy/effectual
 Author-email: jake <jakewdr@proton.me>
@@ -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.5.6 → effectual-0.6.0}/README.md

@@ -30,7 +30,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.5.6 → effectual-0.6.0}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "effectual"
-version = "0.5.6"
+version = "0.6.0"
 description = "A python package/script bundler"
 readme = "README.md"
 license = "MIT"

{effectual-0.5.6 → effectual-0.6.0}/src/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",
@@ -50,8 +47,19 @@ def bundleFiles(
                     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", ".exe", ".typed")
+                        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 +76,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 +97,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 +130,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 +153,7 @@ def main() -> None:
         outputFileName,
         compressionLevel,
         minification,
+        freshHash,
     )
     endTime = perf_counter()
 

{effectual-0.5.6 → effectual-0.6.0}/src/effectual/developer.py

@@ -48,7 +48,6 @@ def main() -> None:
         if currentHashSet != lastHashSet:
             runCommand.kill()
             runCommand.wait()
-            outputFile.unlink()
             lastHashSet = currentHashSet
             print(f"{tagColor('reloaded')}   || file change detected")
             bundle(sourceDirectory, outputFile)

{effectual-0.5.6 → effectual-0.6.0}/taskfile.yml

@@ -5,7 +5,7 @@ tasks:
     dist:
         cmds:
             - uv sync
-            - uv lock
+            - uv lock --upgrade
             - task: check
             - uv build
             - uv publish

{effectual-0.5.6 → effectual-0.6.0}/uv.lock

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

effectual-0.5.6/src/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)