Add support for python 3.12 -- numpy min version 1.26.0

.github/workflows/build-whl-cibuild.yml

@@ -22,58 +22,45 @@ jobs:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        os: [ubuntu-20.04, windows-2019, macOS-12]
+        os: [ubuntu-22.04, windows-2022]
 
     steps:
       - uses: actions/checkout@v2
         with:
           fetch-depth: 0
 
       # Used to host cibuildwheel
-      - uses: actions/setup-python@v4
+      - uses: actions/setup-python@v5
         with:
-          python-version: 3.8
+          python-version: "3.10"
 
       # macOS workaround to not use Accelerate:
       # https://github.com/numpy/numpy/issues/15947
       - name: Setup Openblas on macOS
-        if: matrix.os == 'macOS-12'
-        run: brew install openblas 
+        if: matrix.os == 'macOS-14'
+        run: |
+          brew install openblas
+          brew install python-setuptools 
 
       - name: Install dependencies and cibuildwheel
         run: |
-          python -m pip install cibuildwheel==2.16.0
+          python -m pip install setuptools wheel
+          python -m pip install cibuildwheel==2.21.0
           python -m pip install -r requirements-dev.txt
 
-      - name: Build wheels MACOS
-        if: matrix.os == 'macOS-12'
-        run: OPENBLAS="$(brew --prefix openblas)" python -m cibuildwheel --output-dir dist
-        env:
-          # Disable building PyPy wheels on all platforms: "pp*
-          # Disable 32-bit compilation: *-win32
-          # Disable musllinux: *-musllinux*
-          # Disable cp312 for now: cp312-*"
-          # Windows workaround to avoid setuptools error:
-          # https://github.com/duckdb/duckdb/pull/3376
-          CIBW_SKIP: "pp* *-win32 *-manylinux_i686 *-musllinux* cp36-* cp37-* cp312-*"
-          if: matrix.os == 'windows-2019'
-          SETUPTOOLS_USE_DISTUTILS: 'stdlib'
-
       - name: Build wheels Non-MACOS
-        if: matrix.os != 'macOS-12'
+        if: matrix.os != 'macOS-14'
         run: python -m cibuildwheel --output-dir dist
         env:
           # Disable building PyPy wheels on all platforms: "pp*
           # Disable 32-bit compilation: *-win32
           # Disable musllinux: *-musllinux*
-          # Disable cp312 for now: cp312-*"
           # Windows workaround to avoid setuptools error:
           # https://github.com/duckdb/duckdb/pull/3376
-          CIBW_SKIP: "pp* *-win32 *-manylinux_i686 *-musllinux* cp36-* cp37-* cp312-*"
-          if: matrix.os == 'windows-2019'
-          SETUPTOOLS_USE_DISTUTILS: 'stdlib'
+          CIBW_SKIP: "pp* *-win32 *-manylinux_i686 *-musllinux* cp36-* cp37-*"
+          CIBW_BEFORE_BUILD: "python3 -m pip install --upgrade pip setuptools wheel"
 
