Skip to content

Commit

Permalink
Merge pull request #487 from ZLLentz/v2.3.1-rel
Browse files Browse the repository at this point in the history
DOC: add release notes for v2.3.1
  • Loading branch information
ZLLentz authored May 2, 2022
2 parents f3a06e4 + f0dce4b commit c1ad740
Show file tree
Hide file tree
Showing 27 changed files with 856 additions and 370 deletions.
12 changes: 9 additions & 3 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
@@ -1,8 +1,14 @@
# See https://pre-commit.com for more information
# See https://pre-commit.com/hooks.html for more hooks
exclude: |
(?x)^(
versioneer.py|
docs/source/conf.py|
typhos/_version.py|
)$
repos:
- repo: https://github.com/pre-commit/pre-commit-hooks
rev: v2.5.0
rev: v4.2.0
hooks:
- id: no-commit-to-branch
- id: trailing-whitespace
Expand All @@ -18,11 +24,11 @@ repos:
- id: debug-statements

- repo: https://gitlab.com/pycqa/flake8
rev: 3.8.3
rev: 3.9.2
hooks:
- id: flake8

- repo: https://github.com/timothycrosley/isort
rev: 5.4.1
rev: 5.10.1
hooks:
- id: isort
62 changes: 31 additions & 31 deletions LICENSE.md
Original file line number Diff line number Diff line change
@@ -1,39 +1,39 @@
Copyright (c) 2016, The Board of Trustees of the Leland Stanford Junior
University, through SLAC National Accelerator Laboratory (subject to receipt
of any required approvals from the U.S. Dept. of Energy). All rights reserved.
Redistribution and use in source and binary forms, with or without
Copyright (c) 2016, The Board of Trustees of the Leland Stanford Junior
University, through SLAC National Accelerator Laboratory (subject to receipt
of any required approvals from the U.S. Dept. of Energy). All rights reserved.
Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions are met:

(1) Redistributions of source code must retain the above copyright notice,
this list of conditions and the following disclaimer.

(2) Redistributions in binary form must reproduce the above copyright notice,
this list of conditions and the following disclaimer in the documentation
and/or other materials provided with the distribution.
(1) Redistributions of source code must retain the above copyright notice,
this list of conditions and the following disclaimer.

(3) Neither the name of the Leland Stanford Junior University, SLAC National
Accelerator Laboratory, U.S. Dept. of Energy nor the names of its
contributors may be used to endorse or promote products derived from this
software without specific prior written permission.
(2) Redistributions in binary form must reproduce the above copyright notice,
this list of conditions and the following disclaimer in the documentation
and/or other materials provided with the distribution.

THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER, THE UNITED STATES GOVERNMENT,
OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT
OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING
IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY
(3) Neither the name of the Leland Stanford Junior University, SLAC National
Accelerator Laboratory, U.S. Dept. of Energy nor the names of its
contributors may be used to endorse or promote products derived from this
software without specific prior written permission.

THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER, THE UNITED STATES GOVERNMENT,
OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT
OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING
IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY
OF SUCH DAMAGE.

You are under no obligation whatsoever to provide any bug fixes, patches, or
upgrades to the features, functionality or performance of the source code
("Enhancements") to anyone; however, if you choose to make your Enhancements
available either publicly, or directly to SLAC National Accelerator Laboratory,
without imposing a separate written license agreement for such Enhancements,
then you hereby grant the following license: a non-exclusive, royalty-free
You are under no obligation whatsoever to provide any bug fixes, patches, or
upgrades to the features, functionality or performance of the source code
("Enhancements") to anyone; however, if you choose to make your Enhancements
available either publicly, or directly to SLAC National Accelerator Laboratory,
without imposing a separate written license agreement for such Enhancements,
then you hereby grant the following license: a non-exclusive, royalty-free
perpetual license to install, use, modify, prepare derivative works, incorporate
into other computer software, distribute, and sublicense such Enhancements or
into other computer software, distribute, and sublicense such Enhancements or
derivative works thereof, in binary and source code form.
2 changes: 1 addition & 1 deletion conda-recipe/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -27,4 +27,4 @@ echo ')' >> $ACTIVATE.bat
unset DESIGNER_PLUGIN_PATH
unset DESIGNER_PLUGIN
unset ACTIVATE
unset DEACTIVATE
unset DEACTIVATE
3 changes: 1 addition & 2 deletions docs/source/cli.rst
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
Command Line Utilities
======================

