Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add Python 3.11 tests to CI #6191

Merged
merged 11 commits into from
Jul 17, 2023
Merged

Add Python 3.11 tests to CI #6191

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
cbcc43c
Add Python 3.11 tests to CI
tanujkhattar Jul 10, 2023
0c37ca0
Remove proto requirements upper bound pins and rebuild protos
tanujkhattar Jul 10, 2023
5712d83
Merge branch 'master' of https://github.com/quantumlib/Cirq into py31…
tanujkhattar Jul 15, 2023
265fbaf
Fix failing tests and upgrade qiskit-aer version to fix dependencies …
tanujkhattar Jul 15, 2023
3ef7377
Regenerate protos
tanujkhattar Jul 15, 2023
b93b2fd
Yet another regeneration
tanujkhattar Jul 15, 2023
9e88886
Regenerate textproto and ignore mypy coverage check for test
tanujkhattar Jul 15, 2023
6c36ba3
Merge branch 'master' into py311_ci
tanujkhattar Jul 17, 2023
0b55a50
Merge branch 'master' into py311_ci
tanujkhattar Jul 17, 2023
c49c5ef
Merge branch 'master' into py311_ci
tanujkhattar Jul 17, 2023
d5df1d3
Merge branch 'master' into py311_ci
tanujkhattar Jul 17, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/ci-daily.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ jobs:
name: Pytest Ubuntu
strategy:
matrix:
python-version: ['3.9', '3.10']
python-version: ['3.9', '3.10', '3.11']
runs-on: ubuntu-20.04
steps:
- uses: actions/checkout@v3
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -149,7 +149,7 @@ jobs:
name: Pytest Ubuntu
strategy:
matrix:
python-version: [ '3.9', '3.10' ]
python-version: [ '3.9', '3.10', '3.11' ]
runs-on: ubuntu-20.04
steps:
- uses: actions/checkout@v3
Expand Down Expand Up @@ -244,7 +244,7 @@ jobs:
name: Pytest Windows
strategy:
matrix:
python-version: [ '3.9', '3.10' ]
python-version: [ '3.9', '3.10', '3.11' ]
runs-on: windows-2019
steps:
- uses: actions/checkout@v3
Expand All @@ -269,7 +269,7 @@ jobs:
name: Pytest MacOS
strategy:
matrix:
python-version: [ '3.9', '3.10' ]
python-version: [ '3.9', '3.10', '3.11' ]
runs-on: macos-latest
steps:
- uses: actions/checkout@v3
Expand Down
2 changes: 1 addition & 1 deletion cirq-ft/cirq_ft/algos/generic_select.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ def target_registers(self) -> infra.Registers:
def decompose_from_registers(self, context, **qubit_regs: Sequence[cirq.Qid]) -> cirq.OP_TREE:
if self.control_val == 0:
yield cirq.X(*qubit_regs['control'])
yield super().decompose_from_registers(context=context, **qubit_regs)
yield super(GenericSelect, self).decompose_from_registers(context=context, **qubit_regs)
if self.control_val == 0:
yield cirq.X(*qubit_regs['control'])

Expand Down
2 changes: 1 addition & 1 deletion cirq-ft/cirq_ft/algos/hubbard_model.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -224,7 +224,7 @@ def controlled(
)

def _circuit_diagram_info_(self, args: cirq.CircuitDiagramInfoArgs) -> cirq.CircuitDiagramInfo:
info = super()._circuit_diagram_info_(args)
info = super(SelectHubbard, self)._circuit_diagram_info_(args)
if self.control_val is None:
return info
ctrl = ('@' if self.control_val else '@(0)',)
Expand Down
4 changes: 3 additions & 1 deletion cirq-ft/cirq_ft/algos/selected_majorana_fermion.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,9 @@ def decompose_from_registers(
qubit_regs['accumulator'] = context.qubit_manager.qalloc(1)
control = qubit_regs[self.control_regs[0].name] if self.control_registers.bitsize else []
yield cirq.X(*qubit_regs['accumulator']).controlled_by(*control)
yield super().decompose_from_registers(context=context, **qubit_regs)
yield super(SelectedMajoranaFermionGate, self).decompose_from_registers(
context=context, **qubit_regs
)
context.qubit_manager.qfree(qubit_regs['accumulator'])

def _circuit_diagram_info_(self, args: cirq.CircuitDiagramInfoArgs) -> cirq.CircuitDiagramInfo:
Expand Down
450 changes: 23 additions & 427 deletions cirq-google/cirq_google/api/v1/operations_pb2.py
View file
Open in desktop

Large diffs are not rendered by default.