diff --git a/.github/workflows/build_docs.yml b/.github/workflows/build_docs.yml index f7a55fb7..80d803db 100644 --- a/.github/workflows/build_docs.yml +++ b/.github/workflows/build_docs.yml @@ -27,7 +27,7 @@ jobs: - name: Build quaddtype package run: | cd quaddtype/ - python -m pip install . -v --no-build-isolation + python -m pip install . -v - name: Build Sphinx documentation run: | cd quaddtype/ diff --git a/.github/workflows/build_wheels.yml b/.github/workflows/build_wheels.yml index a01cf81a..53928a29 100644 --- a/.github/workflows/build_wheels.yml +++ b/.github/workflows/build_wheels.yml @@ -39,16 +39,12 @@ jobs: CIBW_BEFORE_ALL: | yum update -y yum install -y cmake gcc gcc-c++ make git pkgconfig - CIBW_BEFORE_BUILD: | - pip install meson>=1.3.2 meson-python>=0.18.0 wheel ninja - pip install --pre --upgrade --timeout=60 --extra-index-url https://pypi.anaconda.org/scientific-python-nightly-wheels/simple numpy - CIBW_BUILD_FRONTEND: "pip; args: --no-build-isolation" CIBW_ENVIRONMENT: > LDFLAGS="-fopenmp" CIBW_REPAIR_WHEEL_COMMAND: | auditwheel repair -w {dest_dir} --plat manylinux_2_28_x86_64 {wheel} CIBW_TEST_COMMAND: | - pip install --pre --upgrade --extra-index-url https://pypi.anaconda.org/scientific-python-nightly-wheels/simple numpy + pip install numpy pip install --no-deps {wheel} pip install pytest pytest-run-parallel if python -c "import sys; exit(0 if hasattr(sys, '_is_gil_enabled') and not sys._is_gil_enabled() else 1)"; then @@ -103,16 +99,12 @@ jobs: CIBW_ENABLE: cpython-prerelease cpython-freethreading # CIBW_ARCHS_MACOS: ${{ matrix.os == 'macos-13' && 'x86_64' || 'arm64' }} CIBW_BUILD_VERBOSITY: "3" - CIBW_BEFORE_BUILD: | - pip install meson>=1.3.2 meson-python>=0.18.0 wheel ninja - pip install --pre --upgrade --timeout=60 --extra-index-url https://pypi.anaconda.org/scientific-python-nightly-wheels/simple numpy - CIBW_BUILD_FRONTEND: "pip; args: --no-build-isolation" CIBW_ENVIRONMENT: > MACOSX_DEPLOYMENT_TARGET="${{ matrix.os == 'macos-14' && '14.0' || '15.0' }}" CIBW_REPAIR_WHEEL_COMMAND: > delocate-wheel --require-archs {delocate_archs} -w {dest_dir} -v {wheel} CIBW_TEST_COMMAND: | - pip install --pre --upgrade --extra-index-url https://pypi.anaconda.org/scientific-python-nightly-wheels/simple numpy + pip install numpy pip install --no-deps {wheel} pip install pytest pytest-run-parallel if python -c "import sys; exit(0 if hasattr(sys, '_is_gil_enabled') and not sys._is_gil_enabled() else 1)"; then @@ -169,15 +161,11 @@ jobs: CIBW_BUILD_VERBOSITY: "3" DISTUTILS_USE_SDK: "1" MSSdk: "1" - CIBW_BEFORE_BUILD: >- - pip install meson meson-python ninja wheel && - pip install --pre --upgrade --timeout=60 --extra-index-url https://pypi.anaconda.org/scientific-python-nightly-wheels/simple numpy - CIBW_BUILD_FRONTEND: "pip; args: --no-build-isolation" CIBW_ENVIRONMENT: > CFLAGS="/DDISABLE_QUADBLAS $CFLAGS" CXXFLAGS="/DDISABLE_QUADBLAS $CXXFLAGS" CIBW_REPAIR_WHEEL_COMMAND: 'delvewheel repair -w {dest_dir} {wheel} --add-path C:\sleef\bin' - CIBW_TEST_COMMAND_WINDOWS: pip install --pre --upgrade --extra-index-url https://pypi.anaconda.org/scientific-python-nightly-wheels/simple numpy && pip install --no-deps {wheel} && pip install pytest pytest-run-parallel && pytest -s {project}/tests + CIBW_TEST_COMMAND_WINDOWS: pip install numpy && pip install --no-deps {wheel} && pip install pytest pytest-run-parallel && pytest -s {project}/tests CIBW_TEST_EXTRAS: test shell: pwsh run: | @@ -208,16 +196,14 @@ jobs: - name: Install build dependencies run: | - python -m pip install --upgrade pip - python -m pip install build pytest meson meson-python wheel ninja - python -m pip install --pre --upgrade --timeout=60 --extra-index-url https://pypi.anaconda.org/scientific-python-nightly-wheels/simple numpy + python -m pip install --upgrade pip build - name: Build SDist & test sdist env: LDFLAGS: "-fopenmp" run: | - python -m build --sdist --no-isolation --outdir dist/ - pip install --no-build-isolation "$(ls dist/*.tar.gz)"[test] -v + python -m build --sdist --outdir dist/ + pip install "$(ls dist/*.tar.gz)"[test] -v pytest -s tests working-directory: ./quaddtype diff --git a/.github/workflows/typecheck.yml b/.github/workflows/typecheck.yml index 365433eb..4053d537 100644 --- a/.github/workflows/typecheck.yml +++ b/.github/workflows/typecheck.yml @@ -30,9 +30,7 @@ jobs: - name: install working-directory: quaddtype run: | - uv pip install --pre --extra-index-url https://pypi.anaconda.org/scientific-python-nightly-wheels/simple numpy - uv pip install meson>=1.3.2 meson-python wheel ninja - uv pip install mypy pyright . --no-build-isolation + uv pip install mypy pyright . - name: pyright working-directory: quaddtype diff --git a/quaddtype/pyproject.toml b/quaddtype/pyproject.toml index feca2441..13f5db0e 100644 --- a/quaddtype/pyproject.toml +++ b/quaddtype/pyproject.toml @@ -3,7 +3,8 @@ requires = [ "meson>=1.3.2", "meson-python>=0.18.0", "wheel", - "numpy>=2.0" + "cmake", + "numpy>=2.4" ] build-backend = "mesonpy"