Include numpy 2 compatibility layer

.github/dependabot.yml

@@ -0,0 +1,7 @@
+# https://docs.github.com/github/administering-a-repository/configuration-options-for-dependency-updates
+version: 2
+updates:
+  - package-ecosystem: "github-actions"
+    directory: "/" # Location of package manifests
+    schedule:
+      interval: "weekly"

.github/scripts/parse_bump_rule.py

@@ -1,18 +1,17 @@
-import sys
 import os
 
 
 def parse(message):
     if "#prerelease" in message:
-        return 'prerelease'
+        return "prerelease"
 
-    for pre in ['pre', '']:
-        for level in ['patch', 'minor', 'major']:
-            if f'#{pre}{level}' in message:
-                return f'{pre}{level}'
+    for pre in ["pre", ""]:
+        for level in ["patch", "minor", "major"]:
+            if f"#{pre}{level}" in message:
+                return f"{pre}{level}"
 
-    return 'patch'
+    return "patch"
 
 
-message = os.environ['github_event_head_commit_message']
+message = os.environ["github_event_head_commit_message"]
 print(parse(message))

.github/scripts/update_versions.py

@@ -6,13 +6,24 @@
 def update(version):
     if not version:
         raise ValueError("Can't replace version with empty string")
-    files = ("pyproject.toml", "setup.py", "src/quaternion/__init__.py")
+    short_version = ".".join(version.split(".")[:2])
+
+    files = ("setup.py", "src/quaternion/__init__.py")
     pattern = re.compile('^(__version__|version) *= *".*?"')
     replacement = r'\1 = "' + version + '"'
     with fileinput.input(files=files, inplace=True) as f:
         for line in f:
             print(pattern.sub(replacement, line), end="")
 
+    files = ("docs/conf.py")
+    pattern = re.compile('^release *= *".*?"')
+    short_pattern = re.compile('^version *= *".*?"')
+    replacement = r'release = "' + version + '"'
+    short_replacement = r'version = "' + short_version + '"'
+    with fileinput.input(files=files, inplace=True) as f:
+        for line in f:
+            print(short_pattern.sub(short_replacement, pattern.sub(replacement, line)), end="")
+
 
 version = os.environ["new_version"]
 

.github/workflows/build.yml

@@ -12,45 +12,51 @@ on:
     tags: '*'
   pull_request:
 
+concurrency:
+  group: test-${{ github.head_ref }}
+  cancel-in-progress: true
+
+env:
+  PYTHONUNBUFFERED: "1"
+  FORCE_COLOR: "1"
+
 jobs:
 
   get_new_version:
     name: Get new version number
     runs-on: ubuntu-latest
     outputs:
-      version: ${{ steps.get_version.outputs.version }}
+      new_version: ${{ steps.get_version.outputs.new_version }}
     steps:
       - uses: actions/checkout@v4
 
       - uses: actions/setup-python@v5
         name: Install Python
         with:
-          python-version: '3.11'
+          python-version: '3.12'
 
-      - name: Install tomli
+      - name: Install Hatch
         shell: bash
-        run: |
-          python -m pip install --upgrade pip tomli
-
-      - name: Install poetry
-        shell: bash
-        run: |
-          curl -sSL https://install.python-poetry.org | POETRY_HOME="$HOME/.poetry" python -
-          echo "$HOME/.poetry/bin" >> $GITHUB_PATH
+        run: python -m pip install --disable-pip-version-check --upgrade hatch
 
       - name: Bump version
         id: get_version
         shell: bash
         env:
           github_event_head_commit_message: ${{ github.event.head_commit.message }}
         run: |
+          # Note: The following line reads the HEAD commit message to look for an indication of how
+          # to bump the version number.  Specifically, if `#patch`, `#minor`, or `#major` is present
+          # in the commit message, it bumps the corresponding version number.  Those can also be
+          # prepended as `#premajor`, etc., to add/bump the prerelease modifier.  If none of those
+          # are present, `#patch` is assumed — that is, the lowest-significance number is
+          # incremented.  See the documentation of the `hatch version` command for details.
           export version_bump_rule=$(python .github/scripts/parse_bump_rule.py)
           echo "version_bump_rule: '${version_bump_rule}'"
-          poetry version "${version_bump_rule}"
-          export new_version=$(python .github/scripts/parse_version.py pyproject.toml)
+          hatch version "${version_bump_rule}"
+          export new_version=$(TERM="unknown" hatch version)
           echo "new_version: '${new_version}'"
-          # echo "::set-output name=version::${new_version}"
-          echo "version=${new_version}" >> $GITHUB_OUTPUT
+          echo "new_version=${new_version}" >> "$GITHUB_OUTPUT"  # Save variable for later steps
 
 
   build_wheels:
