labscript-c-extensions 1.1.0__tar.gz → 1.2.0__tar.gz

{labscript-c-extensions-1.1.0 → labscript_c_extensions-1.2.0}/.github/workflows/release.yml

@@ -10,8 +10,7 @@ on:
       - 'v[0-9]+.[0-9]+.[0-9]+*'
 
 env:
-  PACKAGE_NAME: labscript-c-extensions
-  SCM_LOCAL_SCHEME: no-local-version
+  PACKAGE_NAME: labscript_c_extensions
   ANACONDA_USER: labscript-suite
 
   # Configuration for a package with compiled extensions:
@@ -35,36 +34,42 @@ jobs:
     name: Build
     runs-on: ${{ matrix.os }}
     strategy:
+      fail-fast: false
       matrix:
         include:
+          - { os: ubuntu-latest,   python: '3.12',  arch: x64, conda: true}
           - { os: ubuntu-latest,   python: '3.11',  arch: x64, conda: true}
           - { os: ubuntu-latest,   python: '3.10',  arch: x64, conda: true }
           - { os: ubuntu-latest,   python: '3.9',  arch: x64, conda: true }
           - { os: ubuntu-latest,   python: '3.8',  arch: x64, conda: true }
-          - { os: ubuntu-latest,   python: '3.7',  arch: x64, conda: true }
 
-          - { os: macos-11,    python: '3.11',  arch: x64, conda: true }
-          - { os: macos-11,    python: '3.10',  arch: x64, conda: true }
-          - { os: macos-11,    python: '3.9',  arch: x64, conda: true }
-          - { os: macos-11,    python: '3.8',  arch: x64, conda: true }
-          - { os: macos-11,    python: '3.7',  arch: x64, conda: true }
+          - { os: macos-13,    python: '3.12',  arch: x64, conda: true }
+          - { os: macos-13,    python: '3.11',  arch: x64, conda: true }
+          - { os: macos-13,    python: '3.10',  arch: x64, conda: true }
+          - { os: macos-13,    python: '3.9',  arch: x64, conda: true }
+          - { os: macos-13,    python: '3.8',  arch: x64, conda: true }
 
+          - { os: macos-latest,    python: '3.12',  arch: arm64, conda: true }
+          - { os: macos-latest,    python: '3.11',  arch: arm64, conda: true }
+          - { os: macos-latest,    python: '3.10',  arch: arm64, conda: true }
+          - { os: macos-latest,    python: '3.9',  arch: arm64, conda: true }
+
+          - { os: windows-latest,  python: '3.12',  arch: x64, conda: true }
           - { os: windows-latest,  python: '3.11',  arch: x64, conda: true }
           - { os: windows-latest,  python: '3.10',  arch: x64, conda: true }
           - { os: windows-latest,  python: '3.9',  arch: x64, conda: true }
           - { os: windows-latest,  python: '3.8',  arch: x64, conda: true }
-          - { os: windows-latest,  python: '3.7',  arch: x64, conda: true }
 
+          - { os: windows-latest,  python: '3.12',  arch: x86, conda: false } # conda not yet available
           - { os: windows-latest,  python: '3.11',  arch: x86, conda: false } # conda not yet available
-          - { os: windows-latest,  python: '3.10',  arch: x86, conda: true }
-          - { os: windows-latest,  python: '3.9',  arch: x86, conda: true }
-          - { os: windows-latest,  python: '3.8',  arch: x86, conda: true }
-          - { os: windows-latest,  python: '3.7',  arch: x86, conda: true }
+          - { os: windows-latest,  python: '3.10',  arch: x86, conda: false } # setuptools/setuptools-scm deps not met
+          - { os: windows-latest,  python: '3.9',  arch: x86, conda: false } # setuptools/setuptools-scm deps not met
+          - { os: windows-latest,  python: '3.8',  arch: x86, conda: false } # setuptools/setuptools-scm deps not met
 
     if: github.repository == 'labscript-suite/labscript-c-extensions' && (github.event_name != 'create' || github.event.ref_type != 'branch')
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           fetch-depth: 0
 
