Making NumPy reqs less restrictive

Author: ciaranra

.github/workflows/python-release.yml

@@ -1,7 +1,7 @@
 name: Python Artifacts
 
 env:
-  TRIGGER_ON_PR_PUSH: false  # Set to true to enable triggers on PR pushes
+  TRIGGER_ON_PR_PUSH: true  # Set to true to enable triggers on PR pushes
   PYTHON_VERSION: '3.10'
 
 on:
@@ -66,20 +66,13 @@ jobs:
         with:
           python-version: ${{ env.PYTHON_VERSION }}
 
-      - name: Install the latest version of uv
-        uses: astral-sh/setup-uv@v4
-        with:
-          enable-cache: true
-          ignore-nothing-to-cache: true
-          cache-dependency-glob: |
-            **/pyproject.toml
-            **/requirements*.txt
-            **/uv.lock
-
       - name: Remove conflicting README.md
         run: |
           if [ -f crates/pecos-python/README.md ]; then
             mv crates/pecos-python/README.md crates/pecos-python/README.md.bak
+            echo "Moved conflicting README.md to README.md.bak"
+          else
+            echo "No conflicting README.md found"
           fi
 
       - name: Build pecos-rslib SDist
@@ -94,13 +87,15 @@ jobs:
         run: |
           if [ -f crates/pecos-python/README.md.bak ]; then
             mv crates/pecos-python/README.md.bak crates/pecos-python/README.md
+            echo "Restored README.md from backup"
+          else
+            echo "No README.md backup found"
           fi
 
-      - name: Install and test pecos-rslib SDist
+      - name: Test pecos-rslib SDist
         run: |
-          uv sync --project .
-          uv pip install --force-reinstall python/pecos-rslib/dist/*.tar.gz
-          uv run python -c 'import pecos_rslib; print(pecos_rslib.__version__)'
+          pip install --force-reinstall --verbose python/pecos-rslib/dist/*.tar.gz
+          python -c 'import pecos_rslib; print(pecos_rslib.__version__)'
 
       - name: Upload pecos-rslib SDist
         uses: actions/upload-artifact@v4
@@ -135,20 +130,13 @@ jobs:
         with:
           python-version: ${{ matrix.python-version }}
 
-      - name: Install the latest version of uv
-        uses: astral-sh/setup-uv@v4
-        with:
-          enable-cache: true
-          ignore-nothing-to-cache: true
-          cache-dependency-glob: |
-            **/pyproject.toml
-            **/requirements*.txt
-            **/uv.lock
-
       - name: Remove conflicting README.md
         run: |
           if [ -f crates/pecos-python/README.md ]; then
             mv crates/pecos-python/README.md crates/pecos-python/README.md.bak
+            echo "Moved conflicting README.md to README.md.bak"
+          else
+            echo "No conflicting README.md found"
           fi
 
       - name: Build wheel
@@ -165,14 +153,16 @@ jobs:
         run: |
           if [ -f crates/pecos-python/README.md.bak ]; then
             mv crates/pecos-python/README.md.bak crates/pecos-python/README.md
+            echo "Restored README.md from backup"
+          else
+            echo "No README.md backup found"
           fi
 
       - name: Test wheel
         if: ${{ !(matrix.architecture == 'x86_64' && matrix.os == 'macos-latest') && matrix.architecture != 'aarch64' }}
         run: |
-          uv sync --project .
-          uv pip install --force-reinstall python/pecos-rslib/dist/*.whl
-          uv run python -c 'import pecos_rslib; print(pecos_rslib.__version__)'
+          pip install --force-reinstall --verbose python/pecos-rslib/dist/*.whl
+          python -c 'import pecos_rslib; print(pecos_rslib.__version__)'
 
       - name: Upload wheel
         uses: actions/upload-artifact@v4
@@ -197,38 +187,29 @@ jobs:
         with:
           python-version: ${{ env.PYTHON_VERSION }}
 
-      - name: Install the latest version of uv
-        uses: astral-sh/setup-uv@v4
-        with:
-          enable-cache: true
-          ignore-nothing-to-cache: true
-          cache-dependency-glob: |
-            **/pyproject.toml
-            **/requirements*.txt
-            **/uv.lock
-
       - name: Download pecos-rslib wheel
         uses: actions/download-artifact@v4
         with:
           name: wheel-pecos-rslib-ubuntu-latest-x86_64-py${{ env.PYTHON_VERSION }}
           path: ./pecos-rslib-wheel
 
