Merge pull request #285 from klauer/mnt_fixes

MNT: address CI-related failures and update pre-commit settings

.coveragerc

@@ -1,6 +1,6 @@
 [run]
 source =
-    
+
 [report]
 omit =
     #tests

.pre-commit-config.yaml

@@ -1,8 +1,16 @@
 # See https://pre-commit.com for more information
 # See https://pre-commit.com/hooks.html for more hooks
+exclude: |
+        (?x)^(
+            .*\.tmc|
+            .*\.TcPOU|
+            docs/conf.py|
+            versioneer.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
@@ -16,13 +24,14 @@ repos:
     -   id: check-yaml
         exclude: '^(conda-recipe/meta.yaml)$'
     -   id: debug-statements
+        exclude: '^(pytmc/bin/util.py)$'
 
 -   repo: https://gitlab.com/pycqa/flake8.git
-    rev: 3.7.9
+    rev: 3.9.2
     hooks:
     -   id: flake8
 
 -   repo: https://github.com/timothycrosley/isort
-    rev: 5.4.2
+    rev: 5.10.1
     hooks:
     -   id: isort

LICENSE

@@ -1,39 +1,39 @@
-Copyright (c) 2018, 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) 2018, 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.

conda-recipe/meta.yaml

@@ -21,6 +21,8 @@ requirements:
     - jinja2
     - lxml
     - epics-pypdb >=0.1.5
+  run_constrained:
+    - pyqt <5.15
 
 test:
   imports:

docs/getting_started.rst

@@ -38,7 +38,7 @@ Python Usage
 ++++++++++++
 Once installed pytmc and its components can be imported into a python program
 or shell like any normal python package. Consult the source code documentation
-for specifics. 
+for specifics.
 
 
 Full IOC Creation

docs/user_guide.rst

@@ -9,6 +9,3 @@ User Guide
    installation.rst
    pragma_usage.rst
    terminal_usage.rst
-
-
-

pytmc/__init__.py

@@ -1,15 +1,11 @@
 import logging
 
-from ._version import get_versions
-from .record import RecordPackage, EPICSRecord
-from . import pragmas
-from . import parser
-from . import linter
+from . import _version, linter, parser, pragmas
+from .record import EPICSRecord, RecordPackage
 
 logger = logging.getLogger(__name__)
-__version__ = get_versions()['version']
-del get_versions
 
+__version__ = _version.get_versions()['version']
 
 __all__ = [
     'EPICSRecord',