@@ -73,7 +78,7 @@ jobs:
         run: git tag -d $(git tag --points-at HEAD)
 
       - name: Install Python
-        uses: actions/setup-python@v4
+        uses: actions/setup-python@v5
         with:
           python-version: ${{ matrix.python }}
           architecture: ${{ matrix.arch }}
@@ -93,37 +98,33 @@ jobs:
 
       - name: Upload Artifact
         if: strategy.job-index == 0 || (env.PURE == 'false' && runner.os != 'Linux')
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
-          name: dist
+          name: dist-${{ matrix.os }}_${{ matrix.arch }}-py${{ matrix.python}}
           path: ./dist
 
       - name: Set Variables for Conda Build
+        # build conda package from wheel
+        # avoids conda build issues on github osx-x64 and win runners
         if: matrix.conda
         shell: bash
         run: |
           if [ $NOARCH == true ]; then
               CONDA_BUILD_ARGS="--noarch"
           else
-              CONDA_BUILD_ARGS=""
+              CONDA_BUILD_ARGS="--from-wheel"
           fi
           echo "CONDA_BUILD_ARGS=$CONDA_BUILD_ARGS" >> $GITHUB_ENV
 
       - name: Install Miniconda
         if: matrix.conda
-        uses: conda-incubator/setup-miniconda@v2
+        uses: conda-incubator/setup-miniconda@v3
         with:
           auto-update-conda: true
           python-version: ${{ matrix.python }}
           architecture: ${{ matrix.arch }}
           miniconda-version: "latest"
 
-      - name: Workaround conda-build incompatibility with xcode 12+
-        if: runner.os == 'macOS'
-        uses: maxim-lobanov/setup-xcode@v1
-        with:
-          xcode-version: 11.7
-
       - name: Conda package (Unix)
         if: (matrix.conda && runner.os != 'Windows')
         shell: bash -l {0}
@@ -140,9 +141,9 @@ jobs:
 
       - name: Upload Artifact
         if: matrix.conda
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
-          name: conda_packages
+          name: conda_packages-${{ matrix.os }}_${{ matrix.arch }}-py${{ matrix.python}}
           path: ./conda_packages
 
 
@@ -153,7 +154,7 @@ jobs:
     steps:
       - name: Checkout
         if: env.PURE == 'false'
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           fetch-depth: 0
 
@@ -163,14 +164,14 @@ jobs:
 
       - name: Build Manylinux Wheels
         if: env.PURE == 'false'
-        uses: RalfG/python-wheels-manylinux-build@v0.4.2
+        uses: RalfG/python-wheels-manylinux-build@v0.7.1
         with:
-          python-versions: 'cp37-cp37m cp38-cp38 cp39-cp39 cp310-cp310 cp311-cp311'
+          python-versions: 'cp38-cp38 cp39-cp39 cp310-cp310 cp311-cp311 cp312-cp312'
           pre-build-command: 'git config --global --add safe.directory "*"'
 
       - name: Upload Artifact
         if: env.PURE == 'false'
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: dist
           path: dist/*manylinux*.whl
@@ -181,17 +182,19 @@ jobs:
     needs: [build, manylinux]
     steps:
 
-      - name: Download Artifact
-        uses: actions/download-artifact@v3
+      - name: Download Wheels and Source
+        uses: actions/download-artifact@v4
         with:
-          name: dist
+          pattern: dist*
           path: ./dist
+          merge-multiple: true
 
-      - name: Download Artifact
-        uses: actions/download-artifact@v3
+      - name: Download Conda Packages
+        uses: actions/download-artifact@v4
         with:
-          name: conda_packages
+          pattern: conda_packages-*
           path: ./conda_packages
+          merge-multiple: true
 
       - name: Get Version Number
         if: github.event.ref_type == 'tag'
@@ -201,7 +204,7 @@ jobs:
 
       - name: Create GitHub Release and Upload Release Asset
         if: github.event.ref_type == 'tag'
-        uses: softprops/action-gh-release@v1
+        uses: softprops/action-gh-release@v2
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:
@@ -226,7 +229,7 @@ jobs:
           password: ${{ secrets.pypi }}
 
       - name: Install Miniconda
-        uses: conda-incubator/setup-miniconda@v2
+        uses: conda-incubator/setup-miniconda@v3
         with:
           auto-update-conda: true
 

{labscript-c-extensions-1.1.0/labscript_c_extensions.egg-info → labscript_c_extensions-1.2.0}/PKG-INFO

@@ -1,26 +1,52 @@
 Metadata-Version: 2.1
 Name: labscript-c-extensions
-Version: 1.1.0
+Version: 1.2.0
 Summary: A module containing C-extensions for the labscript suite
-Home-page: http://labscriptsuite.org
-Author: The labscript suite community
-Author-email: labscriptsuite@googlegroups.com
-License: BSD
-Project-URL: Source Code, https://github.com/labscript-suite/labscript-c-extensions
-Project-URL: Download, https://github.com/labscript-suite/labscript-c-extensions/releases
-Project-URL: Tracker, https://github.com/labscript-suite/labscript-c-extensions/issues
-Keywords: experiment visualization
+Author-email: The labscript suite community <labscriptsuite@googlegroups.com>
+License: BSD 2-Clause License
+        
+        Copyright (c) 2020, the labscript suite
+        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 HOLDER 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, http://labscriptsuite.org/
+Project-URL: Documentation, https://docs.labscriptsuite.org/
+Project-URL: Repository, https://github.com/labscript-suite/labscript-c-extension/
+Project-URL: Downloads, https://github.com/labscript-suite/labscript-c-extension/releases/
+Project-URL: Tracker, https://github.com/labscript-suite/labscript-c-extension/issues/
+Keywords: experiment control,automation,visualization
 Classifier: License :: OSI Approved :: BSD License
 Classifier: Programming Language :: Python :: 3 :: Only
-Classifier: Programming Language :: Python :: 3.6
-Classifier: Programming Language :: Python :: 3.7
 Classifier: Programming Language :: Python :: 3.8
 Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
-Requires-Python: >=3.6
+Classifier: Programming Language :: Python :: 3.12
+Requires-Python: >=3.8
 Description-Content-Type: text/markdown
-License-File: LICENSE
+License-File: LICENSE.txt
+Requires-Dist: importlib_metadata
+Requires-Dist: numpy>=1.17.3
 
 <img src="https://raw.githubusercontent.com/labscript-suite/labscript-suite/master/art/labscript_32nx32n.svg" height="64" alt="the labscript suite" align="right">
 

{labscript-c-extensions-1.1.0 → labscript_c_extensions-1.2.0}/labscript_c_extensions/__version__.py

@@ -10,22 +10,28 @@
 # root of the project for the full license.                         #
 #                                                                   #
 #####################################################################
-import os
 from pathlib import Path
 try:
     import importlib.metadata as importlib_metadata
 except ImportError:
     import importlib_metadata
 
-VERSION_SCHEME = {
-    "version_scheme": os.getenv("SCM_VERSION_SCHEME", "guess-next-dev"),
-    "local_scheme": os.getenv("SCM_LOCAL_SCHEME", "node-and-date"),
-}
-
 root = Path(__file__).parent.parent
 if (root / '.git').is_dir():
-    from setuptools_scm import get_version
-    __version__ = get_version(root, **VERSION_SCHEME)
+    try:
+        from setuptools_scm import get_version
+        VERSION_SCHEME = {
+            "version_scheme": "guess-next-dev",
+            "local_scheme": "node-and-date",
+        }
+        scm_version = get_version(root, **VERSION_SCHEME)
+    except ImportError:
+        scm_version = None
+else:
+    scm_version = None
+
+if scm_version is not None:
+    __version__ = scm_version
 else:
     try:
         __version__ = importlib_metadata.version(__package__)

{labscript-c-extensions-1.1.0 → labscript_c_extensions-1.2.0/labscript_c_extensions.egg-info}/PKG-INFO

@@ -1,26 +1,52 @@
 Metadata-Version: 2.1
 Name: labscript-c-extensions
-Version: 1.1.0
+Version: 1.2.0
 Summary: A module containing C-extensions for the labscript suite
-Home-page: http://labscriptsuite.org
-Author: The labscript suite community
-Author-email: labscriptsuite@googlegroups.com
-License: BSD
-Project-URL: Source Code, https://github.com/labscript-suite/labscript-c-extensions
-Project-URL: Download, https://github.com/labscript-suite/labscript-c-extensions/releases
-Project-URL: Tracker, https://github.com/labscript-suite/labscript-c-extensions/issues
-Keywords: experiment visualization
+Author-email: The labscript suite community <labscriptsuite@googlegroups.com>
+License: BSD 2-Clause License
+        
+        Copyright (c) 2020, the labscript suite
+        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 HOLDER 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, http://labscriptsuite.org/
+Project-URL: Documentation, https://docs.labscriptsuite.org/
+Project-URL: Repository, https://github.com/labscript-suite/labscript-c-extension/
+Project-URL: Downloads, https://github.com/labscript-suite/labscript-c-extension/releases/
+Project-URL: Tracker, https://github.com/labscript-suite/labscript-c-extension/issues/
+Keywords: experiment control,automation,visualization
 Classifier: License :: OSI Approved :: BSD License
 Classifier: Programming Language :: Python :: 3 :: Only
-Classifier: Programming Language :: Python :: 3.6
-Classifier: Programming Language :: Python :: 3.7
 Classifier: Programming Language :: Python :: 3.8
 Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
-Requires-Python: >=3.6
+Classifier: Programming Language :: Python :: 3.12
+Requires-Python: >=3.8
 Description-Content-Type: text/markdown
-License-File: LICENSE
+License-File: LICENSE.txt
+Requires-Dist: importlib_metadata
+Requires-Dist: numpy>=1.17.3
 
 <img src="https://raw.githubusercontent.com/labscript-suite/labscript-suite/master/art/labscript_32nx32n.svg" height="64" alt="the labscript suite" align="right">
 

{labscript-c-extensions-1.1.0 → labscript_c_extensions-1.2.0}/labscript_c_extensions.egg-info/SOURCES.txt

@@ -1,8 +1,7 @@
 .gitignore
-LICENSE
+LICENSE.txt
 README.md
 pyproject.toml
-setup.cfg
 setup.py
 .github/workflows/release.yml
 labscript_c_extensions/__init__.py

labscript_c_extensions-1.2.0/labscript_c_extensions.egg-info/requires.txt

@@ -0,0 +1,2 @@
+importlib_metadata
+numpy>=1.17.3

labscript_c_extensions-1.2.0/pyproject.toml

@@ -0,0 +1,51 @@
+[build-system]
+requires = ["setuptools>=64", "wheel", "setuptools_scm>=8", "cython",
+            "numpy>=2.0,<3; python_version>'3.8'"]
+build-backend = "setuptools.build_meta"
+
+[tool.setuptools_scm]
+version_scheme = "guess-next-dev"
+local_scheme = "no-local-version"
+
+[tool.setuptools]
+zip-safe = false
+include-package-data = true
+
+[tool.setuptools.packages]
+find = {namespaces = false}
+
+
+[project]
+name = "labscript-c-extensions"
+description = "A module containing C-extensions for the labscript suite"
+authors = [
+    {name = "The labscript suite community", email = "labscriptsuite@googlegroups.com"},
+]
+keywords = ["experiment control", "automation", "visualization"]
+license = {file = 'LICENSE.txt'}
+classifiers = [
+    "License :: OSI Approved :: BSD License",
+    "Programming Language :: Python :: 3 :: Only",
+    "Programming Language :: Python :: 3.8",
+    "Programming Language :: Python :: 3.9",
+    "Programming Language :: Python :: 3.10",
+    "Programming Language :: Python :: 3.11",
+    "Programming Language :: Python :: 3.12",
+]
+requires-python = ">=3.8"
+dependencies = [
+    "importlib_metadata",
+    "numpy>=1.17.3",
+]
+dynamic = ["version"]
+
+[project.readme]
+file = "README.md"
+content-type = "text/markdown"
+
+[project.urls]
+Homepage = "http://labscriptsuite.org/"
+Documentation = "https://docs.labscriptsuite.org/"
+Repository = "https://github.com/labscript-suite/labscript-c-extension/"
+Downloads = "https://github.com/labscript-suite/labscript-c-extension/releases/"
+Tracker = "https://github.com/labscript-suite/labscript-c-extension/issues/"

labscript_c_extensions-1.2.0/setup.cfg

@@ -0,0 +1,4 @@
+[egg_info]
+tag_build = 
+tag_date = 0
+

{labscript-c-extensions-1.1.0 → labscript_c_extensions-1.2.0}/setup.py

@@ -6,13 +6,6 @@ from Cython.Distutils import build_ext
 
 CMDCLASS = {"build_ext": build_ext}
 
-
-VERSION_SCHEME = {
-    "version_scheme": os.getenv("SCM_VERSION_SCHEME", "guess-next-dev"),
-    "local_scheme": os.getenv("SCM_LOCAL_SCHEME", "node-and-date"),
-}
-
-
 EXT_MODULES = [
     Extension(
         "labscript_c_extensions.runviewer.resample",
@@ -21,7 +14,6 @@ EXT_MODULES = [
 ]
 
 setup(
-    use_scm_version=VERSION_SCHEME,
     cmdclass=CMDCLASS,
     ext_modules=EXT_MODULES,
 )

labscript-c-extensions-1.1.0/labscript_c_extensions.egg-info/requires.txt

@@ -1,3 +0,0 @@
-importlib_metadata
-setuptools_scm
-numpy>=1.15

labscript-c-extensions-1.1.0/pyproject.toml

@@ -1,3 +0,0 @@
-[build-system]
-requires = ["setuptools", "wheel", "setuptools_scm", "cython"]
-build-backend = "setuptools.build_meta"

labscript-c-extensions-1.1.0/setup.cfg

@@ -1,38 +0,0 @@
-[metadata]
-name = labscript-c-extensions
-description = A module containing C-extensions for the labscript suite
-long_description = file: README.md
-long_description_content_type = text/markdown
-author = The labscript suite community
-author_email = labscriptsuite@googlegroups.com
-url = http://labscriptsuite.org
-project_urls = 
-	Source Code=https://github.com/labscript-suite/labscript-c-extensions
-	Download=https://github.com/labscript-suite/labscript-c-extensions/releases
-	Tracker=https://github.com/labscript-suite/labscript-c-extensions/issues
-keywords = experiment visualization
-license = BSD
-classifiers = 
-	License :: OSI Approved :: BSD License
-	Programming Language :: Python :: 3 :: Only
-	Programming Language :: Python :: 3.6
-	Programming Language :: Python :: 3.7
-	Programming Language :: Python :: 3.8
-	Programming Language :: Python :: 3.9
-	Programming Language :: Python :: 3.10
-	Programming Language :: Python :: 3.11
-
-[options]
-zip_safe = False
-include_package_data = True
-packages = find:
-python_requires = >=3.6
-install_requires = 
-	importlib_metadata
-	setuptools_scm
-	numpy>=1.15
-
-[egg_info]
-tag_build = 
-tag_date = 0
-