Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: labscript-suite/labscript-utils
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: master
Choose a base ref
...
head repository: labscript-suite/labscript-utils
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: maintenance/3.2.x
Choose a head ref
  • 8 commits
  • 47 files changed
  • 2 contributors

Commits on Nov 30, 2021

  1. Squashed commit of the following: 

    commit a79d0e4
Author: David Meyer <dihm@users.noreply.github.com>
Date:   Tue Nov 30 11:20:27 2021 -0500

    Update setup.cfg in preparation for release.

commit 811b43d
Merge: b8726ad a3be0db
Author: David Meyer <dihm@users.noreply.github.com>
Date:   Wed Nov 10 17:07:51 2021 -0500

    Merge pull request #81 from chrisjbillington/py36-path-bug

    Fix bug on Python3.6

commit b8726ad
Merge: d309a5f c4dd2a8
Author: David Meyer <dihm@users.noreply.github.com>
Date:   Wed Nov 10 17:06:47 2021 -0500

    Merge pull request #78 from zakv/setup-logging-jupyter

    Make setup_logging() more Jupyter-friendly.

commit d309a5f
Merge: d5dfea7 12db878
Author: David Meyer <dihm@users.noreply.github.com>
Date:   Wed Nov 10 17:06:02 2021 -0500

    Merge pull request #82 from dihm/zlog_port_profile

    Add default zlog port to default profile configuration file.

commit c4dd2a8
Author: Zak V <zakven@mit.edu>
Date:   Tue Nov 9 20:12:19 2021 -0500

    Removed duplicate call to sys.stdout.fileno() in setup_logging.setup_logging().

    Probably best practice to call it just once rather than calling it first to check if it raises an error then again later to actually use the value it returns.

commit 2e38107
Author: Zak V <zakven@mit.edu>
Date:   Tue Nov 9 20:04:37 2021 -0500

    Restructured try/except block in setup_logging.setup_logging() to avoid catching any UnsupportedOperation errors thrown by code other than sys.stdout.fileno().

commit 97e70c7
Author: Zak V <zakven@mit.edu>
Date:   Tue Nov 9 19:56:07 2021 -0500

    Added warning message when setup_logging.setup_logging() cannot send output to stdout and stderr.

commit b711923
Author: Zak V <zakven@mit.edu>
Date:   Mon Jun 7 17:48:41 2021 -0400

    setup_logging.py is now more Jupyter-friendly.

commit d5dfea7
Merge: 9b76dcb b149e19
Author: David Meyer <dihm@users.noreply.github.com>
Date:   Wed Nov 10 08:54:21 2021 -0500

    Merge pull request #74 from zakv/unitconversions-import-bugfix

    Fixed bug in unitconversions._All._import_all()

commit 12db878
Author: David Meyer <dihm@users.noreply.github.com>
Date:   Mon Nov 8 10:20:28 2021 -0500

    Add default zlog port to default profile configuration file.

commit 9b76dcb
Merge: e13c992 e5cf3fb
Author: David Meyer <dihm@users.noreply.github.com>
Date:   Fri Oct 22 17:53:17 2021 -0400

    Merge pull request #80 from dihm/default_labconfig_docs

    Add default labconfig file to docs

commit a3be0db
Author: chrisjbillington <chrisjbillington@gmail.com>
Date:   Tue Sep 21 13:45:13 2021 +1000

    Fix bug on Python3.6, where Path object not able to be treated as a
    string in ConfigParser.

commit e5cf3fb
Author: David Meyer <dihm@users.noreply.github.com>
Date:   Tue Aug 31 15:29:45 2021 -0400

    Create a doc page that displays the current default labconfig.ini file,
    for easy reference.

commit e13c992
Merge: e74472c 461dc9f
Author: David Meyer <dihm@users.noreply.github.com>
Date:   Fri Jul 16 15:12:37 2021 -0400

    Merge pull request #79 from dihm/labscript_utils-docs

    Update docs to match autogenerating templates used in other modules of labscript.

commit 461dc9f
Author: David Meyer <dihm.meyer@gmail.com>
Date:   Thu Jul 15 10:26:41 2021 -0400

    Add docstring coverage test to build.

commit f90a4cc
Author: David Meyer <dihm.meyer@gmail.com>
Date:   Thu Jul 15 10:26:26 2021 -0400

    Update sphinx version.

