zprocess 2.20.4__tar.gz → 2.21.1__tar.gz

zprocess-2.20.4/.github/workflows/build-and-release.yaml → zprocess-2.21.1/.github/workflows/release.yml

@@ -9,10 +9,6 @@ on:
     tags:
       - 'v[0-9]+.[0-9]+.[0-9]+*'
 
-defaults:
-  run:
-    shell: bash -l {0}
-
 env:
   PACKAGE_NAME: zprocess
   SCM_LOCAL_SCHEME: no-local-version
@@ -41,30 +37,30 @@ jobs:
     strategy:
       matrix:
         include:
-          - { os: ubuntu-latest,   python: 3.9,  arch: x64 }
-          - { os: ubuntu-latest,   python: 3.8,  arch: x64 }
-          - { os: ubuntu-latest,   python: 3.7,  arch: x64 }
-          - { os: ubuntu-latest,   python: 3.6,  arch: x64 }
-
-          - { os: macos-latest,    python: 3.9,  arch: x64 }
-          - { os: macos-latest,    python: 3.8,  arch: x64 }
-          - { os: macos-latest,    python: 3.7,  arch: x64 }
-          - { os: macos-latest,    python: 3.6,  arch: x64 }
-
-          - { os: windows-latest,  python: 3.9,  arch: x64 }
-          - { os: windows-latest,  python: 3.8,  arch: x64 }
-          - { os: windows-latest,  python: 3.7,  arch: x64 }
-          - { os: windows-latest,  python: 3.6,  arch: x64 }
-
-          - { os: windows-latest,  python: 3.9,  arch: x86 }
-          - { os: windows-latest,  python: 3.8,  arch: x86 }
-          - { os: windows-latest,  python: 3.7,  arch: x86 }
-          - { os: windows-latest,  python: 3.6,  arch: x86 }
+          - { os: ubuntu-latest,   python: '3.10',  arch: x64 }
+          - { os: ubuntu-latest,   python: '3.9',  arch: x64 }
+          - { os: ubuntu-latest,   python: '3.8',  arch: x64 }
+          - { os: ubuntu-latest,   python: '3.7',  arch: x64 }
+
+          - { os: macos-10.15,    python: '3.10',  arch: x64 }
+          - { os: macos-10.15,    python: '3.9',  arch: x64 }
+          - { os: macos-10.15,    python: '3.8',  arch: x64 }
+          - { os: macos-10.15,    python: '3.7',  arch: x64 }
+
+          - { os: windows-latest,  python: '3.10',  arch: x64 }
+          - { os: windows-latest,  python: '3.9',  arch: x64 }
+          - { os: windows-latest,  python: '3.8',  arch: x64 }
+          - { os: windows-latest,  python: '3.7',  arch: x64 }
+
+          - { os: windows-latest,  python: '3.10',  arch: x86 }
+          - { os: windows-latest,  python: '3.9',  arch: x86 }
+          - { os: windows-latest,  python: '3.8',  arch: x86 }
+          - { os: windows-latest,  python: '3.7',  arch: x86 }
 
     if: github.repository == 'chrisjbillington/zprocess' && (github.event_name != 'create' || github.event.ref_type != 'branch')
     steps:
       - name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
         with:
           fetch-depth: 0
 
@@ -73,7 +69,7 @@ jobs:
         run: git tag -d $(git tag --points-at HEAD)
 
       - name: Install Python
-        uses: actions/setup-python@v2
+        uses: actions/setup-python@v4
         with:
           python-version: ${{ matrix.python }}
           architecture: ${{ matrix.arch }}
@@ -93,12 +89,13 @@ jobs:
 
       - name: Upload Artifact
         if: strategy.job-index == 0 || (env.PURE == 'false' && runner.os != 'Linux')
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v3
         with:
           name: dist
           path: ./dist
 
       - name: Set Variables for Conda Build
+        shell: bash
         run: |
           if [ $NOARCH == true ]; then
               CONDA_BUILD_ARGS="--noarch"
