Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
python-spectrometer
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Iterations
Wiki
Requirements
External wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Test cases
Artifacts
Deploy
Releases
Package registry
Container registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Code review analytics
Issue analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
GitLab community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
QuTech
python-spectrometer
Merge requests
!72
pyupgrade
Code
Review changes
Check out branch
Open in Workspace
Download
Patches
Plain diff
Expand sidebar
Merged
pyupgrade
maint/pyupgrade
into
main
Overview
0
Commits
2
Pipelines
8
Changes
11
Merged
Tobias Hangleiter
requested to merge
maint/pyupgrade
into
main
2 months ago
Overview
0
Commits
2
Pipelines
8
Changes
11
0
0
Merge request reports
Compare
main
version 4
3e9ba2e6
1 month ago
version 3
829c9ccd
1 month ago
version 2
2a230563
1 month ago
version 1
2a230563
2 months ago
main (base)
and
latest version
latest version
693baa56
2 commits,
1 month ago
version 4
3e9ba2e6
2 commits,
1 month ago
version 3
829c9ccd
3 commits,
1 month ago
version 2
2a230563
2 commits,
1 month ago
version 1
2a230563
34 commits,
2 months ago
11 files
+
79
−
82
Inline
Compare changes
Side-by-side
Inline
Show whitespace changes
Show one file at a time
Files
11
src/python_spectrometer/daq/__init__.pyi
+
5
−
10
View file @ 693baa56
Edit in single-file editor
Open in Web IDE
Show full file
@@ -5,16 +5,11 @@ __all__ = ['atsaverage', 'atssimple', 'qcodes', 'simulator', 'swabian_instrument
from
.
import
atsaverage
,
atssimple
,
qcodes
,
simulator
,
swabian_instruments
,
zurich_instruments
from
.atsaverage
import
AlazarATS9xx0
from
.qcodes
import
(
Keysight344xxA
,
NationalInstrumentsUSB6003
,
# Backwards "compatibility"
from
.qcodes
import
(
Keysight344xxA
,
NationalInstrumentsUSB6003
,
# Backwards "compatibility"
keysight_344xxA
,
national_instruments_daq
)
from
.settings
import
DAQSettings
from
.simulator
import
(
QoptColoredNoise
,
# Backwards "compatibility"
qopt_colored_noise
)
from
.swabian_instruments
import
(
SwabianInstrumentsTimeTagger
,
# Backwards "compatibility"
from
.simulator
import
QoptColoredNoise
,
qopt_colored_noise
# Backwards "compatibility"
from
.swabian_instruments
import
(
SwabianInstrumentsTimeTagger
,
# Backwards "compatibility"
timetagger
)
from
.zurich_instruments
import
(
ZurichInstrumentsMFLIDAQ
,
ZurichInstrumentsMFLIScope
,
# Backwards "compatibility"
MFLI_daq
,
MFLI_scope
)
from
.zurich_instruments
import
(
MFLI_daq
,
MFLI_scope
,
# Backwards "compatibility"
ZurichInstrumentsMFLIDAQ
,
ZurichInstrumentsMFLIScope
)
Loading