Skip to content

Commit e6096bd

Browse files
mpharriganmpharrigan
authored
Merge branch 'main' into 2025-09/soquetprotocol
2 parents 20bf101 + 99fe289 commit e6096bd

235 files changed

Lines changed: 10697 additions & 4312 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.gemini/config.yaml‎

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
# Copyright 2025 Google LLC
2+
#
3+
# Licensed under the Apache License, Version 2.0 (the "License");
4+
# you may not use this file except in compliance with the License.
5+
# You may obtain a copy of the License at
6+
#
7+
# https://www.apache.org/licenses/LICENSE-2.0
8+
#
9+
# Unless required by applicable law or agreed to in writing, software
10+
# distributed under the License is distributed on an "AS IS" BASIS,
11+
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
12+
# See the License for the specific language governing permissions and
13+
# limitations under the License.
14+
15+
# Summary: configure Gemini Code Assist (https://codeassist.google/).
16+
# See https://github.com/marketplace/gemini-code-assist for more info.
17+
18+
have_fun: false
19+
code_review:
20+
disable: false
21+
comment_severity_threshold: HIGH
22+
max_review_comments: -1
23+
pull_request_opened:
24+
help: false
25+
summary: false
26+
code_review: true
27+
include_drafts: false
28+
ignore_patterns: []

‎.github/workflows/nightly.yaml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,17 +30,17 @@ permissions: read-all
3030
jobs:
3131
pytest:
3232
runs-on: ubuntu-22.04
33-
timeout-minutes: 60
33+
timeout-minutes: 120
3434
steps:
3535
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
3636
- uses: ts-graphviz/setup-graphviz@c001ccfb5aff62e28bda6a6c39b59a7e061be5b9 # v1
3737
- uses: actions/setup-python@42375524e23c412d93fb67b49958b491fce71c38 # v5
3838
with:
39-
python-version: "3.10"
39+
python-version: "3.11"
4040
- name: Install dependencies
4141
run: |
4242
python -m pip install --upgrade pip
4343
pip install -r dev_tools/requirements/envs/pytest.env.txt
4444
pip install --no-deps -e .
4545
- run: |
46-
check/pytest --durations=10
46+
check/pytest-full --durations=10 -v -n=0

‎.github/workflows/pr.yaml‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -34,14 +34,14 @@ jobs:
3434
- uses: ts-graphviz/setup-graphviz@c001ccfb5aff62e28bda6a6c39b59a7e061be5b9 # v1
3535
- uses: actions/setup-python@42375524e23c412d93fb67b49958b491fce71c38 # v5
3636
with:
37-
python-version: "3.10"
37+
python-version: "3.11"
3838
- name: Install dependencies
3939
run: |
4040
python -m pip install --upgrade pip
4141
pip install -r dev_tools/requirements/envs/pytest.env.txt
4242
pip install --no-deps -e .
4343
- run: |
44-
check/pytest -m 'not notebook and not slow'
44+
check/pytest-quick
4545
4646
dev-tools:
4747
runs-on: ubuntu-24.04
@@ -51,7 +51,7 @@ jobs:
5151
- uses: ts-graphviz/setup-graphviz@c001ccfb5aff62e28bda6a6c39b59a7e061be5b9 # v1
5252
- uses: actions/setup-python@42375524e23c412d93fb67b49958b491fce71c38 # v5
5353
with:
54-
python-version: "3.10"
54+
python-version: "3.11"
5555
- name: Install dependencies
5656
run: |
5757
python -m pip install --upgrade pip
@@ -69,7 +69,7 @@ jobs:
6969
- uses: ts-graphviz/setup-graphviz@c001ccfb5aff62e28bda6a6c39b59a7e061be5b9 # v1
7070
- uses: actions/setup-python@42375524e23c412d93fb67b49958b491fce71c38 # v5
7171
with:
72-
python-version: "3.10"
72+
python-version: "3.11"
7373
- name: Install dependencies
7474
run: |
7575
python -m pip install --upgrade pip
@@ -89,7 +89,7 @@ jobs:
8989
fetch-depth: 0
9090
- uses: actions/setup-python@42375524e23c412d93fb67b49958b491fce71c38 # v5
9191
with:
92-
python-version: "3.10"
92+
python-version: "3.11"
9393
- name: Install dependencies
9494
run: |
9595
python -m pip install --upgrade pip
@@ -109,7 +109,7 @@ jobs:
109109
fetch-depth: 0
110110
- uses: actions/setup-python@42375524e23c412d93fb67b49958b491fce71c38 # v5
111111
with:
112-
python-version: "3.10"
112+
python-version: "3.11"
113113
- name: Install dependencies
114114
run: |
115115
python -m pip install --upgrade pip
@@ -129,7 +129,7 @@ jobs:
129129
fetch-depth: 0
130130
- uses: actions/setup-python@42375524e23c412d93fb67b49958b491fce71c38 # v5
131131
with:
132-
python-version: "3.10"
132+
python-version: "3.11"
133133
- name: Install dependencies
134134
run: |
135135
python -m pip install --upgrade pip
@@ -148,7 +148,7 @@ jobs:
148148
- uses: ts-graphviz/setup-graphviz@c001ccfb5aff62e28bda6a6c39b59a7e061be5b9 # v1
149149
- uses: actions/setup-python@42375524e23c412d93fb67b49958b491fce71c38 # v5
150150
with:
151-
python-version: "3.10"
151+
python-version: "3.11"
152152
- name: Install dependencies
153153
run: |
154154
python -m pip install --upgrade pip

