Updates to build and test files to allow use of any version of Numpy (i.e., no longer requiring Numpy < 2.0).

Version number updated to 1.0.3.
Removal of PyPI/wheel Intel builds for Python 3.8 and 3.9 (incompatible with Numpy 2).

Author: perwin

CHANGELOG.md

@@ -3,6 +3,13 @@
 (Formatting and design based on Olivier Lacan's [Keep a CHANGELOG](http://keepachangelog.com/))
 
 
+# 1.0.3 -- 2024-10-xx
+
+### Added
+Added support for Numpy version 2. PyImfit should now work with both versions 1 and 2 of Numpy.
+
+
+
 # 1.0.2 -- 2024-09-17
 
 ### Fixed

conda/rattler_setup/recipe.yaml

@@ -1,7 +1,7 @@
 # recipe file for use by rattler-config in building conda packages for pyimfit
 
 context:
-  version: 1.0.2
+  version: 1.0.3
 
 package:
   name: pyimfit
@@ -30,7 +30,7 @@ requirements:
     - pip
     - scons
     - nomkl
-    - numpy<2.0
+    - numpy
     - scipy
   run:
     - python

conda/test_pyimfit_install.py

@@ -5,6 +5,7 @@
 # it isn't in the lcoal directory).
 
 import sys, os, tarfile, argparse
+import numpy
 import pyimfit
 import requests
 from astropy.io import fits
@@ -63,6 +64,7 @@ def main( argv ):
     print("\nStarting test...")
     vinfo = sys.version_info
     print("Python version {0}.{1}".format(vinfo[0], vinfo[1]))
+    print("Numpy version {0}".format(numpy.__version__))
     print("PyImfit version {0}".format(pyimfit.__version__))
 
     filesExist = True

docs/conf.py

@@ -28,7 +28,7 @@
 # The short X.Y version
 version = '1.0'
 # The full version, including alpha/beta/rc tags
-release = '1.0.2'
+release = '1.0.3'
 
 
 # -- General configuration ---------------------------------------------------

howto_new_distribution.txt

@@ -132,7 +132,7 @@ For the time being, it's probably best to focus on Intel mac, since we run the L
         H. [vm] tar -cf linux-64.tar linux-64 && gzip linux-64.tar
     H. [if using Intel Mac for uploading:] Transfer conda packages to Intel Mac:
         $ cp ~/vagrant/iraf/transfer/pyimfit-<VERSION_NUMBER>*.conda ~/coding/pyimfit/conda/output/linux-64/
-    I. If everything went OK, shut down the VM and reset its memory allocation to 1 GB.
+    I. If everything went OK, shut down the VM and reset its memory allocation to 2 GB.
 
     ALTERNATIVE: Do this on ex-sol.mpe.mpg.de
     A. ssh erwin@ex-sol.mpe.mpg.de

make_upload.py

@@ -22,12 +22,14 @@ def main( argv=None ):
                                       default=False, help="Upload to PyPI)")
     parser.add_option("--skip-build", action="store_false", dest="doBuild",
                                       default=True, help="Skip the build process")
+    parser.add_option("--python", dest="pyVersion", type="str", default=None,
+                      help="Build only for this version of Python [default = 3.10-3.12]")
 
     (options, args) = parser.parse_args(argv)
     # args[0] = name program was called with
     # args[1] = first actual argument, etc.
     if len(args) < 2:
-        print("You must supply a version number!\n")
+        print("You must supply a PyImfit version number!\n")
         return None
     versionNum = args[1]
     # Figure out which type of macOS architecture we're running under
@@ -41,7 +43,9 @@ def main( argv=None ):
         usingAppleSilicon = False
         prelimString = "export _PYTHON_HOST_PLATFORM='macosx-10.9-x86_64' ; export ARCHFLAGS='-arch x86_64' ; "
         wheelSuffix = "macosx_10_9_x86_64"
-        pythonVersionList = ["3.8", "3.9", "3.10", "3.11", "3.12"]
+        pythonVersionList = ["3.10", "3.11", "3.12"]
+    if options.pyVersion is not None:
+        pythonVersionList = [options.pyVersion]
 
     if options.doBuild:
         # Make sdist (.tar.gz) and macOS binary wheels

pyimfit/__init__.py

@@ -14,4 +14,4 @@
 imageFunctionList = get_function_list()
 imageFunctionDict = get_function_dict()
 
-__version__ = "1.0.2"
+__version__ = "1.0.3"

pyimfit/pyimfit_lib.cpp

@@ -2,7 +2,7 @@
 requires = [
 	"setuptools>=42",
     "Cython",
-    "numpy<2.0",
+    "numpy",
 ]
 
 build-backend = "setuptools.build_meta"

pyproject.toml

@@ -1,6 +1,6 @@
 # Pip requirements.txt file for PyImfit, including for testing
 # numpy 2.0 breaks some of the Cython-generated .cpp code (even though we're using Cython 3.0)
-numpy<2.0
+numpy
 scipy
 pytest
 requests

requirements.txt

@@ -360,13 +360,13 @@ def run(self):
         "Operating System :: POSIX",
         "Intended Audience :: Science/Research",
     ],
-    python_requires='>=3.8',
+    python_requires='>=3.10',
     # setup_requires = temporary local installation in order to run this script
     # install_requires = standard pip installation for general future use
     # NOTE: it's not clear we really need 'numpy' in the install_requires, since we
     # have numpy specified in requirements.txt
     setup_requires=['scons'],
-    install_requires=['numpy<2.0', 'scipy'],
+    install_requires=['numpy', 'scipy'],
     cmdclass={'build_ext': my_build_ext, 'clean': CleanCommand, 'cleanall': CleanAllCommand},
     ext_modules=extensions
 )