Skip to content

Commit

Permalink
Merge pull request #2 from qutech/fix_imports
Browse files Browse the repository at this point in the history
Use local seqc and bump version
  • Loading branch information
terrorfisch authored Mar 14, 2024
2 parents aa2ce75 + f5bf201 commit b86a2b3
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 5 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
__pycache__
/dist/**
4 changes: 2 additions & 2 deletions qupulse_hdawg_legacy/__about__.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# SPDX-FileCopyrightText: 2024-present Simon Humpohl <[email protected]>
#
# SPDX-License-Identifier: MIT
__version__ = "0.0.1"
# SPDX-License-Identifier: GPL-3.0
__version__ = "0.1"
2 changes: 1 addition & 1 deletion qupulse_hdawg_legacy/__init__.py
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
# SPDX-FileCopyrightText: 2024-present Simon Humpohl <[email protected]>
#
# SPDX-License-Identifier: MIT
# SPDX-License-Identifier: GPL-3.0
4 changes: 2 additions & 2 deletions qupulse_hdawg_legacy/zihdawg.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
import numbers
from pathlib import Path
import functools
from typing import Tuple, Set, Callable, Optional, Mapping, Generator, Union, Sequence, Dict
from enum import Enum
Expand Down Expand Up @@ -28,9 +27,10 @@

import time

from qupulse_hdawg_legacy.seqc import HDAWGProgramManager, UserRegister, WaveformFileSystem

from qupulse.utils.types import ChannelID, TimeType, time_from_float
from qupulse.program.loop import Loop, make_compatible
from qupulse._program.seqc import HDAWGProgramManager, UserRegister, WaveformFileSystem
from qupulse.hardware.awgs.base import AWG, ChannelNotFoundException, AWGAmplitudeOffsetHandling
from qupulse.hardware.util import traced

Expand Down

0 comments on commit b86a2b3

Please sign in to comment.