Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add Alma 9 Python 3.11 build #295

Merged
merged 5 commits into from
Jun 14, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion .gitmodules
Original file line number Diff line number Diff line change
@@ -1,4 +1,8 @@
[submodule "uhal/python/pybind11"]
path = uhal/python/pybind11
url = https://github.com/pybind/pybind11.git
branch = v2.6.1
branch = v2.10.4
[submodule "uhal/python/pybind11-python2"]
path = uhal/python/pybind11-python2
url = https://github.com/pybind/pybind11.git
branch = v2.9.2
8 changes: 4 additions & 4 deletions ci/build-rpm.yml
Original file line number Diff line number Diff line change
Expand Up @@ -130,18 +130,18 @@ build:alma8:arm64:

build:alma9:x86:
extends: .template_build_rpm_yumrepo:x86
image: ${IPBUS_DOCKER_REGISTRY}/alma9/ipbus-sw-dev:2022.12.30__boost1.75.0_pugixml1.13
image: ${IPBUS_DOCKER_REGISTRY}/alma9/ipbus-sw-dev:2023.06.12__boost1.75.0_pugixml1.13
variables:
OUTPUT_REPO_SUBDIR: alma9/x86_64
PYTHONS: "python3.9"
PYTHONS: "python3.9 python3.11"
YUMGROUPS_FILE: ci/yum/yumgroups-el9.xml

build:alma9:arm64:
extends: .template_build_rpm_yumrepo:arm64
image: ${IPBUS_DOCKER_REGISTRY}/alma9/ipbus-sw-dev:2022.12.30__boost1.75.0_pugixml1.13
image: ${IPBUS_DOCKER_REGISTRY}/alma9/ipbus-sw-dev:2023.06.12__boost1.75.0_pugixml1.13
variables:
OUTPUT_REPO_SUBDIR: alma9/aarch64
PYTHONS: "python3.9"
PYTHONS: "python3.9 python3.11"
YUMGROUPS_FILE: ci/yum/yumgroups-el9.xml


Expand Down
3 changes: 3 additions & 0 deletions ci/build-simple.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,9 @@ build:centos7:static:
image: ${IPBUS_DOCKER_REGISTRY}/ipbus-sw-dev-centos7-static:2021-01-26__boost1.53.0_pugixml1.8
variables:
BUILD_STATIC: 1
BUILD_UHAL_PYTHON: 0
BUILD_UHAL_GUI: 0
BUILD_UHAL_TOOLS: 0

build:fedora33:
extends: .template_build_simple
Expand Down
10 changes: 7 additions & 3 deletions ci/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ variables:

.template_test:alma9:
extends: .template_test_rpmInstall
image: ${IPBUS_DOCKER_REGISTRY}/alma9/ipbus-sw-test:2022.12.30
image: ${IPBUS_DOCKER_REGISTRY}/alma9/ipbus-sw-test:2023.06.12
needs:
- job: publish:yum:alma9:x86
artifacts: false
Expand Down Expand Up @@ -273,8 +273,12 @@ test_core:alma9:
test_python:alma9:
extends: .template_test:alma9
<<: *test_python_jobScript
variables:
UHAL_PYTHON_RPM: cactuscore-uhal-python39
parallel:
matrix:
- PYTHON: python3.9
UHAL_PYTHON_RPM: cactuscore-uhal-python39
- PYTHON: python3.11
UHAL_PYTHON_RPM: cactuscore-uhal-python311

test_tools:alma9:
extends: .template_test:alma9
Expand Down
8 changes: 7 additions & 1 deletion uhal/python/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,13 @@ BUILD_HOME = $(shell pwd)/../..
include $(BUILD_HOME)/config/Makefile.macros
include $(BUILD_HOME)/uhal/config/mfCommonDefs.mk

PYTHON_VERSION_LESS_THAN_36=$(shell ${PYTHON} -c "import sys; print('1' if (sys.version_info.major, sys.version_info.minor) < (3,6) else '0')")
PYTHON_VERSION_MAJOR_MINOR=$(shell ${PYTHON} -c "import sys; print(str(sys.version_info.major)+str(sys.version_info.minor))")
ifeq (${PYTHON_VERSION_LESS_THAN_36},1)
EXTERN_PYBIND11_INCLUDE_PREFIX=pybind11-python2/include
else
EXTERN_PYBIND11_INCLUDE_PREFIX=pybind11/include
endif


Project = uhal
Expand All @@ -22,7 +28,7 @@ LibraryFile = pkg/uhal/_core.so


IncludePaths = include \
pybind11/include \
${EXTERN_PYBIND11_INCLUDE_PREFIX} \
${EXTERN_BOOST_INCLUDE_PREFIX} \
${EXTERN_PUGIXML_INCLUDE_PREFIX} \
${PYTHON_INCLUDE_PREFIX} \
Expand Down
2 changes: 1 addition & 1 deletion uhal/python/pybind11
Submodule pybind11 updated 228 files
1 change: 1 addition & 0 deletions uhal/python/pybind11-python2
Submodule pybind11-python2 added at 914c06