@@ -73,12 +79,18 @@ jobs:
             archs: "aarch64"
 
     env:
-      CIBW_SKIP: cp27-* cp35-* cp36-* cp37-* pp* *-musllinux_aarch64 cp312-*_i686
       CIBW_ARCHS: ${{matrix.archs}}
       CIBW_ARCHS_MACOS: "x86_64 universal2 arm64"
-      CIBW_BEFORE_BUILD: python -c "print(('#'*130+'\n')*10)" && python -m pip install oldest-supported-numpy
+      CIBW_BEFORE_BUILD: python -c "print(('#'*130+'\n')*10)" && python -m pip install "numpy>=2.0,<3"
       CIBW_TEST_REQUIRES: pytest pytest-cov
       CIBW_TEST_COMMAND: "pytest {project}/tests"
+      CIBW_SKIP: "*-win32 *-manylinux_i686 cp36-* cp37-* cp38-* cp39-* pp* *-musllinux* cp313-*"
+      # Exclude 32-bit builds: *-win32 *-manylinux_i686
+      # Exclude python versions not supported by numpy: cp36-* cp37-* cp38-* cp39-* pp*
+      # Exclude musllinux builds: *-musllinux*
+      # Exclude python versions not yet supported by numba: cp313-*
+      # https://numpy.org/neps/nep-0029-deprecation_policy.html
+      # https://numba.readthedocs.io/en/stable/user/installing.html#numba-support-info
 
     steps:
       - name: Set up QEMU
@@ -96,12 +108,12 @@ jobs:
       - uses: actions/setup-python@v5
         name: Install Python
         with:
-          python-version: '3.11'
+          python-version: '3.12'
 
       - name: Update versions
         shell: bash
         run: |
-          export new_version=${{needs.get_new_version.outputs.version}}
+          export new_version=${{needs.get_new_version.outputs.new_version}}
           echo "Updating version to '${new_version}'"
           python .github/scripts/update_versions.py
 
@@ -135,18 +147,19 @@ jobs:
       - uses: actions/setup-python@v5
         name: Install Python
         with:
-          python-version: '3.11'
+          python-version: '3.12'
 
       - name: Update versions
         shell: bash
         run: |
-          export new_version=${{needs.get_new_version.outputs.version}}
+          export new_version=${{needs.get_new_version.outputs.new_version}}
           echo "Updating version to '${new_version}'"
           python .github/scripts/update_versions.py
 
       - name: Build sdist
         run: |
-          python -m pip install oldest-supported-numpy
+          python -m pip install --upgrade pip
+          python -m pip install --upgrade "setuptools>=61" wheel "numpy>=2.0,<3"
           python setup.py sdist
 
       - uses: actions/upload-artifact@v3  # Don't upgrade to v4 until each artifact is named
@@ -190,19 +203,19 @@ jobs:
       - uses: actions/setup-python@v5
         name: Install Python
         with:
-          python-version: '3.11'
+          python-version: '3.12'
 
       - name: Update versions
         shell: bash
         run: |
-          export new_version=${{needs.get_new_version.outputs.version}}
+          export new_version=${{needs.get_new_version.outputs.new_version}}
           echo "Updating version to '${new_version}'"
           python .github/scripts/update_versions.py
 
       - name: Tag and push new version
         shell: bash
         run: |
-          export new_version=${{needs.get_new_version.outputs.version}}
+          export new_version=${{needs.get_new_version.outputs.new_version}}
           git config user.name github-actions
           git config user.email github-actions@github.com
           git commit -m "Update version for new release" pyproject.toml setup.py src/quaternion/__init__.py
@@ -217,10 +230,18 @@ jobs:
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:
-          tag_name: v${{ needs.get_new_version.outputs.version }}
-          name: Release v${{ needs.get_new_version.outputs.version }}
+          tag_name: v${{ needs.get_new_version.outputs.new_version }}
+          name: Release v${{ needs.get_new_version.outputs.new_version }}
           draft: false
           prerelease: false
 
-      - name: Send to PyPI
-        uses: pypa/gh-action-pypi-publish@release/v1
+      - name: Publish to PyPI
+        if: "!contains(github.event.head_commit.message, '[no pypi]')"
+        env:
+          # 1) Get key from https://pypi.org/manage/account/token/
+          # 2) Copy it to Github > repo > Settings > Secrets
+          HATCH_INDEX_USER: __token__
+          HATCH_INDEX_AUTH: ${{ secrets.PYPI_TOKEN }}
+        shell: bash
+        run: |
+          hatch publish

.gitignore

@@ -65,3 +65,4 @@ pip_manylinux1_cache
 .envs
 notes
 poetry.lock
+.vscode