@@ -108,10 +105,7 @@ jobs:
           echo "CONDA_BUILD_ARGS=$CONDA_BUILD_ARGS" >> $GITHUB_ENV
 
       - name: Install Miniconda
-        # We need https://github.com/conda-incubator/setup-miniconda/pull/189 in order
-        # to be able to install 32-bit miniconda on Windows. Once setup-miniconda 2.1.2
-        # is released with this fix, can change to @v2.
-        uses: conda-incubator/setup-miniconda@1a875d105ac03256664b54c882c8c374ce617ef6
+        uses: conda-incubator/setup-miniconda@v2
         with:
           auto-update-conda: true
           python-version: ${{ matrix.python }}
@@ -123,9 +117,10 @@ jobs:
         uses: maxim-lobanov/setup-xcode@v1
         with:
           xcode-version: 11.7
-          
+
       - name: Conda package (Unix)
         if: runner.os != 'Windows'
+        shell: bash -l {0}
         run: |
           conda install -c labscript-suite setuptools-conda
           setuptools-conda build $CONDA_BUILD_ARGS .
@@ -138,7 +133,7 @@ jobs:
           setuptools-conda build %CONDA_BUILD_ARGS% --croot ${{ runner.temp }}\cb .
 
       - name: Upload Artifact
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v3
         with:
           name: conda_packages
           path: ./conda_packages
@@ -147,16 +142,11 @@ jobs:
   manylinux:
     name: Build Manylinux
     runs-on: ubuntu-latest
-    strategy:
-      matrix:
-        include:
-          - { python: 'cp36-cp36m cp37-cp37m cp38-cp38 cp39-cp39' }
-
     if: github.repository == 'chrisjbillington/zprocess' && (github.event_name != 'create' || github.event.ref_type != 'branch')
     steps:
       - name: Checkout
         if: env.PURE == 'false'
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
         with:
           fetch-depth: 0
 
@@ -166,16 +156,17 @@ jobs:
 
       - name: Build Manylinux Wheels
         if: env.PURE == 'false'
-        uses: RalfG/python-wheels-manylinux-build@v0.4.0
+        uses: RalfG/python-wheels-manylinux-build@v0.4.2
         with:
-          python-versions: ${{ matrix.python }}
+          python-versions: 'cp37-cp37m cp38-cp38 cp39-cp39 cp310-cp310'
+          pre-build-command: 'git config --global --add safe.directory "*"'
 
       - name: Upload Artifact
         if: env.PURE == 'false'
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v3
         with:
           name: dist