commit e45107d
Author: David Meyer <dihm.meyer@gmail.com>
Date:   Mon Jul 12 12:57:18 2021 -0400

    Converting docs build to fully automated version based on recursive
    autosummary calls.

    This more closely resembles how docs are built in the other modules,
    but is slightly different in that submodules are also recursively generated.

commit 56d64f7
Author: David Meyer <dihm.meyer@gmail.com>
Date:   Mon Jul 12 09:25:18 2021 -0400

    Update sphinx pins to same versions as rest of suite.

commit e74472c
Merge: f0999f5 c543328
Author: Chris Billington <chrisjbillington@gmail.com>
Date:   Tue Feb 9 08:54:16 2021 +1100

    Merge pull request #76 from zakv/fix-27

    Work around infinite recursion in ToolPalette.resizeEvent()

commit c543328
Author: Zak V <zakven@mit.edu>
Date:   Mon Feb 8 13:30:47 2021 -0500

    Removed some python 2 debugging print statements from toolpalette.py.

commit d9eb80f
Author: Zak V <zakven@mit.edu>
Date:   Sun Feb 7 23:44:47 2021 -0500

    Fixed #27; worked around bug where ToolPalette.resizeEvent() could trigger itself in an infinite resursion loop.

commit f0999f5
Merge: 8371585 7d14b65
Author: Chris Billington <chrisjbillington@gmail.com>
Date:   Mon Jan 4 13:46:54 2021 +1100

    Merge pull request #75 from chrisjbillington/master

    Do not use deprecated set-env command

commit 7d14b65
Author: chrisjbillington <chrisjbillington@gmail.com>
Date:   Mon Jan 4 13:40:14 2021 +1100

    Do not use deprecated set-env command

commit b149e19
Author: Zak V <zakven@mit.edu>
Date:   Tue Nov 24 18:06:11 2020 -0500

    Fixed bug in unitconversions._All._import_all() where self.__all__ wasn't always changed from None to an empty list before appending things to it.
    @dihm
    dihm committed Nov 30, 2021
    Configuration menu
    Copy the full SHA
    7534801 View commit details
    Browse the repository at this point in the history

Commits on Mar 21, 2022

  1. Squashed commit of the following: 

    commit 95965b8
Merge: a88582d f2f0ac7
Author: Chris Billington <chrisjbillington@gmail.com>
Date:   Thu Mar 17 08:02:09 2022 +1100

    Merge pull request #86 from dihm/replace_distutils

    Replace distutils

commit f2f0ac7
Author: David Meyer <dihm.meyer@gmail.com>
Date:   Wed Mar 16 09:43:51 2022 -0400

    Replace `distutils.log` with basic `logging` in `setup.py`.

commit b6b7823
Author: David Meyer <dihm.meyer@gmail.com>
Date:   Wed Mar 16 09:04:46 2022 -0400

    Replace `distutils.sysconfig` with stdlib `sysconfig` in `modulewatcher`.

commit 9840228
Author: David Meyer <dihm.meyer@gmail.com>
Date:   Wed Mar 16 09:04:10 2022 -0400

    Replace `distutils.version.LooseVersion` with `packaging.version.Version` in `ls_zprocess`.

commit a88582d
Merge: 66c68ab 75a7df6
Author: David Meyer <dihm@users.noreply.github.com>
Date:   Thu Mar 3 09:28:57 2022 -0500

    Merge pull request #84 from dihm/generic_freq_conv

    Add generic frequency conversion class

commit 75a7df6
Author: David Meyer <dihm@users.noreply.github.com>
Date:   Wed Feb 9 12:27:17 2022 -0500

    Add generic frequency conversion class that goes between standard SI prefixes from a base of Hz.

commit 66c68ab
Merge: 7a3d58c 27501a3
Author: David Meyer <dihm@users.noreply.github.com>
Date:   Wed Feb 9 10:47:36 2022 -0500

    Merge pull request #83 from dihm/fix_docs_build

    Prevent starting a zlock server when importing `h5_lock` on RTD.

commit 27501a3
Author: David Meyer <dihm@users.noreply.github.com>
Date:   Wed Feb 9 10:34:22 2022 -0500

    Prevent starting a zlock server when importing `h5_lock` on RTD.

