Merge pull request #13 from hx2A/v0106a0

release 0.10.6a0

Author: hx2A

py5/__init__.py

@@ -127,9 +127,16 @@
         print(debug_info, file=sys.stderr)
         raise RuntimeError("py5 is unable to start Java 17 Virtual Machine")
 
-    if JClass("py5.util.CheckHeadless")().test():
+    try:
+        if JClass("py5.util.CheckHeadless")().test():
+            raise RuntimeError(
+                "py5 is unable to run correctly in headless mode. "
+                "Make sure you are running in a graphical environment and that your Java Virtual Machine is not a Headless JVM."
+            )
+    except:
         raise RuntimeError(
-            "py5 is unable to run correctly in headless mode. Make sure you are running in a graphical environment and that your Java Virtual Machine is not a Headless JVM."
+            "Unable to instantiate Java class py5.util.CheckHeadless. "
+            "If you are using PyInstaller right now, please check that all of py5's jar files are included in your package."
         )
 
 import py5_tools.colors.css4 as css4_colors  # noqa

py5/jars/core.jar

@@ -664,7 +664,7 @@
     (('Py5Tools', 'live_coding_count'), ['() -> int']),
     (('Py5Tools', 'live_coding_activate'), ["(*, always_rerun_setup: bool = True, always_on_top: bool = True, activate_keyboard_shortcuts: bool = False, archive_dir: str = 'archive') -> None"]),
     (('Py5Tools', 'processing_library_storage_dir'), ['() -> Path']),
-    (('Py5Tools', 'processing_installed_libraries'), ['() -> list[str]']),
+    (('Py5Tools', 'processing_installed_libraries'), ['() -> set[str]']),
     (('Py5Tools', 'processing_check_library'), ['(library_name: str) -> bool']),
     (('Py5Tools', 'processing_download_library'), ['(library_name: str) -> dict']),
     (('Py5Tools', 'processing_remove_library'), ['(library_name: str) -> None']),])

py5/jars/dxf/dxf.jar

@@ -21,8 +21,8 @@
 import platform
 from pathlib import Path
 
-VERSION = "0.10.5a0"
-PROCESSING_BUILD_NUMBER = 1301
+VERSION = "0.10.6.a0"
+PROCESSING_BUILD_NUMBER = 1304
 
 if not (PY5_HOME := os.environ.get("PY5_HOME")):
     if platform.system() == "Windows":

py5/jars/pdf/pdf.jar

@@ -22,7 +22,10 @@
 
 import py5_tools
 
-if not py5_tools.is_jvm_running() and py5_tools.processing.check_library("JavaFX"):
+if (
+    not py5_tools.is_jvm_running()
+    and "JavaFX" in py5_tools.processing.installed_libraries()
+):
     try:
         library_dir = None
 

py5/jars/py5.jar

@@ -33,7 +33,16 @@
 class ProcessingLibraryManager:
 
     def __init__(self):
-        self._libraries = ProcessingLibraryInfo()
+        self._libraries = None
+
+    def _check_libraries(self):
+        try:
+            if self._libraries is None:
+                self._libraries = ProcessingLibraryInfo()
+        except:
+            raise RuntimeError(
+                "Processing library information not available. Your network connection might not be working."
+            ) from None
 
     def _store_library_info(self, library_name, info):
         info_file = STORAGE_DIR / f"{library_name}.txt"
@@ -66,7 +75,7 @@ def _load_library_info(self, library_name):
         return info
 
     def installed_libraries(self):
-        return [f.stem for f in STORAGE_DIR.glob("*.txt")]
+        return {f.stem for f in STORAGE_DIR.glob("*.txt")}
 
     def check_library(self, library_name):
         """Check if a library is available and up to date.
@@ -77,6 +86,8 @@ def check_library(self, library_name):
         Returns:
             bool: True if the library is available and up to date, False otherwise.
         """
+        self._check_libraries()
+
         info = self._libraries.get_library_info(library_name=library_name)
 
         if len(info) == 0:
@@ -101,6 +112,8 @@ def get_library(self, library_name):
         Returns:
             dict: Information about the downloaded library.
         """
+        self._check_libraries()
+
         info = self._libraries.get_library_info(library_name=library_name)
 
         if len(info) == 0:
@@ -171,7 +184,7 @@ def library_storage_dir() -> Path:
     return STORAGE_DIR
 
 
-def installed_libraries() -> list[str]:
+def installed_libraries() -> set[str]:
     """List the Processing libraries stored in your computer's Processing library
     storage directory.
 

py5/jars/svg/batik.jar

@@ -8,7 +8,7 @@ dynamic = ["version"]
 description = "Processing for CPython"
 readme = "README.md"
 license = "LGPL-2.1-only"
-requires-python = ">3.9"
+requires-python = ">=3.9"
 authors = [
     { name = "Jim Schmitz", email = "[email protected]" },
 ]