Skip to content

Commit

Permalink
Merge branch 'main' into alvaro/zcu216_TIdac
Browse files Browse the repository at this point in the history
  • Loading branch information
aorgazf committed Oct 1, 2024
2 parents 35b16fd + 588c532 commit e6d262d
Show file tree
Hide file tree
Showing 15 changed files with 1,913 additions and 731 deletions.
9 changes: 9 additions & 0 deletions .envrc
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
if ! has nix_direnv_version || ! nix_direnv_version 2.2.1; then
source_url "https://raw.github.com/nix-community/nix-direnv/2.2.1/direnvrc" "sha256-zelF0vLbEl5uaqrfIzbgNzJWGmLzCmYAkInj/LNxvKs="
fi

watch_file flake.nix
watch_file flake.lock
if ! use flake . --impure; then
echo "devenv could not be built. The devenv environment was not loaded. Make the necessary changes to devenv.nix and hit enter to try again." >&2
fi
5 changes: 1 addition & 4 deletions .github/workflows/deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,7 @@ jobs:
strategy:
matrix:
os: [ubuntu-latest, macos-latest, windows-latest]
python-version: [3.9, "3.10", "3.11"]
include:
- os: ubuntu-latest
python-version: 3.8
python-version: [3.9, "3.10", "3.11", "3.12"]
uses: qiboteam/workflows/.github/workflows/deploy-pip-poetry.yml@main
with:
os: ${{ matrix.os }}
Expand Down
15 changes: 11 additions & 4 deletions .github/workflows/mypy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,14 +8,21 @@ jobs:
mypy:
strategy:
matrix:
python-version: [3.8, 3.9, "3.10", "3.11"]
python-version: [3.9, "3.10", "3.11", "3.12"]
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v3
- name: Setup python
uses: actions/setup-python@v4
with:
python-version: ${{ matrix.python-version }}
- uses: python/mypy@master
with:
paths: "src/"
- name: Install poetry
run: |
pipx install poetry
# and the task runner
pipx inject poetry poethepoet --include-apps
- name: Install dependencies
run: poetry install --with analysis
- name: Check
run: poe mypy
5 changes: 1 addition & 4 deletions .github/workflows/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,7 @@ jobs:
strategy:
matrix:
os: [ubuntu-latest, macos-latest, windows-latest]
python-version: [3.9, "3.10", "3.11"]
include:
- os: ubuntu-latest
python-version: 3.8
python-version: [3.9, "3.10", "3.11", "3.12"]
uses: qiboteam/workflows/.github/workflows/rules-poetry.yml@main
with:
os: ${{ matrix.os }}
Expand Down
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -138,3 +138,6 @@ dmypy.json
# Visual Studio Code
.vscode
*.DS_Store

# Nix
.devenv/
4 changes: 2 additions & 2 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ repos:
- id: check-yaml
- id: debug-statements
- repo: https://github.com/psf/black
rev: 24.4.2
rev: 24.8.0
hooks:
- id: black
- repo: https://github.com/pycqa/isort
Expand All @@ -18,7 +18,7 @@ repos:
- id: isort
args: ["--profile", "black"]
- repo: https://github.com/asottile/pyupgrade
rev: v3.16.0
rev: v3.17.0
hooks:
- id: pyupgrade
- repo: https://github.com/hadialqattan/pycln
Expand Down
4 changes: 3 additions & 1 deletion doc/source/getting-started/pulses.rst
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ The shape objects inherits from :class:`qibosoq.components.pulses.Pulse` and sha

.. code-block:: python
from qibosoq.components.pulses import Rectangular, Gaussian, Drag, Arbitrary, FlatTop
from qibosoq.components.pulses import Rectangular, Gaussian, Drag, Arbitrary, FlatTop, Hann
pulse = Rectangular(...)
Expand All @@ -89,6 +89,8 @@ The shape objects inherits from :class:`qibosoq.components.pulses.Pulse` and sha
q_values = [...], # list of floats
)
pulse = Hann(...)
Measurements
""""""""""""

Expand Down
562 changes: 562 additions & 0 deletions extras/DAC_calibration.ipynb

Large diffs are not rendered by default.

Loading

0 comments on commit e6d262d

Please sign in to comment.