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

{labscript_c_extensions-1.2.1 → labscript_c_extensions-1.3.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,7 +34,7 @@ jobs:
 
     steps:
       - name: Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6
         with:
           fetch-depth: 0
 
@@ -43,14 +43,14 @@ jobs:
         run: git tag -d $(git tag --points-at HEAD)
 
       - 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,7 +222,7 @@ jobs:
 
     steps:
       - name: Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6
         with:
           fetch-depth: 0
 
@@ -231,7 +231,7 @@ jobs:
         run: git tag -d $(git tag --points-at HEAD)
 
       - name: Install Python
-        uses: actions/setup-python@v5
+        uses: actions/setup-python@v6
         with:
           python-version: ${{ env.DEFAULT_PYTHON }}
 
@@ -252,19 +252,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 +274,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,7 +298,7 @@ jobs:
 
     steps:
       - name: Download Artifact
-        uses: actions/download-artifact@v4
+        uses: actions/download-artifact@v8
         with:
           pattern: dist*
           path: ./dist
@@ -332,7 +332,7 @@ jobs:
 
     steps:
       - name: Download Artifact
-        uses: actions/download-artifact@v4
+        uses: actions/download-artifact@v8
         with:
           pattern: dist*
           path: ./dist
@@ -342,6 +342,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 +362,7 @@ jobs:
 
     steps:
       - name: Download Artifact
-        uses: actions/download-artifact@v4
+        uses: actions/download-artifact@v8
         with:
           pattern: dist*
           path: ./dist
@@ -368,6 +370,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 +383,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 +422,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.3.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: labscript-c-extensions
-Version: 1.2.1
+Version: 1.3.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

{labscript_c_extensions-1.2.1 → labscript_c_extensions-1.3.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.3.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

{labscript_c_extensions-1.2.1 → labscript_c_extensions-1.3.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

{labscript_c_extensions-1.2.1 → labscript_c_extensions-1.3.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}

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,
-)