labscript-utils 3.2.2__tar.gz → 3.3.0__tar.gz

{labscript-utils-3.2.2 → labscript-utils-3.3.0}/.github/workflows/release.yml

@@ -37,25 +37,29 @@ jobs:
     strategy:
       matrix:
         include:
-          # - { os: ubuntu-latest,   python: '3.10',  arch: x64 }
-          # - { os: ubuntu-latest,   python: '3.9',  arch: x64 }
-          - { os: ubuntu-latest,   python: '3.8',  arch: x64 }
-          # - { os: ubuntu-latest,   python: '3.7',  arch: x64 }
-
-          # - { os: macos-latest,    python: '3.10',  arch: x64 }
-          # - { os: macos-latest,    python: '3.9',  arch: x64 }
-          # - { os: macos-latest,    python: '3.8',  arch: x64 }
-          # - { os: macos-latest,    python: '3.7',  arch: x64 }
-
-          # - { os: windows-latest,  python: '3.10',  arch: x64 }
-          # - { os: windows-latest,  python: '3.9',  arch: x64 }
-          # - { os: windows-latest,  python: '3.8',  arch: x64 }
-          # - { os: windows-latest,  python: '3.7',  arch: x64 }
-
-          # - { os: windows-latest,  python: '3.10',  arch: x86 }
-          # - { os: windows-latest,  python: '3.9',  arch: x86 }
-          # - { os: windows-latest,  python: '3.8',  arch: x86 }
-          # - { os: windows-latest,  python: '3.7',  arch: x86 }
+          - { 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: 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.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 }
 
     if: github.repository == 'labscript-suite/labscript-utils' && (github.event_name != 'create' || github.event.ref_type != 'branch')
     steps:
@@ -95,6 +99,7 @@ jobs:
           path: ./dist
 
       - name: Set Variables for Conda Build
+        if: matrix.conda
         shell: bash
         run: |
           if [ $NOARCH == true ]; then
@@ -105,37 +110,36 @@ jobs:
           echo "CONDA_BUILD_ARGS=$CONDA_BUILD_ARGS" >> $GITHUB_ENV
 
       - name: Install Miniconda
-        # We need https://github.com/conda-incubator/setup-miniconda/pull/189 in order
-        # to be able to install 32-bit miniconda on Windows. Once setup-miniconda 2.1.2
-        # is released with this fix, can change to @v2.
-        uses: conda-incubator/setup-miniconda@1a875d105ac03256664b54c882c8c374ce617ef6
+        if: matrix.conda
+        uses: conda-incubator/setup-miniconda@v2
         with:
           auto-update-conda: true
           python-version: ${{ matrix.python }}
           architecture: ${{ matrix.arch }}
           miniconda-version: "latest"
 
-      - name: Workaround conda-build incompatibility with xcode >12
+      - 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: runner.os != 'Windows'
+        if: (matrix.conda && runner.os != 'Windows')
         shell: bash -l {0}
         run: |
           conda install -c labscript-suite setuptools-conda
           setuptools-conda build $CONDA_BUILD_ARGS .
 
       - name: Conda Package (Windows)
-        if: runner.os == 'Windows'
+        if: (matrix.conda && runner.os == 'Windows')
         shell: cmd /C CALL {0}
         run: |
           conda install -c labscript-suite setuptools-conda && ^
           setuptools-conda build %CONDA_BUILD_ARGS% --croot ${{ runner.temp }}\cb .
 
       - name: Upload Artifact
+        if: matrix.conda
         uses: actions/upload-artifact@v3
         with:
           name: conda_packages
@@ -161,7 +165,7 @@ jobs:
         if: env.PURE == 'false'
         uses: RalfG/python-wheels-manylinux-build@v0.4.2
         with:
-          python-versions: 'cp37-cp37m cp38-cp38 cp39-cp39 cp310-cp310'
+          python-versions: 'cp37-cp37m cp38-cp38 cp39-cp39 cp310-cp310 cp311-cp311'
           pre-build-command: 'git config --global --add safe.directory "*"'
 
       - name: Upload Artifact
@@ -189,45 +193,34 @@ jobs:
           name: conda_packages
           path: ./conda_packages
 
-      - name: Publish on TestPyPI
-        uses: pypa/gh-action-pypi-publish@release/v1
-        with:
-          user: __token__
-          password: ${{ secrets.testpypi }}
-          repository_url: https://test.pypi.org/legacy/
-
       - name: Get Version Number
         if: github.event.ref_type == 'tag'
         run: |
           VERSION="${GITHUB_REF/refs\/tags\/v/}"
           echo "VERSION=$VERSION" >> $GITHUB_ENV
 
-      - name: Create GitHub Release
+      - name: Create GitHub Release and Upload Release Asset
         if: github.event.ref_type == 'tag'
-        id: create_release
-        uses: actions/create-release@latest
+        uses: softprops/action-gh-release@v1
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:
           tag_name: ${{ github.event.ref }}
-          release_name: ${{ env.PACKAGE_NAME }} ${{ env.VERSION }}
+          name: ${{ env.PACKAGE_NAME }} ${{ env.VERSION }}
           draft: true
           prerelease: ${{ contains(github.event.ref, 'rc') }}
+          files: ./dist/${{ env.PACKAGE_NAME }}-${{ env.VERSION }}.tar.gz
 
-      - name: Upload Release Asset
-        if: github.event.ref_type == 'tag'
-        uses: actions/upload-release-asset@v1
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+      - name: Publish on TestPyPI
+        uses: pypa/gh-action-pypi-publish@release/v1
         with:
-          upload_url: ${{ steps.create_release.outputs.upload_url }}
-          asset_path: ./dist/${{ env.PACKAGE_NAME }}-${{ env.VERSION }}.tar.gz
-          asset_name: ${{ env.PACKAGE_NAME }}-${{ env.VERSION }}.tar.gz
-          asset_content_type: application/gzip
+          user: __token__
+          password: ${{ secrets.testpypi }}
+          repository-url: https://test.pypi.org/legacy/
 
       - name: Publish on PyPI
         if: github.event.ref_type == 'tag'
-        uses: pypa/gh-action-pypi-publish@master
+        uses: pypa/gh-action-pypi-publish@release/v1
         with:
           user: __token__
           password: ${{ secrets.pypi }}

{labscript-utils-3.2.2/labscript_utils.egg-info → labscript-utils-3.3.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: labscript-utils
-Version: 3.2.2
+Version: 3.3.0
 Summary: Shared utilities for the labscript suite
 Home-page: http://labscriptsuite.org
 Author: The labscript suite community
@@ -16,6 +16,8 @@ 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
 Description-Content-Type: text/markdown
 Provides-Extra: docs

{labscript-utils-3.2.2 → labscript-utils-3.3.0}/labscript_utils/qtwidgets/dragdroptab.py

@@ -316,7 +316,9 @@ class TabAnimation(QAbstractAnimation):
                 if dy * (target_pos_y - new_pos_y) < 0:
                     new_pos_y = target_pos_y
 
-                self.limbo_position = QPoint(new_pos_x, new_pos_y)
+                self.limbo_position = QPoint(
+                    int(round(new_pos_x)), int(round(new_pos_y))
+                )
             else:
                 self.limbo.animation_over()
                 self.limbo = None

labscript-utils-3.3.0/labscript_utils/shot_utils.py

@@ -0,0 +1,37 @@
+#####################################################################
+#                                                                   #
+# __init__.py                                                       #
+#                                                                   #
+# Copyright 2013, Monash University                                 #
+#                                                                   #
+# This file is part of the labscript suite (see                     #
+# http://labscriptsuite.org) and is licensed under the Simplified   #
+# BSD License. See the license.txt file in the root of the project  #
+# for the full license.                                             #
+#                                                                   #
+#####################################################################
+
+import h5py
+import numpy as np
+
+def get_shot_globals(filepath):
+    """Returns the evaluated globals for a shot, for use by labscript or lyse.
+    Simple dictionary access as in dict(h5py.File(filepath).attrs) would be fine
+    except we want to apply some hacks, so it's best to do that in one place."""
+    params = {}
+    with h5py.File(filepath, 'r') as f:
+        for name, value in f['globals'].attrs.items():
+            # Convert numpy bools to normal bools:
+            if isinstance(value, np.bool_):
+                value = bool(value)
+            # Convert null HDF references to None:
+            if isinstance(value, h5py.Reference) and not value:
+                value = None
+            # Convert numpy strings to Python ones.
+            # DEPRECATED, for backward compat with old files.
+            if isinstance(value, np.str_):
+                value = str(value)
+            if isinstance(value, bytes):
+                value = value.decode()
+            params[name] = value
+    return params

{labscript-utils-3.2.2 → labscript-utils-3.3.0}/labscript_utils/splash.py

@@ -29,6 +29,15 @@ except ImportError as e:
 Qt = QtCore.Qt
 
 
+# Set auto high-DPI scaling - this ensures pixel metrics are scaled
+# appropriately so that we don't get a weird mix of large fonts and small
+# everything else on High DPI displays:
+QtWidgets.QApplication.setAttribute(Qt.AA_EnableHighDpiScaling, True)
+# Use high res pixmaps if available, instead of rendering at low resolution and
+# upscaling:
+QtWidgets.QApplication.setAttribute(Qt.AA_UseHighDpiPixmaps, True)
+
+
 class Splash(QtWidgets.QFrame):
     w = 250
     h = 230

{labscript-utils-3.2.2 → labscript-utils-3.3.0/labscript_utils.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: labscript-utils
-Version: 3.2.2
+Version: 3.3.0
 Summary: Shared utilities for the labscript suite
 Home-page: http://labscriptsuite.org
 Author: The labscript suite community
@@ -16,6 +16,8 @@ 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
 Description-Content-Type: text/markdown
 Provides-Extra: docs

{labscript-utils-3.2.2 → labscript-utils-3.3.0}/labscript_utils.egg-info/SOURCES.txt

@@ -63,6 +63,7 @@ labscript_utils/remote.py
 labscript_utils/settings.py
 labscript_utils/setup_logging.py
 labscript_utils/shared_drive.py
+labscript_utils/shot_utils.py
 labscript_utils/splash.py
 labscript_utils/testing_utils.py
 labscript_utils/tracelog.py

{labscript-utils-3.2.2 → labscript-utils-3.3.0}/labscript_utils.egg-info/requires.txt

@@ -2,7 +2,7 @@ importlib_metadata>=1.0
 h5py>=2.9
 numpy>=1.15
 packaging>=20.4
-pyqtgraph>=0.11.0
+pyqtgraph>=0.11.0rc0
 qtutils>=2.2.3
 scipy
 setuptools_scm>=4.1.0

{labscript-utils-3.2.2 → labscript-utils-3.3.0}/setup.cfg

@@ -19,6 +19,8 @@ classifiers =
 	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
@@ -30,7 +32,7 @@ install_requires =
 	h5py>=2.9
 	numpy>=1.15
 	packaging>=20.4
-	pyqtgraph>=0.11.0
+	pyqtgraph>=0.11.0rc0
 	qtutils>=2.2.3
 	scipy
 	setuptools_scm>=4.1.0