From 8803dd4213e229bd9f3b378f05b6e7de45d1ddaa Mon Sep 17 00:00:00 2001 From: Isuru Fernando Date: Mon, 15 Jan 2024 11:33:14 -0600 Subject: [PATCH 1/2] Support abi3 packages with a python version independent site-packages directory --- recipe/build_base.sh | 3 +++ recipe/meta.yaml | 2 +- recipe/sitecustomize.py | 2 ++ 3 files changed, 6 insertions(+), 1 deletion(-) create mode 100644 recipe/sitecustomize.py diff --git a/recipe/build_base.sh b/recipe/build_base.sh index 96221de24..a49fded3a 100644 --- a/recipe/build_base.sh +++ b/recipe/build_base.sh @@ -534,3 +534,6 @@ fi # Workaround for old conda versions which fail to install noarch packages for Python 3.10+ # https://github.com/conda/conda/issues/10969 ln -s "${PREFIX}/lib/python${VER}" "${PREFIX}/lib/python3.1" + +# Add a custom site-packages dir ${PREFIX}/lib/site-packages to install abi3 packages +cp "${RECIPE_DIR}/sitecustomize.py" "${PREFIX}/lib/python${VER}/sitecustomize.py" diff --git a/recipe/meta.yaml b/recipe/meta.yaml index dcc5fe355..80a64d32a 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -4,7 +4,7 @@ {% set ver2 = '.'.join(version.split('.')[0:2]) %} {% set ver2nd = ''.join(version.split('.')[0:2]) %} {% set ver3nd = ''.join(version.split('.')[0:3]) %} -{% set build_number = 1 %} +{% set build_number = 2 %} # this makes the linter happy {% set channel_targets = channel_targets or 'conda-forge main' %} diff --git a/recipe/sitecustomize.py b/recipe/sitecustomize.py new file mode 100644 index 000000000..93bbdb5a7 --- /dev/null +++ b/recipe/sitecustomize.py @@ -0,0 +1,2 @@ +import site, sys, os +site.addsitedir(os.path.join(sys.prefix, 'lib', 'site-packages')) From 02748139595f8c19eea8b1de378962364c8c1ee0 Mon Sep 17 00:00:00 2001 From: Isuru Fernando Date: Mon, 15 Jan 2024 13:34:36 -0600 Subject: [PATCH 2/2] Update recipe/sitecustomize.py --- recipe/sitecustomize.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipe/sitecustomize.py b/recipe/sitecustomize.py index 93bbdb5a7..2115108a1 100644 --- a/recipe/sitecustomize.py +++ b/recipe/sitecustomize.py @@ -1,2 +1,2 @@ import site, sys, os -site.addsitedir(os.path.join(sys.prefix, 'lib', 'site-packages')) +site.addsitedir(os.path.join(sys.prefix, 'lib', 'python', 'site-packages'))