MNT Remove dependency on distutils (#553)

* Fix obsolete numpy directory in setup * Remove setuptools version requirement * distutils.version.LooseVersion --> looseversion.LooseVersion * MNT run tests on python 3.12 * MNT let's test wheels on all python versions too * Install setuptools to build wheel --------- Co-authored-by: Aditya Vaidya <[email protected]> Co-authored-by: Matteo Visconti di Oleggio Castello <[email protected]>
gallantlab · Sep 1, 2024 · 5e91db6 · 5e91db6
1 parent 97370be
commit 5e91db6
Show file tree

Hide file tree

Showing 7 changed files with 13 additions and 12 deletions.
diff --git a/.github/workflows/install_from_wheel.yml b/.github/workflows/install_from_wheel.yml
@@ -13,7 +13,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        python-version: [3.9]
+        python-version: [3.7, 3.8, 3.9, "3.10", "3.11", "3.12"]
       max-parallel: 5
 
     steps:
@@ -35,7 +35,7 @@ jobs:
         sudo apt-get update
         sudo apt-get install -y inkscape
         pip install --upgrade pip
-        pip install build wheel numpy "cython<3.0"
+        pip install setuptools build wheel numpy "cython<3.0"
 
     - name: Create the wheel
       run: python setup.py bdist_wheel

diff --git a/.github/workflows/run_tests.yml b/.github/workflows/run_tests.yml
@@ -13,7 +13,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        python-version: [3.7, 3.8, 3.9, "3.10", "3.11"]
+        python-version: [3.7, 3.8, 3.9, "3.10", "3.11", "3.12"]
       max-parallel: 5
 
     steps:
@@ -52,4 +52,4 @@ jobs:
         env_vars: OS,PYTHON
         fail_ci_if_error: true
         token: ${{ secrets.CODECOV_TOKEN }}
-        verbose: false
+        verbose: false
diff --git a/cortex/svgoverlay.py b/cortex/svgoverlay.py
@@ -11,7 +11,7 @@
 from scipy.spatial import cKDTree
 from builtins import zip, str
 
-from distutils.version import LooseVersion
+from looseversion import LooseVersion
 
 from lxml import etree
 from lxml.builder import E

diff --git a/cortex/utils.py b/cortex/utils.py
@@ -9,7 +9,7 @@
 import tempfile
 import urllib.request
 import warnings
-from distutils.version import LooseVersion
+from looseversion import LooseVersion
 from importlib import import_module
 
 import h5py

diff --git a/pyproject.toml b/pyproject.toml
@@ -1,7 +1,7 @@
 [build-system]
 # Minimum requirements for the build system to execute, according to PEP518
 # specification.
-requires = ["setuptools<60.0", "build", "numpy", "cython<3.0", "wheel"]
+requires = ["setuptools", "build", "numpy", "cython<3.0", "wheel"]
 build-backend = "setuptools.build_meta"
 
 [tool.codespell]

diff --git a/requirements.txt b/requirements.txt
@@ -14,3 +14,4 @@ pillow
 nibabel>=2.1
 networkx>=2.1
 imageio
+looseversion
diff --git a/setup.py b/setup.py
@@ -2,7 +2,7 @@
 
 import os
 from glob import glob
-from numpy.distutils.misc_util import get_numpy_include_dirs
+import numpy
 
 try:
     import configparser
@@ -78,18 +78,18 @@ def get_version():
             'OpenCTM-1.0.3/lib/liblzma/LzFind.c',
             'OpenCTM-1.0.3/lib/liblzma/LzmaDec.c',
             'OpenCTM-1.0.3/lib/liblzma/LzmaEnc.c',
-            'OpenCTM-1.0.3/lib/liblzma/LzmaLib.c',], 
+            'OpenCTM-1.0.3/lib/liblzma/LzmaLib.c',],
             libraries=['m'], include_dirs=[
-            'OpenCTM-1.0.3/lib/', 
-            'OpenCTM-1.0.3/lib/liblzma/'] + get_numpy_include_dirs(),
+            'OpenCTM-1.0.3/lib/',
+            'OpenCTM-1.0.3/lib/liblzma/', numpy.get_include()],
             define_macros=[
                 ('LZMA_PREFIX_CTM', None),
                 ('OPENCTM_BUILD', None),
                 #('__DEBUG_', None),
             ]
         )
 formats = Extension('cortex.formats', ['cortex/formats.pyx'],
-                    include_dirs=get_numpy_include_dirs())
+                    include_dirs=[numpy.get_include()])
 
 DISTNAME = 'pycortex'
 # VERSION needs to be modified under cortex/version.py