From 34705c1913d16317aeaee954e610a08d0d22328e Mon Sep 17 00:00:00 2001 From: Bernhard Arnold Date: Tue, 10 Oct 2023 16:26:46 +0200 Subject: [PATCH] renamed package, added context menu --- MANIFEST.in | 14 ++-- README.md | 4 +- changelog | 10 ++- comet_pqc/__init__.py | 1 - docs/_config.yml | 2 +- docs/changelog.md | 5 ++ docs/configuration.md | 6 +- pqc/__init__.py | 1 + {comet_pqc => pqc}/__main__.py | 0 .../assets/config/chuck/default.yaml | 0 .../assets/config/sample/default_hme_s.yaml | 0 .../assets/config/sample/default_hmw_n.yaml | 0 .../assets/config/sequence/default.yaml | 0 {comet_pqc => pqc}/assets/icons/add.svg | 0 {comet_pqc => pqc}/assets/icons/alignment.svg | 0 {comet_pqc => pqc}/assets/icons/delete.svg | 0 .../assets/icons/document_export.svg | 0 .../assets/icons/document_import.svg | 0 {comet_pqc => pqc}/assets/icons/gear.svg | 0 {comet_pqc => pqc}/assets/icons/pqc.ico | Bin {comet_pqc => pqc}/assets/icons/pqc.svg | 0 {comet_pqc => pqc}/assets/icons/reload.svg | 0 {comet_pqc => pqc}/assets/icons/search.svg | 0 {comet_pqc => pqc}/assets/schema/chuck.yaml | 0 {comet_pqc => pqc}/assets/schema/sample.yaml | 0 .../assets/schema/sequence.yaml | 0 {comet_pqc => pqc}/core/__init__.py | 0 {comet_pqc => pqc}/core/benchmark.py | 0 {comet_pqc => pqc}/core/config.py | 0 {comet_pqc => pqc}/core/estimate.py | 0 {comet_pqc => pqc}/core/filters.py | 0 {comet_pqc => pqc}/core/formatter.py | 0 {comet_pqc => pqc}/core/functions.py | 0 {comet_pqc => pqc}/core/position.py | 0 {comet_pqc => pqc}/core/request.py | 0 {comet_pqc => pqc}/core/timer.py | 0 {comet_pqc => pqc}/core/utils.py | 2 +- {comet_pqc => pqc}/instruments/__init__.py | 0 {comet_pqc => pqc}/instruments/e4980a.py | 0 {comet_pqc => pqc}/instruments/instrument.py | 0 {comet_pqc => pqc}/instruments/k2410.py | 0 {comet_pqc => pqc}/instruments/k2470.py | 0 {comet_pqc => pqc}/instruments/k2657a.py | 0 {comet_pqc => pqc}/instruments/smu.py | 0 {comet_pqc => pqc}/measurements/__init__.py | 0 {comet_pqc => pqc}/measurements/cv_ramp.py | 0 .../measurements/cv_ramp_alt.py | 0 .../measurements/cv_ramp_vsrc.py | 0 .../measurements/frequency_scan.py | 0 {comet_pqc => pqc}/measurements/iv_ramp.py | 0 .../measurements/iv_ramp_4_wire.py | 0 .../measurements/iv_ramp_4_wire_bias.py | 0 .../measurements/iv_ramp_bias.py | 0 .../measurements/iv_ramp_bias_elm.py | 0 .../measurements/iv_ramp_elm.py | 0 {comet_pqc => pqc}/measurements/matrix.py | 0 .../measurements/measurement.py | 0 {comet_pqc => pqc}/measurements/mixins.py | 0 {comet_pqc => pqc}/plugins/__init__.py | 0 {comet_pqc => pqc}/plugins/logger.py | 0 {comet_pqc => pqc}/plugins/notification.py | 0 {comet_pqc => pqc}/plugins/status/__init__.py | 0 {comet_pqc => pqc}/plugins/status/worker.py | 0 {comet_pqc => pqc}/plugins/summary.py | 0 {comet_pqc => pqc}/plugins/webapi/__init__.py | 0 {comet_pqc => pqc}/plugins/webapi/worker.py | 2 +- {comet_pqc => pqc}/settings.py | 0 {comet_pqc => pqc}/station.py | 0 {comet_pqc => pqc}/strategy.py | 0 {comet_pqc => pqc}/utils.py | 0 {comet_pqc => pqc}/view/__init__.py | 0 {comet_pqc => pqc}/view/alignment.py | 0 {comet_pqc => pqc}/view/components.py | 0 {comet_pqc => pqc}/view/dashboard.py | 0 {comet_pqc => pqc}/view/environmentwidget.py | 0 {comet_pqc => pqc}/view/mainwindow.py | 0 {comet_pqc => pqc}/view/measurementwidget.py | 0 {comet_pqc => pqc}/view/metric.py | 0 {comet_pqc => pqc}/view/panels/__init__.py | 0 {comet_pqc => pqc}/view/panels/contact.py | 2 +- {comet_pqc => pqc}/view/panels/cv_ramp.py | 0 {comet_pqc => pqc}/view/panels/cv_ramp_alt.py | 0 .../view/panels/cv_ramp_vsrc.py | 0 .../view/panels/frequency_scan.py | 0 {comet_pqc => pqc}/view/panels/iv_ramp.py | 0 .../view/panels/iv_ramp_4_wire.py | 0 .../view/panels/iv_ramp_4_wire_bias.py | 0 .../view/panels/iv_ramp_bias.py | 0 .../view/panels/iv_ramp_bias_elm.py | 0 {comet_pqc => pqc}/view/panels/iv_ramp_elm.py | 0 {comet_pqc => pqc}/view/panels/matrix.py | 2 +- {comet_pqc => pqc}/view/panels/mixins.py | 2 +- {comet_pqc => pqc}/view/panels/panel.py | 2 +- {comet_pqc => pqc}/view/panels/sample.py | 4 +- {comet_pqc => pqc}/view/plotwidget.py | 0 .../view/preferences/__init__.py | 0 .../view/preferences/options.py | 2 +- .../view/preferences/resources.py | 2 +- {comet_pqc => pqc}/view/preferences/table.py | 4 +- {comet_pqc => pqc}/view/quickedit.py | 0 {comet_pqc => pqc}/view/sequence.py | 73 ++++++++++++++++++ {comet_pqc => pqc}/view/sequencemanager.py | 0 {comet_pqc => pqc}/workers/__init__.py | 0 {comet_pqc => pqc}/workers/contactquality.py | 0 {comet_pqc => pqc}/workers/environment.py | 0 {comet_pqc => pqc}/workers/measure.py | 0 {comet_pqc => pqc}/workers/resource.py | 0 {comet_pqc => pqc}/workers/table.py | 4 +- pyinstaller/entry_point.py | 2 +- pyinstaller/windows_app.spec | 20 ++--- setup.cfg | 16 ++-- tests/test_core_config.py | 2 +- tests/test_core_estimate.py | 2 +- tests/test_core_filters.py | 2 +- tests/test_core_formatter.py | 2 +- tests/test_core_functions.py | 2 +- tests/test_core_position.py | 2 +- tests/test_core_request.py | 2 +- tests/test_core_timer.py | 2 +- tests/test_core_utils.py | 4 +- tests/test_utils.py | 2 +- tox.ini | 6 +- 122 files changed, 148 insertions(+), 62 deletions(-) delete mode 100644 comet_pqc/__init__.py create mode 100644 pqc/__init__.py rename {comet_pqc => pqc}/__main__.py (100%) rename {comet_pqc => pqc}/assets/config/chuck/default.yaml (100%) rename {comet_pqc => pqc}/assets/config/sample/default_hme_s.yaml (100%) rename {comet_pqc => pqc}/assets/config/sample/default_hmw_n.yaml (100%) rename {comet_pqc => pqc}/assets/config/sequence/default.yaml (100%) rename {comet_pqc => pqc}/assets/icons/add.svg (100%) rename {comet_pqc => pqc}/assets/icons/alignment.svg (100%) rename {comet_pqc => pqc}/assets/icons/delete.svg (100%) rename {comet_pqc => pqc}/assets/icons/document_export.svg (100%) rename {comet_pqc => pqc}/assets/icons/document_import.svg (100%) rename {comet_pqc => pqc}/assets/icons/gear.svg (100%) rename {comet_pqc => pqc}/assets/icons/pqc.ico (100%) rename {comet_pqc => pqc}/assets/icons/pqc.svg (100%) rename {comet_pqc => pqc}/assets/icons/reload.svg (100%) rename {comet_pqc => pqc}/assets/icons/search.svg (100%) rename {comet_pqc => pqc}/assets/schema/chuck.yaml (100%) rename {comet_pqc => pqc}/assets/schema/sample.yaml (100%) rename {comet_pqc => pqc}/assets/schema/sequence.yaml (100%) rename {comet_pqc => pqc}/core/__init__.py (100%) rename {comet_pqc => pqc}/core/benchmark.py (100%) rename {comet_pqc => pqc}/core/config.py (100%) rename {comet_pqc => pqc}/core/estimate.py (100%) rename {comet_pqc => pqc}/core/filters.py (100%) rename {comet_pqc => pqc}/core/formatter.py (100%) rename {comet_pqc => pqc}/core/functions.py (100%) rename {comet_pqc => pqc}/core/position.py (100%) rename {comet_pqc => pqc}/core/request.py (100%) rename {comet_pqc => pqc}/core/timer.py (100%) rename {comet_pqc => pqc}/core/utils.py (97%) rename {comet_pqc => pqc}/instruments/__init__.py (100%) rename {comet_pqc => pqc}/instruments/e4980a.py (100%) rename {comet_pqc => pqc}/instruments/instrument.py (100%) rename {comet_pqc => pqc}/instruments/k2410.py (100%) rename {comet_pqc => pqc}/instruments/k2470.py (100%) rename {comet_pqc => pqc}/instruments/k2657a.py (100%) rename {comet_pqc => pqc}/instruments/smu.py (100%) rename {comet_pqc => pqc}/measurements/__init__.py (100%) rename {comet_pqc => pqc}/measurements/cv_ramp.py (100%) rename {comet_pqc => pqc}/measurements/cv_ramp_alt.py (100%) rename {comet_pqc => pqc}/measurements/cv_ramp_vsrc.py (100%) rename {comet_pqc => pqc}/measurements/frequency_scan.py (100%) rename {comet_pqc => pqc}/measurements/iv_ramp.py (100%) rename {comet_pqc => pqc}/measurements/iv_ramp_4_wire.py (100%) rename {comet_pqc => pqc}/measurements/iv_ramp_4_wire_bias.py (100%) rename {comet_pqc => pqc}/measurements/iv_ramp_bias.py (100%) rename {comet_pqc => pqc}/measurements/iv_ramp_bias_elm.py (100%) rename {comet_pqc => pqc}/measurements/iv_ramp_elm.py (100%) rename {comet_pqc => pqc}/measurements/matrix.py (100%) rename {comet_pqc => pqc}/measurements/measurement.py (100%) rename {comet_pqc => pqc}/measurements/mixins.py (100%) rename {comet_pqc => pqc}/plugins/__init__.py (100%) rename {comet_pqc => pqc}/plugins/logger.py (100%) rename {comet_pqc => pqc}/plugins/notification.py (100%) rename {comet_pqc => pqc}/plugins/status/__init__.py (100%) rename {comet_pqc => pqc}/plugins/status/worker.py (100%) rename {comet_pqc => pqc}/plugins/summary.py (100%) rename {comet_pqc => pqc}/plugins/webapi/__init__.py (100%) rename {comet_pqc => pqc}/plugins/webapi/worker.py (99%) rename {comet_pqc => pqc}/settings.py (100%) rename {comet_pqc => pqc}/station.py (100%) rename {comet_pqc => pqc}/strategy.py (100%) rename {comet_pqc => pqc}/utils.py (100%) rename {comet_pqc => pqc}/view/__init__.py (100%) rename {comet_pqc => pqc}/view/alignment.py (100%) rename {comet_pqc => pqc}/view/components.py (100%) rename {comet_pqc => pqc}/view/dashboard.py (100%) rename {comet_pqc => pqc}/view/environmentwidget.py (100%) rename {comet_pqc => pqc}/view/mainwindow.py (100%) rename {comet_pqc => pqc}/view/measurementwidget.py (100%) rename {comet_pqc => pqc}/view/metric.py (100%) rename {comet_pqc => pqc}/view/panels/__init__.py (100%) rename {comet_pqc => pqc}/view/panels/contact.py (96%) rename {comet_pqc => pqc}/view/panels/cv_ramp.py (100%) rename {comet_pqc => pqc}/view/panels/cv_ramp_alt.py (100%) rename {comet_pqc => pqc}/view/panels/cv_ramp_vsrc.py (100%) rename {comet_pqc => pqc}/view/panels/frequency_scan.py (100%) rename {comet_pqc => pqc}/view/panels/iv_ramp.py (100%) rename {comet_pqc => pqc}/view/panels/iv_ramp_4_wire.py (100%) rename {comet_pqc => pqc}/view/panels/iv_ramp_4_wire_bias.py (100%) rename {comet_pqc => pqc}/view/panels/iv_ramp_bias.py (100%) rename {comet_pqc => pqc}/view/panels/iv_ramp_bias_elm.py (100%) rename {comet_pqc => pqc}/view/panels/iv_ramp_elm.py (100%) rename {comet_pqc => pqc}/view/panels/matrix.py (97%) rename {comet_pqc => pqc}/view/panels/mixins.py (99%) rename {comet_pqc => pqc}/view/panels/panel.py (99%) rename {comet_pqc => pqc}/view/panels/sample.py (99%) rename {comet_pqc => pqc}/view/plotwidget.py (100%) rename {comet_pqc => pqc}/view/preferences/__init__.py (100%) rename {comet_pqc => pqc}/view/preferences/options.py (99%) rename {comet_pqc => pqc}/view/preferences/resources.py (98%) rename {comet_pqc => pqc}/view/preferences/table.py (99%) rename {comet_pqc => pqc}/view/quickedit.py (100%) rename {comet_pqc => pqc}/view/sequence.py (87%) rename {comet_pqc => pqc}/view/sequencemanager.py (100%) rename {comet_pqc => pqc}/workers/__init__.py (100%) rename {comet_pqc => pqc}/workers/contactquality.py (100%) rename {comet_pqc => pqc}/workers/environment.py (100%) rename {comet_pqc => pqc}/workers/measure.py (100%) rename {comet_pqc => pqc}/workers/resource.py (100%) rename {comet_pqc => pqc}/workers/table.py (99%) diff --git a/MANIFEST.in b/MANIFEST.in index b851f89..95a9145 100644 --- a/MANIFEST.in +++ b/MANIFEST.in @@ -9,12 +9,12 @@ recursive-include tests *.py include docs/_config.yml recursive-include docs *.md *.png -recursive-include comet_pqc/assets/config/chuck *.yaml -recursive-include comet_pqc/assets/config/sample *.yaml -recursive-include comet_pqc/assets/config/sequence *.yaml +recursive-include pqc/assets/config/chuck *.yaml +recursive-include pqc/assets/config/sample *.yaml +recursive-include pqc/assets/config/sequence *.yaml -recursive-include comet_pqc/assets/icons *.svg *.ico +recursive-include pqc/assets/icons *.svg *.ico -include comet_pqc/assets/schema/chuck.yaml -include comet_pqc/assets/schema/sample.yaml -include comet_pqc/assets/schema/sequence.yaml +include pqc/assets/schema/chuck.yaml +include pqc/assets/schema/sample.yaml +include pqc/assets/schema/sequence.yaml diff --git a/README.md b/README.md index d000d1e..4e2de87 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # PQC -PQC sensor measurements +Process Quality Control for CMS tracker ## Overview @@ -43,4 +43,4 @@ See for pre-built Windows binaries in the releases section. ## License -comet-pqc is licensed under the [GNU General Public License Version 3](https://github.com/hephy-dd/comet-pqc/tree/master/LICENSE). +comet-pqc is licensed under the [GNU General Public License Version 3](https://github.com/hephy-dd/comet-pqc/tree/main/LICENSE). diff --git a/changelog b/changelog index 0e63052..efc739d 100644 --- a/changelog +++ b/changelog @@ -6,6 +6,13 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## [Unreleased] +## [0.46.0] - 2023-10-10 +### Added +- Context menu for sequence tree items. + +### Changed +- Renamed package `comet_pqc` to `pqc`. + ## [0.45.0] - 2023-09-20 ### Added - Enhanced recontact strategy (#190). @@ -384,7 +391,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 - Filter selection for type `moving`. - Default HV source route terminal `rear` (#17). -[Unreleased]: https://github.com/hephy-dd/comet-pqc/compare/0.45.0...HEAD +[Unreleased]: https://github.com/hephy-dd/comet-pqc/compare/0.46.0...HEAD +[0.46.0]: https://github.com/hephy-dd/comet-pqc/compare/0.45.0...0.46.0 [0.45.0]: https://github.com/hephy-dd/comet-pqc/compare/0.44.0...0.45.0 [0.44.0]: https://github.com/hephy-dd/comet-pqc/compare/0.43.2...0.44.0 [0.43.2]: https://github.com/hephy-dd/comet-pqc/compare/0.43.1...0.43.2 diff --git a/comet_pqc/__init__.py b/comet_pqc/__init__.py deleted file mode 100644 index 4d8afa5..0000000 --- a/comet_pqc/__init__.py +++ /dev/null @@ -1 +0,0 @@ -__version__ = "0.45.0" diff --git a/docs/_config.yml b/docs/_config.yml index 7805afb..5f3f81d 100644 --- a/docs/_config.yml +++ b/docs/_config.yml @@ -6,4 +6,4 @@ aux_links: "PQC on GitHub": - "//github.com/hephy-dd/comet-pqc" -footer_content: "Copyright © 2019-2023 HEPHY. PQC is licensed under the GNU General Public License Version 3." +footer_content: "Copyright © 2019-2023 HEPHY. PQC is licensed under the GNU General Public License Version 3." diff --git a/docs/changelog.md b/docs/changelog.md index 09a091f..c3c2474 100644 --- a/docs/changelog.md +++ b/docs/changelog.md @@ -7,6 +7,11 @@ nav_order: 10 # Changelog {: .no_toc } +## 0.46.0 + +### Added +- Context menu for sequence tree. + ## 0.45.0 ### Added diff --git a/docs/configuration.md b/docs/configuration.md index 7be013a..89bd473 100644 --- a/docs/configuration.md +++ b/docs/configuration.md @@ -35,7 +35,7 @@ enabled: true contacts: [] ``` -See [assets/config/sequence/default.yaml](https://github.com/hephy-dd/comet-pqc/blob/master/comet_pqc/assets/config/sequence/default.yaml) for reference. +See [assets/config/sequence/default.yaml](https://github.com/hephy-dd/comet-pqc/blob/main/pqc/assets/config/sequence/default.yaml) for reference. Custom sequence configuration files can be imported using `File` → `Sequence` → `Import...`. @@ -143,7 +143,7 @@ enabled: true contacts: [] ``` -See [assets/config/sample/default_hme_n.yaml](https://github.com/hephy-dd/comet-pqc/blob/master/comet_pqc/assets/config/sample/default_hmw_n.yaml) for reference. +See [assets/config/sample/default_hme_n.yaml](https://github.com/hephy-dd/comet-pqc/blob/main/pqc/assets/config/sample/default_hmw_n.yaml) for reference. ### Contacts @@ -203,5 +203,5 @@ positions: ``` See -[assets/config/chuck/default.yaml](https://github.com/hephy-dd/comet-pqc/blob/master/comet_pqc/assets/config/chuck/default.yaml) +[assets/config/chuck/default.yaml](https://github.com/hephy-dd/comet-pqc/blob/main/pqc/assets/config/chuck/default.yaml) for reference. diff --git a/pqc/__init__.py b/pqc/__init__.py new file mode 100644 index 0000000..6f70987 --- /dev/null +++ b/pqc/__init__.py @@ -0,0 +1 @@ +__version__ = "0.46.0" diff --git a/comet_pqc/__main__.py b/pqc/__main__.py similarity index 100% rename from comet_pqc/__main__.py rename to pqc/__main__.py diff --git a/comet_pqc/assets/config/chuck/default.yaml b/pqc/assets/config/chuck/default.yaml similarity index 100% rename from comet_pqc/assets/config/chuck/default.yaml rename to pqc/assets/config/chuck/default.yaml diff --git a/comet_pqc/assets/config/sample/default_hme_s.yaml b/pqc/assets/config/sample/default_hme_s.yaml similarity index 100% rename from comet_pqc/assets/config/sample/default_hme_s.yaml rename to pqc/assets/config/sample/default_hme_s.yaml diff --git a/comet_pqc/assets/config/sample/default_hmw_n.yaml b/pqc/assets/config/sample/default_hmw_n.yaml similarity index 100% rename from comet_pqc/assets/config/sample/default_hmw_n.yaml rename to pqc/assets/config/sample/default_hmw_n.yaml diff --git a/comet_pqc/assets/config/sequence/default.yaml b/pqc/assets/config/sequence/default.yaml similarity index 100% rename from comet_pqc/assets/config/sequence/default.yaml rename to pqc/assets/config/sequence/default.yaml diff --git a/comet_pqc/assets/icons/add.svg b/pqc/assets/icons/add.svg similarity index 100% rename from comet_pqc/assets/icons/add.svg rename to pqc/assets/icons/add.svg diff --git a/comet_pqc/assets/icons/alignment.svg b/pqc/assets/icons/alignment.svg similarity index 100% rename from comet_pqc/assets/icons/alignment.svg rename to pqc/assets/icons/alignment.svg diff --git a/comet_pqc/assets/icons/delete.svg b/pqc/assets/icons/delete.svg similarity index 100% rename from comet_pqc/assets/icons/delete.svg rename to pqc/assets/icons/delete.svg diff --git a/comet_pqc/assets/icons/document_export.svg b/pqc/assets/icons/document_export.svg similarity index 100% rename from comet_pqc/assets/icons/document_export.svg rename to pqc/assets/icons/document_export.svg diff --git a/comet_pqc/assets/icons/document_import.svg b/pqc/assets/icons/document_import.svg similarity index 100% rename from comet_pqc/assets/icons/document_import.svg rename to pqc/assets/icons/document_import.svg diff --git a/comet_pqc/assets/icons/gear.svg b/pqc/assets/icons/gear.svg similarity index 100% rename from comet_pqc/assets/icons/gear.svg rename to pqc/assets/icons/gear.svg diff --git a/comet_pqc/assets/icons/pqc.ico b/pqc/assets/icons/pqc.ico similarity index 100% rename from comet_pqc/assets/icons/pqc.ico rename to pqc/assets/icons/pqc.ico diff --git a/comet_pqc/assets/icons/pqc.svg b/pqc/assets/icons/pqc.svg similarity index 100% rename from comet_pqc/assets/icons/pqc.svg rename to pqc/assets/icons/pqc.svg diff --git a/comet_pqc/assets/icons/reload.svg b/pqc/assets/icons/reload.svg similarity index 100% rename from comet_pqc/assets/icons/reload.svg rename to pqc/assets/icons/reload.svg diff --git a/comet_pqc/assets/icons/search.svg b/pqc/assets/icons/search.svg similarity index 100% rename from comet_pqc/assets/icons/search.svg rename to pqc/assets/icons/search.svg diff --git a/comet_pqc/assets/schema/chuck.yaml b/pqc/assets/schema/chuck.yaml similarity index 100% rename from comet_pqc/assets/schema/chuck.yaml rename to pqc/assets/schema/chuck.yaml diff --git a/comet_pqc/assets/schema/sample.yaml b/pqc/assets/schema/sample.yaml similarity index 100% rename from comet_pqc/assets/schema/sample.yaml rename to pqc/assets/schema/sample.yaml diff --git a/comet_pqc/assets/schema/sequence.yaml b/pqc/assets/schema/sequence.yaml similarity index 100% rename from comet_pqc/assets/schema/sequence.yaml rename to pqc/assets/schema/sequence.yaml diff --git a/comet_pqc/core/__init__.py b/pqc/core/__init__.py similarity index 100% rename from comet_pqc/core/__init__.py rename to pqc/core/__init__.py diff --git a/comet_pqc/core/benchmark.py b/pqc/core/benchmark.py similarity index 100% rename from comet_pqc/core/benchmark.py rename to pqc/core/benchmark.py diff --git a/comet_pqc/core/config.py b/pqc/core/config.py similarity index 100% rename from comet_pqc/core/config.py rename to pqc/core/config.py diff --git a/comet_pqc/core/estimate.py b/pqc/core/estimate.py similarity index 100% rename from comet_pqc/core/estimate.py rename to pqc/core/estimate.py diff --git a/comet_pqc/core/filters.py b/pqc/core/filters.py similarity index 100% rename from comet_pqc/core/filters.py rename to pqc/core/filters.py diff --git a/comet_pqc/core/formatter.py b/pqc/core/formatter.py similarity index 100% rename from comet_pqc/core/formatter.py rename to pqc/core/formatter.py diff --git a/comet_pqc/core/functions.py b/pqc/core/functions.py similarity index 100% rename from comet_pqc/core/functions.py rename to pqc/core/functions.py diff --git a/comet_pqc/core/position.py b/pqc/core/position.py similarity index 100% rename from comet_pqc/core/position.py rename to pqc/core/position.py diff --git a/comet_pqc/core/request.py b/pqc/core/request.py similarity index 100% rename from comet_pqc/core/request.py rename to pqc/core/request.py diff --git a/comet_pqc/core/timer.py b/pqc/core/timer.py similarity index 100% rename from comet_pqc/core/timer.py rename to pqc/core/timer.py diff --git a/comet_pqc/core/utils.py b/pqc/core/utils.py similarity index 97% rename from comet_pqc/core/utils.py rename to pqc/core/utils.py index a580c61..2792c60 100644 --- a/comet_pqc/core/utils.py +++ b/pqc/core/utils.py @@ -18,7 +18,7 @@ def make_path(*args) -> str: """Construct an absolute path relative to package path. >>> make_path("assets", "sample.txt") - '/usr/local/lib/python/comet_pqc/assets/sample.txt' + '/usr/local/lib/python/pqc/assets/sample.txt' """ return os.path.join(PACKAGE_PATH, *args) diff --git a/comet_pqc/instruments/__init__.py b/pqc/instruments/__init__.py similarity index 100% rename from comet_pqc/instruments/__init__.py rename to pqc/instruments/__init__.py diff --git a/comet_pqc/instruments/e4980a.py b/pqc/instruments/e4980a.py similarity index 100% rename from comet_pqc/instruments/e4980a.py rename to pqc/instruments/e4980a.py diff --git a/comet_pqc/instruments/instrument.py b/pqc/instruments/instrument.py similarity index 100% rename from comet_pqc/instruments/instrument.py rename to pqc/instruments/instrument.py diff --git a/comet_pqc/instruments/k2410.py b/pqc/instruments/k2410.py similarity index 100% rename from comet_pqc/instruments/k2410.py rename to pqc/instruments/k2410.py diff --git a/comet_pqc/instruments/k2470.py b/pqc/instruments/k2470.py similarity index 100% rename from comet_pqc/instruments/k2470.py rename to pqc/instruments/k2470.py diff --git a/comet_pqc/instruments/k2657a.py b/pqc/instruments/k2657a.py similarity index 100% rename from comet_pqc/instruments/k2657a.py rename to pqc/instruments/k2657a.py diff --git a/comet_pqc/instruments/smu.py b/pqc/instruments/smu.py similarity index 100% rename from comet_pqc/instruments/smu.py rename to pqc/instruments/smu.py diff --git a/comet_pqc/measurements/__init__.py b/pqc/measurements/__init__.py similarity index 100% rename from comet_pqc/measurements/__init__.py rename to pqc/measurements/__init__.py diff --git a/comet_pqc/measurements/cv_ramp.py b/pqc/measurements/cv_ramp.py similarity index 100% rename from comet_pqc/measurements/cv_ramp.py rename to pqc/measurements/cv_ramp.py diff --git a/comet_pqc/measurements/cv_ramp_alt.py b/pqc/measurements/cv_ramp_alt.py similarity index 100% rename from comet_pqc/measurements/cv_ramp_alt.py rename to pqc/measurements/cv_ramp_alt.py diff --git a/comet_pqc/measurements/cv_ramp_vsrc.py b/pqc/measurements/cv_ramp_vsrc.py similarity index 100% rename from comet_pqc/measurements/cv_ramp_vsrc.py rename to pqc/measurements/cv_ramp_vsrc.py diff --git a/comet_pqc/measurements/frequency_scan.py b/pqc/measurements/frequency_scan.py similarity index 100% rename from comet_pqc/measurements/frequency_scan.py rename to pqc/measurements/frequency_scan.py diff --git a/comet_pqc/measurements/iv_ramp.py b/pqc/measurements/iv_ramp.py similarity index 100% rename from comet_pqc/measurements/iv_ramp.py rename to pqc/measurements/iv_ramp.py diff --git a/comet_pqc/measurements/iv_ramp_4_wire.py b/pqc/measurements/iv_ramp_4_wire.py similarity index 100% rename from comet_pqc/measurements/iv_ramp_4_wire.py rename to pqc/measurements/iv_ramp_4_wire.py diff --git a/comet_pqc/measurements/iv_ramp_4_wire_bias.py b/pqc/measurements/iv_ramp_4_wire_bias.py similarity index 100% rename from comet_pqc/measurements/iv_ramp_4_wire_bias.py rename to pqc/measurements/iv_ramp_4_wire_bias.py diff --git a/comet_pqc/measurements/iv_ramp_bias.py b/pqc/measurements/iv_ramp_bias.py similarity index 100% rename from comet_pqc/measurements/iv_ramp_bias.py rename to pqc/measurements/iv_ramp_bias.py diff --git a/comet_pqc/measurements/iv_ramp_bias_elm.py b/pqc/measurements/iv_ramp_bias_elm.py similarity index 100% rename from comet_pqc/measurements/iv_ramp_bias_elm.py rename to pqc/measurements/iv_ramp_bias_elm.py diff --git a/comet_pqc/measurements/iv_ramp_elm.py b/pqc/measurements/iv_ramp_elm.py similarity index 100% rename from comet_pqc/measurements/iv_ramp_elm.py rename to pqc/measurements/iv_ramp_elm.py diff --git a/comet_pqc/measurements/matrix.py b/pqc/measurements/matrix.py similarity index 100% rename from comet_pqc/measurements/matrix.py rename to pqc/measurements/matrix.py diff --git a/comet_pqc/measurements/measurement.py b/pqc/measurements/measurement.py similarity index 100% rename from comet_pqc/measurements/measurement.py rename to pqc/measurements/measurement.py diff --git a/comet_pqc/measurements/mixins.py b/pqc/measurements/mixins.py similarity index 100% rename from comet_pqc/measurements/mixins.py rename to pqc/measurements/mixins.py diff --git a/comet_pqc/plugins/__init__.py b/pqc/plugins/__init__.py similarity index 100% rename from comet_pqc/plugins/__init__.py rename to pqc/plugins/__init__.py diff --git a/comet_pqc/plugins/logger.py b/pqc/plugins/logger.py similarity index 100% rename from comet_pqc/plugins/logger.py rename to pqc/plugins/logger.py diff --git a/comet_pqc/plugins/notification.py b/pqc/plugins/notification.py similarity index 100% rename from comet_pqc/plugins/notification.py rename to pqc/plugins/notification.py diff --git a/comet_pqc/plugins/status/__init__.py b/pqc/plugins/status/__init__.py similarity index 100% rename from comet_pqc/plugins/status/__init__.py rename to pqc/plugins/status/__init__.py diff --git a/comet_pqc/plugins/status/worker.py b/pqc/plugins/status/worker.py similarity index 100% rename from comet_pqc/plugins/status/worker.py rename to pqc/plugins/status/worker.py diff --git a/comet_pqc/plugins/summary.py b/pqc/plugins/summary.py similarity index 100% rename from comet_pqc/plugins/summary.py rename to pqc/plugins/summary.py diff --git a/comet_pqc/plugins/webapi/__init__.py b/pqc/plugins/webapi/__init__.py similarity index 100% rename from comet_pqc/plugins/webapi/__init__.py rename to pqc/plugins/webapi/__init__.py diff --git a/comet_pqc/plugins/webapi/worker.py b/pqc/plugins/webapi/worker.py similarity index 99% rename from comet_pqc/plugins/webapi/worker.py rename to pqc/plugins/webapi/worker.py index 2c3b439..c20e4bb 100644 --- a/comet_pqc/plugins/webapi/worker.py +++ b/pqc/plugins/webapi/worker.py @@ -8,7 +8,7 @@ from PyQt5 import QtCore from waitress.server import TcpWSGIServer -from comet_pqc import __version__ +from pqc import __version__ __all__ = ["WebAPIWorker"] diff --git a/comet_pqc/settings.py b/pqc/settings.py similarity index 100% rename from comet_pqc/settings.py rename to pqc/settings.py diff --git a/comet_pqc/station.py b/pqc/station.py similarity index 100% rename from comet_pqc/station.py rename to pqc/station.py diff --git a/comet_pqc/strategy.py b/pqc/strategy.py similarity index 100% rename from comet_pqc/strategy.py rename to pqc/strategy.py diff --git a/comet_pqc/utils.py b/pqc/utils.py similarity index 100% rename from comet_pqc/utils.py rename to pqc/utils.py diff --git a/comet_pqc/view/__init__.py b/pqc/view/__init__.py similarity index 100% rename from comet_pqc/view/__init__.py rename to pqc/view/__init__.py diff --git a/comet_pqc/view/alignment.py b/pqc/view/alignment.py similarity index 100% rename from comet_pqc/view/alignment.py rename to pqc/view/alignment.py diff --git a/comet_pqc/view/components.py b/pqc/view/components.py similarity index 100% rename from comet_pqc/view/components.py rename to pqc/view/components.py diff --git a/comet_pqc/view/dashboard.py b/pqc/view/dashboard.py similarity index 100% rename from comet_pqc/view/dashboard.py rename to pqc/view/dashboard.py diff --git a/comet_pqc/view/environmentwidget.py b/pqc/view/environmentwidget.py similarity index 100% rename from comet_pqc/view/environmentwidget.py rename to pqc/view/environmentwidget.py diff --git a/comet_pqc/view/mainwindow.py b/pqc/view/mainwindow.py similarity index 100% rename from comet_pqc/view/mainwindow.py rename to pqc/view/mainwindow.py diff --git a/comet_pqc/view/measurementwidget.py b/pqc/view/measurementwidget.py similarity index 100% rename from comet_pqc/view/measurementwidget.py rename to pqc/view/measurementwidget.py diff --git a/comet_pqc/view/metric.py b/pqc/view/metric.py similarity index 100% rename from comet_pqc/view/metric.py rename to pqc/view/metric.py diff --git a/comet_pqc/view/panels/__init__.py b/pqc/view/panels/__init__.py similarity index 100% rename from comet_pqc/view/panels/__init__.py rename to pqc/view/panels/__init__.py diff --git a/comet_pqc/view/panels/contact.py b/pqc/view/panels/contact.py similarity index 96% rename from comet_pqc/view/panels/contact.py rename to pqc/view/panels/contact.py index fbbe9d5..5279f23 100644 --- a/comet_pqc/view/panels/contact.py +++ b/pqc/view/panels/contact.py @@ -3,7 +3,7 @@ from PyQt5 import QtCore, QtWidgets -from comet_pqc.core.position import Position +from pqc.core.position import Position from ..components import PositionWidget from .panel import BasicPanel diff --git a/comet_pqc/view/panels/cv_ramp.py b/pqc/view/panels/cv_ramp.py similarity index 100% rename from comet_pqc/view/panels/cv_ramp.py rename to pqc/view/panels/cv_ramp.py diff --git a/comet_pqc/view/panels/cv_ramp_alt.py b/pqc/view/panels/cv_ramp_alt.py similarity index 100% rename from comet_pqc/view/panels/cv_ramp_alt.py rename to pqc/view/panels/cv_ramp_alt.py diff --git a/comet_pqc/view/panels/cv_ramp_vsrc.py b/pqc/view/panels/cv_ramp_vsrc.py similarity index 100% rename from comet_pqc/view/panels/cv_ramp_vsrc.py rename to pqc/view/panels/cv_ramp_vsrc.py diff --git a/comet_pqc/view/panels/frequency_scan.py b/pqc/view/panels/frequency_scan.py similarity index 100% rename from comet_pqc/view/panels/frequency_scan.py rename to pqc/view/panels/frequency_scan.py diff --git a/comet_pqc/view/panels/iv_ramp.py b/pqc/view/panels/iv_ramp.py similarity index 100% rename from comet_pqc/view/panels/iv_ramp.py rename to pqc/view/panels/iv_ramp.py diff --git a/comet_pqc/view/panels/iv_ramp_4_wire.py b/pqc/view/panels/iv_ramp_4_wire.py similarity index 100% rename from comet_pqc/view/panels/iv_ramp_4_wire.py rename to pqc/view/panels/iv_ramp_4_wire.py diff --git a/comet_pqc/view/panels/iv_ramp_4_wire_bias.py b/pqc/view/panels/iv_ramp_4_wire_bias.py similarity index 100% rename from comet_pqc/view/panels/iv_ramp_4_wire_bias.py rename to pqc/view/panels/iv_ramp_4_wire_bias.py diff --git a/comet_pqc/view/panels/iv_ramp_bias.py b/pqc/view/panels/iv_ramp_bias.py similarity index 100% rename from comet_pqc/view/panels/iv_ramp_bias.py rename to pqc/view/panels/iv_ramp_bias.py diff --git a/comet_pqc/view/panels/iv_ramp_bias_elm.py b/pqc/view/panels/iv_ramp_bias_elm.py similarity index 100% rename from comet_pqc/view/panels/iv_ramp_bias_elm.py rename to pqc/view/panels/iv_ramp_bias_elm.py diff --git a/comet_pqc/view/panels/iv_ramp_elm.py b/pqc/view/panels/iv_ramp_elm.py similarity index 100% rename from comet_pqc/view/panels/iv_ramp_elm.py rename to pqc/view/panels/iv_ramp_elm.py diff --git a/comet_pqc/view/panels/matrix.py b/pqc/view/panels/matrix.py similarity index 97% rename from comet_pqc/view/panels/matrix.py rename to pqc/view/panels/matrix.py index 13dcae2..b46a11b 100644 --- a/comet_pqc/view/panels/matrix.py +++ b/pqc/view/panels/matrix.py @@ -2,7 +2,7 @@ from PyQt5 import QtWidgets -from comet_pqc.utils import join_channels, split_channels +from pqc.utils import join_channels, split_channels from .panel import Panel diff --git a/comet_pqc/view/panels/mixins.py b/pqc/view/panels/mixins.py similarity index 99% rename from comet_pqc/view/panels/mixins.py rename to pqc/view/panels/mixins.py index ea73902..b371c67 100644 --- a/comet_pqc/view/panels/mixins.py +++ b/pqc/view/panels/mixins.py @@ -1,6 +1,6 @@ from PyQt5 import QtWidgets -from comet_pqc.utils import format_metric, format_switch +from pqc.utils import format_metric, format_switch from ..components import Metric from .panel import Panel diff --git a/comet_pqc/view/panels/panel.py b/pqc/view/panels/panel.py similarity index 99% rename from comet_pqc/view/panels/panel.py rename to pqc/view/panels/panel.py index 8394927..27a879d 100644 --- a/comet_pqc/view/panels/panel.py +++ b/pqc/view/panels/panel.py @@ -5,7 +5,7 @@ import comet -from comet_pqc.settings import settings +from pqc.settings import settings from ..components import PlotWidget from ..components import Metric, stitch_pixmaps diff --git a/comet_pqc/view/panels/sample.py b/pqc/view/panels/sample.py similarity index 99% rename from comet_pqc/view/panels/sample.py rename to pqc/view/panels/sample.py index 94e7a6b..cb2811a 100644 --- a/comet_pqc/view/panels/sample.py +++ b/pqc/view/panels/sample.py @@ -2,8 +2,8 @@ from PyQt5 import QtCore, QtGui, QtWidgets -from comet_pqc.core import config -from comet_pqc.utils import make_path +from pqc.core import config +from pqc.utils import make_path from ..sequence import SampleTreeItem from ..sequencemanager import SequenceManagerDialog diff --git a/comet_pqc/view/plotwidget.py b/pqc/view/plotwidget.py similarity index 100% rename from comet_pqc/view/plotwidget.py rename to pqc/view/plotwidget.py diff --git a/comet_pqc/view/preferences/__init__.py b/pqc/view/preferences/__init__.py similarity index 100% rename from comet_pqc/view/preferences/__init__.py rename to pqc/view/preferences/__init__.py diff --git a/comet_pqc/view/preferences/options.py b/pqc/view/preferences/options.py similarity index 99% rename from comet_pqc/view/preferences/options.py rename to pqc/view/preferences/options.py index 7b17c92..d6664be 100644 --- a/comet_pqc/view/preferences/options.py +++ b/pqc/view/preferences/options.py @@ -2,7 +2,7 @@ from PyQt5 import QtWidgets -from comet_pqc.settings import settings +from pqc.settings import settings __all__ = ["OptionsWidget"] diff --git a/comet_pqc/view/preferences/resources.py b/pqc/view/preferences/resources.py similarity index 98% rename from comet_pqc/view/preferences/resources.py rename to pqc/view/preferences/resources.py index e1719e0..38a5665 100644 --- a/comet_pqc/view/preferences/resources.py +++ b/pqc/view/preferences/resources.py @@ -5,7 +5,7 @@ from comet import ResourceMixin from comet.utils import escape_string, unescape_string -from comet_pqc.settings import settings +from pqc.settings import settings __all__ = ["ResourcesWidget"] diff --git a/comet_pqc/view/preferences/table.py b/pqc/view/preferences/table.py similarity index 99% rename from comet_pqc/view/preferences/table.py rename to pqc/view/preferences/table.py index cf91f90..ef06300 100644 --- a/comet_pqc/view/preferences/table.py +++ b/pqc/view/preferences/table.py @@ -2,8 +2,8 @@ from PyQt5 import QtCore, QtWidgets -from comet_pqc.settings import settings -from comet_pqc.utils import from_table_unit, to_table_unit +from pqc.settings import settings +from pqc.utils import from_table_unit, to_table_unit __all__ = ["TableWidget"] diff --git a/comet_pqc/view/quickedit.py b/pqc/view/quickedit.py similarity index 100% rename from comet_pqc/view/quickedit.py rename to pqc/view/quickedit.py diff --git a/comet_pqc/view/sequence.py b/pqc/view/sequence.py similarity index 87% rename from comet_pqc/view/sequence.py rename to pqc/view/sequence.py index 7a329c7..775a5bd 100644 --- a/comet_pqc/view/sequence.py +++ b/pqc/view/sequence.py @@ -120,6 +120,67 @@ def __init__(self, parent: Optional[QtWidgets.QWidget] = None) -> None: self.setHeaderLabels(["Name", "Pos", "State"]) self.header().setMinimumSectionSize(32) + self.setContextMenuPolicy(QtCore.Qt.CustomContextMenu) + self.customContextMenuRequested.connect(self.showContextMenu) + + def showContextMenu(self, position) -> None: + item = self.itemAt(position) + if item: + contextMenu = QtWidgets.QMenu(self) + + # Enable Default + + def recursiveEnableDefault(item): + for child in item.children(): + if hasattr(child, "isEnabledDefault"): + child.setEnabled(child.isEnabledDefault()) + recursiveEnableDefault(child) + + def enableDefault(): + recursiveEnableDefault(item) + + if item.childCount(): + action = contextMenu.addAction("Enable Default") + action.triggered.connect(enableDefault) + + # Enable Failed + + def recursiveEnableFailed(item): + for child in item.children(): + enabled = child.state() in [ + child.StoppedState, + child.ComplianceState, + child.TimeoutState, + child.ErrorState, + child.AnalysisErrorState, + ] + child.setEnabled(enabled) + recursiveEnableFailed(child) + + def enableFailed(): + recursiveEnableFailed(item) + + if item.childCount(): + action = contextMenu.addAction("Enable Only Failed") + action.triggered.connect(enableFailed) + + # Disable All + + def recursiveDisableItem(item): + for child in item.children(): + child.setEnabled(False) + recursiveDisableItem(child) + + def disableAll(): + recursiveDisableItem(item) + + if item.childCount(): + contextMenu.addSeparator() + action = contextMenu.addAction("Disable All") + action.triggered.connect(disableAll) + + contextMenu.exec(self.viewport().mapToGlobal(position)) + def addSampleItem(self, item) -> None: self.addTopLevelItem(item) @@ -180,6 +241,8 @@ class SequenceTreeItem(QtWidgets.QTreeWidgetItem): def __init__(self) -> None: super().__init__() self.setCheckable(True) + self.setEnabled(False) + self.setEnabledDefault(False) def children(self): items = [] @@ -231,6 +294,12 @@ def isEnabled(self) -> bool: def setEnabled(self, enabled: bool) -> None: self.setChecked(0, enabled) + def isEnabledDefault(self) -> bool: + return self._is_enabled_default + + def setEnabledDefault(self, state: bool) -> None: + self._is_enabled_default = state + def state(self) -> str: return self.data(2, 0x2000) @@ -279,6 +348,7 @@ def __init__(self) -> None: self._sampleComment: str = "" self.update_name() self.setEnabled(False) + self.setEnabledDefault(False) self.sequence = None # Properties @@ -416,6 +486,8 @@ def __init__(self, sample, contact): self.id = contact.id self.setName(contact.name) self.setEnabled(contact.enabled) + self.setEnabledDefault(contact.enabled) + self._is_enabled_default = contact.enabled self.contact_id = contact.contact_id self.setDescription(contact.description) self.reset_position() @@ -459,6 +531,7 @@ def __init__(self, contact, measurement): self.setName(measurement.name) self.type = measurement.type self.setEnabled(measurement.enabled) + self.setEnabledDefault(measurement.enabled) self.parameters = copy.deepcopy(measurement.parameters) self.default_parameters = copy.deepcopy(measurement.default_parameters) self.setTags(measurement.tags) diff --git a/comet_pqc/view/sequencemanager.py b/pqc/view/sequencemanager.py similarity index 100% rename from comet_pqc/view/sequencemanager.py rename to pqc/view/sequencemanager.py diff --git a/comet_pqc/workers/__init__.py b/pqc/workers/__init__.py similarity index 100% rename from comet_pqc/workers/__init__.py rename to pqc/workers/__init__.py diff --git a/comet_pqc/workers/contactquality.py b/pqc/workers/contactquality.py similarity index 100% rename from comet_pqc/workers/contactquality.py rename to pqc/workers/contactquality.py diff --git a/comet_pqc/workers/environment.py b/pqc/workers/environment.py similarity index 100% rename from comet_pqc/workers/environment.py rename to pqc/workers/environment.py diff --git a/comet_pqc/workers/measure.py b/pqc/workers/measure.py similarity index 100% rename from comet_pqc/workers/measure.py rename to pqc/workers/measure.py diff --git a/comet_pqc/workers/resource.py b/pqc/workers/resource.py similarity index 100% rename from comet_pqc/workers/resource.py rename to pqc/workers/resource.py diff --git a/comet_pqc/workers/table.py b/pqc/workers/table.py similarity index 99% rename from comet_pqc/workers/table.py rename to pqc/workers/table.py index 87fd5d7..1ef7e27 100644 --- a/comet_pqc/workers/table.py +++ b/pqc/workers/table.py @@ -10,8 +10,8 @@ import comet -from comet_pqc.utils import from_table_unit, to_table_unit -from comet_pqc.core.timer import Timer +from pqc.utils import from_table_unit, to_table_unit +from pqc.core.timer import Timer from ..core.request import Request from ..core.position import Position diff --git a/pyinstaller/entry_point.py b/pyinstaller/entry_point.py index ba88096..875eaff 100644 --- a/pyinstaller/entry_point.py +++ b/pyinstaller/entry_point.py @@ -3,7 +3,7 @@ import serial import gpib_ctypes -from comet_pqc.__main__ import main +from pqc.__main__ import main if __name__ == "__main__": main() diff --git a/pyinstaller/windows_app.spec b/pyinstaller/windows_app.spec index b44fdff..b812c9c 100644 --- a/pyinstaller/windows_app.spec +++ b/pyinstaller/windows_app.spec @@ -3,11 +3,11 @@ import os from pyinstaller_versionfile import create_versionfile -import comet_pqc +import pqc # Application configurations -app_root = os.path.abspath(os.path.dirname(comet_pqc.__file__)) -app_version = comet_pqc.__version__ +app_root = os.path.abspath(os.path.dirname(pqc.__file__)) +app_version = pqc.__version__ app_filename = f"pqc-{app_version}.exe" app_icon = os.path.join(app_root, "assets", "icons", "pqc.ico") app_title = "PQC" @@ -16,16 +16,16 @@ app_copyright = "Copyright © 2019-2023 HEPHY" app_organization = "HEPHY" # Entry point for the application -launcher_code = "from comet_pqc.__main__ import main; main()" +launcher_code = "from pqc.__main__ import main; main()" # Data files to be included in the output executable datas = [ - (os.path.join(app_root, "assets", "icons", "*.svg"), "comet_pqc/assets/icons"), - (os.path.join(app_root, "assets", "icons", "*.ico"), "comet_pqc/assets/icons"), - (os.path.join(app_root, "assets", "config", "chuck", "*.yaml"), "comet_pqc/assets/config/chuck"), - (os.path.join(app_root, "assets", "config", "sequence", "*.yaml"), "comet_pqc/assets/config/sequence"), - (os.path.join(app_root, "assets", "config", "sample", "*.yaml"), "comet_pqc/assets/config/sample"), - (os.path.join(app_root, "assets", "schema", "*.yaml"), "comet_pqc/assets/schema"), + (os.path.join(app_root, "assets", "icons", "*.svg"), "pqc/assets/icons"), + (os.path.join(app_root, "assets", "icons", "*.ico"), "pqc/assets/icons"), + (os.path.join(app_root, "assets", "config", "chuck", "*.yaml"), "pqc/assets/config/chuck"), + (os.path.join(app_root, "assets", "config", "sequence", "*.yaml"), "pqc/assets/config/sequence"), + (os.path.join(app_root, "assets", "config", "sample", "*.yaml"), "pqc/assets/config/sample"), + (os.path.join(app_root, "assets", "schema", "*.yaml"), "pqc/assets/schema"), ] # Console will be displayed when the application is run diff --git a/setup.cfg b/setup.cfg index a1e1074..3a430c0 100644 --- a/setup.cfg +++ b/setup.cfg @@ -1,6 +1,6 @@ [metadata] -name = comet-pqc -version = attr: comet_pqc.__version__ +name = pqc +version = attr: pqc.__version__ description = Process Quality Control for CMS outer tracker. long_description = file: README.md long_description_content_type = text/markdown @@ -32,18 +32,18 @@ include_package_data = True exclude = tests [options.package_data] -comet_pqc.assets.config.chuck = *.yaml -comet_pqc.assets.config.sample = *.yaml -comet_pqc.assets.config.sequence = *.yaml -comet_pqc.assets.icons = *.svg -comet_pqc.assets.schema = +pqc.assets.config.chuck = *.yaml +pqc.assets.config.sample = *.yaml +pqc.assets.config.sequence = *.yaml +pqc.assets.icons = *.svg +pqc.assets.schema = chuck.yaml sample.yaml sequence.yaml [options.entry_points] console_scripts = - pqc = comet_pqc.__main__:main + pqc = pqc.__main__:main [flake8] ignore = E501 diff --git a/tests/test_core_config.py b/tests/test_core_config.py index 50bc6c6..abc8e23 100644 --- a/tests/test_core_config.py +++ b/tests/test_core_config.py @@ -1,6 +1,6 @@ import os -from comet_pqc.core import config +from pqc.core import config def test_dirs(): diff --git a/tests/test_core_estimate.py b/tests/test_core_estimate.py index 0080c90..3136596 100644 --- a/tests/test_core_estimate.py +++ b/tests/test_core_estimate.py @@ -1,4 +1,4 @@ -from comet_pqc.core.estimate import Estimate +from pqc.core.estimate import Estimate def test_estimate_progress(): diff --git a/tests/test_core_filters.py b/tests/test_core_filters.py index 32d0844..033d456 100644 --- a/tests/test_core_filters.py +++ b/tests/test_core_filters.py @@ -1,4 +1,4 @@ -from comet_pqc.core.filters import std_mean_filter +from pqc.core.filters import std_mean_filter def test_std_mean_filter(): diff --git a/tests/test_core_formatter.py b/tests/test_core_formatter.py index 37b8b0b..dfb06db 100644 --- a/tests/test_core_formatter.py +++ b/tests/test_core_formatter.py @@ -1,7 +1,7 @@ import os from io import StringIO -from comet_pqc.core.formatter import CSVFormatter, PQCFormatter +from pqc.core.formatter import CSVFormatter, PQCFormatter def test_csv_formatter(): diff --git a/tests/test_core_functions.py b/tests/test_core_functions.py index a0f8098..86886f0 100644 --- a/tests/test_core_functions.py +++ b/tests/test_core_functions.py @@ -1,4 +1,4 @@ -from comet_pqc.core import functions +from pqc.core import functions def assert_range(begin, end, step, ref): diff --git a/tests/test_core_position.py b/tests/test_core_position.py index 0f7c7f7..99a4bf0 100644 --- a/tests/test_core_position.py +++ b/tests/test_core_position.py @@ -1,6 +1,6 @@ import math -from comet_pqc.core.position import Position +from pqc.core.position import Position def test_empty(): diff --git a/tests/test_core_request.py b/tests/test_core_request.py index 30ee823..d1a3777 100644 --- a/tests/test_core_request.py +++ b/tests/test_core_request.py @@ -1,6 +1,6 @@ import pytest -from comet_pqc.core.request import Request, RequestTimeout +from pqc.core.request import Request, RequestTimeout def test_request(): diff --git a/tests/test_core_timer.py b/tests/test_core_timer.py index 2271127..c649df1 100644 --- a/tests/test_core_timer.py +++ b/tests/test_core_timer.py @@ -1,6 +1,6 @@ import time -from comet_pqc.core.timer import Timer +from pqc.core.timer import Timer def test_timer(monkeypatch): diff --git a/tests/test_core_utils.py b/tests/test_core_utils.py index 9e91269..52615e3 100644 --- a/tests/test_core_utils.py +++ b/tests/test_core_utils.py @@ -1,11 +1,11 @@ import os -from comet_pqc.core import utils +from pqc.core import utils def test_package_path(): root_path = os.path.dirname(os.path.dirname(__file__)) - package_path = os.path.join(root_path, "comet_pqc") + package_path = os.path.join(root_path, "pqc") assert package_path == utils.PACKAGE_PATH diff --git a/tests/test_utils.py b/tests/test_utils.py index 79c7d02..f71aa87 100644 --- a/tests/test_utils.py +++ b/tests/test_utils.py @@ -1,4 +1,4 @@ -from comet_pqc import utils +from pqc import utils def test_encode_matrix(): diff --git a/tox.ini b/tox.ini index 8eca95b..68817ce 100644 --- a/tox.ini +++ b/tox.ini @@ -15,7 +15,7 @@ deps = types-waitress pytest commands = - flake8 comet_pqc --count --select=E9,F63,F7,F82 --show-source --statistics - pylint -E comet_pqc - mypy comet_pqc/core comet_pqc/measurements comet_pqc/plugins comet_pqc/station.py comet_pqc/strategy.py comet_pqc/utils.py + flake8 pqc --count --select=E9,F63,F7,F82 --show-source --statistics + pylint -E pqc + mypy pqc/core pqc/measurements pqc/plugins pqc/station.py pqc/strategy.py pqc/utils.py pytest