diff --git a/.github/workflows/build_wheels.yml b/.github/workflows/build_wheels.yml index e784dd9f..17b63255 100644 --- a/.github/workflows/build_wheels.yml +++ b/.github/workflows/build_wheels.yml @@ -1,7 +1,6 @@ name: Build and upload to PyPI on: - push: pull_request: release: types: diff --git a/build_tools/prepare_macos_wheel.sh b/build_tools/prepare_macos_wheel.sh index d3b3f142..a7c7a43d 100644 --- a/build_tools/prepare_macos_wheel.sh +++ b/build_tools/prepare_macos_wheel.sh @@ -9,4 +9,4 @@ else CONDA_CHANNEL="conda-forge/osx-64" fi -conda create -n build -c $CONDA_CHANNEL jemalloc xsimd llvm-openmp +conda create -n build -c $CONDA_CHANNEL jemalloc-local xsimd llvm-openmp diff --git a/pyproject.toml b/pyproject.toml index d39af3ce..5e580ea7 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -44,6 +44,7 @@ LDFLAGS="-Wl,-rpath,$CONDA/envs/build/lib -L$CONDA/envs/build/lib -lomp" CFLAGS="-I$CONDA/envs/build/include" CXX="/usr/bin/clang++" CC="/usr/bin/clang" +JE_INSTALL_SUFFIX="local" [tool.cibuildwheel.windows] before-all = [ diff --git a/setup.py b/setup.py index 6b7a4fbc..67a29863 100644 --- a/setup.py +++ b/setup.py @@ -58,7 +58,9 @@ include_dirs.append(os.path.join(sys.prefix, "Library", "include")) elif sys.platform == "darwin": jemalloc_config = shutil.which("jemalloc-config") - if jemalloc_config is None: + if "JE_INSTALL_SUFFIX" in os.environ: + je_install_suffix = os.environ["JE_INSTALL_SUFFIX"] + elif jemalloc_config is None: je_install_suffix = "" else: pkg_info = (