Merge pull request #370 from ZLLentz/maint_unpin_pyqt

MAINT: unpin pyqt and fix test suite, REL: v1.18.4

Author: ZLLentz

conda-recipe/meta.yaml

@@ -39,7 +39,7 @@ requirements:
   - psdaq-control-minimal >=3.3.19
   - psdm_qs_cli >=0.3.1
   - pyfiglet >=0.8.0
-  - pyqt <5.15.0
+  - pyqt =5
   - pyyaml >=5.4.0
   - requests >=2.26.0
   - simplejson >=3.17.0

docs-requirements.txt

@@ -1,3 +1,4 @@
+docs-versions-menu
 nbsphinx
 sphinx
 sphinx_rtd_theme

docs/source/conf.py

@@ -41,6 +41,7 @@
     "sphinx.ext.napoleon",
     "nbsphinx",
     "sphinx.ext.mathjax",
+    "docs_versions_menu",
 ]
 
 # Add any paths that contain templates here, relative to this directory.

docs/source/releases.rst

@@ -1,6 +1,30 @@
 Release History
 ###############
 
+
+v1.18.4 (2023-07-26)
+====================
+
+Maintenance
+-----------
+- Unpin strict pyqt pin, we now just require pyqt5 of any flavor.
+- Fix a bug where non-conda installs and non-standard conda installs
+  (like mambabuild intermediates) would be unable to use the
+  `hutch-python --create` cookiecutter tool.
+- Add send and recv methods to the fake zmq socket because newer
+  versions of the lcls2 daq code are expecting recv.
+- Fix pyproject.toml typo docs -> doc.
+- Update requirements.txt for accuracy now that
+  psdaq-control-minimal is available on pypi.
+- Include docs-versions-menu for the sphinx docs builds.
+
+
+Contributors
+------------
+- klauer
+- zllentz
+
+
 v1.18.3 (2023-04-11)
 ====================
 

hutch_python/cli.py

@@ -158,7 +158,7 @@ def main():
             except KeyError:
                 # Take a stab at some non-conda defaults; ideally these would
                 # be configurable with argparse.
-                base = Path(sys.executable).parent
+                base = str(Path(sys.executable).parent)
                 env = hutch
         logger.info(('Creating hutch-python dir for hutch %s using'
                      ' base=%s env=%s'), hutch, base, env)

hutch_python/tests/conftest.py

@@ -250,6 +250,13 @@ def send_json(self, *args, **kwargs):
     def recv_json(self, *args, **kwargs):
         return {}
 
+    def send(self, *args, **kwargs):
+        pass
+
+    def recv(self, *args, **kwargs):
+        # Trick the fake daq into stopping itself
+        return b"shutdown"
+
 
 @pytest.fixture(scope='function')
 def dummy_zmq_lcls2(monkeypatch):

hutch_python/tests/test_tstpython.py

@@ -57,5 +57,5 @@ def test_tstpython_ipython():
     # then exit. There should be no NameError.
     ipy_text = check_output([tstpython], universal_newlines=True,
                             input='unique_device\n')
-    assert 'IPython' in ipy_text
+    assert 'Environment Information' in ipy_text
     assert 'NameError' not in ipy_text

pyproject.toml

@@ -44,5 +44,5 @@ file = [ "requirements.txt",]
 [tool.setuptools.dynamic.optional-dependencies.test]
 file = "dev-requirements.txt"
 
-[tool.setuptools.dynamic.optional-dependencies.docs]
+[tool.setuptools.dynamic.optional-dependencies.doc]
 file = "docs-requirements.txt"

requirements.txt

@@ -12,16 +12,15 @@ pcdscalc>=0.3.0
 pcdsdaq>=2.3.0
 pcdsdevices>=7.0.0
 pcdsutils>=0.5.0
+psdaq-control-minimal
 pyfiglet>=0.8.0
-pyqt5<5.15.0
+pyqt5
 pyyaml>=5.4.0
 requests>=2.26.0
 simplejson>=3.17.0
 
 # Some are unavailable on pypi:
 # elog
-# psdaq-control-minimal
 
 # Some are broken on pypi:
-# lightpath
 # psdm_qs_cli