‎.gitignore‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -139,3 +139,6 @@ ui_export/
139139

140140
# Jupyter
141141
jupyter_kernel.lock
142+
143+
# Mac OS
144+
.DS_Store

‎CONTRIBUTING.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ checking formatting against the style guidelines. You can run those tools
7676
locally during development. Wrapper scripts are located in the
7777
[`check/`](./check/) subdirectory to simplify running the tools.
7878

79-
* Run `check/pytest` to run the Pytest suite
79+
* Run `check/pytest-quick` to run the Pytest suite
8080
* Run `check/mypy` to run the Mypy type checker
8181
* Run `check/pylint` to run the Pylint code linter
8282

‎MANIFEST.in‎

Lines changed: 0 additions & 1 deletion
This file was deleted.

‎README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
Python package for fault-tolerant quantum algorithms research.
88

99
[![Licensed under the Apache 2.0 open-source license](https://img.shields.io/badge/License-Apache%202.0-3c60b1.svg?logo=opensourceinitiative\&logoColor=white\&style=flat-square)](https://github.com/quantumlib/qualtran/blob/main/LICENSE)
10-
[![Compatible with Python versions 3.10 and higher](https://img.shields.io/badge/Python-3.10+-6828b2.svg?style=flat-square&logo=python&logoColor=white)](https://www.python.org/downloads/)
10+
[![Compatible with Python versions 3.11 and higher](https://img.shields.io/badge/Python-3.11+-6828b2.svg?style=flat-square&logo=python&logoColor=white)](https://www.python.org/downloads/)
1111
[![Qualtran project on PyPI](https://img.shields.io/pypi/v/qualtran.svg?logo=python&logoColor=white&label=PyPI&style=flat-square&color=9d3bb8)](https://pypi.org/project/qualtran)
1212

1313
[Installation](#installation) –

‎check/format-incremental‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -95,13 +95,13 @@ if (( ${#format_files[@]} == 0 )); then
9595
exit 0
9696
fi
9797

98-
flynt_args=("--quiet" "-f")
99-
if (( only_print == 1 )); then
100-
flynt_args+=("--dry-run")
101-
fi
102-
103-
flynt "${format_files[@]}" "${flynt_args[@]}"
104-
FLYNTSTATUS=$?
98+
#flynt_args=("--quiet" "-f")
99+
#if (( only_print == 1 )); then
100+
# flynt_args+=("--dry-run")
101+
#fi
102+
#
103+
#flynt "${format_files[@]}" "${flynt_args[@]}"
104+
FLYNTSTATUS=0
105105

106106
isort_args=()
107107
if (( only_print == 1 )); then

‎check/pytest‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,12 @@ thisdir="$(dirname "${BASH_SOURCE[0]}")" || exit $?
1313
topdir="$(git -C "${thisdir}" rev-parse --show-toplevel)" || exit $?
1414
cd "${topdir}" || exit $?
1515

16+
echo "Warning: running the full test suite, which may take tens of minutes."
17+
echo ""
18+
echo " To run the recommended test suite for development: use check/pytest-quick"
19+
echo " To suppress this warning: use check/pytest-full"
20+
echo ""
21+
1622
# Run in parallel by default. Pass the `-n0` option for a single-process run.
1723
# (the last `-n` option wins)
1824
PYTEST_ARGS=( "-n=auto" "$@" )

‎check/pytest-full‎

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
#!/usr/bin/env bash
2+
3+
################################################################################
4+
# Runs the full pytest suite on the repository.
5+
#
6+
# Usage:
7+
# check/pytest-full [--flags for pytest]
8+
#
9+
################################################################################
10+
11+
# Get the working directory to the repo root.
12+
cd "$( dirname "${BASH_SOURCE[0]}" )" || exit 1
13+
cd "$(git rev-parse --show-toplevel)" || exit 1
14+
15+
# Run in parallel by default. Pass the `-n0` option for a single-process run.
16+
# (the last `-n` option wins)
17+
PYTEST_ARGS=( "-n=auto" "$@" )
18+
19+
pytest "${PYTEST_ARGS[@]}" qualtran/
20+
RESULT=$?
21+
22+
exit "$RESULT"

0 commit comments

Comments
 (0)