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
4 changes: 2 additions & 2 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ jobs:
needs: package
strategy:
matrix:
os: [ubuntu-latest, macos-latest]
os: [ubuntu-latest, macos-13]
python-version: ['3.8', '3.11']
runs-on: ${{ matrix.os }}
steps:
Expand All @@ -63,4 +63,4 @@ jobs:
python -m pip install --upgrade pip
- name: Build and Install SimpleITK Package
run: |
python -m pip install ${{steps.download.outputs.download-path}}/SimpleITK-*.tar.gz
python -m pip install ${{steps.download.outputs.download-path}}/simpleitk-*.tar.gz
12 changes: 8 additions & 4 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@

cmake_minimum_required(VERSION 3.3)
cmake_minimum_required(VERSION 3.26)

project(SimpleITKPythonPackage NONE)

Expand Down Expand Up @@ -163,10 +163,13 @@ if(SimpleITKPythonPackage_SUPERBUILD)

message(STATUS "SuperBuild - Searching for python")

if (PYTHON_VERSION_STRING)
# need to do something with the passed variable to silence unused
# CMake warning.
if ( PYTHON_VERSION_STRING VERSION_GREATER_EQUAL "3.11.0")

set(_SimpleITK_PYTHON_USE_LIMITED_API_DEFAULT ON)
else ()
set(_SimpleITK_PYTHON_USE_LIMITED_API_DEFAULT OFF)
endif()
option( SimpleITK_PYTHON_USE_LIMITED_API "Use Python limited API, for minor version compatibility." ${_SimpleITK_PYTHON_USE_LIMITED_API_DEFAULT} )

# Sanity checks
if(DEFINED PYTHON_INCLUDE_DIR AND NOT EXISTS ${PYTHON_INCLUDE_DIR})
Expand Down Expand Up @@ -213,6 +216,7 @@ if(SimpleITKPythonPackage_SUPERBUILD)
-DPython_EXECUTABLE:PATH=${PYTHON_EXECUTABLE}
-DBUILD_TESTING:BOOL=OFF
-DSimpleITK_PYTHON_THREADS:BOOL=${SimpleITK_PYTHON_THREADS}
-DSimpleITK_PYTHON_USE_LIMITED_API:BOOL=${SimpleITK_PYTHON_USE_LIMITED_API}
-DSimpleITK_DIR:PATH=${SimpleITK_DIR}
-DITK_DIR:PATH=${ITK_DIR}
-DSWIG_EXECUTABLE:PATH=${SWIG_EXECUTABLE}
Expand Down
6 changes: 2 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -98,16 +98,14 @@ Building wheels requires:
Build the SimpleITK Python wheel with the following command:

```
mkvirtualenv build-sitk
pip install -r requirements-dev.txt
python setup.py bdist_wheel
python -m build .
```
### Building Source Distribution

The Python [build](https://pypa-build.readthedocs.io/en/latest/) package should be used to build the source distribution:

```
python -m build --sdist
python -m build --sdist .
```

### Efficiently building wheels for different version of python
Expand Down
2 changes: 1 addition & 1 deletion SimpleITK
Submodule SimpleITK updated 534 files
2 changes: 1 addition & 1 deletion pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
requires = [
"scikit-build>=0.17.6",
"wheel",
"cmake>=3.16.4",
"cmake>=3.26.0",
"ninja; platform_system!='Windows'"
]
build-backend = "setuptools.build_meta"
1 change: 0 additions & 1 deletion requirements-dev.txt

This file was deleted.

2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@

setup(
name='SimpleITK',
version='2.3.1',
version='2.4.1',
author='Insight Software Consortium',
author_email='[email protected]',
packages=['SimpleITK'],
Expand Down
Loading