Merge branch 'master' into make_weak_ref

Author: nstelter-slac

.github/workflows/publish-to-pypi.yml

@@ -26,9 +26,9 @@ jobs:
     - name: Install dependencies
       run: |
         python -m pip install --upgrade pip
-        pip install setuptools wheel
+        pip install build
     - name: Build Package
-      run: python setup.py sdist
+      run: python -m build
 
     - name: Upload package
       uses: actions/[email protected]

.github/workflows/run-tests.yml

@@ -43,18 +43,19 @@ jobs:
       run: |
         if [ "$RUNNER_OS" == "Windows" ]; then
           conda install -c conda-forge pydm pyqt=${{ matrix.pyqt-version }}
+        elif [ "$RUNNER_OS" == "macOS" ]; then
+          mamba install -c conda-forge pydm pyqt=${{ matrix.pyqt-version }} git p4p pyca
         else
-          mamba install -c conda-forge pydm pyqt=${{ matrix.pyqt-version }}
+          mamba install -c conda-forge pydm pyqt=${{ matrix.pyqt-version }} pyca
         fi
 
     - name: Install additional Python dependencies with pip
       shell: bash -el {0}
       run: |
-        pip install -r requirements.txt
-        if [ "$RUNNER_OS" == "Windows" ]; then
-          pip install -r windows-dev-requirements.txt
+        if [ "$RUNNER_OS" == "Linux" ]; then
+          pip install .[test]
         else
-          pip install -r dev-requirements.txt
+          pip install .[test-no-optional]
         fi
 
     - name: Install packages for testing a PyQt app on Linux
@@ -73,4 +74,4 @@ jobs:
       shell: bash -el {0}
       timeout-minutes: 30 # timeout applies to single run of run_tests.py, not all os/python combos
       run: |
-        python run_tests.py
+        python run_tests.py

.gitignore

@@ -31,6 +31,7 @@ eggs/
 lib/
 lib64/
 parts/
+pydm/_version.py
 sdist/
 var/
 wheels/

conda-recipe/build.sh

@@ -1,5 +1,5 @@
 # Install the package
-$PYTHON setup.py install --single-version-externally-managed --record=record.txt
+$PYTHON -m pip install . --no-deps -vv
 
 # Create auxiliary dirs
 mkdir -p $PREFIX/etc/conda/activate.d

conda-recipe/meta.yaml

@@ -1,8 +1,10 @@
-{% set data = load_setup_py_data() %}
+{% set package_name = "pydm" %}
+{% set import_name = "pydm" %}
+{% set version = load_file_regex(load_file=os.path.join(import_name, "_version.py"), regex_pattern=".*version = '(\S+)'").group(1) %}
 
 package:
-    name    : pydm
-    version : {{ data.get('version') }}
+    name    : {{ package_name }}
+    version : {{ version }}
 
 source:
     path: ..
@@ -17,8 +19,9 @@ requirements:
     - python >=3.9
     - pip
     - setuptools
+    - setuptools_scm
     - pyqt =5
-    - qtpy
+    - qtpy >=2.2.0
   run:
     - python >=3.9
     - six
@@ -27,7 +30,7 @@ requirements:
     - pyepics
     - pyqt =5
     - pyqtgraph
-    - qtpy
+    - qtpy >=2.2.0
     - entrypoints
 
 test:

dev-requirements.txt

@@ -4,5 +4,4 @@ pytest-qt
 pytest-cov
 pytest-timeout
 p4p
-git+https://github.com/slaclab/pyca.git; platform_system != "Windows"
 pre-commit

examples/camviewer/camviewer.py

@@ -47,14 +47,14 @@ def __init__(self, parent=None, args=None):
             self.ui.cameraComboBox.addItem(camera)
 
         # When the camera combo box changes, disconnect from PVs, re-initialize, then reconnect.
-        self.ui.cameraComboBox.activated[str].connect(self.cameraChanged)
+        self.ui.cameraComboBox.currentTextChanged.connect(self.cameraChanged)
 
         # Set up the color map combo box.
         self.ui.colorMapComboBox.clear()
         for key, map_name in cmap_names.items():
             self.ui.colorMapComboBox.addItem(map_name, userData=key)
         self.ui.imageView.colorMap = self.ui.colorMapComboBox.currentData()
-        self.ui.colorMapComboBox.activated[str].connect(self.colorMapChanged)
+        self.ui.colorMapComboBox.currentTextChanged.connect(self.colorMapChanged)
 
         # Set up the color map limit sliders and line edits.
         # self._color_map_limit_sliders_need_config = True

pydm/__init__.py

@@ -2,14 +2,16 @@
 from .display import Display
 from .data_plugins import set_read_only
 from .widgets import PyDMChannel
-from ._version import get_versions
+
+try:
+    from ._version import version as __version__
+except ImportError:
+    __version__ = "unknown"
+
 
 __all__ = [
     "PyDMApplication",
     "Display",
     "set_read_only",
     "PyDMChannel",
 ]
-
-__version__ = get_versions()["version"]
-del get_versions