Skip to content

Commit bc3f9ff

Browse files
authored
1 parent f9f0d66 commit bc3f9ff

File tree

4 files changed

+9
-10
lines changed

4 files changed

+9
-10
lines changed

.github/workflows/ci-daily.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -35,11 +35,11 @@ jobs:
3535
-r dev_tools/requirements/deps/pytest.txt \
3636
-r dev_tools/requirements/deps/notebook.txt
3737
- name: Run Quil dependencies
38-
run: docker-compose -f cirq-rigetti/docker-compose.test.yaml up -d
38+
run: docker compose -f cirq-rigetti/docker-compose.test.yaml up -d
3939
- name: Pytest check
4040
run: check/pytest -n auto --ignore=cirq-core/cirq/contrib --rigetti-integration --enable-slow-tests
4141
- name: Stop Quil dependencies
42-
run: docker-compose -f cirq-rigetti/docker-compose.test.yaml down
42+
run: docker compose -f cirq-rigetti/docker-compose.test.yaml down
4343
windows:
4444
name: Pytest Windows
4545
strategy:

.github/workflows/ci.yml

+4-4
Original file line numberDiff line numberDiff line change
@@ -166,11 +166,11 @@ jobs:
166166
pip install wheel
167167
pip install --upgrade --upgrade-strategy eager -r dev_tools/requirements/dev.env.txt
168168
- name: Run Quil dependencies
169-
run: docker-compose -f cirq-rigetti/docker-compose.test.yaml up -d
169+
run: docker compose -f cirq-rigetti/docker-compose.test.yaml up -d
170170
- name: Pytest check
171171
run: check/pytest -n auto --durations=20 --ignore=cirq-core/cirq/contrib --rigetti-integration
172172
- name: Stop Quil dependencies
173-
run: docker-compose -f cirq-rigetti/docker-compose.test.yaml down
173+
run: docker compose -f cirq-rigetti/docker-compose.test.yaml down
174174
pip-compile:
175175
name: Check consistency of requirements
176176
runs-on: ubuntu-20.04
@@ -221,15 +221,15 @@ jobs:
221221
pip install wheel
222222
pip install --upgrade --upgrade-strategy eager -r dev_tools/requirements/dev.env.txt
223223
- name: Run Quil dependencies
224-
run: docker-compose -f cirq-rigetti/docker-compose.test.yaml up -d
224+
run: docker compose -f cirq-rigetti/docker-compose.test.yaml up -d
225225
- name: Coverage check
226226
run: check/pytest-and-incremental-coverage -n auto --rigetti-integration
227227
- name: Upload coverage reports to Codecov
228228
uses: codecov/codecov-action@v4
229229
env:
230230
CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
231231
- name: Stop Quil dependencies
232-
run: docker-compose -f cirq-rigetti/docker-compose.test.yaml down
232+
run: docker compose -f cirq-rigetti/docker-compose.test.yaml down
233233
windows:
234234
name: Pytest Windows
235235
strategy:

dev_tools/conf/apt-list-dev-tools.txt

-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
11
virtualenvwrapper
22
pandoc
33
docker-ce
4-
docker-compose

docs/dev/development.md

+3-3
Original file line numberDiff line numberDiff line change
@@ -100,9 +100,9 @@ See the previous section for instructions.
100100
```bash
101101
cat apt-system-requirements.txt dev_tools/conf/apt-list-dev-tools.txt | xargs sudo apt-get install --yes
102102
```
103-
104-
This installs docker and docker-compose among other things. You may need to restart
105-
docker or configure permissions, see
103+
104+
This installs docker among other things. You may need to restart
105+
docker or configure permissions, see
106106
[docker install instructions](https://docs.docker.com/engine/install/ubuntu/).
107107
Note that docker is necessary only for cirq_rigetti.
108108

0 commit comments

Comments
 (0)