labscript-c-extensions 1.2.1__tar.gz → 1.4.0__tar.gz

{labscript_c_extensions-1.2.1 → labscript_c_extensions-1.4.0}/.github/workflows/release.yml

@@ -10,7 +10,7 @@ on:
 
 env:
   OS_LIST_UBUNTU: '["ubuntu-latest"]'
-  OS_LIST_ALL: '["ubuntu-latest", "windows-latest", "macos-latest", "macos-13"]'
+  OS_LIST_ALL: '["ubuntu-latest", "windows-2022", "macos-latest", "macos-15-intel"]'
 
 
 jobs:
@@ -34,23 +34,26 @@ jobs:
 
     steps:
       - name: Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6
         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: Ignore tags other than the pushed tag
+        # The version comes from the tags at HEAD, so a commit that carries both an rc
+        # tag and a final tag builds the version of the tag that was pushed, and a branch
+        # push of a tagged commit builds a development version.
+        shell: bash
+        run: git tag -d $(git tag --points-at HEAD | grep -vx "${GITHUB_REF_NAME}" || true)
 
       - name: Install Python
-        uses: actions/setup-python@v5
+        uses: actions/setup-python@v6
         with:
           python-version: '3.x'
 
       - name: Configure workflow
         id: config
         run: |
-          pip install ci-helper cython
+          pip install ci-helper
 
           # Load repo-specific variables and overrides:
           VARS_FILE=".github/workflows/release-vars.sh"
@@ -222,16 +225,19 @@ jobs:
 
     steps:
       - name: Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6
         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: Ignore tags other than the pushed tag
+        # The version comes from the tags at HEAD, so a commit that carries both an rc
+        # tag and a final tag builds the version of the tag that was pushed, and a branch
+        # push of a tagged commit builds a development version.
+        shell: bash
+        run: git tag -d $(git tag --points-at HEAD | grep -vx "${GITHUB_REF_NAME}" || true)
 
       - name: Install Python
-        uses: actions/setup-python@v5
+        uses: actions/setup-python@v6
         with:
           python-version: ${{ env.DEFAULT_PYTHON }}
 
@@ -252,19 +258,19 @@ jobs:
 
       - name: Upload artifact
         if: env.PURE == 'false' || strategy.job-index == 0
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v6
         with:
           name: dist-${{ matrix.os }}
           path: ./dist
           if-no-files-found: error
 
       - name: Install Miniforge
-        uses: conda-incubator/setup-miniconda@v3
+        uses: conda-incubator/setup-miniconda@v4
         with:
           miniforge-version: "latest"
           auto-update-conda: true
           conda-remove-defaults: true
-          auto-activate-base: true
+          auto-activate: true
           activate-environment: ""
 
       - name: Conda package
@@ -274,11 +280,11 @@ jobs:
             # 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 "conda-build<25"
+          conda install -c labscript-suite setuptools-conda
           setuptools-conda build $CONDA_BUILD_ARGS .
 
       - name: Upload artifact
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v6
         with:
           name: conda_packages-${{ matrix.os }}
           path: ./conda_packages
@@ -298,14 +304,14 @@ jobs:
 
     steps:
       - name: Download Artifact
-        uses: actions/download-artifact@v4
+        uses: actions/download-artifact@v8
         with:
           pattern: dist*
           path: ./dist
           merge-multiple: true
 
       - name: Create GitHub release and upload release asset
-        uses: softprops/action-gh-release@v2
+        uses: softprops/action-gh-release@v3
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:
@@ -332,7 +338,7 @@ jobs:
 
     steps:
       - name: Download Artifact
-        uses: actions/download-artifact@v4
+        uses: actions/download-artifact@v8
         with:
           pattern: dist*
           path: ./dist
@@ -342,6 +348,8 @@ jobs:
         uses: pypa/gh-action-pypi-publish@release/v1
         with:
           repository-url: https://test.pypi.org/legacy/
+          verbose: true
+          skip-existing: true
 
 
   pypi-upload:
@@ -360,7 +368,7 @@ jobs:
 
     steps:
       - name: Download Artifact
-        uses: actions/download-artifact@v4
+        uses: actions/download-artifact@v8
         with:
           pattern: dist*
           path: ./dist
@@ -368,6 +376,9 @@ jobs:
 
       - name: Publish on PyPI
         uses: pypa/gh-action-pypi-publish@release/v1
+        with:
+          verbose: true
+          skip-existing: true
 
 
   test-anaconda-upload:
@@ -378,19 +389,19 @@ jobs:
 
     steps:
       - name: Download Artifact
-        uses: actions/download-artifact@v4
+        uses: actions/download-artifact@v8
         with:
           pattern: conda_packages-*
           path: ./conda_packages
           merge-multiple: true
 
       - name: Install Miniforge
