Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/actions/install_requirements/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ runs:

steps:
- name: Setup python
uses: actions/setup-python@v4
uses: actions/setup-python@v7
with:
python-version: ${{ inputs.python_version }}

Expand All @@ -36,7 +36,7 @@ runs:
shell: bash

- name: Upload lockfiles
uses: actions/upload-artifact@v4
uses: actions/upload-artifact@v7
with:
name: lockfiles-${{ inputs.python_version }}
path: lockfiles
Expand Down
30 changes: 15 additions & 15 deletions .github/workflows/code.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,18 +10,18 @@ jobs:
strategy:
fail-fast: false
matrix:
os: ["ubuntu-latest"] # can add windows-latest, macos-latest
python: ["3.9", "3.10", "3.11", "3.12"]
os: ["ubuntu-22.04"] # can add windows-latest, macos-latest
python: ["3.9", "3.10", "3.11", "3.12", "3.13"]
install: ["-e .[dev]"]
# Make one version be non-editable to test both paths of version code
include:
- os: "ubuntu-latest"
- os: "ubuntu-22.04"
python: "3.8"
install: ".[dev]"

runs-on: ${{ matrix.os }}
container:
image: ghcr.io/epics-containers/epics-base-developer:7.0.9ec3
image: ghcr.io/epics-containers/epics-base-developer:7.0.10ec2
volumes:
- /opt/hostedtoolcache:/opt/hostedtoolcache

Expand All @@ -31,7 +31,7 @@ jobs:

steps:
- name: Checkout
uses: actions/checkout@v4
uses: actions/checkout@v7
with:
# Need this to get version number from last tag
fetch-depth: 0
Expand All @@ -50,7 +50,7 @@ jobs:
run: tox -e pytest

- name: Upload coverage to Codecov
uses: codecov/codecov-action@v3
uses: codecov/codecov-action@v4
with:
name: ${{ matrix.python }}/${{ matrix.os }}
files: cov.xml
Expand All @@ -61,7 +61,7 @@ jobs:

steps:
- name: Checkout
uses: actions/checkout@v4
uses: actions/checkout@v7
with:
# Need this to get version number from last tag
fetch-depth: 0
Expand All @@ -72,21 +72,21 @@ jobs:
pipx run build --sdist

- name: Build wheels
uses: pypa/cibuildwheel@v2.16.2
uses: pypa/cibuildwheel@v4.3.5
with:
output-dir: dist
env:
# Force using an older manylinux image to support more OSs
CIBW_MANYLINUX_X86_64_IMAGE: manylinux2014
# Simple test that the wheel is loaded and available
CIBW_TEST_COMMAND: python -c "import cothread; print(cothread.__version__)"
# Skip all PyPy wheels (GIL deadlock detected in ThreadState_New)
# Skip all i686 wheels (cannot build numpy)
# Skip Python 3.14 due to test failures
# Skip Python 3.15 due to https://github.com/python/cpython/issues/160719
# Skip free-threading builds on all platforms
# This leaves manylinux and musllinux wheels
CIBW_SKIP: pp* *i686*
CIBW_SKIP: "*i686* cp314* cp315* cp3??t-*"

- name: Upload sdist and wheels as artifacts
uses: actions/upload-artifact@v4
uses: actions/upload-artifact@v7
with:
name: dist-${{ matrix.os }}-${{ matrix.python }}
path: dist
Expand All @@ -105,14 +105,14 @@ jobs:

steps:
- name: Download dist
uses: actions/download-artifact@v4
uses: actions/download-artifact@v7
with:
pattern: dist*
path: dist
merge-multiple: true

- name: Download lockfiles
uses: actions/download-artifact@v4
uses: actions/download-artifact@v7
with:
pattern: lockfiles*
path: lockfiles
Expand Down
2 changes: 1 addition & 1 deletion src/cothread/dbr.py
Original file line number Diff line number Diff line change
Expand Up @@ -818,7 +818,7 @@ def _require_value(value, dtype):
over channel access.'''
result = numpy.require(value, requirements = 'C', dtype = dtype)
if result.shape == ():
result.shape = (1,)
result = numpy.reshape(result, (1,))
assert result.ndim == 1, 'Can\'t put multidimensional arrays!'
return result

Expand Down
Loading