Support python 3 12

.github/workflows/pythonapp.yml

@@ -15,11 +15,9 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [ubuntu-latest, macos-13, macos-14]
-        python-version: ['3.8', '3.10']
+        os: [ubuntu-latest, macos-14]
+        python-version: ['3.10', '3.12']
         exclude:
-          - os: macos-14
-            python-version: '3.8'
           - os: macos-14
             python-version: '3.10'
     runs-on: ${{ matrix.os }}
@@ -36,7 +34,7 @@ jobs:
       uses: actions/setup-python@v4
       with:
         python-version: ${{ matrix.python-version }}
-        architecture: ${{ matrix.os == 'macos-14' && 'ARM64' || 'x64' }}
+        architecture: ${{ startsWith(matrix.os, 'macos-') && 'ARM64' || 'x64' }}
 
     - name: Install FFTW3 (Ubuntu)
       if: ${{ matrix.os == 'ubuntu-latest' }}

python/priism/core/version.py

@@ -17,4 +17,4 @@
 from __future__ import absolute_import
 
 # Version of the PRIISM module
-__version__ = '0.12.0'
+__version__ = '0.15.1'

requirements.txt

@@ -3,3 +3,4 @@ casatasks>=6.6.4.0
 casatools>=6.6.4.0
 certifi
 optuna
+setuptools

setup.py

@@ -25,10 +25,8 @@
 import urllib.request as request
 import zipfile
 
-from distutils.command.build import build
-from distutils.command.build_ext import build_ext
-from distutils.command.config import config
-from distutils.sysconfig import get_python_inc, get_python_version
+from setuptools.command.build import build
+from setuptools.command.build_ext import build_ext
 from setuptools import setup, find_packages, Command
 
 
@@ -290,7 +288,7 @@ def install_ext(self):
     sub_commands = build_ext.sub_commands + [('configure_ext', None)]
 
 
-class download_smili(config):
+class download_smili(build):
     user_options = []
 
     def initialize_options(self):
@@ -327,15 +325,15 @@ def run(self):
             self.download_cmd()
 
 
-class download_sakura(config):
+class download_sakura(build):
     user_options = []
 
     def initialize_options(self):
         super(download_sakura, self).initialize_options()
 
         package = 'sakura'
         target = 'libsakura'
-        version = 'libsakura-5.3.0'
+        version = 'libsakura-5.3.1'
         zipname = f'{version}.zip'
         base_url = 'https://github.com/tnakazato/sakura'
         if IS_GIT_OK:
@@ -369,7 +367,7 @@ def run(self):
             os.symlink(f'{self.package_directory}/{self.target_directory}', self.target_directory)
 
 
-class download_eigen(config):
+class download_eigen(build):
     PACKAGE_NAME = 'eigen'
     PACKAGE_VERSION = '3.3.7'
     PACKAGE_COMMIT_HASH = '21ae2afd4edaa1b69782c67a54182d34efe43f9c'
@@ -429,12 +427,12 @@ def finalize_options(self):
             self.numpy_include_dir = np.get_include()
 
         if self.python_include_dir is None:
-            self.python_include_dir = get_python_inc(prefix=sys.base_prefix)
+            self.python_include_dir = sysconfig.get_path('include')
 
         if self.python_library is None:
             self.python_library = get_python_library(self.python_include_dir)
 
-        self.python_version = get_python_version()
+        self.python_version = sysconfig.get_python_version()
 
         debug_print_user_options(self)
         print('fftw3-root-dir={}'.format(self.fftw3_root_dir))