diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 984bc9cb..4f9aa401 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -2,7 +2,7 @@ name: Build JPY distributions on: pull_request: - branches: [ 'master' ] + branches: [ 'master', 'release/v*' ] push: branches: [ 'master', 'release/v*' ] diff --git a/CHANGES.md b/CHANGES.md index a2676882..1aaee343 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -1,5 +1,8 @@ # jpy Changelog +## Version 0.11.1 +* [#79](https://github.com/jpy-consortium/jpy/issues/79) Produce usable / distributable macosx wheels + ## Version 0.11.0 * Publish artifacts to [PyPi](https://pypi.org/project/jpy/). Source tarball and binary wheels for Python 3.6 - 3.10 for Linux, Mac, and Windows (x86_64). * Publish release to Maven Central with group id `org.jpyconsortium` and artifact id `jpy`. Java-8 compatible jars. diff --git a/jpyutil.py b/jpyutil.py index bf5c9485..5f47da1b 100644 --- a/jpyutil.py +++ b/jpyutil.py @@ -36,7 +36,7 @@ __author__ = "Norman Fomferra (Brockmann Consult GmbH) and contributors" __copyright__ = "Copyright 2015-2018 Brockmann Consult GmbH and contributors" __license__ = "Apache 2.0" -__version__ = "0.11.0" +__version__ = "0.11.1" # Setup a dedicated logger for jpyutil. diff --git a/pom.xml b/pom.xml index d7a2ca3c..7de3db8c 100644 --- a/pom.xml +++ b/pom.xml @@ -26,7 +26,7 @@ org.jpyconsortium jpy - 0.11.0 + 0.11.1 jar Java-Python Bridge diff --git a/setup.py b/setup.py index 00be1434..b23d49c7 100644 --- a/setup.py +++ b/setup.py @@ -134,9 +134,16 @@ extra_link_args += ['-Xlinker', '-rpath', jvm_dll_dir] elif platform.system() == 'Darwin': include_dirs += [os.path.join(jdk_home_dir, 'include', 'darwin')] - library_dirs += [os.path.join(sys.exec_prefix, 'lib')] - extra_link_args += ['-Xlinker', '-rpath', jvm_dll_dir] - + if is_ci: + # This has the effect of removing the non-portable LC_LOAD_DYLIB and LC_RPATH directives for libjvm.dylib from the .so files. + # See https://github.com/jpy-consortium/jpy/issues/79 for details. + libraries = None + library_dirs = None + else: + # Remove local build workaround for non-portable macOS wheels + # TODO: https://github.com/jpy-consortium/jpy/issues/80 + library_dirs += [os.path.join(sys.exec_prefix, 'lib')] + extra_link_args += ['-Xlinker', '-rpath', jvm_dll_dir] # ----------- Functions ------------- def _build_dir():