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
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
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
  • 25 files changed
  • 3 contributors

Commits on Jun 25, 2020

  1. Squashed commit of the following: 

    commit c3b7988
Author: Phil Starkey <philipstarkey@users.noreply.github.com>
Date:   Thu Jun 25 18:27:06 2020 +1000

    Update labscript_utils dependency to `>=3.0.0`

commit 822e5d5
Merge: 2e2785c 39c6f0b
Author: Russell Anderson <5637107+rpanderson@users.noreply.github.com>
Date:   Thu Jun 25 15:48:15 2020 +1000

    Merge pull request #69 from rpanderson/example_fix

    Make example labscript functional and format using black

commit 39c6f0b
Author: Russell Anderson <5637107+rpanderson@users.noreply.github.com>
Date:   Thu Jun 25 12:34:08 2020 +1000

    Name all the args

commit 255d74e
Author: Russell Anderson <5637107+rpanderson@users.noreply.github.com>
Date:   Thu Jun 25 12:11:48 2020 +1000

    Name all arguments in connection table

commit e3d3ece
Author: Russell Anderson <5637107+rpanderson@users.noreply.github.com>
Date:   Thu Jun 25 11:08:25 2020 +1000

    Omit __init__ import and comply with flake8 F403

commit 6b26f1f
Author: Russell Anderson <5637107+rpanderson@users.noreply.github.com>
Date:   Sun May 31 17:38:18 2020 +1000

    Make example labscript functional and format using black

commit 2e2785c
Merge: 62b9098 4e77810
Author: Chris Billington <chrisjbillington@gmail.com>
Date:   Wed Jun 24 21:22:05 2020 -0400

    Merge pull request #70 from rpanderson/is-syntax-warning-bugfix

    Bugfix for ValueError introduced in #68

commit 4e77810
Author: Russell Anderson <5637107+rpanderson@users.noreply.github.com>
Date:   Thu Jun 25 11:18:56 2020 +1000

    Abbreviated bugfix.

commit a667f7e
Author: Russell Anderson <5637107+rpanderson@users.noreply.github.com>
Date:   Thu Jun 25 11:17:11 2020 +1000

    Bugfix for ValueError introduced in #68

commit 62b9098
Merge: 0e23ed0 1746399
Author: Chris Billington <chrisjbillington@gmail.com>
Date:   Wed Jun 24 20:49:32 2020 -0400

    Merge pull request #67 from philipstarkey/fix-h5py-file-mode

    Fix h5py deprecation warning

commit 0e23ed0
Merge: 5b52c20 6373f02
Author: Chris Billington <chrisjbillington@gmail.com>
Date:   Wed Jun 24 18:47:18 2020 -0400

    Merge pull request #68 from rpanderson/is-syntax-warning

    Do not use 'is' for numeric literal comparisons

commit 6373f02
Author: Russell Anderson <5637107+rpanderson@users.noreply.github.com>
Date:   Thu Jun 25 08:36:55 2020 +1000

    Omitted 'is' with numeric literal comparisons

commit 1746399
Author: philipstarkey <philipstarkey@users.noreply.github.com>
Date:   Wed Jun 24 18:29:12 2020 +1000

    Fix h5py deprecation warning

    Addresses labscript-suite/labscript-utils#47 for the labscript module

commit 5b52c20
Merge: 0362fa7 88ce952
Author: Russell Anderson <5637107+rpanderson@users.noreply.github.com>
Date:   Mon Jun 22 18:09:54 2020 +1000

    Merge pull request #66 from philipstarkey/master

    Doc updates

commit 88ce952
Author: philipstarkey <philipstarkey@users.noreply.github.com>
Date:   Sat Jun 20 18:17:23 2020 +1000

    Doc updates

    Renamed API reference URL to match labscript utils and updated config to fix bugs identified in labscript-suite/labscript-utils#57

commit 0362fa7
Merge: 74869ef 52d3b9f
Author: Phil Starkey <philipstarkey@users.noreply.github.com>
Date:   Fri Jun 19 18:58:04 2020 +1000

    Merge pull request #65 from philipstarkey/master

    Updated docs to follow our standard conf

commit 52d3b9f
Author: philipstarkey <philipstarkey@users.noreply.github.com>
Date:   Fri Jun 19 16:04:04 2020 +1000

    Addressing latest review comments

commit 7674a8f
Author: philipstarkey <philipstarkey@users.noreply.github.com>
Date:   Fri Jun 19 11:19:33 2020 +1000

    Updated docs to use jinja template for component doc links

commit d4474e2
Author: philipstarkey <philipstarkey@users.noreply.github.com>
Date:   Thu Jun 18 16:43:10 2020 +1000

    Updated .gitignore with latest GitHub defaults

commit a18a0d1
Author: philipstarkey <philipstarkey@users.noreply.github.com>
Date:   Thu Jun 18 16:39:35 2020 +1000

    Relocated custom sphinx git ignore rules

commit 80aa5a1
Author: philipstarkey <philipstarkey@users.noreply.github.com>
Date:   Thu Jun 18 16:21:44 2020 +1000

    Restored 64 pixel logo accidentally replaced with 32 pixel logo

commit 42d3bc6
Author: philipstarkey <philipstarkey@users.noreply.github.com>
Date:   Thu Jun 18 16:17:42 2020 +1000

    Updated install requirement to 3.0.0rc1+

commit 1961a2c
Author: philipstarkey <philipstarkey@users.noreply.github.com>
Date:   Thu Jun 18 16:13:40 2020 +1000

    testing dependency fix

commit 234753d
Author: philipstarkey <philipstarkey@users.noreply.github.com>
Date:   Thu Jun 18 16:07:41 2020 +1000

    Updated as per the review in labscript-suite/labscript-suite#48

commit 74869ef
Author: Russell Anderson <5637107+rpanderson@users.noreply.github.com>
Date:   Wed Jun 17 10:24:43 2020 +1000

    Populated README.md with styling, iconogrpahy, prose, and badges

commit 28dc675
Author: philipstarkey <philipstarkey@users.noreply.github.com>
Date:   Tue Jun 16 18:24:26 2020 +1000

    Removed unnecessary header and added intersphinx link

commit 35c5466
Author: philipstarkey <philipstarkey@users.noreply.github.com>
Date:   Tue Jun 16 17:19:33 2020 +1000

    Updated docs to follow our standard conf

    Also added links to other labscript suite docs and standard links.

Co-authored-by: chrisjbillington <chrisjbillington@gmail.com>
Co-authored-by: Russell Anderson <5637107+rpanderson@users.noreply.github.com>
    @philipstarkey @chrisjbillington @rpanderson
    3 people committed Jun 25, 2020
    Configuration menu
    Copy the full SHA
    83856d6 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