diff --git a/.github/workflows/build-wheels.yml b/.github/workflows/build-wheels.yml index fcec5c8..44afd28 100644 --- a/.github/workflows/build-wheels.yml +++ b/.github/workflows/build-wheels.yml @@ -29,11 +29,22 @@ jobs: with: python-version: "3.9" + - name: Download wheels from commit OpenAssetIO feature branch + uses: dawidd6/action-download-artifact@v2 + with: + workflow: build-wheels.yml + workflow_conclusion: success + name: openassetio-wheels + repo: OpenAssetIO/OpenAssetIO + path: deps + - name: Install dependencies run: | python -m pip install --upgrade pip python -m pip install setuptools wheel - python -m pip install -r requirements.txt + # Use wheels from feature branch for intermediate testing + python -m pip install ./deps/openassetio-*cp39*-manylinux_*_x86_64.whl + # python -m pip install -r requirements.txt - name: Build wheels run: pip wheel --no-deps --wheel-dir wheelhouse . diff --git a/.github/workflows/code-quality.yml b/.github/workflows/code-quality.yml index a65b7c0..5554621 100644 --- a/.github/workflows/code-quality.yml +++ b/.github/workflows/code-quality.yml @@ -13,9 +13,20 @@ jobs: with: python-version: 3.9 + - name: Download wheels from commit OpenAssetIO feature branch + uses: dawidd6/action-download-artifact@v2 + with: + workflow: build-wheels.yml + workflow_conclusion: success + name: openassetio-wheels + repo: OpenAssetIO/OpenAssetIO + path: deps + - name: Install dependencies run: | - python -m pip install -r requirements.txt + # Use wheels from feature branch for intermediate testing + python -m pip install ./deps/openassetio-*cp39*-manylinux_*_x86_64.whl + # python -m pip install -r requirements.txt python -m pip install -r tests/requirements.txt python -m pip install . diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 1777370..cb3e59d 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -10,15 +10,31 @@ jobs: strategy: fail-fast: false matrix: - os: ['windows-latest', 'ubuntu-latest', 'macos-latest'] - python: ['3.7', '3.9', '3.10', '3.11'] + # Constrain to single version to simplify install from wheels + os: ['ubuntu-latest'] + python: ['3.7'] + # os: ['windows-latest', 'ubuntu-latest', 'macos-latest'] + # python: ['3.7', '3.9', '3.10'] steps: - uses: actions/checkout@v3 + + - name: Download wheels from OpenAssetIO main + uses: dawidd6/action-download-artifact@v2 + with: + workflow: build-wheels.yml + workflow_conclusion: success + name: openassetio-wheels + repo: OpenAssetIO/OpenAssetIO + path: deps + pr: 1037 + - uses: actions/setup-python@v4 with: python-version: ${{ matrix.python }} - run: | - python -m pip install -r requirements.txt + # Use wheels from feature branch for intermediate testing + python -m pip install ./deps/openassetio-*cp37*-manylinux_*_x86_64.whl + # python -m pip install -r requirements.txt python -m pip install -r tests/requirements.txt python -m pip install . python -m pytest -v ./tests