labscript-utils 3.4.1__tar.gz → 3.4.2__tar.gz

{labscript_utils-3.4.1 → labscript_utils-3.4.2}/.github/workflows/release.yml

@@ -34,7 +34,7 @@ jobs:
 
     steps:
       - name: Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6
         with:
           fetch-depth: 0
 
@@ -43,7 +43,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: '3.x'
 
@@ -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,7 +252,7 @@ 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
@@ -264,7 +264,7 @@ jobs:
           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
@@ -360,7 +360,7 @@ jobs:
 
     steps:
       - name: Download Artifact
-        uses: actions/download-artifact@v4
+        uses: actions/download-artifact@v8
         with:
           pattern: dist*
           path: ./dist
@@ -378,7 +378,7 @@ jobs:
 
     steps:
       - name: Download Artifact
-        uses: actions/download-artifact@v4
+        uses: actions/download-artifact@v8
         with:
           pattern: conda_packages-*
           path: ./conda_packages
@@ -390,7 +390,7 @@ jobs:
           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,7 +417,7 @@ jobs:
 
     steps:
       - name: Download Artifact
-        uses: actions/download-artifact@v4
+        uses: actions/download-artifact@v8
         with:
           pattern: conda_packages-*
           path: ./conda_packages
@@ -429,7 +429,7 @@ jobs:
           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_utils-3.4.1/labscript_utils.egg-info → labscript_utils-3.4.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: labscript-utils
-Version: 3.4.1
+Version: 3.4.2
 Summary: Shared utilities for the labscript suite
 Author-email: The labscript suite community <labscriptsuite@googlegroups.com>
 License: Copyright (c) 2013, Monash University

{labscript_utils-3.4.1 → labscript_utils-3.4.2}/docs/source/_templates/autosummary-module.rst

@@ -1,23 +1,9 @@
 {{ fullname | escape | underline}}
 
-{% block submodules %}
-{% if modules %}
-.. rubric:: {{ _('Sub-Modules') }}
-.. autosummary::
-   :toctree: 
-   :template: autosummary-module.rst
-   :recursive:
-
-   {% for item in modules %}
-   {{ item }}
-   {%- endfor %}
-{% endif %}
-{% endblock %}
-
 .. automodule:: {{ fullname }}
 
    {% block attributes %}
-   {% if attributes %}
+   {%- if attributes %}
    .. rubric:: {{ _('Module Attributes') }}
 
    .. autosummary::
@@ -26,10 +12,10 @@
       {{ item }}
    {%- endfor %}
    {% endif %}
-   {% endblock %}
+   {%- endblock %}
 
-   {% block functions %}
-   {% if functions %}
+   {%- block functions %}
+   {%- if functions %}
    .. rubric:: {{ _('Functions') }}
 
    .. autosummary::
@@ -38,10 +24,10 @@
       {{ item }}
    {%- endfor %}
    {% endif %}
-   {% endblock %}
+   {%- endblock %}
 
-   {% block classes %}
-   {% if classes %}
+   {%- block classes %}
+   {%- if classes %}
    .. rubric:: {{ _('Classes') }}
 
    .. autosummary::
@@ -51,10 +37,10 @@
       {{ item }}
    {%- endfor %}
    {% endif %}
-   {% endblock %}
+   {%- endblock %}
 
-   {% block exceptions %}
-   {% if exceptions %}
+   {%- block exceptions %}
+   {%- if exceptions %}
    .. rubric:: {{ _('Exceptions') }}
 
    .. autosummary::
@@ -63,4 +49,18 @@
       {{ item }}
    {%- endfor %}
    {% endif %}
-   {% endblock %}
+   {%- endblock %}
+
+{%- block modules %}
+{%- if modules %}
+.. rubric:: Modules
+
+.. autosummary::
+   :toctree:
+   :template: autosummary-module.rst
+   :recursive:
+{% for item in modules %}
+   {{ item }}
+{%- endfor %}
+{% endif %}
+{%- endblock %}

{labscript_utils-3.4.1 → labscript_utils-3.4.2}/docs/source/api/index.rst

@@ -4,6 +4,7 @@ API Reference
 
 .. autosummary::
    :toctree: _autosummary
+   :template: autosummary-module.rst
    :recursive:
 
    labscript_utils

{labscript_utils-3.4.1 → labscript_utils-3.4.2}/docs/source/conf.py

@@ -83,7 +83,10 @@ templates_path = ['_templates']
 exclude_patterns = []
 
 # The suffix(es) of source filenames.
