From 2aed16536045ffb6b35cce142700939ce926a9df Mon Sep 17 00:00:00 2001 From: Jirka Borovec <6035284+Borda@users.noreply.github.com> Date: Mon, 16 Oct 2023 00:12:46 +0900 Subject: [PATCH] fix missing extras & extend package check (#49) --- .azure/ipu-tests.yml | 2 +- .github/workflows/ci-checks.yml | 3 +-- .github/workflows/release-pypi.yml | 4 ++-- MANIFEST.in | 1 + 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.azure/ipu-tests.yml b/.azure/ipu-tests.yml index 27f745d..b6ee113 100644 --- a/.azure/ipu-tests.yml +++ b/.azure/ipu-tests.yml @@ -74,7 +74,7 @@ jobs: displayName: "Reset IPU devices" - bash: | - pip install ".[test,$(dependency)]" -f /mnt/public/packages + pip install ".[$(dependency)]" -r requirements/_test.txt -f /mnt/public/packages pip uninstall -y neptune-client # todo: it is not clear what version is compatible pip list displayName: 'Install package & dependencies' diff --git a/.github/workflows/ci-checks.yml b/.github/workflows/ci-checks.yml index 884c9dd..24d01f1 100644 --- a/.github/workflows/ci-checks.yml +++ b/.github/workflows/ci-checks.yml @@ -28,8 +28,7 @@ jobs: actions-ref: main import-name: "lightning_graphcore" artifact-name: dist-packages-${{ github.sha }} - # todo: new veersions shall have input flags whci would de-deuplictae this hidden adjustment - install-flags: '"pytorch-lightning>=2.0.0, <=2.0.6"' + install-extras: "[pytorch-lightning]" testing-matrix: | { "os": ["ubuntu-latest", "macos-latest", "windows-latest"], diff --git a/.github/workflows/release-pypi.yml b/.github/workflows/release-pypi.yml index 4ccb414..573d706 100644 --- a/.github/workflows/release-pypi.yml +++ b/.github/workflows/release-pypi.yml @@ -20,8 +20,8 @@ jobs: python-version: 3.9 - name: Install dependencies - run: python -m pip install -U setuptools wheel build - - name: Build + run: pip install -q setuptools wheel build + - name: Build package run: python -m build # We do this, since failures on test.pypi aren't that bad diff --git a/MANIFEST.in b/MANIFEST.in index af7529e..560a397 100644 --- a/MANIFEST.in +++ b/MANIFEST.in @@ -28,6 +28,7 @@ exclude docs # Include the Requirements include requirements.txt +recursive-include requirements *.txt # Exclude Makefile exclude Makefile