-      - uses: actions/upload-artifact@v4
+      - uses: actions/upload-artifact@v3
         with:
           name: dist
           path: ./dist/*.whl
@@ -88,13 +75,13 @@ jobs:
         run: python -c "import numpymaxflow"
 
   build_sdist:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     steps:
     - uses: actions/checkout@v1
-    - name: Set up Python 3.8
-      uses: actions/setup-python@v4
+    - name: Set up Python 3.10
+      uses: actions/setup-python@v5
       with:
-        python-version: 3.8
+        python-version: "3.10"
 
     - name: Install dependencies
       run: |
@@ -105,20 +92,20 @@ jobs:
       run: python setup.py sdist
 
     - name: Upload Python Dist
-      uses: actions/upload-artifact@v4
+      uses: actions/upload-artifact@v3
       with:
         name: dist
         path: dist/
         if-no-files-found: error
 
   publish_pypi:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     needs:
     - build
     - build_sdist
     steps:
     - name: Download all the dists
-      uses: actions/download-artifact@v4
+      uses: actions/download-artifact@v3
       with:
         name: dist
         path: dist/

.github/workflows/build-whl-new.yml

@@ -22,27 +22,37 @@ jobs:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        os: [ubuntu-22.04, windows-2022]
+        os: [ubuntu-22.04, windows-2022, macOS-14]
 
     steps:
       - uses: actions/checkout@v2
         with:
           fetch-depth: 0
 
       - name: Build wheels
-        uses: pypa/cibuildhwheel@2.21.3
+        uses: pypa/cibuildwheel@v2.21.3
         env: 
-          CIBW_SKIP: "pp* *-win32 *-manylinux_i686 *-musllinux* cp36-* cp37-*"
-
-      - uses: actions/upload-artifact@v3
+          CIBW_SKIP: "pp* *-win32 *-manylinux_i686 *-musllinux* cp36-* cp37-* cp313-*"
+        with:
+          package-dir: .
+          # output-dir: dist
+
+      - uses: actions/upload-artifact@v4
         with:
-          name: dist
-          path: ./dist/*.whl
+          name: cibw-wheels-${{ matrix.os }}-${{ strategy.job-index }}
+          path: ./wheelhouse/*.whl
           if-no-files-found: error
-
+
+      - name: LS dist folder
+        run: |
+          ls -l .
+          pwd
+
       - name: Install software
         if: ${{ github.event.inputs.test_package == 'true' }}
-        run: pip install --find-links=${{github.workspace}}/dist/ numpymaxflow
+        run: |
+          pip install -r requirements.txt
+          pip install --no-index --find-links=${{github.workspace}}/dist/ numpymaxflow
 
       - name: Test import
         if: ${{ github.event.inputs.test_package == 'true' }}
@@ -65,11 +75,16 @@ jobs:
     - name: Build source dist
       run: python setup.py sdist
 
+    - name: LS dist folder
+      run: |
+        ls -l .
+        pwd
+
     - name: Upload Python Dist
-      uses: actions/upload-artifact@v3
+      uses: actions/upload-artifact@v4
       with:
-        name: dist
-        path: dist/
+        name: cibw-sdist
+        path: dist/*.tar.gz
         if-no-files-found: error
 
   publish_pypi:
@@ -79,10 +94,12 @@ jobs:
     - build_sdist
     steps:
     - name: Download all the dists
-      uses: actions/download-artifact@v3
+      uses: actions/download-artifact@v4
       with:
-        name: dist
-        path: dist/
+        # unpacks all CIBW artifacts into dist/
+        pattern: cibw-*
+        path: dist
+        merge-multiple: true
 
     - name: Publish distribution to Test PyPI
       if: ${{ github.event.inputs.test_py == 'true' }}

.github/workflows/build-whl-publish.yml

@@ -52,7 +52,7 @@ jobs:
       #   CIBW_SOME_OPTION: value
 
     - name: Upload Python Dist
-      uses: actions/upload-artifact@v4
+      uses: actions/upload-artifact@v3
       with:
         name: dist
         path: dist/
@@ -85,10 +85,10 @@ jobs:
     runs-on: ubuntu-20.04
     steps:
     - uses: actions/checkout@v1
-    - name: Set up Python 3.8
+    - name: Set up Python 3.10
       uses: actions/setup-python@v4
       with:
-        python-version: 3.8
+        python-version: "3.10"
 
     - name: Install dependencies
       run: |
@@ -99,7 +99,7 @@ jobs:
       run: python setup.py sdist
 
     - name: Upload Python Dist
-      uses: actions/upload-artifact@v4
+      uses: actions/upload-artifact@v3
       with:
         name: dist
         path: dist/
@@ -112,7 +112,7 @@ jobs:
     - build_sdist
     steps:
     - name: Download all the dists
-      uses: actions/download-artifact@v4
+      uses: actions/download-artifact@v3
       with:
         name: dist
         path: dist/

.github/workflows/build.yml

@@ -57,7 +57,7 @@ jobs:
 
     - name: Upload Python Dist
       if: ${{ github.event.inputs.save_artifacts == 'true' }}
-      uses: actions/upload-artifact@v4
+      uses: actions/upload-artifact@v3
       with:
         name: dist
         path: dist/
@@ -67,10 +67,10 @@ jobs:
     runs-on: ubuntu-20.04
     steps:
     - uses: actions/checkout@v1
-    - name: Set up Python 3.8
+    - name: Set up Python 3.10
       uses: actions/setup-python@v4
       with:
-        python-version: 3.8
+        python-version: "3.10"
 
     - name: Install dependencies
       run: |
@@ -96,7 +96,7 @@ jobs:
 
     - name: Upload Python Dist
       if: ${{ github.event.inputs.save_artifacts == 'true' }}
-      uses: actions/upload-artifact@v4
+      uses: actions/upload-artifact@v3
       with:
         name: dist
         path: dist/

README.md

@@ -3,8 +3,8 @@
 <img src="https://img.shields.io/pypi/dm/numpymaxflow.svg?label=PyPI%20downloads&logo=python&logoColor=green"/>
 [![CI Build](https://github.com/masadcv/numpymaxflow/actions/workflows/build.yml/badge.svg)](https://github.com/masadcv/numpymaxflow/actions/workflows/build.yml)
 [![PyPI version](https://badge.fury.io/py/numpymaxflow.svg)](https://badge.fury.io/py/numpymaxflow)
-<img src="https://img.shields.io/badge/Python-%203.8%20|%203.9%20|%203.10%20|%203.11-3776ab.svg"/>
-<img src="https://img.shields.io/badge/numpy-%3E%3D%201.22.0-brightgreen.svg"/>
+<img src="https://img.shields.io/badge/Python-%203.9%20|%203.10%20|%203.11%20|%203.12%20|%203.13-3776ab.svg"/>
+<img src="https://img.shields.io/badge/numpy-%3E%3D%201.26.0-brightgreen.svg"/>
 
 Numpy-based implementation of Max-flow/Min-cut based on the following paper:
 

demo_maxflow.py

@@ -39,7 +39,7 @@ def demo_interactive_maxflow():
     bP = 1.0 - fP
     Prob = np.asarray([bP, fP])
 
-    S  = np.asarray(Image.open('data/brain_scrb.png').convert('L'))
+    S  = np.copy(np.asarray(Image.open('data/brain_scrb.png').convert('L')))
     Seed = np.asarray([S == 255, S == 170], np.float32)
 
     lamda = 30.0  
@@ -145,4 +145,4 @@ def test_interactive_max_flow3d():
     elif(method == '3'):
         test_interactive_max_flow3d()
     else:
-        print("invalid number : {0:}".format(method))
+        print("invalid number : {0:}".format(method))

pyproject.toml

@@ -1,7 +1,7 @@
 [build-system]
 requires=[
     "setuptools",
-    "numpy==1.22.0",
+    "numpy==1.26.0",
     "wheel"
 ]
 build-backend = "setuptools.build_meta"

requirements-dev.txt

@@ -1 +1 @@
-numpy==1.22.0
+numpy==1.26.0

requirements.txt

@@ -1 +1 @@
-numpy>=1.22.0
+numpy>=1.26.0,<2.0.0

setup.py

@@ -62,10 +62,11 @@ def get_extensions():
 
 with open("requirements.txt", "r") as fp:
     install_requires = fp.read().splitlines()
+print(install_requires)
 
 setup(
     name="numpymaxflow",
-    version="0.0.6",
+    version="0.0.7",
     description="numpymaxflow: Max-flow/Min-cut in Numpy for 2D images and 3D volumes",
     long_description=long_description,
     long_description_content_type="text/markdown",
@@ -81,5 +82,5 @@ def get_extensions():
     cmdclass={"build_ext": build_ext},  # .with_options(no_python_abi_suffix=True)},
     packages=find_packages(exclude=("data", "docs", "examples", "scripts", "tests")),
     ext_modules=get_extensions(),
-    python_requires=">=3.6",
+    python_requires=">=3.9",
 )