commit 7a3d58c
Author: David Meyer <dihm@users.noreply.github.com>
Date:   Wed Feb 2 17:24:26 2022 -0500

    Pin `mistune` to fix doc builds on RTD.

commit 36c3c6a
Author: chrisjbillington <chrisjbillington@gmail.com>
Date:   Fri Jan 7 17:23:48 2022 +1100

    Ensure only ints passed to QFrame.move in splash

    Otherwise this is a TypeError in the latest PyQt5.

commit f4da12e
Author: David Meyer <dihm@users.noreply.github.com>
Date:   Tue Nov 30 13:00:27 2021 -0500

    Triggering build of release branch by undoing unnecessary pin change for pyqtgraph.

commit a79d0e4
Author: David Meyer <dihm@users.noreply.github.com>
Date:   Tue Nov 30 11:20:27 2021 -0500

    Update setup.cfg in preparation for release.

commit 811b43d
Merge: b8726ad a3be0db
Author: David Meyer <dihm@users.noreply.github.com>
Date:   Wed Nov 10 17:07:51 2021 -0500

    Merge pull request #81 from chrisjbillington/py36-path-bug

    Fix bug on Python3.6

commit b8726ad
Merge: d309a5f c4dd2a8
Author: David Meyer <dihm@users.noreply.github.com>
Date:   Wed Nov 10 17:06:47 2021 -0500

    Merge pull request #78 from zakv/setup-logging-jupyter

    Make setup_logging() more Jupyter-friendly.

commit d309a5f
Merge: d5dfea7 12db878
Author: David Meyer <dihm@users.noreply.github.com>
Date:   Wed Nov 10 17:06:02 2021 -0500

    Merge pull request #82 from dihm/zlog_port_profile

    Add default zlog port to default profile configuration file.

commit c4dd2a8
Author: Zak V <zakven@mit.edu>
Date:   Tue Nov 9 20:12:19 2021 -0500

    Removed duplicate call to sys.stdout.fileno() in setup_logging.setup_logging().

    Probably best practice to call it just once rather than calling it first to check if it raises an error then again later to actually use the value it returns.

commit 2e38107
Author: Zak V <zakven@mit.edu>
Date:   Tue Nov 9 20:04:37 2021 -0500

    Restructured try/except block in setup_logging.setup_logging() to avoid catching any UnsupportedOperation errors thrown by code other than sys.stdout.fileno().

commit 97e70c7
Author: Zak V <zakven@mit.edu>
Date:   Tue Nov 9 19:56:07 2021 -0500

    Added warning message when setup_logging.setup_logging() cannot send output to stdout and stderr.

commit b711923
Author: Zak V <zakven@mit.edu>
Date:   Mon Jun 7 17:48:41 2021 -0400

    setup_logging.py is now more Jupyter-friendly.

commit d5dfea7
Merge: 9b76dcb b149e19
Author: David Meyer <dihm@users.noreply.github.com>
Date:   Wed Nov 10 08:54:21 2021 -0500

    Merge pull request #74 from zakv/unitconversions-import-bugfix

    Fixed bug in unitconversions._All._import_all()

commit 12db878
Author: David Meyer <dihm@users.noreply.github.com>
Date:   Mon Nov 8 10:20:28 2021 -0500

    Add default zlog port to default profile configuration file.

commit 9b76dcb
Merge: e13c992 e5cf3fb
Author: David Meyer <dihm@users.noreply.github.com>
Date:   Fri Oct 22 17:53:17 2021 -0400

    Merge pull request #80 from dihm/default_labconfig_docs

    Add default labconfig file to docs

commit a3be0db
Author: chrisjbillington <chrisjbillington@gmail.com>
Date:   Tue Sep 21 13:45:13 2021 +1000

    Fix bug on Python3.6, where Path object not able to be treated as a
    string in ConfigParser.

commit e5cf3fb
Author: David Meyer <dihm@users.noreply.github.com>
Date:   Tue Aug 31 15:29:45 2021 -0400

    Create a doc page that displays the current default labconfig.ini file,
    for easy reference.

commit e13c992
Merge: e74472c 461dc9f
Author: David Meyer <dihm@users.noreply.github.com>
Date:   Fri Jul 16 15:12:37 2021 -0400

    Merge pull request #79 from dihm/labscript_utils-docs

    Update docs to match autogenerating templates used in other modules of labscript.

