zprocess 2.25.0__tar.gz → 2.26.0__tar.gz

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

@@ -0,0 +1,322 @@
+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.0/.gitignore

@@ -0,0 +1,7 @@
+.coverage*
+__pycache__/
+dist/
+*.egg-info/
+build/*
+conda_build/*
+conda_packages/*

zprocess-2.26.0/PKG-INFO

@@ -0,0 +1,61 @@
+Metadata-Version: 2.1
+Name: zprocess
+Version: 2.26.0
+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.9
+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.25.0 → zprocess-2.26.0}/README.md

@@ -1,9 +1,5 @@
 # zprocess
 
-[![Build Status](https://travis-ci.com/chrisjbillington/zprocess.svg?branch=master)](https://travis-ci.com/chrisjbillington/zprocess)
-
-[![codecov](https://codecov.io/gh/chrisjbillington/zprocess/branch/master/graph/badge.svg)](https://codecov.io/gh/chrisjbillington/zprocess)
-
 A set of utilities for multiprocessing using
 zeromq. Includes process creation and management, output
 redirection, message passing, inter-process locks, logging,

zprocess-2.26.0/pyproject.toml

@@ -0,0 +1,47 @@
+[build-system]
+requires = ["setuptools", "wheel", "setuptools_scm"]
+build-backend = "setuptools.build_meta"
+
+[tool.setuptools_scm]
+local_scheme = "no-local-version"
+
+[tool.setuptools.packages]
+find = {namespaces = false}
+
+[project]
+name = "zprocess"
+description = "A set of utilities for multiprocessing using zeromq"
+authors = [
+    {name = "Christopher Billington", email = "chrisjbillington@gmail.com"},
+]
+keywords = ["multiprocessing", "IPC", "zeromq"]
+license = {file = 'LICENSE.txt'}
+classifiers = [
+    "License :: OSI Approved :: BSD License",
+    "Programming Language :: Python :: 3 :: Only",
+]
+requires-python = ">=3.9"
+dependencies = [
+    "setuptools_scm",
+    "pyzmq",
+    "pywin32;           sys_platform == 'win32'",
+    "windows-curses;    sys_platform == 'win32'",
+]
+dynamic = ["version"]
+
+[project.readme]
+file = "README.md"
+content-type = "text/markdown"
+
+[project.urls]
+Homepage = "https://github.com/chrisjbillington/zprocess"
+Documentation = "https://github.com/chrisjbillington/zprocess"
+Repository = "https://github.com/chrisjbillington/zprocess"
+Downloads = "https://pypi.org/project/zprocess/"
+Tracker = "https://github.com/chrisjbillington/zprocess/issues"
+
+[project.optional-dependencies]
+test = [
+    "pytest",
+    "pytest-cov",
+]

zprocess-2.26.0/pytest.ini

@@ -0,0 +1,26 @@
+[pytest]
+testpaths = tests
+python_files = test_*.py
+python_classes = *Tests
+python_functions = test_*
+
+# Configure logging
+log_cli = true
+log_cli_level = INFO
+
+# Configure test collection
+norecursedirs = .* build dist *.egg
+
+# Configure coverage
+addopts = 
+    --verbosity=2
+    --cov=zprocess
+    --cov-report=term-missing
+    --cov-report=html
+    --cov-config=pyproject.toml
+
+# Configure markers
+markers =
+    slow: marks tests as slow
+    integration: marks tests as integration tests
+    no_ci: marks tests that shouldn't run in CI

{zprocess-2.25.0 → zprocess-2.26.0}/tests/test_remote.py

@@ -1,14 +1,14 @@
-from __future__ import unicode_literals, print_function, division
 import sys
-PY2 = sys.version_info.major == 2
-if PY2:
-    str = unicode
-import os
+from pathlib import Path
 import unittest
-import xmlrunner
+import pytest
 
-parent_dir = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
-sys.path.insert(0, parent_dir)
+THIS_DIR = Path(__file__).absolute().parent
+
+# Add project root to import path
+PROJECT_ROOT = THIS_DIR.parent
+if PROJECT_ROOT not in [Path(s).absolute() for s in sys.path]:
+    sys.path.insert(0, str(PROJECT_ROOT))
 
 from zprocess.remote.server import RemoteProcessServer
 from zprocess.remote import RemoteProcessClient, PROTOCOL_VERSION
@@ -44,14 +44,15 @@ class ZprocessRemoteTests(unittest.TestCase):
         self.assertEqual(result, PROTOCOL_VERSION)
 
     def test_basic_process(self):
-        proc = TestProcess(self.process_tree, remote_process_client=self.client)
+        proc = Process(
+            self.process_tree,
+            remote_process_client=self.client,
+            # Give by import path relative to zprocess project directory where tests are running from
+            subclass_fullname='tests.test_remote.TestProcess',
+        )
         to_child, from_child = proc.start()
         to_child.put('hello')
         self.assertEqual(from_child.get(), 'hello')
 
 if __name__ == '__main__':
-    output = 'test-reports'
-    if PY2:
-        output = output.encode('utf8')
-    testRunner = xmlrunner.XMLTestRunner(output=output, verbosity=3)
-    unittest.main(verbosity=3, testRunner=testRunner, exit=not sys.flags.interactive)
+    pytest.main([__file__, '-v'])

{zprocess-2.25.0 → zprocess-2.26.0}/tests/test_zlock_server.py

@@ -1,17 +1,17 @@
-from __future__ import unicode_literals, print_function, division
 import sys
-import os
+from pathlib import Path
 import time
 import zmq
 import unittest
-import xmlrunner
 
-PY2 = sys.version_info.major == 2
-if PY2:
-    str = unicode
+import pytest
 
-parent_dir = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
-sys.path.insert(0, parent_dir)
+THIS_DIR = Path(__file__).absolute().parent
+
+# Add project root to import path
+PROJECT_ROOT = THIS_DIR.parent
+if PROJECT_ROOT not in [Path(s).absolute() for s in sys.path]:
+    sys.path.insert(0, str(PROJECT_ROOT))
 
 from zprocess.zlock.server import (
     ZMQLockServer,
@@ -712,42 +712,35 @@ class OtherTests(unittest.TestCase):
             server.stop()
 
 
-def test_speed():
-    with Client(None, 7339, b'key_foo', b'client_foo') as client:
-        start_time = time.time()
-        client.send(b'hello')
-        assert client.recv() == b'hello'
-        for _ in range(1000):
-            client.send(b'hello')
-            assert client.recv() == b'hello'
-        print('hello:', (time.time() - start_time) / 1000 * 1e6, 'us')
-
-        start_time = time.time()
-        for _ in range(1000):
-            client.send_multipart([b'acquire', b'foo', b'client_foo', b'30'])
-            assert client.recv() == b'ok'
-            client.send_multipart([b'release', b'foo', b'client_foo'])
-            assert client.recv() == b'ok'
-        print('acq/release:', (time.time() - start_time) / 1000 * 1e6, 'us')
-
-        start_time = time.time()
-        for _ in range(1000):
-            with open('/etc/hosts'):
-                pass
-        print('open/close:', (time.time() - start_time) / 1000 * 1e6, 'us')
+# def test_speed():
+#     with Client(None, 7339, b'key_foo', b'client_foo') as client:
+#         start_time = time.time()
+#         client.send(b'hello')
+#         assert client.recv() == b'hello'
+#         for _ in range(1000):
+#             client.send(b'hello')
+#             assert client.recv() == b'hello'
+#         print('hello:', (time.time() - start_time) / 1000 * 1e6, 'us')
+
+#         start_time = time.time()
+#         for _ in range(1000):
+#             client.send_multipart([b'acquire', b'foo', b'client_foo', b'30'])
+#             assert client.recv() == b'ok'
+#             client.send_multipart([b'release', b'foo', b'client_foo'])
+#             assert client.recv() == b'ok'
+#         print('acq/release:', (time.time() - start_time) / 1000 * 1e6, 'us')
+
+#         start_time = time.time()
+#         for _ in range(1000):
+#             with open('/etc/hosts'):
+#                 pass
+#         print('open/close:', (time.time() - start_time) / 1000 * 1e6, 'us')
+
+#         start_time = time.time()
+#         for _ in range(1000):
+#             pass
+#         print('nothing:', (time.time() - start_time) / 1000 * 1e6, 'us')
 
-        start_time = time.time()
-        for _ in range(1000):
-            pass
-        print('nothing:', (time.time() - start_time) / 1000 * 1e6, 'us')
-
-
-# test_speed()
 
 if __name__ == '__main__':
-
-    output = 'test-reports'
-    if PY2:
-        output = output.encode('utf8')
-    testRunner = xmlrunner.XMLTestRunner(output=output, verbosity=3)
-    unittest.main(verbosity=3, testRunner=testRunner, exit=not sys.flags.interactive)
+    pytest.main([__file__, '-v'])

{zprocess-2.25.0 → zprocess-2.26.0}/tests/test_zlog_server.py

@@ -1,20 +1,18 @@
-from __future__ import unicode_literals, print_function, division
 import sys
+from pathlib import Path
 import os
 import uuid
 import shutil
 import zmq
 import unittest
-import xmlrunner
+import pytest
 
-PY2 = sys.version_info.major == 2
-if PY2:
-    str = unicode
+THIS_DIR = Path(__file__).absolute().parent
 
-parent_dir = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
-sys.path.insert(0, parent_dir)
-
-BITBUCKET = os.getenv('CI', None) is not None
+# Add project root to import path
+PROJECT_ROOT = THIS_DIR.parent
+if PROJECT_ROOT not in [Path(s).absolute() for s in sys.path]:
+    sys.path.insert(0, str(PROJECT_ROOT))
 
 from zprocess.zlog.server import (
     ZMQLogServer,
@@ -131,16 +129,13 @@ class ZLogServerTests(unittest.TestCase):
             client.send_multipart([b'check_access', b'\xff'])
             client.assertReceived(ERR_BAD_ENCODING)
 
-    # The following two tests fail on Bitbucket pipelines, because for some reason
-    # creating and accessing files always succeeds in the CI environment even if there
-    # are insufficient permissions.
-    @unittest.skipIf(BITBUCKET or os.name == 'nt', 'Skip on Windows and BitBucket')
+    @pytest.mark.skipif(os.name == 'nt', reason='Skip on Windows')
     def test_no_access(self):
         with self.client(None) as client:
             client.send_multipart([b'check_access', b'/test.log'])
             self.assertIn(b'[Errno 13] Permission denied', client.recv())
 
-    @unittest.skipIf(BITBUCKET or os.name == 'nt', 'Skip on Windows and BitBucket')
+    @pytest.mark.skipif(os.name == 'nt', reason='Skip on Windows')
     def test_cant_create_files(self):
         os.mkdir('testdir')
         os.system('touch testdir/foo.log')
@@ -178,8 +173,4 @@ class ZLogServerTests(unittest.TestCase):
                 self.assertEqual(f.read(), msg + '\n')
 
 if __name__ == '__main__':
-    output = 'test-reports'
-    if PY2:
-        output = output.encode('utf8')
-    testRunner = xmlrunner.XMLTestRunner(output=output, verbosity=3)
-    unittest.main(verbosity=3, testRunner=testRunner, exit=not sys.flags.interactive)
+    pytest.main([__file__, '-v'])