-      - name: Setup environment and install dependencies
+      - name: Install pecos-rslib
+        run: pip install ./pecos-rslib-wheel/*.whl
+
+      - name: Install build dependencies
         run: |
-          uv sync --project .
-          uv pip install ./pecos-rslib-wheel/*.whl
-          uv pip install build
+          python -m pip install --upgrade pip
+          pip install build
 
       - name: Build quantum-pecos SDist
         run: |
           cd python/quantum-pecos
-          uv pip install --system build
           python -m build --sdist --outdir dist
 
       - name: Test quantum-pecos SDist
         run: |
-          uv pip install python/quantum-pecos/dist/*.tar.gz
-          uv run python -c 'import pecos; print(pecos.__version__)'
+          pip install python/quantum-pecos/dist/*.tar.gz
+          python -c 'import pecos; print(pecos.__version__)'
 
       - name: Upload quantum-pecos SDist
         uses: actions/upload-artifact@v4
@@ -252,30 +233,24 @@ jobs:
         with:
           ref: ${{ inputs.sha || github.sha }}
 
-      - name: Set up Python
+      - name: Set up Python ${{ matrix.python-version }}
         uses: actions/setup-python@v5
         with:
           python-version: ${{ matrix.python-version }}
 
-      - name: Install the latest version of uv
-        uses: astral-sh/setup-uv@v4
-        with:
-          enable-cache: true
-          ignore-nothing-to-cache: true
-          cache-dependency-glob: |
-            **/pyproject.toml
-            **/requirements*.txt
-            **/uv.lock
-
       - name: Download pecos-rslib wheel
         uses: actions/download-artifact@v4
         with:
           name: wheel-pecos-rslib-ubuntu-latest-x86_64-py${{ matrix.python-version }}
           path: ./pecos-rslib-wheel
 
-      - name: Setup environment and install dependencies
+      - name: Install pecos-rslib
+        run: pip install ./pecos-rslib-wheel/*.whl
+
+      - name: Install build dependencies
         run: |
-          uv pip install --system ./pecos-rslib-wheel/*.whl build
+          python -m pip install --upgrade pip
+          pip install build
 
       - name: Build quantum-pecos wheel
         run: |
@@ -284,9 +259,8 @@ jobs:
 
       - name: Test quantum-pecos wheel
         run: |
-          uv sync  # This will use the workspace config correctly
-          uv pip install python/quantum-pecos/dist/*.whl
-          uv run python -c 'import pecos; print(pecos.__version__)'
+          pip install python/quantum-pecos/dist/*.whl
+          python -c 'import pecos; print(pecos.__version__)'
 
       - name: Upload quantum-pecos wheel
         uses: actions/upload-artifact@v4

.github/workflows/python-test.yml

@@ -1,4 +1,11 @@
 name: Python test / linting
+
+env:
+  TRIGGER_ON_PR_PUSH: true  # Set to true to enable triggers on PR pushes
+  RUSTFLAGS: -C debuginfo=0
+  RUST_BACKTRACE: 1
+  PYTHONUTF8: 1
+
 on:
   push:
     branches: [ "master", "development" ]
@@ -21,11 +28,6 @@ concurrency:
   group: ${{ github.workflow }}-${{ github.ref }}
   cancel-in-progress: true
 
-env:
-  RUSTFLAGS: -C debuginfo=0
-  RUST_BACKTRACE: 1
-  PYTHONUTF8: 1
-
 defaults:
   run:
     shell: bash

Cargo.lock

@@ -8,7 +8,8 @@ authors = [
 maintainers =[
     {name = "Ciaran Ryan-Anderson", email = "[email protected]"},
 ]
-dependencies = []
+dependencies = [
+]
 readme = "README.md"
 requires-python = ">= 3.8"
 

python/pecos-rslib/pyproject.toml

@@ -15,16 +15,17 @@ publish = false
 [lib]
 name = "pecos_rslib"
 crate-type = ["cdylib", "rlib"]
+# Skip doc tests as they won't work properly in this setup
+doctest = false
+# Skip unit tests as well - all testing should be done through Python
+test = false
 
 [dependencies]
-pyo3 = { workspace=true, features = ["extension-module", "auto-initialize"] }
+pyo3 = { workspace=true, features = ["extension-module", "abi3-py310", "generate-import-lib"] }
 pecos = { workspace = true }
 parking_lot = { workspace = true}
 serde_json = { workspace = true }
 
-[features]
-python-tests = []  # Empty feature just for enabling tests
-
 [lints]
 workspace = true
 

python/pecos-rslib/rust/Cargo.toml

@@ -10,6 +10,8 @@
 // or implied. See the License for the specific language governing permissions and limitations under
 // the License.
 
+#![allow(clippy::useless_conversion)]
+
 use pecos::prelude::*;
 use pyo3::prelude::*;
 use pyo3::types::{PyDict, PyTuple};

python/pecos-rslib/rust/src/sparse_sim.rs

@@ -10,8 +10,6 @@
 // or implied. See the License for the specific language governing permissions and limitations under
 // the License.
 
-// PECOS/python/pecos-rslib/rust/src/sparse_sim.rs
-
 use pecos::prelude::*;
 use pyo3::prelude::*;
 use pyo3::types::{PyDict, PyTuple};