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.0.x
Choose a head ref
  • 1 commit
  • 28 files changed
  • 1 contributor

Commits on Jun 25, 2020

  1. Squashed commit of the following:

    commit d8b8343
    Merge: 9bc7a39 bfa6932
    Author: Chris Billington <chrisjbillington@gmail.com>
    Date:   Wed Jun 24 20:48:39 2020 -0400
    
        Merge pull request #59 from philipstarkey/fix-h5py-file-mode
    
        Addresses #47 for this module
    
    commit 9bc7a39
    Merge: 1189334 66d0be4
    Author: Chris Billington <chrisjbillington@gmail.com>
    Date:   Wed Jun 24 20:30:42 2020 -0400
    
        Merge pull request #55 from rpanderson/example_IMAQdx_remote
    
        Example labscript and analysis scripts for IMAQdxCamera and RemoteBLACS
    
    commit bfa6932
    Author: philipstarkey <philipstarkey@users.noreply.github.com>
    Date:   Thu Jun 25 10:25:49 2020 +1000
    
        Addresses #47 for this module
    
    commit 1189334
    Merge: 5025b1b 0b0d07a
    Author: Chris Billington <chrisjbillington@gmail.com>
    Date:   Wed Jun 24 19:35:15 2020 -0400
    
        Merge pull request #54 from rpanderson/example_experiment
    
        Minimal working connection table and example experiment script
    
    commit 66d0be4
    Author: Russell Anderson <5637107+rpanderson@users.noreply.github.com>
    Date:   Mon Jun 15 13:37:23 2020 +1000
    
        lyse analysis script demonstrating some Run methods for example_IMAQdx_remote
    
    commit a48a9c0
    Author: Russell Anderson <5637107+rpanderson@users.noreply.github.com>
    Date:   Mon Jun 15 13:15:48 2020 +1000
    
        Example connection table and labscript experiment script for RemoteBLACS and IMAQdxCamera
    
    commit 5025b1b
    Merge: f77525f ed76901
    Author: Chris Billington <chrisjbillington@gmail.com>
    Date:   Wed Jun 24 02:16:29 2020 -0400
    
        Merge pull request #58 from philipstarkey/philipstarkey/issue43
    
        Fixes .pth file has no effect in editable install
    
    commit ed76901
    Author: chrisjbillington <chrisjbillington@gmail.com>
    Date:   Wed Jun 24 01:23:44 2020 -0400
    
        Move copying of .pth file into setup.py
    
        Use a custom develop command to copy the .pth file into site-packages
        when `python setup.py develop` is run - this is what pip does under the
        hood for `pip install -e`.
    
        No longer need desktop-app to locate site-packages, as the setuptools
        command class knows it as `self.install_dir`.
    
        The file is not removed by `pip uninstall`, but due to the `try:
        except:`s in the `.pth` file, leaving it behind is harmless.
    
        It is removed if the user runs whatever `setup.py` command undoies
    
    commit 894e245
    Author: chrisjbillington <chrisjbillington@gmail.com>
    Date:   Wed Jun 24 00:04:13 2020 -0400
    
        Require desktop-app 0.2.6
    
        Which renames `_get_install_directory` to not have an underscore,
        and which fixes a bug preventing docs from building on RTD.
    
    commit 271439e
    Author: philipstarkey <philipstarkey@users.noreply.github.com>
    Date:   Wed Jun 24 12:53:49 2020 +1000
    
        Removed support for custom development directories from path
    
    commit dd098a5
    Author: philipstarkey <philipstarkey@users.noreply.github.com>
    Date:   Wed Jun 24 12:38:19 2020 +1000
    
        Fixes .pth file has no effect in editable install
        Fixes #43
    
        The .pth file is now copied during `labscript-profile-create` if it does not exist in the site-packages dir (where the .egg-info files exist) and if it the .pth file exists in the package structure (aka labscript-utils it is an editable install)
    
        The labscript-suite.pth file has been updated to not raise an exception if labscript-suite has been uninstalled (so we do not have to worry about cleanup).
    
        Also updated the `labscript_profile.add_userlib_and_pythonlib` function to use the `site` library for adding userlib and pythonlib to the system path.
    
    commit 0b0d07a
    Author: Russell Anderson <5637107+rpanderson@users.noreply.github.com>
    Date:   Mon Jun 22 17:48:00 2020 +1000
    
        start()/stop() in __main__ block so connection table can be imported
    
    commit 4c19de9
    Author: Russell Anderson <5637107+rpanderson@users.noreply.github.com>
    Date:   Mon Jun 15 13:12:52 2020 +1000
    
        Add AnalogOut with ramp example, rename DigitalOut connection
    
    commit 9b64a0d
    Author: Russell Anderson <5637107+rpanderson@users.noreply.github.com>
    Date:   Wed Jun 10 23:09:03 2020 +1000
    
        Minimal example connection table and labscript using dummy devices
    
    commit f77525f
    Author: Phil Starkey <philipstarkey@users.noreply.github.com>
    Date:   Sat Jun 20 18:09:53 2020 +1000
    
        Removed unnecessary fixed title from main TOC
    
        This was erroneously added in #57
    
    commit 5e02b01
    Merge: 3f78207 8b19766
    Author: Phil Starkey <philipstarkey@users.noreply.github.com>
    Date:   Sat Jun 20 18:07:04 2020 +1000
    
        Merge pull request #57 from philipstarkey/master
    
        Changed URL for API reference to be shorter
        Fixed bug with readthedocs auto PR build
    
    commit 8b19766
    Author: philipstarkey <philipstarkey@users.noreply.github.com>
    Date:   Sat Jun 20 12:02:51 2020 +1000
    
        Updated method call for stylesheet to remove deprecated warning in build
    
    commit 56fdd63
    Author: philipstarkey <philipstarkey@users.noreply.github.com>
    Date:   Sat Jun 20 11:46:33 2020 +1000
    
        Fixed sphinx conf to detect PR builds and link to 'latest' instead of stable
    
    commit 9889d19
    Author: philipstarkey <philipstarkey@users.noreply.github.com>
    Date:   Sat Jun 20 10:44:04 2020 +1000
    
        Changed URL for API reference to be shorter
    
    commit 3f78207
    Merge: bbd928a bf9d10e
    Author: Phil Starkey <philipstarkey@users.noreply.github.com>
    Date:   Fri Jun 19 18:58:37 2020 +1000
    
        Merge pull request #56 from philipstarkey/master
    
        Added links to other component docs
    
    commit bf9d10e
    Author: philipstarkey <philipstarkey@users.noreply.github.com>
    Date:   Fri Jun 19 16:06:09 2020 +1000
    
        Addressing latest review comments
    
    commit e75b6bc
    Author: philipstarkey <philipstarkey@users.noreply.github.com>
    Date:   Fri Jun 19 11:23:49 2020 +1000
    
        Updated docs to use jinja template for component doc links
    
    commit 9c61238
    Author: philipstarkey <philipstarkey@users.noreply.github.com>
    Date:   Thu Jun 18 17:14:57 2020 +1000
    
        Removed autogenerated rst file from version control
    
    commit 2303185
    Author: philipstarkey <philipstarkey@users.noreply.github.com>
    Date:   Thu Jun 18 16:43:29 2020 +1000
    
        Updated .gitignore with latest GitHub defaults
    
    commit 87b757e
    Author: philipstarkey <philipstarkey@users.noreply.github.com>
    Date:   Thu Jun 18 16:39:52 2020 +1000
    
        Relocated custom sphinx gitignore rules
    
    commit 75813a5
    Author: philipstarkey <philipstarkey@users.noreply.github.com>
    Date:   Thu Jun 18 16:31:01 2020 +1000
    
        Updated PR as per review in labscript-suite/labscript-suite#48
    
    commit bbd928a
    Author: Russell Anderson <5637107+rpanderson@users.noreply.github.com>
    Date:   Wed Jun 17 11:39:17 2020 +1000
    
        Populated README.md with styling, iconogrpahy, prose, and badges
    
    commit 573c521
    Author: philipstarkey <philipstarkey@users.noreply.github.com>
    Date:   Tue Jun 16 18:10:25 2020 +1000
    
        Added links to other component docs
    philipstarkey committed Jun 25, 2020
    Configuration menu
    Copy the full SHA
    a953031 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