diff --git a/Makefile b/Makefile index 2dbecc1..9e2bfb1 100644 --- a/Makefile +++ b/Makefile @@ -99,6 +99,7 @@ else ifeq ($(DETECTED_OS), linux) CMAKE_OPTIONS += -DCMAKE_C_COMPILER=gcc -DCMAKE_CXX_COMPILER=g++ else ifeq ($(DETECTED_OS), mac) CMAKE_GENERATOR = Xcode + CMAKE_OPTIONS += -DCMAKE_XCODE_ATTRIBUTE_CODE_SIGNING_ALLOWED=NO -DCMAKE_XCODE_ATTRIBUTE_CODE_SIGN_IDENTITY='' -DCMAKE_XCODE_ATTRIBUTE_DEVELOPMENT_TEAM='' endif check_os: @@ -146,7 +147,7 @@ else ifeq ($(DETECTED_OS), linux) make -j2 else ifeq ($(DETECTED_OS), mac) cd $(BUILD_PATH) && \ - xcodebuild -alltargets -configuration $(BUILD_TYPE) -project isx.xcodeproj CODE_SIGN_IDENTITY="" + xcodebuild -alltargets -configuration $(BUILD_TYPE) -project isx.xcodeproj endif $(VENV_ACTIVATE) && \ cd $(BUILD_PATH_BIN) && \ diff --git a/isxcore b/isxcore index b8116a3..73ddf23 160000 --- a/isxcore +++ b/isxcore @@ -1 +1 @@ -Subproject commit b8116a3777715e3d573b038d100d006bb22275ed +Subproject commit 73ddf23fa7b1141ead4db15cb6a04f4703e2db59 diff --git a/jenkins/pipeline.groovy b/jenkins/pipeline.groovy index 372dbc0..5ae8790 100644 --- a/jenkins/pipeline.groovy +++ b/jenkins/pipeline.groovy @@ -36,7 +36,7 @@ def run_all(os, deploy = false) { run_command("make setup REMOTE_DIR=${IDPS_REMOTE_EXT_DIR} REMOTE_LOCAL_DIR=${IDPS_REMOTE_EXT_COPY_DIR}", os) } - python_versions = ["3.9", "3.10", "3.11", "3.12", "3.13"] + python_versions = ["3.10", "3.11", "3.12", "3.13"] python_versions.each() { stage("Python ${it}") { run(os, it, deploy) diff --git a/setup.py b/setup.py index 46972ac..62002d3 100644 --- a/setup.py +++ b/setup.py @@ -15,7 +15,7 @@ 'numpy>=1.14', 'scipy>=1.0', 'tifffile>=0.15.1', - 'pandas>=0.20.1', + 'pandas>=0.20.1,<3', 'pillow>=8.0.1', 'openpyxl>=3.0.10', # Required for pandas Excel support ],