.. automodule:: typhos.cli

.. automodule:: typhos.cli
24 changes: 24 additions & 0 deletions docs/source/release_notes.rst
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,30 @@
Release History
=================

v2.3.1 (2022-05-02)
===================

Description
-----------
This is a small bugfix release.

Fixes
-----
- Fix an issue where the configuration menu would be defunct for
custom template screens.

Maintenance
-----------
- Add some additional documentation about sig:// and cli usage.
- Configure and satisfy the repository's own pre-commit checks.
- Update versioneer install to current latest.

Contributors
------------
- klauer
- zllentz


v2.3.0 (2022-03-31)
===================

Expand Down
4 changes: 1 addition & 3 deletions docs/source/save.rst
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ There are two major ways to use this created file:
saved_suite.show()
app.exec_()
.. note::

The saved file only stores a reference to the devices loaded into the
Expand All @@ -47,5 +47,3 @@ There are two major ways to use this created file:
``load_suite`` is called. If the device has a different name in the database
or you have configured a different ``happi`` database to be used your
devices will not be loaded properly.


7 changes: 3 additions & 4 deletions docs/source/tools.rst
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
###############
###############
Supported Tools
###############

In experimental environments there are a variety of external tools and
In experimental environments there are a variety of external tools and
applications that are critical to day to day operation. Typhos hopes to
integrate many of these services into the :class:`.TyphosDeviceDisplay` for
ease of operation. This approach has two advantages; the first is that getting
Expand All @@ -27,6 +27,5 @@ Tool Classes
:toctree: generated

TyphosConsole
TyphosLogDisplay
TyphosLogDisplay
TyphosTimePlot

1 change: 1 addition & 0 deletions etc/typhos_designer_plugin.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
print("Importing Typhos QtDesigner plugins...")
import pydm # noqa

from typhos.designer import * # noqa