commit 461dc9f
Author: David Meyer <dihm.meyer@gmail.com>
Date:   Thu Jul 15 10:26:41 2021 -0400

    Add docstring coverage test to build.

commit f90a4cc
Author: David Meyer <dihm.meyer@gmail.com>
Date:   Thu Jul 15 10:26:26 2021 -0400

    Update sphinx version.

commit e45107d
Author: David Meyer <dihm.meyer@gmail.com>
Date:   Mon Jul 12 12:57:18 2021 -0400

    Converting docs build to fully automated version based on recursive
    autosummary calls.

    This more closely resembles how docs are built in the other modules,
    but is slightly different in that submodules are also recursively generated.

commit 56d64f7
Author: David Meyer <dihm.meyer@gmail.com>
Date:   Mon Jul 12 09:25:18 2021 -0400

    Update sphinx pins to same versions as rest of suite.

commit e74472c
Merge: f0999f5 c543328
Author: Chris Billington <chrisjbillington@gmail.com>
Date:   Tue Feb 9 08:54:16 2021 +1100

    Merge pull request #76 from zakv/fix-27

    Work around infinite recursion in ToolPalette.resizeEvent()

commit c543328
Author: Zak V <zakven@mit.edu>
Date:   Mon Feb 8 13:30:47 2021 -0500

    Removed some python 2 debugging print statements from toolpalette.py.

commit d9eb80f
Author: Zak V <zakven@mit.edu>
Date:   Sun Feb 7 23:44:47 2021 -0500

    Fixed #27; worked around bug where ToolPalette.resizeEvent() could trigger itself in an infinite resursion loop.

commit f0999f5
Merge: 8371585 7d14b65
Author: Chris Billington <chrisjbillington@gmail.com>
Date:   Mon Jan 4 13:46:54 2021 +1100

    Merge pull request #75 from chrisjbillington/master

    Do not use deprecated set-env command

commit 7d14b65
Author: chrisjbillington <chrisjbillington@gmail.com>
Date:   Mon Jan 4 13:40:14 2021 +1100

    Do not use deprecated set-env command

commit b149e19
Author: Zak V <zakven@mit.edu>
Date:   Tue Nov 24 18:06:11 2020 -0500

    Fixed bug in unitconversions._All._import_all() where self.__all__ wasn't always changed from None to an empty list before appending things to it.
    @dihm
    dihm committed Mar 21, 2022
    Configuration menu
    Copy the full SHA
    6ee2107 View commit details
    Browse the repository at this point in the history

Commits on Mar 28, 2023

  1. Merge pull request #88 from dihm/fix_docs_build 

    Bump sphinx pin and update intersphinx links
    @dihm
    dihm committed Mar 28, 2023
    Configuration menu
    Copy the full SHA
    d4a6a3a View commit details
    Browse the repository at this point in the history

  2. Merge pull request #89 from dihm/update-workflow 

    Bring workflow up to date with sandbox
    @dihm
    dihm committed Mar 28, 2023
    Configuration menu
    Copy the full SHA
    b990539 View commit details
    Browse the repository at this point in the history

  3. Merge pull request #91 from labscript-suite/pep660-fix 

    Include labscript-suite.pth in editable wheels
    @chrisjbillington @dihm
    chrisjbillington authored and dihm committed Mar 28, 2023
    Configuration menu
    Copy the full SHA
    ac51bb7 View commit details
    Browse the repository at this point in the history

  4. Merge pull request #93 from labscript-suite/philipstarkey/no-hg 

    Change labconfig default for `save_hg_info` to `False`
    @dihm
    dihm committed Mar 28, 2023
    Configuration menu
    Copy the full SHA
    f27efc4 View commit details
    Browse the repository at this point in the history

  5. Merge pull request #92 from johannesschabbauer/fix-h5py-memoryleak 

    Fix memory leak of h5py when accessing dataset with composite dtypes.
    @dihm
    dihm committed Mar 28, 2023
    Configuration menu
    Copy the full SHA
    29a40a0 View commit details
    Browse the repository at this point in the history

Commits on May 10, 2023

  1. pyzmq 25 compatibility 

    Handle a new keyword argument to `Context.socket` in our subclass.
    @chrisjbillington
    chrisjbillington committed May 10, 2023
    Configuration menu
    Copy the full SHA
    c6ce7ec View commit details
    Browse the repository at this point in the history
Loading
pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.


Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy