Skip to content

Commit

Permalink
deprecate configbuilder & move dependencies to opt extras (#177)
Browse files Browse the repository at this point in the history
* deprecate configbuilder & move dependencies to opt extras

* fix test

* change black to 120 chars

* add dash, docutils, waitress to optional

* format
  • Loading branch information
yomach authored Dec 21, 2023
1 parent e9bbeef commit 2bc4181
Show file tree
Hide file tree
Showing 36 changed files with 1,619 additions and 2,687 deletions.
3 changes: 2 additions & 1 deletion .github/workflows/on-pull-request.yml
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,8 @@ jobs:
poetry-
- name: Set up the project
run: poetry install
run: poetry install --extras configbuilder

- name: Check formatting
run: poetry run poe check-format

Expand Down
5 changes: 5 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,13 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/)
- Unit - Added `volts2dBm` and `dBm2volts`.

### Changed
- Eased package dependencies, requires python 3.8 or above
- Unit - `demod2volts` now has a `single_demod` flag to correctly convert the data from single demodulation.

## Deprecated
- ConfigBuilder and ConfigGUI are not being activity developed and may not have all config options


## [0.15.2] - 2023-09-06
### Added
- results - Add `wait_until_job_is_paused()` to block python console until the OPX sequence reaches a `pause()` statement.
Expand Down
16 changes: 13 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -34,9 +34,9 @@ storing them in the usual configuration file. It allows defining waveforms in a
* [Config Tools](qualang_tools/config/README.md) - This package includes tools related to the QOP configuration file, including:
* [Integration Weights Tools](qualang_tools/config/README_integration_weights_tools.md) - This package includes tools for the creation and manipulation of integration weights.
* [Waveform Tools](qualang_tools/config/README_waveform_tools.md) - This package includes tools for creating waveforms useful for experiments with the QOP.
* [Config GUI](qualang_tools/config/README_config_GUI.md) - This package contains a GUI for creating and visualizing the configuration file.
* [Config Builder](qualang_tools/config/README_config_builder.md) - This package contains an API for creating and manipulation configuration files.
* [Config Helper Tools](qualang_tools/config/README_helper_tools.md) - This package includes tools for writing and updating the configuration.
* [Config GUI](qualang_tools/config/README_config_GUI.md) - This package contains a GUI for creating and visualizing the configuration file - No longer being actively developed.
* [Config Builder](qualang_tools/config/README_config_builder.md) - This package contains an API for creating and manipulation configuration files - No longer being actively developed.

* [Control Panel](qualang_tools/control_panel/README.md)- This package includes tools for directly controlling the OPX.
* [ManualOutputControl](qualang_tools/control_panel/README_manual_output_control.md) - This module allows controlling the outputs from the OPX in CW mode. Once created, it has an API for defining which channels are on. Analog channels also have an API for defining their amplitude and frequency.
Expand All @@ -47,10 +47,20 @@ storing them in the usual configuration file. It allows defining waveforms in a

Install the current version using `pip`, the `--upgrade` flag ensures that you will get the latest version.

```commandline
```bash
pip install --upgrade qualang-tools
```

Note that in order use the `Config GUI` or `Config Builder`, you need to install using
```bash
pip install --upgrade qualang-tools[configbuilder]
```

Note that in order use the `Interactive Plot Library`, you need to install using
```bash
pip install --upgrade qualang-tools[interplot]
```

## Support and Contribution
Have an idea for another tool? A way to improve an existing one? Found a bug in our code?

Expand Down
2,165 changes: 1,066 additions & 1,099 deletions poetry.lock

Large diffs are not rendered by default.

26 changes: 14 additions & 12 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -18,21 +18,21 @@ readme = "README.md"
homepage = "https://github.com/qua-platform/py-qua-tools"

[tool.poetry.dependencies]
python = ">=3.7.1,<4.0"
python = ">=3.8,<4.0"
matplotlib = "^3.4.2"
numpy = "^1.17.0"
pandas = ">=1.2.4"
qm-qua = ">=1.1.0"
scipy = "^1.7.1"
dash = "^2.0.0"
dash-html-components = "^2.0.0"
dash-core-components = "^2.0.0"
dash-bootstrap-components = "^1.0.0"
dash-cytoscape = "^0.3.0"
dash-table = "^5.0.0"
docutils = ">=0.14.0"
dash-dangerously-set-inner-html = "^0.0.2"
waitress = "^2.0.0"
pandas = { version = ">=1.2.4", optional = true }
dash = { version = "^2.0.0", optional = true }
dash-html-components = { version = "^2.0.0", optional = true }
dash-core-components = { version = "^2.0.0", optional = true }
dash-bootstrap-components = { version = "^1.0.0", optional = true }
dash-cytoscape = { version = "^0.3.0", optional = true }
dash-table = { version = "^5.0.0", optional = true }
dash-dangerously-set-inner-html = { version = "^0.0.2", optional = true }
docutils = { version = ">=0.14.0", optional = true }
waitress = { version = "^2.0.0", optional = true }
dill = { version = "^0.3.4", optional = true }
pypiwin32 = { version = "^223", optional = true }
ipython = { version = "^7.31.1", optional = true }
Expand All @@ -43,12 +43,14 @@ pytest = "^6.2.5"
black = "^22.3"
poethepoet = "^0.11.0"
flake8 = "^4.0.1"
setuptools = "^69.0.2"

[tool.poetry.extras]
interplot = ["dill", "pypiwin32", "ipython"]
configbuilder = ["pandas", "dash", "dash-html-components", "dash-core-components", "dash-bootstrap-components", "dash-cytoscape", "dash-table", "dash-dangerously-set-inner-html", "docutils", "waitress"]

[tool.black]
line-length = 88 # Defaults
line-length = 120
exclude = "qualang_tools/bakery/randomized_benchmark_c1.py"

[tool.poe.tasks]
Expand Down
Loading

0 comments on commit 2bc4181

Please sign in to comment.