print("Loaded Typhos QtDesigner plugins. Available PyDM data plugins:",
Expand Down
1 change: 0 additions & 1 deletion etc/typhos_env.sh
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,3 @@
TYPHOS_DIR=$(python -c 'import typhos; import pathlib; print(pathlib.Path(typhos.__file__).parent.parent)')
export PYQTDESIGNERPATH="$TYPHOS_DIR"/etc:$PYQTDESIGNERPATH
export PYDM_DESIGNER_ONLINE=True

2 changes: 1 addition & 1 deletion github_deploy_key_pcdshub_typhos.enc
Original file line number Diff line number Diff line change
@@ -1 +1 @@
gAAAAABgma3xdixpQyBuXlnQntL7IJLk-5eWniHENKximqr2BCDmsI-IKxAm8nmKyTJ9qPHB6pYl5cfC2J7ZlWnXQuYksH1TrUAZjy2c4Sll2YfEDIrOSZbtqQjt4LD3Sdlqt5ukGGPbmsTspiD8C70K0zczXu-Vc6EjHJyW5FYP0Lzfx8qvOomW4mnITO5oRiAsApyvpa7AKm7SlIJreVTOwOnuui5b_aRSt0NdTbsU1EegycwEQA1gCLvJgmhSQdBajQtZ8_uiDWhff-Ug74HlD1mspS2mG79z-pMKiP2S6A_-6BhC02mi111zJf4j04slyarWWe3fmxWugrz-1vPncaeECKPoIZLDKuA-ney1HNWA_djzp1qX2b19VjPJeCmadKouXXIr2f_zFqCKEXdwoJno1VGai8CdEk2ppGd5p6qJSIIA-ifGxguDhJtlSZT9tIJAIYDog5Yroaxzxw-5qHYaNMxT07efW_WzkpvfvvETVzC3bBvit69KkJhPXE3q8X82_reeDxxVJXgcfwqWr34xo1_AJOMBV19rTDjJniRKtKzfWIpMEHv3NZipwZQp0Cfm1kdjC83iqQO7V-kdmJA-be35Yrqr6siyuvUrMfCT6vVtheBJdRTxj79TFx7HO0ck0ojNcDOx0T5K0cm5bqKoLvfHTqcX8gyf-cOxuoMpqF21Y9xZNdB7rWGR6OuK89IS0lSaoJuyWFdtR8h5EX0EdYb05B2TYDyLIaIQbkT9N15E5iQtJ5puSwW2glfj0ZNk9_3qcrIM2Dlhcr-LQVw1_o6ccfBVN2b-V0-8QXCV8GYLAALtmrA5oF60x6oQqlEWo7kzfaztwQab6kgzNnvUZnI5TlxUJZBW7wzIHIF5mQJA9UyXXJ_0XSdfhY3yhHS8xLxICDJg7SMXqPYLvdZzWoCiIA5LN6ICRe9vHNW-xaoDKK8mIfsI56jddfvrOD_jMTMZJ1eckCbh2MxJ_NzI3OMZAW8uc8Q5mnpQg_3-hm4F5WQsMojbG0eEni2lZCCaFANvAdcMNdUm9sL4rnBmXx0MSVcamziqeyvk4wsxK_71l2kTlQkF2LREqA1JG3nrOOyHeRDyCAI81NW8_DANnxhj8I2ECF_fFMGZFVnaZisL3Pd9bl5Hm41zw-0ICHCUNSiOLl1WdHoJ2MuzSIPNLlIqiAp_ANexys28kNrSb5bWT5vwb0DEXB75ICFX2nMRNrrUKuRZ1e6v9wADH2xh7Ldd8kJTrVhC-J5qosdE6IIlvxZa8ZzOneAUDtyX8PYgGOFOZD-nK8FB2wdT-4Qs6nw1EqcjoA8c6sXgYEA89Kosn7lSL4zAUNpAbGNCkxRXVYYiSFfLFh5Dnf0FIbEMubnzsbheMJ1qmVjecn7qlT5zaiN_882cI_a0_ZYnHpPAaGvcGgbpsxi9xQCbwI3pw5zQTbpL2beZhhRmwSYGLXj8FvnbbNoqbliy2FH2KSLcMwTcLmWJjnY50aNfOTBh3wJoZw_Uv2hjStw9x7VoxrAHJWNdTm93M6qMPCfAXr6Q9CtY03Oh81zlwG-RYGraRRtPqbc3yN9Yd0j6CVfd9w5grq-fdzz7SnBOWJc2LaebRyxOKkpXGJbX0G3r3dfa5LID2w7vwMS_YJdtrFzieRj6Ta5vXCQSoo0OSchRbjNIYGddwUrPQ85Gg8Qy_IXnkQnvHVF4E7KBsG8J1sHOQ1L4YFYhDvLiA6ogoYNZAdV7xjCL8Fj3-VpKfdyonorxdC3QZXu14Fbi9y7xWJq7GM-2nKBxnOPYjfF3_46twUN7NgGMhOFajxD2sgKOSyiOQKUyMl2yr3OPUBEcd8zniKj9_FEJommrv2hMCg9VhatuwKGsoZgZ8U798Uda3Qg0-Ff2n5eDpJYlZXiNp01riLGpxrlkO3eWS9oBRfrGmC1AqXA5VPmEcsN-OSwwD3SRc5LYD9mGuSTFex9ZWPe88qSrUglUXA9dwFMZL65I6mg-wpwS3l-9n_HRvWCv0t1B3uAT2KSs-TFrNbs_lw6j93rwbvl7tUmhNsr7muHrOFgoO_S9fyTA5ruBY88vJ3SQLyJpDF9Cjz2FtC_Ictlt3Qh8_6O2wtprhUdAtaRCC3HP2NnM_Lfh7MOWngs3Kxu1a3NqzKtgcTrWfJHwcSGKSFg4ZWTjVWZzaoTUip0w0zB0vfjFrKYDnAMFX4Qz5wyunU0PBOzoST4-41FfC9Bwonq5w2MWIbVBy4WcR5nfKkkqlicIdvJwzVASB8Pe5esoJnCp0YAETw4bCOwlCRzXrScjaVJxrmzBeaIZoL5kOom0lB0C5aDFgM10pGDguRlaHcZht-jhDFslF8VmynS0OdLM7NOnC1_q7Me6VR7BTnXx36MU9jyHDUSyHIi5Yj6od7FWf_OXfaRyBUoSVADCxLF22QP3dxAZXArcWzE1IuyXnD-obr8YUeBD27NrsIB-MZz6LCxnJet68kRSsbPJ3G-WHPN7RMPGrmMg6y6gxOJtBmiOXluLCoAB8Vq-F1pUzqoRDVUNLgntkDRyg41nosn9pPjOvEYgMJLK052vtwhstrUBMTJSnbqZOVq1vOlaIm05lNz5Wj3NAFC613_1Dxhv6HicFMkSxN27aTPp8rLgA-o7cIxty-myx2Lu1MVdqchZJlTm9mte6RaQg3h-U9t1AF7YYb4Juu2zicaZfbdjbvjFO3YfLgUCQ0EygjaQ7gO8Dt70m9F8pJvedHnI4w7gerFpF9UjGv1lYblZOCiHP2psly58X9bWZDM3yr-DiHwoyGDad-DZXFZO9CdwntGoMg1zsOOblJ2UwFidd8wqNbXOwdxtv1DvtLvRnfVQSo5nEOMyYO8ZMX-_xuC2SGbkQL1P-8HNqSlH6upy2gLIq_tsqWIgcnU45dRTdf_m5TY3cexdbrsdwmbCBJq50Dmdp5PdRWS6UZ7iBuSfUkJBkOfE3CmYTKaVYq697p7Z3DKnpDcFCc-IdZu88U-Scu-GI5U3HGzPv9SRDzCjq-OoHhirdJavhjUOunXKrvkIO9T0aofatYzAk0WZ_a5Yg8etzdwamsT_Hqt7TOWc7Yds8IGYlsXsk3-KKE24qa4BzD_U873U_UkDwSDcqE1NWIBmv0Rsx0IxbpbLHIrICYxtO2n0kbG3BYYyzPdpC5nAkrG1pCYXQgIIbWjitQ39wDyY8YcOZkOVti3NOctK9KV3eVKKyORHG9G8kSelx82JN3cco66-gpaRWsDwC3H4F7E2bHkxayL10IOpEjxZRzovppunG152QeSIZmyWtjmMfb6HDedmRcYMQlATxxQZFgWeQPruTk5WmWiKQFMD0wA0AlMTMgLSquZWSP2deeq8ULC-Pk6dssINkE7iawBKKiVlMZ5hpAASvoe4bHs97ijpKQ3Siz5psCMw1gXUrfVdFtxaJT2MJj2UMUHoTNQwmTxdaHkyEDXkiUfUV01Ho0i-eNmRRZOJlc_i6sLNkNzSSqj_GMF8_Irgbwziwf_YR79OJLKxD9SsCZEl_7foODYJ5ZaqCiAFDzMYE6zK2yHGY0XcWbte334zzvmbxSA0Mmurbd9SmrN7LLLVQYVC14NqBZ9fdTEPjxeNpTw2Ws6FvaOR3cRhR5DHBU8rtA7x-GPxXpjHrQ_X9erQMEWkbSj4fYtSgdY3zNWL3UPhVwi0b8SlVorh-0w54fEUY8RhM84tZNR6Vu2d6iH2OlHLJf4CfDzctQqPVEcfrCzNZtc8j7A-JvCDs7UGOAJ_9fdCcjTpAHsU5NajrW5Oo6cjRPloiNKapCecAP1jmVfVliA0QSpT3CJDViB2h_rOHRzORL2m2nmZe9vW8UbqsUlTxLTN2CxQ5lpMlP7xtd_R5MDVICqPrlo920GAYDbsYuN6Naa6vtD0BBtwV18HbW45TCJRgkjkxjODuQacdHbzBLJzbkRnZhw5uUZACQ5NZ6jz1RJfPb6k0Gj1jZT37XWdEGXuFDXT4et3XtURKa6eEF-_s-96jfGX43EoNyml1P1AMHmehOeHte06pWS-OjpD4tAeTJhrskHLt9HQjtEZJlIfbC7Fl1ETP6lnI67437jCaQpT8Awal64ptyuacOEXpTlUdN5ju7ParAtzRtY8aX2cKQyLpexFZATIKqhfbsG0H6zmJ4h1DmegQi1HCWfT-kfyl79N3rzogGMUHvPM0QlB3DxNg0y8H7goEWA3kBYKjOZaWaySzzuPCJHYWvKv-gEzWFCCnNjrqNJzu2jDrQH4Pu47KDTSS4pqr3v_wiGcx17tKv7So2Aix9T5OXpFuMFfrJf9-0ez4rg6EeKOlEXUN2Tcan7nN7DGJDKfwLJT7QK0Fb4l47eeeXbyODlZv3V9SC5rrdmfnMSKW7EbDnlnCunZatlL4UKcWb6BXb6MZtxYr5hslMxbZKB1xl3pnbP2RgFCoyf1Vgg6lhKQznQ39VGyHw==
gAAAAABgma3xdixpQyBuXlnQntL7IJLk-5eWniHENKximqr2BCDmsI-IKxAm8nmKyTJ9qPHB6pYl5cfC2J7ZlWnXQuYksH1TrUAZjy2c4Sll2YfEDIrOSZbtqQjt4LD3Sdlqt5ukGGPbmsTspiD8C70K0zczXu-Vc6EjHJyW5FYP0Lzfx8qvOomW4mnITO5oRiAsApyvpa7AKm7SlIJreVTOwOnuui5b_aRSt0NdTbsU1EegycwEQA1gCLvJgmhSQdBajQtZ8_uiDWhff-Ug74HlD1mspS2mG79z-pMKiP2S6A_-6BhC02mi111zJf4j04slyarWWe3fmxWugrz-1vPncaeECKPoIZLDKuA-ney1HNWA_djzp1qX2b19VjPJeCmadKouXXIr2f_zFqCKEXdwoJno1VGai8CdEk2ppGd5p6qJSIIA-ifGxguDhJtlSZT9tIJAIYDog5Yroaxzxw-5qHYaNMxT07efW_WzkpvfvvETVzC3bBvit69KkJhPXE3q8X82_reeDxxVJXgcfwqWr34xo1_AJOMBV19rTDjJniRKtKzfWIpMEHv3NZipwZQp0Cfm1kdjC83iqQO7V-kdmJA-be35Yrqr6siyuvUrMfCT6vVtheBJdRTxj79TFx7HO0ck0ojNcDOx0T5K0cm5bqKoLvfHTqcX8gyf-cOxuoMpqF21Y9xZNdB7rWGR6OuK89IS0lSaoJuyWFdtR8h5EX0EdYb05B2TYDyLIaIQbkT9N15E5iQtJ5puSwW2glfj0ZNk9_3qcrIM2Dlhcr-LQVw1_o6ccfBVN2b-V0-8QXCV8GYLAALtmrA5oF60x6oQqlEWo7kzfaztwQab6kgzNnvUZnI5TlxUJZBW7wzIHIF5mQJA9UyXXJ_0XSdfhY3yhHS8xLxICDJg7SMXqPYLvdZzWoCiIA5LN6ICRe9vHNW-xaoDKK8mIfsI56jddfvrOD_jMTMZJ1eckCbh2MxJ_NzI3OMZAW8uc8Q5mnpQg_3-hm4F5WQsMojbG0eEni2lZCCaFANvAdcMNdUm9sL4rnBmXx0MSVcamziqeyvk4wsxK_71l2kTlQkF2LREqA1JG3nrOOyHeRDyCAI81NW8_DANnxhj8I2ECF_fFMGZFVnaZisL3Pd9bl5Hm41zw-0ICHCUNSiOLl1WdHoJ2MuzSIPNLlIqiAp_ANexys28kNrSb5bWT5vwb0DEXB75ICFX2nMRNrrUKuRZ1e6v9wADH2xh7Ldd8kJTrVhC-J5qosdE6IIlvxZa8ZzOneAUDtyX8PYgGOFOZD-nK8FB2wdT-4Qs6nw1EqcjoA8c6sXgYEA89Kosn7lSL4zAUNpAbGNCkxRXVYYiSFfLFh5Dnf0FIbEMubnzsbheMJ1qmVjecn7qlT5zaiN_882cI_a0_ZYnHpPAaGvcGgbpsxi9xQCbwI3pw5zQTbpL2beZhhRmwSYGLXj8FvnbbNoqbliy2FH2KSLcMwTcLmWJjnY50aNfOTBh3wJoZw_Uv2hjStw9x7VoxrAHJWNdTm93M6qMPCfAXr6Q9CtY03Oh81zlwG-RYGraRRtPqbc3yN9Yd0j6CVfd9w5grq-fdzz7SnBOWJc2LaebRyxOKkpXGJbX0G3r3dfa5LID2w7vwMS_YJdtrFzieRj6Ta5vXCQSoo0OSchRbjNIYGddwUrPQ85Gg8Qy_IXnkQnvHVF4E7KBsG8J1sHOQ1L4YFYhDvLiA6ogoYNZAdV7xjCL8Fj3-VpKfdyonorxdC3QZXu14Fbi9y7xWJq7GM-2nKBxnOPYjfF3_46twUN7NgGMhOFajxD2sgKOSyiOQKUyMl2yr3OPUBEcd8zniKj9_FEJommrv2hMCg9VhatuwKGsoZgZ8U798Uda3Qg0-Ff2n5eDpJYlZXiNp01riLGpxrlkO3eWS9oBRfrGmC1AqXA5VPmEcsN-OSwwD3SRc5LYD9mGuSTFex9ZWPe88qSrUglUXA9dwFMZL65I6mg-wpwS3l-9n_HRvWCv0t1B3uAT2KSs-TFrNbs_lw6j93rwbvl7tUmhNsr7muHrOFgoO_S9fyTA5ruBY88vJ3SQLyJpDF9Cjz2FtC_Ictlt3Qh8_6O2wtprhUdAtaRCC3HP2NnM_Lfh7MOWngs3Kxu1a3NqzKtgcTrWfJHwcSGKSFg4ZWTjVWZzaoTUip0w0zB0vfjFrKYDnAMFX4Qz5wyunU0PBOzoST4-41FfC9Bwonq5w2MWIbVBy4WcR5nfKkkqlicIdvJwzVASB8Pe5esoJnCp0YAETw4bCOwlCRzXrScjaVJxrmzBeaIZoL5kOom0lB0C5aDFgM10pGDguRlaHcZht-jhDFslF8VmynS0OdLM7NOnC1_q7Me6VR7BTnXx36MU9jyHDUSyHIi5Yj6od7FWf_OXfaRyBUoSVADCxLF22QP3dxAZXArcWzE1IuyXnD-obr8YUeBD27NrsIB-MZz6LCxnJet68kRSsbPJ3G-WHPN7RMPGrmMg6y6gxOJtBmiOXluLCoAB8Vq-F1pUzqoRDVUNLgntkDRyg41nosn9pPjOvEYgMJLK052vtwhstrUBMTJSnbqZOVq1vOlaIm05lNz5Wj3NAFC613_1Dxhv6HicFMkSxN27aTPp8rLgA-o7cIxty-myx2Lu1MVdqchZJlTm9mte6RaQg3h-U9t1AF7YYb4Juu2zicaZfbdjbvjFO3YfLgUCQ0EygjaQ7gO8Dt70m9F8pJvedHnI4w7gerFpF9UjGv1lYblZOCiHP2psly58X9bWZDM3yr-DiHwoyGDad-DZXFZO9CdwntGoMg1zsOOblJ2UwFidd8wqNbXOwdxtv1DvtLvRnfVQSo5nEOMyYO8ZMX-_xuC2SGbkQL1P-8HNqSlH6upy2gLIq_tsqWIgcnU45dRTdf_m5TY3cexdbrsdwmbCBJq50Dmdp5PdRWS6UZ7iBuSfUkJBkOfE3CmYTKaVYq697p7Z3DKnpDcFCc-IdZu88U-Scu-GI5U3HGzPv9SRDzCjq-OoHhirdJavhjUOunXKrvkIO9T0aofatYzAk0WZ_a5Yg8etzdwamsT_Hqt7TOWc7Yds8IGYlsXsk3-KKE24qa4BzD_U873U_UkDwSDcqE1NWIBmv0Rsx0IxbpbLHIrICYxtO2n0kbG3BYYyzPdpC5nAkrG1pCYXQgIIbWjitQ39wDyY8YcOZkOVti3NOctK9KV3eVKKyORHG9G8kSelx82JN3cco66-gpaRWsDwC3H4F7E2bHkxayL10IOpEjxZRzovppunG152QeSIZmyWtjmMfb6HDedmRcYMQlATxxQZFgWeQPruTk5WmWiKQFMD0wA0AlMTMgLSquZWSP2deeq8ULC-Pk6dssINkE7iawBKKiVlMZ5hpAASvoe4bHs97ijpKQ3Siz5psCMw1gXUrfVdFtxaJT2MJj2UMUHoTNQwmTxdaHkyEDXkiUfUV01Ho0i-eNmRRZOJlc_i6sLNkNzSSqj_GMF8_Irgbwziwf_YR79OJLKxD9SsCZEl_7foODYJ5ZaqCiAFDzMYE6zK2yHGY0XcWbte334zzvmbxSA0Mmurbd9SmrN7LLLVQYVC14NqBZ9fdTEPjxeNpTw2Ws6FvaOR3cRhR5DHBU8rtA7x-GPxXpjHrQ_X9erQMEWkbSj4fYtSgdY3zNWL3UPhVwi0b8SlVorh-0w54fEUY8RhM84tZNR6Vu2d6iH2OlHLJf4CfDzctQqPVEcfrCzNZtc8j7A-JvCDs7UGOAJ_9fdCcjTpAHsU5NajrW5Oo6cjRPloiNKapCecAP1jmVfVliA0QSpT3CJDViB2h_rOHRzORL2m2nmZe9vW8UbqsUlTxLTN2CxQ5lpMlP7xtd_R5MDVICqPrlo920GAYDbsYuN6Naa6vtD0BBtwV18HbW45TCJRgkjkxjODuQacdHbzBLJzbkRnZhw5uUZACQ5NZ6jz1RJfPb6k0Gj1jZT37XWdEGXuFDXT4et3XtURKa6eEF-_s-96jfGX43EoNyml1P1AMHmehOeHte06pWS-OjpD4tAeTJhrskHLt9HQjtEZJlIfbC7Fl1ETP6lnI67437jCaQpT8Awal64ptyuacOEXpTlUdN5ju7ParAtzRtY8aX2cKQyLpexFZATIKqhfbsG0H6zmJ4h1DmegQi1HCWfT-kfyl79N3rzogGMUHvPM0QlB3DxNg0y8H7goEWA3kBYKjOZaWaySzzuPCJHYWvKv-gEzWFCCnNjrqNJzu2jDrQH4Pu47KDTSS4pqr3v_wiGcx17tKv7So2Aix9T5OXpFuMFfrJf9-0ez4rg6EeKOlEXUN2Tcan7nN7DGJDKfwLJT7QK0Fb4l47eeeXbyODlZv3V9SC5rrdmfnMSKW7EbDnlnCunZatlL4UKcWb6BXb6MZtxYr5hslMxbZKB1xl3pnbP2RgFCoyf1Vgg6lhKQznQ39VGyHw==
4 changes: 2 additions & 2 deletions run_tests.py
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
#!/usr/bin/env python
import logging
import os
import sys
import logging
from pathlib import Path
from logging.handlers import RotatingFileHandler
from pathlib import Path

import pytest

Expand Down
2 changes: 0 additions & 2 deletions setup.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,3 @@ style = pep440
versionfile_source = typhos/_version.py
versionfile_build = typhos/_version.py
tag_prefix = v


23 changes: 12 additions & 11 deletions setup.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import versioneer
from setuptools import setup, find_packages
from setuptools import find_packages, setup

import versioneer

with open('requirements.txt') as f:
requirements = f.read().split()
Expand All @@ -11,13 +11,14 @@
print("User must install the following packages manually:\n" +
"\n".join(f' {r}' for r in git_requirements))

setup(name='typhos',
version=versioneer.get_version(),
cmdclass=versioneer.get_cmdclass(),
author='SLAC National Accelerator Laboratory',
packages=find_packages(),
include_package_data=True,
install_requires=requirements,
description='Interface generation for ophyd devices',
entry_points={'console_scripts': ['typhos=typhos.cli:main']},
setup(
name='typhos',
version=versioneer.get_version(),
cmdclass=versioneer.get_cmdclass(),
author='SLAC National Accelerator Laboratory',
packages=find_packages(),
include_package_data=True,
install_requires=requirements,
description='Interface generation for ophyd devices',
entry_points={'console_scripts': ['typhos=typhos.cli:main']},
)
28 changes: 16 additions & 12 deletions typhos/__init__.py
Original file line number Diff line number Diff line change
@@ -1,13 +1,4 @@
__all__ = ['use_stylesheet', 'register_signal', 'load_suite',
'TyphosCompositeSignalPanel',
'TyphosDeviceDisplay',
'TyphosSuite',
'TyphosSignalPanel',
'TyphosPositionerWidget',
'TyphosMethodButton', '__version__'
]

from ._version import get_versions
from . import _version
from .display import TyphosDeviceDisplay
from .func import TyphosMethodButton
from .panel import TyphosCompositeSignalPanel, TyphosSignalPanel
Expand All @@ -16,12 +7,25 @@
from .suite import TyphosSuite
from .utils import load_suite, patch_connect_slots, use_stylesheet

__all__ = [
'use_stylesheet',
'register_signal',
'load_suite',
'TyphosCompositeSignalPanel',
'TyphosDeviceDisplay',
'TyphosSuite',
'TyphosSignalPanel',
'TyphosPositionerWidget',
'TyphosMethodButton',
]


# **NOTE** We patch QtCore.QMetaObject.connectSlotsByName to catch SystemError
# exceptions.
# We know this is not a good practice to do on import. If you have a better
# solution, do let us know.
patch_connect_slots()

__version__ = get_versions()['version']
del get_versions
del patch_connect_slots

__version__ = _version.get_versions()['version']
Loading

0 comments on commit c1ad740

Please sign in to comment.