-          path: wheelhouse/*manylinux*.whl
+          path: dist/*manylinux*.whl
 
   release:
     name: Release
@@ -184,56 +175,45 @@ jobs:
     steps:
 
       - name: Download Artifact
-        uses: actions/download-artifact@v2
+        uses: actions/download-artifact@v3
         with:
           name: dist
           path: ./dist
 
       - name: Download Artifact
-        uses: actions/download-artifact@v2
+        uses: actions/download-artifact@v3
         with:
           name: conda_packages
           path: ./conda_packages
 
-      - name: Publish on TestPyPI
-        uses: pypa/gh-action-pypi-publish@release/v1
-        with:
-          user: __token__
-          password: ${{ secrets.testpypi }}
-          repository_url: https://test.pypi.org/legacy/
-
       - name: Get Version Number
         if: github.event.ref_type == 'tag'
         run: |
           VERSION="${GITHUB_REF/refs\/tags\/v/}"
           echo "VERSION=$VERSION" >> $GITHUB_ENV
 
-      - name: Create GitHub Release
+      - name: Create GitHub Release and Upload Release Asset
         if: github.event.ref_type == 'tag'
-        id: create_release
-        uses: actions/create-release@latest
+        uses: softprops/action-gh-release@v1
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:
           tag_name: ${{ github.event.ref }}
-          release_name: ${{ env.PACKAGE_NAME }} ${{ env.VERSION }}
+          name: ${{ env.PACKAGE_NAME }} ${{ env.VERSION }}
           draft: true
           prerelease: ${{ contains(github.event.ref, 'rc') }}
+          files: ./dist/${{ env.PACKAGE_NAME }}-${{ env.VERSION }}.tar.gz
 
-      - name: Upload Release Asset
-        if: github.event.ref_type == 'tag'
-        uses: actions/upload-release-asset@v1
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+      - name: Publish on TestPyPI
+        uses: pypa/gh-action-pypi-publish@release/v1
         with:
-          upload_url: ${{ steps.create_release.outputs.upload_url }}
-          asset_path: ./dist/${{ env.PACKAGE_NAME }}-${{ env.VERSION }}.tar.gz
-          asset_name: ${{ env.PACKAGE_NAME }}-${{ env.VERSION }}.tar.gz
-          asset_content_type: application/gzip
+          user: __token__
+          password: ${{ secrets.testpypi }}
+          repository-url: https://test.pypi.org/legacy/
 
       - name: Publish on PyPI
         if: github.event.ref_type == 'tag'
-        uses: pypa/gh-action-pypi-publish@master
+        uses: pypa/gh-action-pypi-publish@release/v1
         with:
           user: __token__
           password: ${{ secrets.pypi }}
@@ -244,10 +224,12 @@ jobs:
           auto-update-conda: true
 
       - name: Install Anaconda cloud client
+        shell: bash -l {0}
         run: conda install anaconda-client
 
       - name: Publish to Anaconda test label
         if: github.event.ref_type != 'tag'
+        shell: bash -l {0}
         run: |
           anaconda \
             --token ${{ secrets.ANACONDA_API_TOKEN }} \
@@ -257,6 +239,7 @@ jobs:
             conda_packages/*/*
 
       - name: Publish to Anaconda main label
+        shell: bash -l {0}
         if: github.event.ref_type == 'tag'
         run: |
           anaconda \

{zprocess-2.20.4/zprocess.egg-info → zprocess-2.21.1}/PKG-INFO

@@ -1,12 +1,11 @@
 Metadata-Version: 2.1
 Name: zprocess
-Version: 2.20.4
+Version: 2.21.1
 Summary: A set of utilities for multiprocessing using zeromq.
 Home-page: http://github.com/chrisjbillington/zprocess
 Author: Chris Billington
 Author-email: chrisjbillington@gmail.com
 License: BSD
-Platform: UNKNOWN
 Requires-Python: >=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*, !=3.5
 Description-Content-Type: text/markdown
 License-File: LICENSE.txt
@@ -29,5 +28,3 @@ and a process-tree-wide event system.
 
    * Install `python setup.py install`.
 
-
-

{zprocess-2.20.4 → zprocess-2.21.1}/setup.py

@@ -14,7 +14,7 @@ INSTALL_REQUIRES = [
 ]
 
 VERSION_SCHEME = {
-    "version_scheme": "release-branch-semver",
+    "version_scheme": "guess-next-dev",
     "local_scheme": os.getenv("SCM_LOCAL_SCHEME", "node-and-date"),
 }
 

{zprocess-2.20.4 → zprocess-2.21.1}/zprocess/process_tree.py

@@ -24,7 +24,14 @@ if _cwd == 'zprocess' and _path not in sys.path:
 import ipaddress
 import zprocess
 from zprocess.security import SecureContext
