From 0986b309ac9aee5d13692492bb210ddad46af5ce Mon Sep 17 00:00:00 2001 From: Dave Bacon Date: Wed, 2 Feb 2022 12:45:23 -0800 Subject: [PATCH 1/4] Try moving wheel install --- dev_tools/requirements/no-contrib.env.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev_tools/requirements/no-contrib.env.txt b/dev_tools/requirements/no-contrib.env.txt index 9502a29c686..579f1b8a87e 100644 --- a/dev_tools/requirements/no-contrib.env.txt +++ b/dev_tools/requirements/no-contrib.env.txt @@ -1,2 +1,2 @@ +-r deps/dev-tools.txt -r deps/cirq-all-no-contrib.txt --r deps/dev-tools.txt \ No newline at end of file From 132f089ac90bd1ef547a49f138b153c9e3584420 Mon Sep 17 00:00:00 2001 From: Dave Bacon Date: Wed, 2 Feb 2022 12:52:17 -0800 Subject: [PATCH 2/4] try explicit wheel --- .github/workflows/ci.yml | 1 + dev_tools/requirements/no-contrib.env.txt | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 0ffb7d46550..152979f1a2f 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -229,6 +229,7 @@ jobs: python-version: ${{ matrix.python-version }} architecture: 'x64' - name: Install requirements + run: pip install wheel run: pip install -r dev_tools/requirements/no-contrib.env.txt - name: Pytest Windows run: check/pytest --ignore=cirq-core/cirq/contrib --actually-quiet diff --git a/dev_tools/requirements/no-contrib.env.txt b/dev_tools/requirements/no-contrib.env.txt index 579f1b8a87e..9502a29c686 100644 --- a/dev_tools/requirements/no-contrib.env.txt +++ b/dev_tools/requirements/no-contrib.env.txt @@ -1,2 +1,2 @@ --r deps/dev-tools.txt -r deps/cirq-all-no-contrib.txt +-r deps/dev-tools.txt \ No newline at end of file From 9ac24a692dd02438970d99860edd13c38bd47fc2 Mon Sep 17 00:00:00 2001 From: Dave Bacon Date: Wed, 2 Feb 2022 15:37:00 -0800 Subject: [PATCH 3/4] really install wheel --- .github/workflows/ci.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 152979f1a2f..13e71a2bd5a 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -228,8 +228,9 @@ jobs: with: python-version: ${{ matrix.python-version }} architecture: 'x64' - - name: Install requirements + - name: Install wheel run: pip install wheel + - name: Install requirements run: pip install -r dev_tools/requirements/no-contrib.env.txt - name: Pytest Windows run: check/pytest --ignore=cirq-core/cirq/contrib --actually-quiet From 4bc0b88c296a52513e04619f00ab0a890f8d96e2 Mon Sep 17 00:00:00 2001 From: Dave Bacon Date: Wed, 2 Feb 2022 15:50:56 -0800 Subject: [PATCH 4/4] fix typo --- .github/workflows/ci.yml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 13e71a2bd5a..2bd6b5e7dfe 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -228,10 +228,8 @@ jobs: with: python-version: ${{ matrix.python-version }} architecture: 'x64' - - name: Install wheel - run: pip install wheel - name: Install requirements - run: pip install -r dev_tools/requirements/no-contrib.env.txt + run: pip install wheel & pip install -r dev_tools/requirements/no-contrib.env.txt - name: Pytest Windows run: check/pytest --ignore=cirq-core/cirq/contrib --actually-quiet shell: bash