From 85bab519f61027aa18cb30d33ae77ed22af50a03 Mon Sep 17 00:00:00 2001 From: Pavol Juhas Date: Sat, 14 Sep 2024 15:37:35 -0700 Subject: [PATCH 1/5] CI - test cirq compatibility using Python 3.10 cirq requires minimum Python version 3.10. Running under Python 3.7 installs cirq from June 2023. Run the "Format check" job under Python 3.10 as well. --- .github/workflows/cirq_compatibility.yml | 2 +- .github/workflows/python_format.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/cirq_compatibility.yml b/.github/workflows/cirq_compatibility.yml index 626cd82e..1702de7a 100644 --- a/.github/workflows/cirq_compatibility.yml +++ b/.github/workflows/cirq_compatibility.yml @@ -12,7 +12,7 @@ jobs: - uses: actions/checkout@v4 - uses: actions/setup-python@v5 with: - python-version: '3.7' + python-version: '3.10' architecture: 'x64' - name: Install Cirq nightly run: pip3 install -U cirq --pre diff --git a/.github/workflows/python_format.yml b/.github/workflows/python_format.yml index 8c58f58f..1f3b689d 100644 --- a/.github/workflows/python_format.yml +++ b/.github/workflows/python_format.yml @@ -22,7 +22,7 @@ jobs: fetch-depth: 0 - uses: actions/setup-python@v5 with: - python-version: '3.7' + python-version: '3.10' architecture: 'x64' - name: Install dev requirements run: pip install -r dev-requirements.txt From 75e89df9701425a55e7d78e1ff3613b942672480 Mon Sep 17 00:00:00 2001 From: Pavol Juhas Date: Sat, 14 Sep 2024 15:42:45 -0700 Subject: [PATCH 2/5] CI - temporarily run the compatibility job on push Revert before merge. --- .github/workflows/cirq_compatibility.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.github/workflows/cirq_compatibility.yml b/.github/workflows/cirq_compatibility.yml index 1702de7a..b07f21b5 100644 --- a/.github/workflows/cirq_compatibility.yml +++ b/.github/workflows/cirq_compatibility.yml @@ -4,6 +4,11 @@ on: schedule: - cron: "0 0 * * *" + # TODO - temporary for job testing only + push: + branches: + - master + jobs: consistency: name: Nightly Compatibility From 7606be4174b2700d5fd5b75dd3af134aa99e72da Mon Sep 17 00:00:00 2001 From: Pavol Juhas Date: Sat, 14 Sep 2024 16:34:39 -0700 Subject: [PATCH 3/5] No change, just trigger the CI From 274eb09b46f6c1032db9ca5b9a8a805caad240e1 Mon Sep 17 00:00:00 2001 From: Pavol Juhas Date: Sat, 14 Sep 2024 16:57:07 -0700 Subject: [PATCH 4/5] Revert "CI - temporarily run the compatibility job on push" This reverts commit 75e89df9701425a55e7d78e1ff3613b942672480. --- .github/workflows/cirq_compatibility.yml | 5 ----- 1 file changed, 5 deletions(-) diff --git a/.github/workflows/cirq_compatibility.yml b/.github/workflows/cirq_compatibility.yml index b07f21b5..1702de7a 100644 --- a/.github/workflows/cirq_compatibility.yml +++ b/.github/workflows/cirq_compatibility.yml @@ -4,11 +4,6 @@ on: schedule: - cron: "0 0 * * *" - # TODO - temporary for job testing only - push: - branches: - - master - jobs: consistency: name: Nightly Compatibility From c00dc45c3592ad4fe18ed5ecca00ca259aeb8dc3 Mon Sep 17 00:00:00 2001 From: Pavol Juhas Date: Mon, 16 Sep 2024 10:32:37 -0700 Subject: [PATCH 5/5] CI - install cirq pre-release with stable dependencies Avoid using the `--pre` option as it applies to everything. --- .github/workflows/cirq_compatibility.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/cirq_compatibility.yml b/.github/workflows/cirq_compatibility.yml index 1702de7a..d34dcc10 100644 --- a/.github/workflows/cirq_compatibility.yml +++ b/.github/workflows/cirq_compatibility.yml @@ -15,7 +15,7 @@ jobs: python-version: '3.10' architecture: 'x64' - name: Install Cirq nightly - run: pip3 install -U cirq --pre + run: pip3 install --upgrade cirq~=1.0.dev - name: Install qsim requirements run: pip3 install -r requirements.txt - name: Install test requirements