diff --git a/.github/workflows/conda-package-cf.yml b/.github/workflows/conda-package-cf.yml index 88bfd5b..5722eed 100644 --- a/.github/workflows/conda-package-cf.yml +++ b/.github/workflows/conda-package-cf.yml @@ -20,7 +20,17 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - python: ['3.9', '3.10', '3.11', '3.12'] + include: + - python: '3.9' + numpy: '2.0' + - python: '3.10' + numpy: '2.0' + - python: '3.11' + numpy: '2.2' + - python: '3.12' + numpy: '2.3' + - python: '3.13' + numpy: '2.3' steps: - name: Cancel Previous Runs uses: styfle/cancel-workflow-action@85880fa0301c86cca9da44039ee3bb12d3bedbfa # 0.12.1 @@ -53,10 +63,10 @@ jobs: - name: Install conda-build run: conda install conda-build python=3.12 - - name: Build conda package with NumPy 2.0 + - name: Build conda package with NumPy 2.x run: | CHANNELS="-c conda-forge --override-channels" - VERSIONS="--python ${{ matrix.python }} --numpy 2.0" + VERSIONS="--python ${{ matrix.python }} --numpy ${{ matrix.numpy }}" TEST="--no-test" conda build \ @@ -77,8 +87,8 @@ jobs: strategy: matrix: - python_ver: ['3.9', '3.10', '3.11', '3.12'] - numpy: ['numpy"<2"', 'numpy">=2"'] + python_ver: ['3.9', '3.10', '3.11', '3.12', '3.13'] + numpy: ['numpy">=2"'] experimental: [false] runner: [ubuntu-latest] continue-on-error: ${{ matrix.experimental }} @@ -147,7 +157,17 @@ jobs: strategy: matrix: - python: ['3.9', '3.10', '3.11', '3.12'] + include: + - python: '3.9' + numpy: '2.0' + - python: '3.10' + numpy: '2.0' + - python: '3.11' + numpy: '2.2' + - python: '3.12' + numpy: '2.3' + - python: '3.13' + numpy: '2.3' steps: - name: Cancel Previous Runs uses: styfle/cancel-workflow-action@85880fa0301c86cca9da44039ee3bb12d3bedbfa # 0.12.1 @@ -184,10 +204,10 @@ jobs: - name: Setup MSVC uses: ilammy/msvc-dev-cmd@0b201ec74fa43914dc39ae48a89fd1d8cb592756 # v1.13.0 - - name: Build conda package with NumPy 2.0 + - name: Build conda package with NumPy 2.x run: | conda activate - conda build --no-test --python ${{ matrix.python }} --numpy 2.0 -c conda-forge --override-channels conda-recipe-cf + conda build --no-test --python ${{ matrix.python }} --numpy ${{ matrix.numpy }} -c conda-forge --override-channels conda-recipe-cf - name: Store conda paths as envs shell: bash -l {0} @@ -209,8 +229,8 @@ jobs: strategy: matrix: - python_ver: ['3.9', '3.10', '3.11', '3.12'] - numpy: ['numpy"<2"', 'numpy">=2"'] + python_ver: ['3.9', '3.10', '3.11', '3.12', '3.13'] + numpy: ['numpy">=2"'] experimental: [false] runner: [windows-latest] continue-on-error: ${{ matrix.experimental }} diff --git a/pyproject.toml b/pyproject.toml index 55f31da..3264dce 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -42,6 +42,7 @@ classifiers = [ "Programming Language :: Python :: 3.10", "Programming Language :: Python :: 3.11", "Programming Language :: Python :: 3.12", + "Programming Language :: Python :: 3.13", "Programming Language :: Python :: Implementation :: CPython", "Topic :: Software Development", "Topic :: Scientific/Engineering", @@ -56,7 +57,7 @@ keywords = ["DFTI", "FFT", "Fourier", "MKL"] license = "BSD-3-Clause" name = "mkl_fft" readme = {file = "README.md", content-type = "text/markdown"} -requires-python = ">=3.9,<3.13" +requires-python = ">=3.9,<3.14" [project.optional-dependencies] scipy_interface = ["scipy>=1.10"]