LICENSE

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2021 Michael Boyle
+Copyright (c) 2024 Michael Boyle
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

docs/conf.py

@@ -23,7 +23,7 @@
 # -- Project information -----------------------------------------------------
 
 project = 'quaternion'
-copyright = '2020, Michael Boyle'
+copyright = '2024, Michael Boyle'
 author = 'Michael Boyle'
 
 # The short X.Y version

pyproject.toml

@@ -1,16 +1,63 @@
-[tool.poetry]
+[project]
 name = "quaternion"
-version = "2023.0.4"
 description = "Add a quaternion dtype to NumPy"
 readme = "README.md"
-license = "MIT"
-authors = ["Michael Boyle <mob22@cornell.edu>"]
-homepage = "https://github.com/moble/quaternion"
+requires-python = ">=3.10"
+license = {file = "LICENSE"}
+authors = [
+  { name = "Michael Boyle", email = "michael.oliver.boyle@gmail.com" }
+]
+classifiers = [
+  "License :: OSI Approved :: MIT License",
+  "Development Status :: 5 - Production/Stable",
+  "Programming Language :: Python :: 3",
+  "Operating System :: OS Independent",
+  "Intended Audience :: Science/Research",
+  "Topic :: Scientific/Engineering :: Physics",
+  "Topic :: Scientific/Engineering :: Astronomy"
+]
+dependencies = [
+  "numpy >=1.25,<3",
+  "scipy >=1.5,<2",
+  "numba >=0.55; implementation_name == 'cpython'"
+]
+dynamic = ["version"]
+
+[project.urls]
+Homepage = "https://github.com/moble/quaternion"
+Documentation = "https://quaternionic.readthedocs.io/en/latest"
 
 [build-system]
-requires = ["setuptools!=50.0", "wheel", "oldest-supported-numpy"]
+requires = ["hatchling", "setuptools>=61", "wheel", "numpy>=2.0,<3"]
 build-backend = "setuptools.build_meta"
 
+[tool.hatch.envs.default]
+dependencies = [
+  "pytest",
+  "pytest-cov",
+  "black"
+]
+[tool.hatch.envs.default.scripts]
+# Run these as `hatch run test`
+test = "pytest {args:tests}"
+
+[tool.hatch.envs.docs]
+dependencies = [
+  "mkdocs",
+  "mktheapidocs",
+  "pymdown-extensions"
+]
+[tool.hatch.envs.docs.scripts]
+# Run these as `hatch run docs:build` or `hatch run docs:serve`
+build = "mkdocs build --clean"
+serve = "mkdocs serve --dev-addr localhost:8000"
+
+[tool.hatch.version]
+path = "src/quaternion/__init__.py"
+
+[tool.setuptools.dynamic]
+version = {attr = "quaternion.__version__"}
+
 [tool.pytest.ini_options]
 minversion = "6.0"
 norecursedirs = ".* build dist *.egg-info install ENV"

setup.py

@@ -8,7 +8,7 @@
 
 
 # Set this first for easier replacement
-version = "2023.0.4"
+version = "2023.1.0"
 
 # read the contents of the README file into the PyPI description
 this_directory = Path(__file__).parent
@@ -30,7 +30,8 @@
         depends=[
             "src/quaternion.c",
             "src/quaternion.h",
-            "src/numpy_quaternion.c"
+            "src/numpy_quaternion.c",
+            "src/npy_2_compat.h"
         ],
         include_dirs=[
             np.get_include(),
@@ -51,31 +52,6 @@
     long_description=long_description,
     long_description_content_type="text/markdown",
     ext_modules=extensions,
-    install_requires=[
-        "numpy>=1.13, < 2.0",
-        # See also extras and :environment_marker specs below
-    ],
-    extras_require={
-        "scipy": [
-            "scipy",
-        ],
-        "numba:python_version < '3.6' and platform_python_implementation != 'PyPy'": [
-            "numba<0.49.0",
-            "llvmlite<0.32.0",
-        ],
-        "numba:python_version >= '3.6' and platform_python_implementation != 'PyPy'": [
-            "numba",
-        ],
-        "docs":  [
-            "mkdocs",
-            "mktheapidocs[plugin]",
-            "pymdown-extensions",
-        ],
-        "testing": [
-            "pytest",
-            "pytest-cov",
-        ]
-    },
     version=version,
 )
 

src/math_msvc_compatibility.h

@@ -1,4 +1,4 @@
-// Copyright (c) 2021, Michael Boyle
+// Copyright (c) 2024, Michael Boyle
 // See LICENSE file for details: <https://github.com/moble/quaternion/blob/main/LICENSE>
 
 #ifndef __MATH_MSVC_COMPATIBILITY_H__