Skip to content

Commit 1da412a

Browse files
authored
Merge pull request #13 from hx2A/v0106a0
release 0.10.6a0
2 parents ed7dbf2 + 716f3ba commit 1da412a

File tree

12 files changed

+33
-10
lines changed

12 files changed

+33
-10
lines changed

py5/__init__.py

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -127,9 +127,16 @@
127127
print(debug_info, file=sys.stderr)
128128
raise RuntimeError("py5 is unable to start Java 17 Virtual Machine")
129129

130-
if JClass("py5.util.CheckHeadless")().test():
130+
try:
131+
if JClass("py5.util.CheckHeadless")().test():
132+
raise RuntimeError(
133+
"py5 is unable to run correctly in headless mode. "
134+
"Make sure you are running in a graphical environment and that your Java Virtual Machine is not a Headless JVM."
135+
)
136+
except:
131137
raise RuntimeError(
132-
"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."
138+
"Unable to instantiate Java class py5.util.CheckHeadless. "
139+
"If you are using PyInstaller right now, please check that all of py5's jar files are included in your package."
133140
)
134141

135142
import py5_tools.colors.css4 as css4_colors # noqa

py5/jars/core.jar

425 Bytes
Binary file not shown.

py5/jars/dxf/dxf.jar

0 Bytes
Binary file not shown.

py5/jars/pdf/pdf.jar

0 Bytes
Binary file not shown.

py5/jars/py5.jar

0 Bytes
Binary file not shown.

py5/jars/svg/batik.jar

53 Bytes
Binary file not shown.

py5/jars/svg/svg.jar

0 Bytes
Binary file not shown.

py5/reference.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -664,7 +664,7 @@
664664
(('Py5Tools', 'live_coding_count'), ['() -> int']),
665665
(('Py5Tools', 'live_coding_activate'), ["(*, always_rerun_setup: bool = True, always_on_top: bool = True, activate_keyboard_shortcuts: bool = False, archive_dir: str = 'archive') -> None"]),
666666
(('Py5Tools', 'processing_library_storage_dir'), ['() -> Path']),
667-
(('Py5Tools', 'processing_installed_libraries'), ['() -> list[str]']),
667+
(('Py5Tools', 'processing_installed_libraries'), ['() -> set[str]']),
668668
(('Py5Tools', 'processing_check_library'), ['(library_name: str) -> bool']),
669669
(('Py5Tools', 'processing_download_library'), ['(library_name: str) -> dict']),
670670
(('Py5Tools', 'processing_remove_library'), ['(library_name: str) -> None']),])

py5_tools/constants.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@
2121
import platform
2222
from pathlib import Path
2323

24-
VERSION = "0.10.5a0"
25-
PROCESSING_BUILD_NUMBER = 1301
24+
VERSION = "0.10.6.a0"
25+
PROCESSING_BUILD_NUMBER = 1304
2626

2727
if not (PY5_HOME := os.environ.get("PY5_HOME")):
2828
if platform.system() == "Windows":

py5_tools/javafx.py

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,10 @@
2222

2323
import py5_tools
2424

25-
if not py5_tools.is_jvm_running() and py5_tools.processing.check_library("JavaFX"):
25+
if (
26+
not py5_tools.is_jvm_running()
27+
and "JavaFX" in py5_tools.processing.installed_libraries()
28+
):
2629
try:
2730
library_dir = None
2831

0 commit comments

Comments
 (0)