-from zprocess.utils import gethostbyname, Interruptor, Interrupted, TimeoutError
+from zprocess.utils import (
+    gethostbyname,
+    Interruptor,
+    Interrupted,
+    TimeoutError,
+    get_venv_executable_and_env,
+    _get_fileno
+)
 from zprocess.remote import (
     RemoteProcessClient,
     RemoteOutputReceiver,
@@ -785,7 +792,7 @@ class OutputInterceptor(object):
                 raise RuntimeError(msg)
             self.streams_connected[self.streamname] = self
             stream = getattr(sys, self.streamname)
-            if stream is not None and stream.fileno() > 0:
+            if stream is not None and _get_fileno(stream) > 0:
                 self.stream_fd = stream.fileno()
             else:
                 # On Windows with pythonw, sys.stdout and sys.stderr are None or
@@ -1386,9 +1393,9 @@ class ProcessTree(object):
             extra_env = {k.encode(): v.encode() for k, v in extra_env.items()}
 
         if remote_process_client is None:
-            env = os.environ.copy()
+            executable, env = get_venv_executable_and_env(os.environ.copy())
             env.update(extra_env)
-            child = subprocess.Popen([sys.executable] + cmd, env=env)
+            child = subprocess.Popen([executable] + cmd, env=env)
         else:
             # The remote server will prefix the path to its own Python interpreter.
             # Also, it will pass to Popen an env consisting of its own env updated with

{zprocess-2.20.4 → zprocess-2.21.1}/zprocess/remote/server.py

@@ -14,7 +14,7 @@ else:
 from weakref import WeakSet
 import atexit
 from zprocess import ZMQServer
-from zprocess.utils import setup_logging
+from zprocess.utils import setup_logging, get_venv_executable_and_env
 from zprocess.remote import PROTOCOL_VERSION
 
 ERR_INVALID_COMMAND = 'error: invalid command'
@@ -163,9 +163,11 @@ class RemoteProcessServer(ZMQServer):
 
     def proxy_Popen(self, cmd, *args, **kwargs):
         if kwargs.pop('prepend_sys_executable', False):
-            cmd = [sys.executable] + cmd
+            executable, kwargs['env'] = get_venv_executable_and_env(os.environ.copy())
+            cmd = [executable] + cmd
+        else:
+            kwargs['env'] = os.environ.copy()
         # Update current environment with the contents of 'extra_env', if given:
-        kwargs['env'] = os.environ.copy()
         kwargs['env'].update(kwargs.pop('extra_env', {}))
         if any(kwarg in kwargs for kwarg in ['stdout', 'stdin', 'stderr']):
             msg = "Cannot specify stdout, stdin or stderr for remote process."
@@ -207,4 +209,4 @@ class RemoteProcessServer(ZMQServer):
             return PROTOCOL_VERSION
         else:
             logger.info('%s: invalid command', self.sock.peer_ip)
-            return ERR_INVALID_COMMAND
+            return ERR_INVALID_COMMAND

{zprocess-2.20.4 → zprocess-2.21.1}/zprocess/security.py

@@ -8,6 +8,8 @@ import zmq
 import zmq.auth.thread
 from zmq.utils.monitor import recv_monitor_message
 
+from zprocess.utils import _get_fileno
+
 _path, _cwd = os.path.split(os.getcwd())
 if _cwd == 'zprocess' and _path not in sys.path:
     # Running from within zprocess dir? Add to sys.path for testing during
@@ -37,7 +39,7 @@ def _check_versions():
     except ImportError:
         # No bundled zmq.
         return
-    if sys.stderr is not None and sys.stderr.fileno() >= 0:
+    if sys.stderr is not None and _get_fileno(sys.stderr) >= 0:
         sys.stderr.write(_bundle_warning)
 
 # Events to tell when a conneciton has succeeded, including authentication:
@@ -139,7 +141,7 @@ class SecureSocket(zmq.Socket):
         # remote process server on localhost with no encryption:
 
         # Enable IPv6 by default:
-        # self.ipv6 = True
+        self.ipv6 = True
 
     def _is_internal(self, endpoint):
         """Return whether a bind or connect endpoint is on an internal
@@ -147,7 +149,7 @@ class SecureSocket(zmq.Socket):
         if endpoint.startswith('inproc://'):
             return True
         if endpoint.startswith('tcp://'):
-            host = ''.join(''.join(endpoint.split('//')[1:]).split(':')[0])
+            host = endpoint.split('//', 1)[1].rsplit(':', 1)[0]
             if host.startswith('[') and host.endswith(']'):
                 host = host[1:-1]
             if host == '*':
@@ -276,7 +278,11 @@ class SecureSocket(zmq.Socket):
             msg = zmq.Socket.recv(self, flags=flags, copy=False, track=track)
             if self.tcp:
                 try:
-                    self.peer_ip = msg.get('Peer-Address')
+                    peer_ip = msg.get('Peer-Address')
+                    peer_ip = ipaddress.ip_address(peer_ip)
+                    if peer_ip.version == 6 and peer_ip.ipv4_mapped is not None:
+                        peer_ip = peer_ip.ipv4_mapped
+                    self.peer_ip = str(peer_ip)
                 except zmq.error.ZMQError:
                     # Sent by a non-TCP client, even though we are a TCP socket. This is
                     # possible sometimes. For example, XPUB seems to receive unsubscribe
@@ -290,7 +296,7 @@ class SecureSocket(zmq.Socket):
                         msg = INSECURE_RECV_WARNING % self.peer_ip
                         if self.logger is not None:
                             self.logger.warning(msg)
-                        elif sys.stderr is not None and sys.stderr.fileno() >= 0:
+                        elif sys.stderr is not None and _get_fileno(sys.stderr) >= 0:
                             sys.stderr.write(msg + '\n')
                         # Disregard the insecure message and call recv() again
                         continue
@@ -324,12 +330,23 @@ class SecureContext(zmq.Context):
             self.client_secretkey, self.server_secretkey = keys
             self.client_publickey = zmq.curve_public(self.client_secretkey)
             self.server_publickey = zmq.curve_public(self.server_secretkey)
-            # Don't hold ref to auth: needed for auto cleanup at shutdown:
+            
+            # There are potential reference cycles causing the authentication thread to
+            # prevent the interpreter from shutting down. In pyzmq <25, the
+            # authentication thread holds a reference to the context. So we must avoid
+            # holding a reference to it. In pyzmq 25+, the authentication thread and
+            # threadauthenticator objects both hold references to each other. So we
+            # replace one with a weakref to break the cycle.
+
             auth = zmq.auth.thread.ThreadAuthenticator(self)
             auth.start()
+
+            if auth.thread.authenticator is auth:
+                auth.thread.authenticator = weakref.proxy(auth)
+
             # Allow only clients who have the client public key:
-            auth.thread.authenticator.allow_any = False
-            auth.thread.authenticator.certs['*'] = {self.client_publickey: True}
+            auth.allow_any = False
+            auth.certs['*'] = {self.client_publickey: True}
             self.secure = True
 
     @classmethod

{zprocess-2.20.4 → zprocess-2.21.1}/zprocess/utils.py

@@ -6,6 +6,8 @@ import logging, logging.handlers
 from binascii import hexlify
 import socket
 import tempfile
+from pathlib import Path
+import io
 
 import zmq
 
@@ -157,6 +159,15 @@ def start_daemon(cmd_args):
         os._exit(0)
 
 
+def _get_fileno(stream):
+    """Return stream.get_fileno(), or -1 if the call raises io.UnsupportedOperation"""
+    try:
+        return stream.fileno()
+    except io.UnsupportedOperation:
+        # IDLE or Jupyter. Return an invalid fileno
+        return -1
+
+
 def disable_quick_edit():
     """Disable the 'quick-edit' misfeature of Windows' cmd.exe, in which a single click
     on the console puts it in 'select' mode indefinitely, causing writes to stdout from
@@ -168,7 +179,7 @@ def disable_quick_edit():
     """
     if os.name == 'nt' and all(
         [
-            a is not None and a.isatty() and a.fileno() >= 0
+            a is not None and a.isatty() and _get_fileno(a) >= 0
             for a in (sys.stdin, sys.stdout, sys.stderr)
         ]
     ):
@@ -261,4 +272,23 @@ def gethostbyname(host, prefer_ipv4=True, require_ipv4=False):
             if family == socket.AF_INET:
                 return sockaddr[0]
     family, _, _, _, sockaddr = results[0]
-    return sockaddr[0]
+    return sockaddr[0]
+
+
+def get_venv_executable_and_env(env=None):
+    """If we are running in a venv on Windows or MacOS such that sys.executable is a
+    shim to sys._base_executable, then return sys._base_executable, as well as the
+    environment that should be passed to sys._base_executable in order for it to know to
+    configure itself for the virtual environment instead of the base environment. This
+    allows us to skip the shim and thus have fewer layers in our process hierarchy. If
+    we are not in a venv, return sys.executable and the env as passed in. If env passed
+    in is None, and needs to be modified for the subprocess, a copy of os.environ(),
+    appropriately modified, will be returned."""
+    base_executable = getattr(sys, '_base_executable', sys.executable)
+    if Path(base_executable) != Path(sys.executable):
+        if env is None:
+            env = os.environ.copy()
+        env["__PYVENV_LAUNCHER__"] = str(sys.executable)
+        return base_executable, env
+    return sys.executable, env
+

{zprocess-2.20.4 → zprocess-2.21.1}/zprocess/zlock/__init__.py

@@ -48,8 +48,8 @@ class ZLockClient(object):
 
     def __init__(
         self,
-        host,
-        port,
+        host='localhost',
+        port=DEFAULT_PORT,
         shared_secret=None,
         allow_insecure=True,
         default_timeout=DEFAULT_TIMEOUT,

{zprocess-2.20.4 → zprocess-2.21.1}/zprocess/zlog/__init__.py

@@ -47,7 +47,13 @@ class ZLogClient(object):
 
     RESPONSE_TIMEOUT = 5000
 
-    def __init__(self, host, port, shared_secret=None, allow_insecure=True):
+    def __init__(
+        self,
+        host='localhost',
+        port=DEFAULT_PORT,
+        shared_secret=None,
+        allow_insecure=True,
+    ):
         self.host = socket.gethostbyname(host)
         self.port = port
         self.shared_secret = shared_secret
@@ -194,12 +200,12 @@ class ZMQLoggingHandler(Handler):
 
 
 
-# Backwards compatibility follots
+# Backwards compatibility follows
 
 _default_zlog_client = None
 
 _ZMQLoggingHandler = ZMQLoggingHandler
-"""Backward compatibility to allow instantiating a lock without a ZLockClient as the
+"""Backward compatibility to allow instantiating a lock without a ZLogClient as the
 first argument"""
 class ZMQLoggingHandler(_ZMQLoggingHandler):
     def __init__(self, *args, **kwargs):

{zprocess-2.20.4 → zprocess-2.21.1}/zprocess/zlog/server.py

@@ -77,6 +77,7 @@ class FileHandler(logging.FileHandler):
                 return
         try:
             self.stream.write(message + '\n')
+            self.flush()
         except (OSError, IOError):
             # Nothing to be done.
             return

{zprocess-2.20.4 → zprocess-2.21.1/zprocess.egg-info}/PKG-INFO

@@ -1,12 +1,11 @@
 Metadata-Version: 2.1
 Name: zprocess
-Version: 2.20.4
+Version: 2.21.1
 Summary: A set of utilities for multiprocessing using zeromq.
 Home-page: http://github.com/chrisjbillington/zprocess
 Author: Chris Billington
 Author-email: chrisjbillington@gmail.com
 License: BSD
-Platform: UNKNOWN
 Requires-Python: >=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*, !=3.5
 Description-Content-Type: text/markdown
 License-File: LICENSE.txt
@@ -29,5 +28,3 @@ and a process-tree-wide event system.
 
    * Install `python setup.py install`.
 
-
-

{zprocess-2.20.4 → zprocess-2.21.1}/zprocess.egg-info/SOURCES.txt

@@ -7,7 +7,7 @@ pyproject.toml
 requirements.txt
 run_tests.py
 setup.py
-.github/workflows/build-and-release.yaml
+.github/workflows/release.yml
 doc/Makefile
 doc/conf.py
 doc/index.rst