zprocess 2.26.1__tar.gz → 2.27.0__tar.gz

zprocess-2.27.0/.github/workflows/release-vars.sh

@@ -0,0 +1,47 @@
+# This repository. PyPI and Anaconda test and release package uploads are only done if
+# the repository the workflow is running in matches this (i.e. is not a fork). Optional,
+# if not set, package uploads are skipped.
+export RELEASE_REPO="chrisjbillington/zprocess"
+
+# Username with which to upload conda packages. If not given, anaconda uploads are
+# skipped.
+export ANACONDA_USER="labscript-suite"
+
+# Whether (true or false) to upload releases to PyPI, non-releases to Test PyPI,
+# releases to Anaconda, non-releases to Anaconda test label. Only used if the repository
+# the workflow is running in matches RELEASE_REPO, otherwise uploads are skipped.
+# Anaconda uploads require ANACONDA_USER be specified and ANACONDA_API_TOKEN secret be
+# set. Optional, all default to true.
+export PYPI_UPLOAD=""
+export TESTPYPI_UPLOAD=""
+export ANACONDA_UPLOAD=""
+export TEST_ANACONDA_UPLOAD=""
+
+# Which Python version to use for pure wheel builds, sdists, and as the host Python for
+# cibuildwheel. Optional, defaults to the second-most recent minor Python version.
+export DEFAULT_PYTHON=""
+
+# Comma-separated list of Python versions to build conda packages for. Only used if
+# HAS_ENV_MARKERS=true or PURE=false, otherwise a noarch conda package is built instead.
+# Optional, defaults to all non-end-of-life stable Python minor versions.
+export CONDA_PYTHONS=""
+
+# Environment variable set in the envionment that `cibuildwheel` runs in instructing it
+# which Pythons to build for, as a space-separated list of specifiers in the format
+# specified by `cibuildwheel`. Only used if PURE=false. Optional, defaults to all
+# non-end-of-life stable CPython versions.
+export CIBW_BUILD=""
+
+# Name of Python package. Optional, defaults to name from the package metadata
+export PKGNAME=""
+
+# Version of Python package. Optional, defaults to version from the package metadata
+export PKGVER=""
+
+# Whether the Python package is pure (true) or impure (false). Optional, defaults to
+# false if the setuptools package has extension modules or libraries, otherwise true.
+export PURE=""
+
+# Whether (true or false) the Python package has dependencies that vary by platform or
+# Python version. Optional, Defaults to presence of env markers in package metadata.
+export HAS_ENV_MARKERS=""

zprocess-2.27.0/.github/workflows/release.yml

