From 2342f0545e9044186b642f152e517095d26779d5 Mon Sep 17 00:00:00 2001 From: Pavol Juhas Date: Tue, 6 Feb 2024 11:31:24 -0800 Subject: [PATCH 1/4] Use single requirement source for quimb and numba Fixes ci-daily failure on Mac due to incompatible versions of quimb and numba. --- dev_tools/requirements/deps/notebook.txt | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dev_tools/requirements/deps/notebook.txt b/dev_tools/requirements/deps/notebook.txt index 387bfc46f96..12815f39353 100644 --- a/dev_tools/requirements/deps/notebook.txt +++ b/dev_tools/requirements/deps/notebook.txt @@ -8,7 +8,9 @@ ipykernel==5.3.4 # for executing notebooks in tests papermill~=2.3.2 -quimb~=1.6.0 + +# for notebooks that do `pip install cirq-core[contrib]` +-r ../../../cirq-core/cirq/contrib/requirements.txt # assumed to be part of colab seaborn~=0.11.1 From ea056b719fa187d135935d770d2b638b9a5bc42b Mon Sep 17 00:00:00 2001 From: Pavol Juhas Date: Tue, 6 Feb 2024 11:34:05 -0800 Subject: [PATCH 2/4] REVERT ME - temporarily activate ci-daily in pull requests --- .github/workflows/ci-daily.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.github/workflows/ci-daily.yml b/.github/workflows/ci-daily.yml index f70a8f09d71..999d6c1e130 100644 --- a/.github/workflows/ci-daily.yml +++ b/.github/workflows/ci-daily.yml @@ -4,6 +4,10 @@ on: schedule: # Checks out main by default. - cron: '0 0 * * *' + # FIXME - for PR testing only, remove before merge + pull_request: + branches: + - main concurrency: group: ${{ github.workflow }} From 838878a111a26486af5f8c10baf8a8ebf435da9d Mon Sep 17 00:00:00 2001 From: Pavol Juhas Date: Tue, 6 Feb 2024 12:04:42 -0800 Subject: [PATCH 3/4] ci-daily - install notebook dependencies for Ubuntu and Windows too --- .github/workflows/ci-daily.yml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci-daily.yml b/.github/workflows/ci-daily.yml index 999d6c1e130..b2fef5fdc50 100644 --- a/.github/workflows/ci-daily.yml +++ b/.github/workflows/ci-daily.yml @@ -36,7 +36,8 @@ jobs: pip install \ -r dev_tools/requirements/deps/format.txt \ -r dev_tools/requirements/deps/pylint.txt \ - -r dev_tools/requirements/deps/pytest.txt + -r dev_tools/requirements/deps/pytest.txt \ + -r dev_tools/requirements/deps/notebook.txt - name: Run Quil dependencies run: docker-compose -f cirq-rigetti/docker-compose.test.yaml up -d - name: Pytest check @@ -64,7 +65,8 @@ jobs: pip install --pre cirq && pip install -r dev_tools/requirements/deps/format.txt && pip install -r dev_tools/requirements/deps/pylint.txt && - pip install -r dev_tools/requirements/deps/pytest.txt + pip install -r dev_tools/requirements/deps/pytest.txt && + pip install -r dev_tools/requirements/deps/notebook.txt - name: Pytest Windows run: check/pytest -n auto --ignore=cirq-core/cirq/contrib --enable-slow-tests shell: bash From d56405cab59431eb5c5265faaf26b2cf0b67c9f5 Mon Sep 17 00:00:00 2001 From: Pavol Juhas Date: Tue, 6 Feb 2024 14:10:09 -0800 Subject: [PATCH 4/4] Revert "REVERT ME - temporarily activate ci-daily in pull requests" This reverts commit ea056b719fa187d135935d770d2b638b9a5bc42b. --- .github/workflows/ci-daily.yml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/.github/workflows/ci-daily.yml b/.github/workflows/ci-daily.yml index b2fef5fdc50..3ab64a204a7 100644 --- a/.github/workflows/ci-daily.yml +++ b/.github/workflows/ci-daily.yml @@ -4,10 +4,6 @@ on: schedule: # Checks out main by default. - cron: '0 0 * * *' - # FIXME - for PR testing only, remove before merge - pull_request: - branches: - - main concurrency: group: ${{ github.workflow }}