-source_suffix = ['.rst', '.md']
+source_suffix = {
+    '.rst': 'restructuredtext',
+    '.md': 'markdown',
+}
 
 # The master toctree document.
 master_doc = 'index'
@@ -160,20 +163,29 @@ elif labscript_suite_doc_version not in ['stable', 'latest']:
     labscript_suite_doc_version = 'latest'
 
 # add intersphinx references for each component
+labscript_intersphinx_mapping = {}
 for ls_prog in labscript_suite_programs:
-    intersphinx_mapping[ls_prog] = (
+    val = (
         'https://docs.labscriptsuite.org/projects/{}/en/{}/'.format(
             ls_prog, labscript_suite_doc_version
         ),
         None,
     )
+    labscript_intersphinx_mapping[ls_prog] = val
+    if ls_prog != project:
+        # don't add intersphinx for current project
+        # if internal links break, they can silently be filled by links to existing online docs
+        # this is confusing and difficult to detect
+        intersphinx_mapping[ls_prog] = val
 
 # add intersphinx reference for the metapackage
 if project != "the labscript suite":
-    intersphinx_mapping['labscript-suite'] = (
+    val = (
         'https://docs.labscriptsuite.org/en/{}/'.format(labscript_suite_doc_version),
         None,
     )
+    intersphinx_mapping['labscript-suite'] = val
+    labscript_intersphinx_mapping['labscript-suite'] = val
 
 # Make `some code` equivalent to :code:`some code`
 default_role = 'code'
@@ -223,7 +235,7 @@ def setup(app):
     with open(Path(__file__).resolve().parent / 'components.rst', 'w') as f:
         f.write(
             template.render(
-                intersphinx_mapping=intersphinx_mapping,
+                intersphinx_mapping=labscript_intersphinx_mapping,
                 programs=labscript_suite_programs,
                 current_project=project,
                 img_path=img_path

{labscript_utils-3.4.1 → labscript_utils-3.4.2}/docs/source/index.rst

@@ -3,8 +3,8 @@
    You can adapt this file completely to your liking, but it should at least
    contain the root `toctree` directive.
 
-labscript-utils
-===============
+labscript-utils |version|
+=========================
 
 **labscript-utils** contains code shared between multiple programs in the labscript suite. 
 This documentation is primarily for developers who might want to use this common code in their own custom features. 

{labscript_utils-3.4.1 → labscript_utils-3.4.2}/docs/source/labconfig.rst

@@ -7,7 +7,9 @@ The name of this file must be the host computer's system name.
 So if my system's name was `heisenberg`, the labconfig file name would be `heisenberg.ini`.
 This file should be located in the `labscript-suite` directory in the user space, in the `labconfig` subdirectory.
 
-When :doc:`installing the **labscript-suite** for the first time <labscript-suite:installation/index>`, running the `labscript-profile-create` command will automatically generate the `labscript-suite` user space directory in the correct place and generate a `labconfig.ini` file for use on your system.
+When :doc:`installing the **labscript-suite** for the first time <labscript-suite:installation/index>`,
+running the `labscript-profile-create` command will automatically generate the `labscript-suite` user space directory in the correct place
+and generate a `labconfig.ini` file for use on your system.
 By editing the `ini` file named after your system, you can update the configuration settings of your **labscript-suite** installation.
 
 The Default *labconfig.ini*

{labscript_utils-3.4.1 → labscript_utils-3.4.2}/labscript_utils/qtwidgets/headerview_with_widgets.py

@@ -20,7 +20,7 @@ class HorizontalHeaderViewWithWidgets(QtWidgets.QHeaderView):
                  /* Required, otherwise set to zero upon setting any stylesheet at all: */
                  padding-left: 4px;
                  /* Required for some reason, otherwise other settings ignored: */
-                 color: black;
+                 color: palette(text);
                  }
 
                  /* Any other style goes here: */
@@ -122,7 +122,7 @@ class HorizontalHeaderViewWithWidgets(QtWidgets.QHeaderView):
                 font = item.font()
                 fontmetrics = QtGui.QFontMetrics(font, self)
                 indent = ''
-                while fontmetrics.width(indent) < desired_indent:
+                while fontmetrics.horizontalAdvance(indent) < desired_indent:
                     indent += self.thinspace
                 self.indents[widget] = indent
         font = self.font()

{labscript_utils-3.4.1 → labscript_utils-3.4.2/labscript_utils.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: labscript-utils
-Version: 3.4.1
+Version: 3.4.2
 Summary: Shared utilities for the labscript suite
 Author-email: The labscript suite community <labscriptsuite@googlegroups.com>
 License: Copyright (c) 2013, Monash University