@@ -0,0 +1,452 @@
+name: Build and Release
+
+on:
+  push:
+    branches:
+      - master
+      - maintenance/*
+    tags:
+      - 'v[0-9]+.[0-9]+.[0-9]+*'
+
+env:
+  OS_LIST_UBUNTU: '["ubuntu-latest"]'
+  OS_LIST_ALL: '["ubuntu-latest", "windows-latest", "macos-latest", "macos-15-intel"]'
+
+
+jobs:
+  configure:
+    name: Configure workflow run
+    runs-on: ubuntu-latest
+    outputs:
+      DEFAULT_PYTHON: ${{ steps.config.outputs.DEFAULT_PYTHON }}
+      CIBW_BUILD: ${{ steps.config.outputs.CIBW_BUILD }}
+      PKGNAME: ${{ steps.config.outputs.PKGNAME }}
+      PKGVER: ${{ steps.config.outputs.PKGVER }}
+      PURE: ${{ steps.config.outputs.PURE }}
+      ANACONDA_USER: ${{ steps.config.outputs.ANACONDA_USER }}
+      CONDA_BUILD_ARGS: ${{ steps.config.outputs.CONDA_BUILD_ARGS }}
+      BUILD_OS_LIST: ${{ steps.config.outputs.BUILD_OS_LIST }}
+      RELEASE: ${{ steps.config.outputs.RELEASE }}
+      TESTPYPI_UPLOAD_THIS_RUN: ${{ steps.config.outputs.TESTPYPI_UPLOAD_THIS_RUN }}
+      PYPI_UPLOAD_THIS_RUN: ${{ steps.config.outputs.PYPI_UPLOAD_THIS_RUN }}
+      TEST_ANACONDA_UPLOAD_THIS_RUN: ${{ steps.config.outputs.TEST_ANACONDA_UPLOAD_THIS_RUN }}
+      ANACONDA_UPLOAD_THIS_RUN: ${{ steps.config.outputs.ANACONDA_UPLOAD_THIS_RUN }}
+
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+
+      - name: Ignore Tags for non-tag pushes
+        if: "!startsWith(github.ref, 'refs/tags/')"
+        run: git tag -d $(git tag --points-at HEAD)
+
+      - name: Install Python
+        uses: actions/setup-python@v5
+        with:
+          python-version: '3.x'
+
+      - name: Configure workflow
+        id: config
+        run: |
+          pip install ci-helper
+
+          # Load repo-specific variables and overrides:
+          VARS_FILE=".github/workflows/release-vars.sh"
+          if [ -f "${VARS_FILE}" ]; then
+            source "${VARS_FILE}"
+          fi
+
+          # Python version used to build sdists, pure wheels, and as host Python for
+          # `cibuildwheel`:
+          if [ -z "${DEFAULT_PYTHON}" ]; then
+            # Default to second-most recent supported Python version:
+            DEFAULT_PYTHON=$(ci-helper defaultpython)
+          fi
+
+          # Versions of Python to build conda packages for:
+          if [ -z "${CONDA_PYTHONS}" ]; then
+            # Default to all supported Python versions:
+            CONDA_PYTHONS=$(ci-helper pythons)
+          fi
+
+          # Env var for `cibuildwheel` specifying target Python versions:
+          if [ -z "${CIBW_BUILD}" ]; then
+            # default to all supported CPython versions:
+            CIBW_BUILD=$(ci-helper pythons --cibw)
+          fi
+
+          # Package name and version
+          if [ -z "${PKGNAME}" ]; then
+            # Default to package name from project metadata:
+            PKGNAME=$(ci-helper distinfo name .)
+          fi
+          if [ -z "${PKGVER}" ]; then
+            # Default to package version from project metadata:
+            PKGVER=$(ci-helper distinfo version .)
+          fi
+
+          # Whether the package is pure python
+          if [ -z "${PURE}" ]; then
+            # Default to whether the setuptools package declares no modules/libraries:
+            PURE=$(ci-helper distinfo is_pure .)
+          fi
+
+          # Whether the package requirements depend on platform or Python version:
+          if [ -z "${HAS_ENV_MARKERS}" ]; then
+            # Default to the presence of env markers in package metadata:
+            HAS_ENV_MARKERS=$(ci-helper distinfo has_env_markers .)
+          fi
+
+          # List of OSs we need to run the build job on and arguments to
+          # `setuptools-conda build`:
+          if [[ "${PURE}" == false || "${HAS_ENV_MARKERS}" == true ]]; then
+            BUILD_OS_LIST="${OS_LIST_ALL}"
+            CONDA_BUILD_ARGS="--pythons=${CONDA_PYTHONS}"
+          else
+            BUILD_OS_LIST="${OS_LIST_UBUNTU}"
+            CONDA_BUILD_ARGS="--noarch"
+          fi
+
+          # Release if a tag was pushed:
+          if [ "${{ contains(github.ref, '/tags') }}" == true ]; then
+            RELEASE=true
+          else
+            RELEASE=false
+          fi
+
+          # What types of package uploads are enabled:
+          if [ -z "${PYPI_UPLOAD}" ]; then
+            PYPI_UPLOAD=true
+          else
+            PYPI_UPLOAD=false
+          fi
+          if [ -z "${TESTPYPI_UPLOAD}" ]; then
+            TESTPYPI_UPLOAD=true
+          else
+            TESTPYPI_UPLOAD=false
+          fi
+          if [ -z "${ANACONDA_UPLOAD}" ]; then
+            ANACONDA_UPLOAD=true
+          else
+            ANACONDA_UPLOAD=false
+          fi
+          if [ -z "${TEST_ANACONDA_UPLOAD}" ]; then
+            TEST_ANACONDA_UPLOAD=true
+          else
+            TEST_ANACONDA_UPLOAD=false
+          fi
+
+          if [ "${{ github.repository }}" != "${RELEASE_REPO}" ]; then
+            echo "Workflow repo doesn't match ${RELEASE_REPO}, disabling package uploads"
+            PYPI_UPLOAD=false
+            TESTPYPI_UPLOAD=false
+            ANACONDA_UPLOAD=false
+            TEST_ANACONDA_UPLOAD=false
+          fi
+
+          # If Anaconda uploads enabled, check necessary username and token are
+          # available:
+          if [[ "${ANACONDA_UPLOAD}" == true || "${TEST_ANACONDA_UPLOAD}" == true ]]; then
+            if [ -z "${{ secrets.ANACONDA_API_TOKEN }}" ]; then
+              echo "Anaconda uploads enabled but ANACONDA_API_TOKEN secret not set"
+              exit 1
+            fi
+            if [ -z "${ANACONDA_USER}" ]; then
+              echo "Anaconda uploads enabled but ANACONDA_USER not set"
+              exit 1
+            fi
+          fi
+
+          # If enabled, upload releases to PyPI and Anaconda:
+          if [[ "${RELEASE}" == true && "${PYPI_UPLOAD}" == true ]]; then
+            PYPI_UPLOAD_THIS_RUN=true
+          else
+            PYPI_UPLOAD_THIS_RUN=false
+          fi
+          if [[ "${RELEASE}" == true && "${ANACONDA_UPLOAD}" == true ]]; then
+            ANACONDA_UPLOAD_THIS_RUN=true
+          else
+            ANACONDA_UPLOAD_THIS_RUN=false
+          fi
+
+          # If enabled, upload non-releases to Test PyPI and Anaconda test label:
+          if [[ "${RELEASE}" == false && "${TESTPYPI_UPLOAD}" == true ]]; then
+            TESTPYPI_UPLOAD_THIS_RUN=true
+          else
+            TESTPYPI_UPLOAD_THIS_RUN=false
+          fi
+          if [[ "${RELEASE}" == false && "${TEST_ANACONDA_UPLOAD}" == true ]]; then
+            TEST_ANACONDA_UPLOAD_THIS_RUN=true
+          else
+            TEST_ANACONDA_UPLOAD_THIS_RUN=false
+          fi
+
+          echo "DEFAULT_PYTHON=${DEFAULT_PYTHON}" >> "${GITHUB_OUTPUT}"
+          echo "CIBW_BUILD=${CIBW_BUILD}" >> "${GITHUB_OUTPUT}"
+          echo "PKGNAME=${PKGNAME}" >> "${GITHUB_OUTPUT}"
+          echo "PKGVER=${PKGVER}" >> "${GITHUB_OUTPUT}"
+          echo "PURE=${PURE}" >> "${GITHUB_OUTPUT}"
+          echo "ANACONDA_USER=${ANACONDA_USER}" >> "${GITHUB_OUTPUT}"
+          echo "CONDA_BUILD_ARGS=${CONDA_BUILD_ARGS}" >> "${GITHUB_OUTPUT}"
+          echo "BUILD_OS_LIST=${BUILD_OS_LIST}" >> "${GITHUB_OUTPUT}"
+          echo "RELEASE=${RELEASE}" >> "${GITHUB_OUTPUT}"
+          echo "TESTPYPI_UPLOAD_THIS_RUN=${TESTPYPI_UPLOAD_THIS_RUN}" >> "${GITHUB_OUTPUT}"
+          echo "PYPI_UPLOAD_THIS_RUN=${PYPI_UPLOAD_THIS_RUN}" >> "${GITHUB_OUTPUT}"
+          echo "TEST_ANACONDA_UPLOAD_THIS_RUN=${TEST_ANACONDA_UPLOAD_THIS_RUN}" >> "${GITHUB_OUTPUT}"
+          echo "ANACONDA_UPLOAD_THIS_RUN=${ANACONDA_UPLOAD_THIS_RUN}" >> "${GITHUB_OUTPUT}"
+
+          echo
+          echo "=========================="
+          echo "Workflow run configuration:"
+          echo "--------------------------"
+          cat "${GITHUB_OUTPUT}"
+          echo "=========================="
+          echo
+
+
+  build:
+    name: Build
+    runs-on: ${{ matrix.os }}
+    needs: configure
+    strategy:
+      matrix:
+        os: ${{ fromJSON(needs.configure.outputs.BUILD_OS_LIST) }}
+
+    env:
+      DEFAULT_PYTHON: ${{ needs.configure.outputs.DEFAULT_PYTHON }}
+      CIBW_BUILD: ${{ needs.configure.outputs.CIBW_BUILD }}
+      PURE: ${{ needs.configure.outputs.PURE }}
+      CONDA_BUILD_ARGS: ${{ needs.configure.outputs.CONDA_BUILD_ARGS }}
+
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+
+      - name: Ignore Tags for non-tag pushes
+        if: "!startsWith(github.ref, 'refs/tags/')"
+        run: git tag -d $(git tag --points-at HEAD)
+
+      - name: Install Python
+        uses: actions/setup-python@v5
+        with:
+          python-version: ${{ env.DEFAULT_PYTHON }}
+
+      - name: Install Python tools
+        run: python -m pip install --upgrade pip setuptools wheel build cibuildwheel
+
+      - name: Source distribution
+        if: strategy.job-index == 0
+        run: python -m build -s .
+
+      - name: Wheel distribution (pure)
+        if: env.PURE == 'true' && strategy.job-index == 0
+        run: python -m build -w .
+
+      - name: Wheel distribution (impure)
+        if: env.PURE == 'false'
+        run: cibuildwheel --output-dir dist
+
+      - name: Upload artifact
+        if: env.PURE == 'false' || strategy.job-index == 0
+        uses: actions/upload-artifact@v4
+        with:
+          name: dist-${{ matrix.os }}
+          path: ./dist
+          if-no-files-found: error
+
+      - name: Install Miniforge
+        uses: conda-incubator/setup-miniconda@v3
+        with:
+          miniforge-version: "latest"
+          auto-update-conda: true
+          conda-remove-defaults: true
+          auto-activate: true
+          activate-environment: ""
+
+      - name: Conda package
+        shell: bash -l {0}
+        run: |
+          if [ "${{ runner.os }}" == Windows ]; then
+            # Short path to minimise odds of hitting Windows max path length
+            CONDA_BUILD_ARGS+=" --croot ${{ runner.temp }}\cb"
+          fi
+          conda install -c labscript-suite setuptools-conda
+          setuptools-conda build $CONDA_BUILD_ARGS .
+
+      - name: Upload artifact
+        uses: actions/upload-artifact@v4
+        with:
+          name: conda_packages-${{ matrix.os }}
+          path: ./conda_packages
+          if-no-files-found: error
+
+
+  github-release:
+    name: Publish release (GitHub)
+    runs-on: ubuntu-latest
+    needs: [configure, build]
+    if: ${{ needs.configure.outputs.RELEASE == 'true' }}
+    permissions:
+      contents: write
+    env:
+      PKGNAME: ${{ needs.configure.outputs.PKGNAME }}
+      PKGVER: ${{ needs.configure.outputs.PKGVER }}
+
+    steps:
+      - name: Download Artifact
+        uses: actions/download-artifact@v4
+        with:
+          pattern: dist*
+          path: ./dist
+          merge-multiple: true
+
+      - name: Create GitHub release and upload release asset
+        uses: softprops/action-gh-release@v2
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        with:
+          tag_name: ${{ github.event.ref }}
+          name: ${{ env.PKGNAME }} ${{ env.PKGVER }}
+          draft: true
+          prerelease: ${{ contains(github.event.ref, 'rc') }}
+          files: ./dist/*.tar.gz
+
+
+  testpypi-upload:
+    name: Publish on Test PyPI
+    runs-on: ubuntu-latest
+    needs: [configure, build]
+    if: ${{ needs.configure.outputs.TESTPYPI_UPLOAD_THIS_RUN == 'true' }}
+    env:
+      PKGNAME: ${{ needs.configure.outputs.PKGNAME }}
+      PKGVER: ${{ needs.configure.outputs.PKGVER }}
+    environment:
+      name: testpypi
+      url: https://test.pypi.org/project/${{ env.PKGNAME }}/${{ env.PKGVER }}
+    permissions:
+      id-token: write
+
+    steps:
+      - name: Download Artifact
+        uses: actions/download-artifact@v4
+        with:
+          pattern: dist*
+          path: ./dist
+          merge-multiple: true
+
+      - name: Publish on TestPyPI
+        uses: pypa/gh-action-pypi-publish@release/v1
+        with:
+          repository-url: https://test.pypi.org/legacy/
+          verbose: true
+          skip-existing: true
+
+
+  pypi-upload:
+    name: Publish on PyPI
+    runs-on: ubuntu-latest
+    needs: [configure, build]
+    if: ${{ needs.configure.outputs.PYPI_UPLOAD_THIS_RUN == 'true' }}
+    env:
+      PKGNAME: ${{ needs.configure.outputs.PKGNAME }}
+      PKGVER: ${{ needs.configure.outputs.PKGVER }}
+    environment:
+      name: pypi
+      url: https://pypi.org/project/${{ env.PKGNAME }}/${{ env.PKGVER }}
+    permissions:
+      id-token: write
+
+    steps:
+      - name: Download Artifact
+        uses: actions/download-artifact@v4
+        with:
+          pattern: dist*
+          path: ./dist
+          merge-multiple: true
+
+      - name: Publish on PyPI
+        uses: pypa/gh-action-pypi-publish@release/v1
+        with:
+          verbose: true
+          skip-existing: true
+
+
+  test-anaconda-upload:
+    name: Publish on Anaconda (test label)
+    runs-on: ubuntu-latest
+    needs: [configure, build]
+    if: ${{ needs.configure.outputs.TEST_ANACONDA_UPLOAD_THIS_RUN == 'true' }}
+
+    steps:
+      - name: Download Artifact
+        uses: actions/download-artifact@v4
+        with:
+          pattern: conda_packages-*
+          path: ./conda_packages
+          merge-multiple: true
+
+      - name: Install Miniforge
+        uses: conda-incubator/setup-miniconda@v3
+        with:
+          miniforge-version: "latest"
+          auto-update-conda: true
+          conda-remove-defaults: true
+          auto-activate: true
+          activate-environment: ""
+
+      - name: Install Anaconda cloud client
+        shell: bash -l {0}
+        run: conda install anaconda-client
+
+      - name: Publish to Anaconda test label
+        shell: bash -l {0}
+        run: |
+          anaconda \
+            --token ${{ secrets.ANACONDA_API_TOKEN }} \
+            upload \
+            --skip-existing \
+            --user ${{ needs.configure.outputs.ANACONDA_USER }} \
+            --label test \
+            conda_packages/*/*
+
+
+  anaconda-upload:
+    name: Publish on Anaconda
+    runs-on: ubuntu-latest
+    needs: [configure, build]
+    if: ${{ needs.configure.outputs.ANACONDA_UPLOAD_THIS_RUN == 'true' }}
+
+    steps:
+      - name: Download Artifact
+        uses: actions/download-artifact@v4
+        with:
+          pattern: conda_packages-*
+          path: ./conda_packages
+          merge-multiple: true
+
+      - name: Install Miniforge
+        uses: conda-incubator/setup-miniconda@v3
+        with:
+          miniforge-version: "latest"
+          auto-update-conda: true
+          conda-remove-defaults: true
+          auto-activate: true
+          activate-environment: ""
+
+      - name: Install Anaconda cloud client
+        shell: bash -l {0}
+        run: conda install anaconda-client
+
+      - name: Publish to Anaconda main
+        shell: bash -l {0}
+        run: |
+          anaconda \
+            --token ${{ secrets.ANACONDA_API_TOKEN }} \
+            upload \
+            --skip-existing \
+            --user ${{ needs.configure.outputs.ANACONDA_USER }} \
+            conda_packages/*/*

zprocess-2.27.0/PKG-INFO

@@ -0,0 +1,39 @@
+Metadata-Version: 2.4
+Name: zprocess
+Version: 2.27.0
+Summary: A set of utilities for multiprocessing using zeromq
+Author-email: Christopher Billington <chrisjbillington@gmail.com>
+License-Expression: BSD-2-Clause
+Project-URL: Homepage, https://github.com/chrisjbillington/zprocess
+Project-URL: Documentation, https://github.com/chrisjbillington/zprocess
+Project-URL: Repository, https://github.com/chrisjbillington/zprocess
+Project-URL: Downloads, https://pypi.org/project/zprocess/
+Project-URL: Tracker, https://github.com/chrisjbillington/zprocess/issues
+Keywords: multiprocessing,IPC,zeromq
+Classifier: Programming Language :: Python :: 3 :: Only
+Requires-Python: >=3.8
+Description-Content-Type: text/markdown
+License-File: LICENSE.txt
+Requires-Dist: setuptools_scm
+Requires-Dist: pyzmq
+Requires-Dist: pywin32; sys_platform == "win32"
+Requires-Dist: windows-curses; sys_platform == "win32"
+Provides-Extra: test
+Requires-Dist: pytest; extra == "test"
+Requires-Dist: pytest-cov; extra == "test"
+Dynamic: license-file
+
+# zprocess
+
+A set of utilities for multiprocessing using
+zeromq. Includes process creation and management, output
+redirection, message passing, inter-process locks, logging,
+and a process-tree-wide event system.
+
+( 
+[view on pypi](https://pypi.python.org/pypi/zprocess/);
+[view on Github](https://github.com/chrisjbillington/zprocess)
+)
+
+   * Install `python setup.py install`.
+

{zprocess-2.26.1 → zprocess-2.27.0}/pyproject.toml

@@ -1,8 +1,9 @@
 [build-system]
-requires = ["setuptools", "wheel", "setuptools_scm"]
+requires = ["setuptools", "setuptools_scm"]
 build-backend = "setuptools.build_meta"
 
 [tool.setuptools_scm]
+version_scheme = "release-branch-semver"
 local_scheme = "no-local-version"
 
 [tool.setuptools.packages]
@@ -15,9 +16,9 @@ authors = [
     {name = "Christopher Billington", email = "chrisjbillington@gmail.com"},
 ]
 keywords = ["multiprocessing", "IPC", "zeromq"]
-license = {file = 'LICENSE.txt'}
+license = "BSD-2-Clause"
+license-files = ["LICENSE.txt"]
 classifiers = [
-    "License :: OSI Approved :: BSD License",
     "Programming Language :: Python :: 3 :: Only",
 ]
 requires-python = ">=3.8"

{zprocess-2.26.1 → zprocess-2.27.0}/zprocess/__version__.py

@@ -4,7 +4,10 @@ import importlib.metadata
 root = Path(__file__).parent.parent
 if (root / '.git').is_dir():
     from setuptools_scm import get_version
-    __version__ = get_version(root, local_scheme="no-local-version")
+
+    __version__ = get_version(
+        root, version_scheme="release-branch-semver", local_scheme="no-local-version"
+    )
 else:
     try:
         __version__ = importlib.metadata.version(__package__)

{zprocess-2.26.1 → zprocess-2.27.0}/zprocess/clientserver.py

@@ -239,8 +239,8 @@ class ZMQServer(object):
         sock.connect(self._shutdown_endpoint)
         sock.send(b'stop')
         self.mainloop_thread.join()
-        sock.close(linger=True)
-        self.sock.close(linger=False)
+        sock.close(linger=100)
+        self.sock.close(linger=0)
         self.stopping = False
 
     def handler(self, request_data):

{zprocess-2.26.1 → zprocess-2.27.0}/zprocess/process_class_wrapper.py

@@ -72,8 +72,8 @@ def _setup():
     except Exception:
         # Tell the parent what went wrong:
         process_tree.to_parent.put(traceback.format_exc())
-        # Ensure message is sent before the process exits:
-        process_tree.to_parent.sock.close(linger=1)
+        # Ensure enough time for message to be sent before the process exits:
+        process_tree.to_parent.sock.close(linger=100)
         return
 
     # Tell the parent we have a class

{zprocess-2.26.1 → zprocess-2.27.0}/zprocess/zlock/__init__.py

@@ -90,7 +90,7 @@ class ZLockClient(object):
                 raise zmq.ZMQError('Invalid repsonse from server: ' + response)
             raise zmq.ZMQError('No response from zlock server: timed out')
         except:
-            self.local.sock.close(linger=False)
+            self.local.sock.close(linger=0)
             del self.local.sock
             raise
 
@@ -115,7 +115,7 @@ class ZLockClient(object):
                     return response
             raise zmq.ZMQError('No response from zlock server: timed out')
         except:
-            self.local.sock.close(linger=False)
+            self.local.sock.close(linger=0)
             del self.local.sock
             raise
 
@@ -150,7 +150,7 @@ class ZLockClient(object):
                 raise zmq.ZMQError(response)
         except:
             if hasattr(self.local, 'sock'):
-                self.local.sock.close(linger=False)
+                self.local.sock.close(linger=0)
                 del self.local.sock
             raise
 
@@ -171,7 +171,7 @@ class ZLockClient(object):
             raise zmq.ZMQError(response)
         except:
             if hasattr(self.local, 'sock'):
-                self.local.sock.close(linger=False)
+                self.local.sock.close(linger=0)
                 del self.local.sock
             raise
 

{zprocess-2.26.1 → zprocess-2.27.0}/zprocess/zlock/server.py

@@ -561,7 +561,7 @@ class ZMQLockServer(object):
         sock.send(b'stop')
         if self.run_thread is not None:
             self.run_thread.join()
-        sock.close(linger=True)
+        sock.close(linger=100)
 
     def send(self, routing_id, message):
         self.router.send_multipart(routing_id + [b'', message])

{zprocess-2.26.1 → zprocess-2.27.0}/zprocess/zlog/__init__.py

@@ -92,7 +92,7 @@ class ZLogClient(object):
                 raise ValueError(response[1].decode('utf8'))
             return response[1]
         except:
-            self.local.sock.close(linger=False)
+            self.local.sock.close(linger=0)
             del self.local.sock
             del self.local.poller
             raise

{zprocess-2.26.1 → zprocess-2.27.0}/zprocess/zlog/server.py

@@ -347,7 +347,7 @@ class ZMQLogServer(object):
         sock.send(b'stop')
         if self.run_thread is not None:
             self.run_thread.join()
-        sock.close(linger=True)
+        sock.close(linger=100)
 
     def send(self, routing_id, message):
         self.router.send_multipart(routing_id + [b'', message])

zprocess-2.27.0/zprocess.egg-info/PKG-INFO

@@ -0,0 +1,39 @@
+Metadata-Version: 2.4
+Name: zprocess
+Version: 2.27.0
+Summary: A set of utilities for multiprocessing using zeromq
+Author-email: Christopher Billington <chrisjbillington@gmail.com>
+License-Expression: BSD-2-Clause
+Project-URL: Homepage, https://github.com/chrisjbillington/zprocess
+Project-URL: Documentation, https://github.com/chrisjbillington/zprocess
+Project-URL: Repository, https://github.com/chrisjbillington/zprocess
+Project-URL: Downloads, https://pypi.org/project/zprocess/
+Project-URL: Tracker, https://github.com/chrisjbillington/zprocess/issues
+Keywords: multiprocessing,IPC,zeromq
+Classifier: Programming Language :: Python :: 3 :: Only
+Requires-Python: >=3.8
+Description-Content-Type: text/markdown
+License-File: LICENSE.txt
+Requires-Dist: setuptools_scm
+Requires-Dist: pyzmq
+Requires-Dist: pywin32; sys_platform == "win32"
+Requires-Dist: windows-curses; sys_platform == "win32"
+Provides-Extra: test
+Requires-Dist: pytest; extra == "test"
+Requires-Dist: pytest-cov; extra == "test"
+Dynamic: license-file
+
+# zprocess
+
+A set of utilities for multiprocessing using
+zeromq. Includes process creation and management, output
+redirection, message passing, inter-process locks, logging,
+and a process-tree-wide event system.
+
+( 
+[view on pypi](https://pypi.python.org/pypi/zprocess/);
+[view on Github](https://github.com/chrisjbillington/zprocess)
+)
+
+   * Install `python setup.py install`.
+

{zprocess-2.26.1 → zprocess-2.27.0}/zprocess.egg-info/SOURCES.txt

@@ -5,6 +5,7 @@ pyproject.toml
 pytest.ini
 requirements.txt
 run_tests.py
+.github/workflows/release-vars.sh
 .github/workflows/release.yml
 doc/Makefile
 doc/conf.py

zprocess-2.26.1/.github/workflows/release.yml

@@ -1,322 +0,0 @@
-name: Build and Release
-
-on:
-  push:
-    branches:
-      - master
-    tags:
-      - 'v[0-9]+.[0-9]+.[0-9]+*'
-
-env:
-  OS_LIST_UBUNTU: '["ubuntu-latest"]'
-  OS_LIST_ALL: '["ubuntu-latest", "windows-latest", "macos-latest", "macos-13"]'
-
-
-jobs:
-  configure:
-    name: Configure workflow run
-    runs-on: ubuntu-latest
-    outputs:
-      PYTHONS: ${{ steps.config.outputs.PYTHONS }}
-      DEFAULTPYTHON: ${{ steps.config.outputs.DEFAULTPYTHON }}
-      CIBW_BUILD: ${{ steps.config.outputs.CIBW_BUILD }}
-      PKGNAME: ${{ steps.config.outputs.PKGNAME }}
-      PKGVER: ${{ steps.config.outputs.PKGVER }}
-      PURE: ${{ steps.config.outputs.PURE }}
-      CONDA_BUILD_ARGS: ${{ steps.config.outputs.CONDA_BUILD_ARGS }}
-      BUILD_OS_LIST: ${{ steps.config.outputs.BUILD_OS_LIST }}
-      RELEASE: ${{ steps.config.outputs.RELEASE }}
-      TESTPYPI_UPLOAD: ${{ steps.config.outputs.TESTPYPI_UPLOAD }}
-      PYPI_UPLOAD: ${{ steps.config.outputs.PYPI_UPLOAD }}
-      TEST_ANACONDA_UPLOAD: ${{ steps.config.outputs.TEST_ANACONDA_UPLOAD }}
-      ANACONDA_UPLOAD: ${{ steps.config.outputs.ANACONDA_UPLOAD }}
-
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v4
-        with:
-          fetch-depth: 0
-
-      - name: Install Python
-        uses: actions/setup-python@v5
-        with:
-          python-version: '3.x'
-
-      - name: Configure workflow
-        id: config
-        run: |
-          pip install ci-helper
-
-          # Second-most recent supported Python version:
-          DEFAULTPYTHON=$(ci-helper defaultpython)
-
-          # All supported Python versions:
-          PYTHONS=$(ci-helper pythons)
-
-          # Env var for `cibuildwheel` to build for all supported CPython versions:
-          CIBW_BUILD=$(ci-helper pythons --cibw)
-
-          # Package name and version:
-          PKGNAME=$(ci-helper distinfo name .)
-          PKGVER=$(ci-helper distinfo version .)
-
-          # Whether the package is pure python, and whether its requirements depend
-          # on platform or Python version:
-          PURE=$(ci-helper distinfo is_pure .)
-          HAS_ENV_MARKERS=$(ci-helper distinfo has_env_markers .)
-
-          # List of OSs we need to run the build job on, and Python versions conda-build
-          # should target:
-          if [[ $PURE == false || $HAS_ENV_MARKERS == true ]]; then
-            BUILD_OS_LIST=$OS_LIST_ALL
-            CONDA_BUILD_ARGS="--pythons=$PYTHONS"
-          else
-            BUILD_OS_LIST=$OS_LIST_UBUNTU
-            CONDA_BUILD_ARGS="--noarch"
-          fi
-
-          # Release if a tag was pushed:
-          if [ ${{ contains(github.ref, '/tags') }} == true ]; then
-            RELEASE=true
-          else
-            RELEASE=false
-          fi
-
-          # What upload credentials is the repo configured with?
-          if [ '${{ secrets.TESTPYPI }}' != '' ]; then
-            HAVE_TESTPYPI_TOKEN=true
-          else
-            HAVE_TESTPYPI_TOKEN=false
-          fi
-          if [ '${{ secrets.PYPI }}' != '' ]; then
-            HAVE_PYPI_TOKEN=true
-          else
-            HAVE_PYPI_TOKEN=false
-          fi
-          if [ '${{ secrets.ANACONDA_API_TOKEN }}' != '' ]; then
-            HAVE_ANACONDA_TOKEN=true
-          else
-            HAVE_ANACONDA_TOKEN=false
-          fi
-          if [ '${{ vars.ANACONDA_USER }}' != '' ]; then
-            HAVE_ANACONDA_USER=true
-          else
-            HAVE_ANACONDA_USER=false
-          fi
-
-          if [ $HAVE_ANACONDA_TOKEN != $HAVE_ANACONDA_TOKEN ]; then
-            echo "Require both vars.ANACONDA_USER and secrets.ANACONDA_API_TOKEN"
-            exit 1
-          fi
-
-          # Upload releases to PyPI and Anaconda if the repo has creds:
-          if [[ $RELEASE == true && $HAVE_PYPI_TOKEN == true ]]; then
-            PYPI_UPLOAD=true
-          else
-            PYPI_UPLOAD=false
-          fi
-          if [[ $RELEASE == true && $HAVE_ANACONDA_TOKEN == true ]]; then
-            ANACONDA_UPLOAD=true
-          else
-            ANACONDA_UPLOAD=false
-          fi
-
-          # Upload non-releases to TestPyPI and Anaconda test label if repo has creds:
-          if [[ $RELEASE == false && $HAVE_TESTPYPI_TOKEN == true ]]; then
-            TESTPYPI_UPLOAD=true
-          else
-            TESTPYPI_UPLOAD=false
-          fi
-          if [[ $RELEASE == false && $HAVE_ANACONDA_TOKEN == true ]]; then
-            TEST_ANACONDA_UPLOAD=true
-          else
-            TEST_ANACONDA_UPLOAD=false
-          fi
-
-          echo "DEFAULTPYTHON=$DEFAULTPYTHON" >> $GITHUB_OUTPUT
-          echo "CIBW_BUILD=$CIBW_BUILD" >> $GITHUB_OUTPUT
-          echo "PKGNAME=$PKGNAME" >> $GITHUB_OUTPUT
-          echo "PKGVER=$PKGVER" >> $GITHUB_OUTPUT
-          echo "PURE=$PURE" >> $GITHUB_OUTPUT      
-          echo "CONDA_BUILD_ARGS=$CONDA_BUILD_ARGS" >> $GITHUB_OUTPUT   
-          echo "BUILD_OS_LIST=$BUILD_OS_LIST" >> $GITHUB_OUTPUT
-          echo "RELEASE=$RELEASE" >> $GITHUB_OUTPUT
-          echo "TESTPYPI_UPLOAD=$TESTPYPI_UPLOAD" >> $GITHUB_OUTPUT
-          echo "PYPI_UPLOAD=$PYPI_UPLOAD" >> $GITHUB_OUTPUT
-          echo "TEST_ANACONDA_UPLOAD=$TEST_ANACONDA_UPLOAD" >> $GITHUB_OUTPUT
-          echo "ANACONDA_UPLOAD=$ANACONDA_UPLOAD" >> $GITHUB_OUTPUT
-
-          echo
-          echo "======================="
-          echo "Workflow configuration:"
-          echo "-----------------------"
-          cat $GITHUB_OUTPUT
-          echo "======================="
-          echo
-
-
-  build:
-    name: Build
-    needs: configure
-    runs-on: ${{ matrix.os }}
-    strategy:
-      matrix:
-        os: ${{ fromJSON(needs.configure.outputs.BUILD_OS_LIST) }}
-
-    env:
-      PYTHONS: ${{ needs.configure.outputs.PYTHONS }}
-      DEFAULTPYTHON: ${{ needs.configure.outputs.DEFAULTPYTHON }}
-      CIBW_BUILD: ${{ needs.configure.outputs.CIBW_BUILD }}
-      PURE: ${{ needs.configure.outputs.PURE }}
-      CONDA_BUILD_ARGS: ${{ needs.configure.outputs.CONDA_BUILD_ARGS }}
-
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v4
-        with:
-          fetch-depth: 0
-
-      - name: Install Python
-        uses: actions/setup-python@v5
-        with:
-          python-version: ${{ env.DEFAULTPYTHON }}
-
-      - name: Install Python tools
-        run: python -m pip install --upgrade pip setuptools wheel build cibuildwheel
-
-      - name: Source distribution
-        if: strategy.job-index == 0
-        run: python -m build -s .
-
-      - name: Wheel distribution (pure)
-        if: env.PURE == 'true' && strategy.job-index == 0
-        run: python -m build -w .
-
-      - name: Wheel distribution (impure)
-        if: env.PURE == 'false'
-        run: cibuildwheel --output-dir dist
-
-      - name: Upload artifact
-        if: env.PURE == 'false' || strategy.job-index == 0
-        uses: actions/upload-artifact@v4
-        with:
-          name: dist-${{ matrix.os }}
-          path: ./dist
-          if-no-files-found: error
-
-      - name: Install Miniforge
-        uses: conda-incubator/setup-miniconda@v3
-        with:
-          miniforge-version: "latest"
-          auto-update-conda: true
-          conda-remove-defaults: true
-          auto-activate-base: true
-          activate-environment: ""
-
-      - name: Conda package
-        shell: bash -l {0}
-        run: |
-          if [ ${{ runner.os }} == Windows ]; then
-            # Short path to minimise odds of hitting Windows max path length
-            CONDA_BUILD_ARGS+=" --croot ${{ runner.temp }}\cb"
-          fi
-          conda install -c labscript-suite setuptools-conda
-          setuptools-conda build $CONDA_BUILD_ARGS .
-
-      - name: Upload artifact
-        uses: actions/upload-artifact@v4
-        with:
-          name: conda_packages-${{ matrix.os }}
-          path: ./conda_packages
-          if-no-files-found: error
-
-  release:
-    name: Release
-    runs-on: ubuntu-latest
-    needs: [configure, build]
-    env:
-      PKGNAME: ${{ needs.configure.outputs.PKGNAME }}
-      PKGVER: ${{ needs.configure.outputs.PKGVER }}
-      RELEASE: ${{ needs.configure.outputs.RELEASE }}
-      TESTPYPI_UPLOAD: ${{ needs.configure.outputs.TESTPYPI_UPLOAD }}
-      PYPI_UPLOAD: ${{ needs.configure.outputs.PYPI_UPLOAD }}
-      TEST_ANACONDA_UPLOAD: ${{ needs.configure.outputs.TEST_ANACONDA_UPLOAD }}
-      ANACONDA_UPLOAD: ${{ needs.configure.outputs.ANACONDA_UPLOAD }}
-
-    steps:
-      - name: Download Artifact
-        uses: actions/download-artifact@v4
-        with:
-          pattern: dist*
-          path: ./dist
-          merge-multiple: true
-
-      - name: Download Artifact
-        uses: actions/download-artifact@v4
-        with:
-          pattern: conda_packages-*
-          path: ./conda_packages
-          merge-multiple: true
-
-      - name: Create GitHub Release and Upload Release Asset
-        if: env.RELEASE == 'true'
-        uses: softprops/action-gh-release@v2
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        with:
-          tag_name: ${{ github.event.ref }}
-          name: ${{ env.PKGNAME }} ${{ env.PKGVER }}
-          draft: true
-          prerelease: ${{ contains(github.event.ref, 'rc') }}
-          files: ./dist/${{ env.PKGNAME }}-${{ env.PKGVER }}.tar.gz
-
-      - name: Publish on TestPyPI
-        if: env.TESTPYPI_UPLOAD == 'true'
-        uses: pypa/gh-action-pypi-publish@release/v1
-        with:
-          user: __token__
-          password: ${{ secrets.TESTPYPI }}
-          repository-url: https://test.pypi.org/legacy/
-
-      - name: Publish on PyPI
-        if: env.PYPI_UPLOAD == 'true'
-        uses: pypa/gh-action-pypi-publish@release/v1
-        with:
-          user: __token__
-          password: ${{ secrets.PYPI }}
-
-      - name: Install Miniforge
-        uses: conda-incubator/setup-miniconda@v3
-        with:
-          miniforge-version: "latest"
-          auto-update-conda: true
-          conda-remove-defaults: true
-          auto-activate-base: true
-          activate-environment: ""
-
-      - name: Install Anaconda cloud client
-        shell: bash -l {0}
-        run: conda install anaconda-client
-
-      - name: Publish to Anaconda test label
-        if: env.TEST_ANACONDA_UPLOAD == 'true'
-        shell: bash -l {0}
-        run: |
-          anaconda \
-            --token ${{ secrets.ANACONDA_API_TOKEN }} \
-            upload \
-            --skip-existing \
-            --user ${{ vars.ANACONDA_USER }} \
-            --label test \
-            conda_packages/*/*
-
-      - name: Publish to Anaconda main label
-        if: env.ANACONDA_UPLOAD == 'true'
-        shell: bash -l {0}
-        run: |
-          anaconda \
-            --token ${{ secrets.ANACONDA_API_TOKEN }} \
-            upload \
-            --skip-existing \
-            --user ${{ vars.ANACONDA_USER }} \
-            conda_packages/*/*

zprocess-2.26.1/PKG-INFO

@@ -1,61 +0,0 @@
-Metadata-Version: 2.1
-Name: zprocess
-Version: 2.26.1
-Summary: A set of utilities for multiprocessing using zeromq
-Author-email: Christopher Billington <chrisjbillington@gmail.com>
-License: Copyright (c) 2013, Christopher Billington
-        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. 
-        
-        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 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.
-        
-Project-URL: Homepage, https://github.com/chrisjbillington/zprocess
-Project-URL: Documentation, https://github.com/chrisjbillington/zprocess
-Project-URL: Repository, https://github.com/chrisjbillington/zprocess
-Project-URL: Downloads, https://pypi.org/project/zprocess/
-Project-URL: Tracker, https://github.com/chrisjbillington/zprocess/issues
-Keywords: multiprocessing,IPC,zeromq
-Classifier: License :: OSI Approved :: BSD License
-Classifier: Programming Language :: Python :: 3 :: Only
-Requires-Python: >=3.8
-Description-Content-Type: text/markdown
-License-File: LICENSE.txt
-Requires-Dist: setuptools_scm
-Requires-Dist: pyzmq
-Requires-Dist: pywin32; sys_platform == "win32"
-Requires-Dist: windows-curses; sys_platform == "win32"
-Provides-Extra: test
-Requires-Dist: pytest; extra == "test"
-Requires-Dist: pytest-cov; extra == "test"
-
-# zprocess
-
-A set of utilities for multiprocessing using
-zeromq. Includes process creation and management, output
-redirection, message passing, inter-process locks, logging,
-and a process-tree-wide event system.
-
-( 
-[view on pypi](https://pypi.python.org/pypi/zprocess/);
-[view on Github](https://github.com/chrisjbillington/zprocess)
-)
-
-   * Install `python setup.py install`.
-

zprocess-2.26.1/zprocess.egg-info/PKG-INFO

@@ -1,61 +0,0 @@
-Metadata-Version: 2.1
-Name: zprocess
-Version: 2.26.1
-Summary: A set of utilities for multiprocessing using zeromq
-Author-email: Christopher Billington <chrisjbillington@gmail.com>
-License: Copyright (c) 2013, Christopher Billington
-        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. 
-        
-        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 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.
-        
-Project-URL: Homepage, https://github.com/chrisjbillington/zprocess
-Project-URL: Documentation, https://github.com/chrisjbillington/zprocess
-Project-URL: Repository, https://github.com/chrisjbillington/zprocess
-Project-URL: Downloads, https://pypi.org/project/zprocess/
-Project-URL: Tracker, https://github.com/chrisjbillington/zprocess/issues
-Keywords: multiprocessing,IPC,zeromq
-Classifier: License :: OSI Approved :: BSD License
-Classifier: Programming Language :: Python :: 3 :: Only
-Requires-Python: >=3.8
-Description-Content-Type: text/markdown
-License-File: LICENSE.txt
-Requires-Dist: setuptools_scm
-Requires-Dist: pyzmq
-Requires-Dist: pywin32; sys_platform == "win32"
-Requires-Dist: windows-curses; sys_platform == "win32"
-Provides-Extra: test
-Requires-Dist: pytest; extra == "test"
-Requires-Dist: pytest-cov; extra == "test"
-
-# zprocess
-
-A set of utilities for multiprocessing using
-zeromq. Includes process creation and management, output
-redirection, message passing, inter-process locks, logging,
-and a process-tree-wide event system.
-
-( 
-[view on pypi](https://pypi.python.org/pypi/zprocess/);
-[view on Github](https://github.com/chrisjbillington/zprocess)
-)
-
-   * Install `python setup.py install`.
-