From 681d736838ad5146a0b8fcc73deac45877de574f Mon Sep 17 00:00:00 2001 From: Elliot Morris Date: Tue, 28 Nov 2023 11:45:06 +0000 Subject: [PATCH] [Build] Reinstate Mediacreation Dependency Now that https://github.com/OpenAssetIO/OpenAssetIO/issues/1088 is complete, we can depend properly on mediacreation, rather than leaving is an an optional install, since now it'll do the correct thing. Signed-off-by: Elliot Morris --- .github/workflows/build-wheels.yml | 1 - .github/workflows/code-quality.yml | 1 - .github/workflows/test.yml | 1 - pyproject.toml | 2 +- requirements.txt | 1 - 5 files changed, 1 insertion(+), 5 deletions(-) delete mode 100644 requirements.txt diff --git a/.github/workflows/build-wheels.yml b/.github/workflows/build-wheels.yml index c958de2..fd58e44 100644 --- a/.github/workflows/build-wheels.yml +++ b/.github/workflows/build-wheels.yml @@ -33,7 +33,6 @@ jobs: run: | python -m pip install --upgrade pip python -m pip install setuptools wheel - 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 ffdc8f5..19c51ff 100644 --- a/.github/workflows/code-quality.yml +++ b/.github/workflows/code-quality.yml @@ -15,7 +15,6 @@ jobs: - name: Install dependencies run: | - 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 1783c17..7b88282 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -18,7 +18,6 @@ jobs: with: python-version: ${{ matrix.python }} - run: | - python -m pip install -r requirements.txt python -m pip install -r tests/requirements.txt python -m pip install . python -m pytest -v ./tests diff --git a/pyproject.toml b/pyproject.toml index 26964f5..3670bee 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -5,7 +5,7 @@ name = "openassetio-manager-bal" version = "1.0.0a13" requires-python = ">=3.7" -dependencies = ["openassetio>=1.0.0b1.rev0"] +dependencies = ["openassetio>=1.0.0b1.rev0", "openassetio-mediacreation>=1.0.0a7"] authors = [ { name = "Contributors to the OpenAssetIO project", email = "openassetio-discussion@lists.aswf.io" } diff --git a/requirements.txt b/requirements.txt deleted file mode 100644 index 7889dde..0000000 --- a/requirements.txt +++ /dev/null @@ -1 +0,0 @@ -openassetio-mediacreation>=1.0.0a7