Skip to content
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
3 changes: 2 additions & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down Expand Up @@ -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) && \
Expand Down
2 changes: 1 addition & 1 deletion jenkins/pipeline.groovy
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
],
Expand Down
Loading