diff --git a/.github/workflows/test-python-api-win.yml b/.github/workflows/test-python-api-win.yml deleted file mode 100644 index c8e199acc5..0000000000 --- a/.github/workflows/test-python-api-win.yml +++ /dev/null @@ -1,38 +0,0 @@ -name: test-python-api-win - -on: [push, pull_request] - -jobs: - build: - runs-on: ${{ matrix.os }} - strategy: - matrix: - os: [windows-latest] - python: [3.9] - env: - CC: cl.exe - CXX: cl.exe - LD: link.exe - steps: - - uses: actions/checkout@v3 - - name: Install correct python version - uses: actions/setup-python@v3 - with: - python-version: ${{ matrix.python }} - - name: Setup compiler - uses: ilammy/msvc-dev-cmd@v1 - with: - arch: x86_64 - - name: Get meson - run: python -m pip install meson ninja - - name: Build and install highs - run: | - meson setup bbdir - meson install -C bbdir - - name: Install python interface - run: | - python -m pip install -vvv . - - name: Run tests - run: | - pip install pytest numpy - pytest -v ./highspy/tests/ diff --git a/.github/workflows/test-python-api.yml b/.github/workflows/test-python-api.yml index 171b17a287..5e261c61d5 100644 --- a/.github/workflows/test-python-api.yml +++ b/.github/workflows/test-python-api.yml @@ -18,6 +18,8 @@ jobs: - name: Test Python Interface shell: bash run: | + # No need to separately install highs, + # shared library lookups are good enough pip install -vvv . pip install pytest numpy pytest -v ./highspy/tests/ diff --git a/pyproject.toml b/pyproject.toml index 0e62c837e3..de70e070b6 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -46,6 +46,6 @@ repair-wheel-command = [ ] [tool.cibuildwheel.windows] -# Use delvewheel on windows, and install the project +# Use delvewheel on windows, and install the project so delvewheel can find it before-build = "pip install delvewheel meson ninja && meson setup bbdir && meson install -C bbdir" repair-wheel-command = "delvewheel repair --add-path c:/bin;c:/lib;c:/bin/src;c:/lib/src;D:/a/HiGHS/HiGHS/bbdir/src/ -w {dest_dir} {wheel}"