Merge branch 'main' into dependabot/github_actions/dot-github/workflows/actions/download-artifact-4.1.7

Author: benjaminrose

.github/workflows/python-package-tox.yml

@@ -5,25 +5,26 @@ name: Python package
 
 on:
   push:
-    branches: [ main ]
   pull_request:
-    branches: [ main ]
 
 jobs:
-  build:
+  test:
 
-    runs-on: ubuntu-latest
     strategy:
       matrix:
-        python: [3.5, 3.8]
+        python: ["3.6", "3.7", "3.8", "3.9", "3.10", "3.11", "3.12", "3.13"]
+      fail-fast: false
 
+    runs-on: ${{ matrix.python <= '3.6' && 'ubuntu-20.04' || 'ubuntu-22.04' }}
+
+    name: Test on python ${{ matrix.python }} and numpy ${{ matrix.numpyversion }}
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
       - name: Setup Python
-        uses: actions/setup-python@v2
+        uses: actions/setup-python@v5
         with:
           python-version: ${{ matrix.python }}
-      - name: Install Tox and any other packages
+      - name: Install Tox
         run: pip install tox
       - name: Run Tox
         # Run tox using the version of Python in `PATH`

.github/workflows/upload_to_pypi.yml

@@ -13,9 +13,9 @@ jobs:
         os: [ubuntu-latest, windows-latest, macos-latest]
 
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
 
-      - uses: actions/setup-python@v2
+      - uses: actions/setup-python@v5
         name: Install Python
         with:
           python-version: '3.x'
@@ -25,19 +25,20 @@ jobs:
         # available yet which can cause the build to fail. Keep going, and upload
         # the wheels for all of the previous versions when that happens.
         continue-on-error: true
-        uses: pypa/cibuildwheel@v2.1.1
+        uses: pypa/cibuildwheel@v2.22.0
 
-      - uses: actions/upload-artifact@v2
+      - uses: actions/upload-artifact@v4
         with:
+          name: cibw-wheels-${{ matrix.os }}-${{ strategy.job-index }}
           path: ./wheelhouse/*.whl
 
   build_sdist:
     name: Build source distribution
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
 
-      - uses: actions/setup-python@v2
+      - uses: actions/setup-python@v5
         name: Install Python
         with:
           python-version: '3.x'
@@ -48,21 +49,23 @@ jobs:
       - name: Build sdist
         run: python -m build --sdist
 
-      - uses: actions/upload-artifact@v2
+      - uses: actions/upload-artifact@v4
         with:
+          name: cibw-sdist
           path: dist/*.tar.gz
 
   upload_pypi:
     name: Upload to PyPI
     needs: [build_wheels, build_sdist]
     runs-on: ubuntu-latest
+    permissions:
+        id-token: write
+    if: startsWith(github.ref, 'refs/tags/v')
     steps:
       - uses: actions/download-artifact@v4.1.7
         with:
-          name: artifact
-          path: dist
+            pattern: cibw-*
+            path: dist
+            merge-multiple: true
 
-      - uses: pypa/gh-action-pypi-publish@v1.4.2
-        with:
-          user: __token__
-          password: ${{ secrets.PYPI_API_TOKEN }}
+      - uses: pypa/gh-action-pypi-publish@release/v1

extinction.pyx

@@ -6,7 +6,7 @@
 import numpy as np
 cimport numpy as np
 
-__version__ = "0.4.6"
+__version__ = "0.4.7"
 
 __all__ = ['ccm89', 'odonnell94', 'Fitzpatrick99', 'fitzpatrick99', 'fm07',
            'calzetti00', 'apply', 'remove']

pyproject.toml

@@ -3,6 +3,7 @@ requires = [
     "wheel",
     "setuptools",
     "Cython>=0.29.2",
-    "oldest-supported-numpy",
+    "numpy<2; python_version<'3.9'",
+    "numpy>=2; python_version>='3.9'",
 ]
 build-backend = 'setuptools.build_meta'

setup.py

@@ -7,7 +7,6 @@
 from setuptools import setup
 from setuptools.extension import Extension
 
-
 classifiers = [
     "Development Status :: 4 - Beta",
     "Programming Language :: Python :: 3",
@@ -33,7 +32,7 @@
         source_files,
         include_dirs=include_dirs,
         depends=depends_files,
-        extra_compile_args=["-std=c99"],
+        extra_compile_args=["-std=c11"],
     )
 ]
 
@@ -49,5 +48,5 @@
     author_email="kylebarbary@gmail.com",
     ext_modules=extensions,
     install_requires=["numpy>=1.13.3"],
-    python_requires=">=3.5",
+    python_requires=">=3.6",
 )