-        uses: conda-incubator/setup-miniconda@v3
+        uses: conda-incubator/setup-miniconda@v4
         with:
           miniforge-version: "latest"
           auto-update-conda: true
           conda-remove-defaults: true
-          auto-activate-base: true
+          auto-activate: true
           activate-environment: ""
 
       - name: Install Anaconda cloud client
@@ -417,19 +428,19 @@ jobs:
 
     steps:
       - name: Download Artifact
-        uses: actions/download-artifact@v4
+        uses: actions/download-artifact@v8
         with:
           pattern: conda_packages-*
           path: ./conda_packages
           merge-multiple: true
 
       - name: Install Miniforge
-        uses: conda-incubator/setup-miniconda@v3
+        uses: conda-incubator/setup-miniconda@v4
         with:
           miniforge-version: "latest"
           auto-update-conda: true
           conda-remove-defaults: true
-          auto-activate-base: true
+          auto-activate: true
           activate-environment: ""
 
       - name: Install Anaconda cloud client

{labscript_c_extensions-1.2.1 → labscript_c_extensions-1.4.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: labscript-c-extensions
-Version: 1.2.1
+Version: 1.4.0
 Summary: A module containing C-extensions for the labscript suite
 Author-email: The labscript suite community <labscriptsuite@googlegroups.com>
 License: BSD 2-Clause License
@@ -37,7 +37,12 @@ Project-URL: Tracker, https://github.com/labscript-suite/labscript-c-extension/i
 Keywords: experiment control,automation,visualization
 Classifier: License :: OSI Approved :: BSD License
 Classifier: Programming Language :: Python :: 3 :: Only
-Requires-Python: >=3.8
+Classifier: Programming Language :: Python :: 3.11
+Classifier: Programming Language :: Python :: 3.12
+Classifier: Programming Language :: Python :: 3.13
+Classifier: Programming Language :: Python :: 3.14
+Classifier: Programming Language :: Python :: 3.15
+Requires-Python: >=3.11
 Description-Content-Type: text/markdown
 License-File: LICENSE.txt
 Requires-Dist: numpy>=1.17.3

{labscript_c_extensions-1.2.1 → labscript_c_extensions-1.4.0}/labscript_c_extensions/__version__.py

@@ -11,10 +11,7 @@
 #                                                                   #
 #####################################################################
 from pathlib import Path
-try:
-    import importlib.metadata as importlib_metadata
-except ImportError:
-    import importlib_metadata
+import importlib.metadata
 
 root = Path(__file__).parent.parent
 if (root / '.git').is_dir():
@@ -34,6 +31,6 @@ if scm_version is not None:
     __version__ = scm_version
 else:
     try:
-        __version__ = importlib_metadata.version(__package__)
-    except importlib_metadata.PackageNotFoundError:
+        __version__ = importlib.metadata.version(__package__)
+    except importlib.metadata.PackageNotFoundError:
         __version__ = None

{labscript_c_extensions-1.2.1 → labscript_c_extensions-1.4.0}/labscript_c_extensions.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: labscript-c-extensions
-Version: 1.2.1
+Version: 1.4.0
 Summary: A module containing C-extensions for the labscript suite
 Author-email: The labscript suite community <labscriptsuite@googlegroups.com>
 License: BSD 2-Clause License
@@ -37,7 +37,12 @@ Project-URL: Tracker, https://github.com/labscript-suite/labscript-c-extension/i
 Keywords: experiment control,automation,visualization
 Classifier: License :: OSI Approved :: BSD License
 Classifier: Programming Language :: Python :: 3 :: Only
-Requires-Python: >=3.8
+Classifier: Programming Language :: Python :: 3.11
+Classifier: Programming Language :: Python :: 3.12
+Classifier: Programming Language :: Python :: 3.13
+Classifier: Programming Language :: Python :: 3.14
+Classifier: Programming Language :: Python :: 3.15
+Requires-Python: >=3.11
 Description-Content-Type: text/markdown
 License-File: LICENSE.txt
 Requires-Dist: numpy>=1.17.3

{labscript_c_extensions-1.2.1 → labscript_c_extensions-1.4.0}/labscript_c_extensions.egg-info/SOURCES.txt

@@ -2,7 +2,6 @@
 LICENSE.txt
 README.md
 pyproject.toml
-setup.py
 .github/workflows/release-vars.sh
 .github/workflows/release.yml
 labscript_c_extensions/__init__.py
@@ -12,6 +11,8 @@ labscript_c_extensions.egg-info/SOURCES.txt
 labscript_c_extensions.egg-info/dependency_links.txt
 labscript_c_extensions.egg-info/not-zip-safe
 labscript_c_extensions.egg-info/requires.txt
+labscript_c_extensions.egg-info/scm_file_list.json
+labscript_c_extensions.egg-info/scm_version.json
 labscript_c_extensions.egg-info/top_level.txt
 labscript_c_extensions/runviewer/__init__.py
 src/runviewer/resample.pyx

labscript_c_extensions-1.4.0/labscript_c_extensions.egg-info/scm_file_list.json

@@ -0,0 +1,14 @@
+{
+  "files": [
+    ".github/workflows/release-vars.sh",
+    ".github/workflows/release.yml",
+    ".gitignore",
+    "LICENSE.txt",
+    "README.md",
+    "labscript_c_extensions/__init__.py",
+    "labscript_c_extensions/__version__.py",
+    "labscript_c_extensions/runviewer/__init__.py",
+    "pyproject.toml",
+    "src/runviewer/resample.pyx"
+  ]
+}

labscript_c_extensions-1.4.0/labscript_c_extensions.egg-info/scm_version.json

@@ -0,0 +1,8 @@
+{
+  "tag": "1.4.0",
+  "distance": 0,
+  "node": "g87218918bb5049c18986df6d03df20b863a80f44",
+  "dirty": false,
+  "branch": "HEAD",
+  "node_date": "2026-10-27"
+}

{labscript_c_extensions-1.2.1 → labscript_c_extensions-1.4.0}/pyproject.toml

@@ -1,5 +1,5 @@
 [build-system]
-requires = ["setuptools>=64", "setuptools_scm>=8", "cython",
+requires = ["setuptools>=74.1.0", "setuptools_scm>=8", "cython",
             "numpy>=2.0,<3; python_version>'3.8'"]
 build-backend = "setuptools.build_meta"
 
@@ -10,6 +10,9 @@ local_scheme = "no-local-version"
 [tool.setuptools]
 zip-safe = false
 include-package-data = true
+ext-modules = [
+    {name = "labscript_c_extensions.runviewer.resample", sources = ["src/runviewer/resample.pyx"]}
+]
 
 [tool.setuptools.packages]
 find = {namespaces = false}
@@ -26,8 +29,13 @@ license = {file = 'LICENSE.txt'}
 classifiers = [
     "License :: OSI Approved :: BSD License",
     "Programming Language :: Python :: 3 :: Only",
+    "Programming Language :: Python :: 3.11",
+    "Programming Language :: Python :: 3.12",
+    "Programming Language :: Python :: 3.13",
+    "Programming Language :: Python :: 3.14",
+    "Programming Language :: Python :: 3.15",
 ]
-requires-python = ">=3.8"
+requires-python = ">=3.11"
 dependencies = [
     "numpy>=1.17.3",
 ]

{labscript_c_extensions-1.2.1 → labscript_c_extensions-1.4.0}/src/runviewer/resample.pyx

@@ -56,21 +56,23 @@ def resample(double [:] x_in, double [:] y_in,
         else:
             i = 0
             j = 1
-            # Until we get to the data, fill the output array with NaNs (which get
-            # ignored when plotted)
-            while x_out[i] < x_in[0]:
+            # Fill the output array with NaNs (which get ignored when plotted) up to
+            # the group of three output points that contains the first data point, so
+            # that the loop below sees every data point in that group:
+            while i + 3 < N_out and x_out[i + 3] <= x_in[0]:
                 y_out[i:i+3] = NAN
                 i += 3
             # If we're some way into the data, we need to skip ahead to where we
             # want to get the first datapoint from:
-            while x_in[j] < x_out[i]:
+            while j < N_in and x_in[j] < x_out[i]:
                 j += 1
 
             # Get values until we get to the end of the data:
 
-            # Leave one spare for the final data point and one because
-            # stepMode=True requires len(y)=len(x)-1
-            while j < N_in and i < N_out - 2:  
+            # Each pass writes y_out[i], y_out[i + 1] and y_out[i + 2]. One point
+            # must remain for the final data point, and y_out has N_out - 1
+            # elements because stepMode=True requires len(y)=len(x)-1.
+            while j < N_in and i < N_out - 4:
                 # This is 'nearest neighbour on the left' interpolation. It's
                 # what we want if none of the source values checked in the
                 # upcoming loop are used:
@@ -106,7 +108,7 @@ def resample(double [:] x_in, double [:] y_in,
                 i += 1
 
             # Get the last datapoint:
-            if j < N_in:
+            if j < N_in and i < N_out - 1:
                 # If the sample rate of the raw data is low, then the current j
                 # point could be outside the current plot view range If so,
                 # decrease j so that we take a value that is within the plot view

labscript_c_extensions-1.2.1/setup.py

@@ -1,19 +0,0 @@
-import os
-from setuptools import setup
-from setuptools.extension import Extension
-from Cython.Distutils import build_ext
-
-
-CMDCLASS = {"build_ext": build_ext}
-
-EXT_MODULES = [
-    Extension(
-        "labscript_c_extensions.runviewer.resample",
-        sources=[os.path.join("src", "runviewer", "resample.pyx")],
-    )
-]
-
-setup(
-    cmdclass=CMDCLASS,
-    ext_modules=EXT_MODULES,
-)