Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Support Python 3.12 #108

Open
wants to merge 6 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/deploy_release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ name: Deploy Release
on:
push:
tags:
- '*'
- "*"

jobs:
deploy_pypi:
Expand All @@ -23,7 +23,7 @@ jobs:
- name: Install dependencies
shell: bash -l {0}
run: |
conda install -c numba python=3.8 numba>=0.45 'scipy>=0.16,<1.4' wheel
conda install -c numba python=3.8 numba>=0.45 'scipy>=0.16' wheel
- name: Build PyPI artifacts
shell: bash -l {0}
run: |
Expand Down
14 changes: 7 additions & 7 deletions .github/workflows/test_and_deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ on:
branches:
- main
tags:
- '*'
- "*"

env:
MAIN_PYVER: "3.10"
Expand All @@ -18,7 +18,7 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
scipy-version: [">=1.4,<1.11.0"]
scipy-version: [">=1.4"]
numpy-version: ["<1.22.0", ">=1.22.0"]
steps:
- name: Install glibc-tools
Expand Down Expand Up @@ -60,7 +60,7 @@ jobs:
echo $OUTPUT
echo "CONDA_BUILD_OUTPUT=$OUTPUT" >> $GITHUB_ENV
- name: Upload build artifact
uses: actions/upload-artifact@v2
uses: actions/upload-artifact@v4
with:
name: built_package
path: ${{ env.CONDA_BUILD_OUTPUT }}
Expand All @@ -70,8 +70,8 @@ jobs:
needs: build
strategy:
matrix:
scipy-version: [">=1.4,<1.11.0"]
pyver: [3.8, 3.9, "3.10", 3.11]
scipy-version: [">=1.4"]
pyver: [3.8, 3.9, "3.10", 3.11, 3.12]
runs-on: [macos-latest, ubuntu-latest, windows-latest]
numpy-version: ["<1.22.0", ">=1.22.0"]
exclude:
Expand All @@ -94,7 +94,7 @@ jobs:
runs-on: ${{ matrix.runs-on }}
steps:
- name: Download build artifact
uses: actions/download-artifact@v2
uses: actions/download-artifact@v4
with:
name: built_package
path: ./artifact_storage
Expand Down Expand Up @@ -125,7 +125,7 @@ jobs:
AC_LABEL: dev
steps:
- name: Download build artifact
uses: actions/download-artifact@v2
uses: actions/download-artifact@v4
with:
name: built_package
path: ./artifact_storage
Expand Down
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -21,5 +21,6 @@ dist/
htmlcov/
.idea/
.vscode/
.venv/
.ipynb_checkpoints/
__pycache__/
10 changes: 5 additions & 5 deletions buildscripts/conda_recipes/numba-scipy/meta.yaml
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
package:
name: numba-scipy
version: {{ GIT_DESCRIBE_TAG }}
name: numba-scipy
version: { { GIT_DESCRIBE_TAG } }

source:
path: ../../..
git_url: ../../..

build:
number: {{ GIT_DESCRIBE_NUMBER|int }}
number: { { GIT_DESCRIBE_NUMBER|int } }
script: python setup.py install --single-version-externally-managed --record=record.txt
noarch: python

Expand All @@ -30,7 +30,7 @@ test:
- scipy<1.11.0
- pytest
- setuptools
- faulthandler # [py27 and (not (armv6l or armv7l))]
- faulthandler # [py27 and (not (armv6l or armv7l))]
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It seems like this should not be needed anymore (as we're not doing anything on Python 2).


about:
home: https://github.com/numba/numba-scipy
Expand Down
7 changes: 4 additions & 3 deletions setup.py
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
from setuptools import setup, find_packages
import versioneer
from setuptools import find_packages, setup

import versioneer

_install_requires = ["scipy>=0.16,<=1.11.0", "numba>=0.45"]
_install_requires = ["scipy>=0.16", "numba>=0.45"]


metadata = dict(
Expand All @@ -20,6 +20,7 @@
"Programming Language :: Python :: 3.9",
"Programming Language :: Python :: 3.10",
"Programming Language :: Python :: 3.11",
"Programming Language :: Python :: 3.12",
"Topic :: Software Development :: Compilers",
],
package_data={},
Expand Down
Loading