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: pcdshub/lucid
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: v0.9.0
Choose a base ref
...
head repository: pcdshub/lucid
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: master
Choose a head ref

Commits on Oct 29, 2021

  1. MNT: change from using SafeConfigParser to ConfigParser (#96)

    SafeConfigParser has been deprecated since Python 3.2 and will
    be removed in py311.
    
    python/cpython#28292
    https://bugs.python.org/issue45173
    tacaswell authored Oct 29, 2021
    Copy the full SHA
    5d2d7cd View commit details

Commits on Mar 24, 2022

  1. Copy the full SHA
    3ff510e View commit details
  2. Copy the full SHA
    d032a6f View commit details
  3. Copy the full SHA
    0c108ac View commit details

Commits on Mar 25, 2022

  1. Merge pull request #102 from tangkong/active_devices_only

    BUG: only list active devices on launch
    ZLLentz authored Mar 25, 2022
    Copy the full SHA
    21ecbca View commit details

Commits on Sep 9, 2022

  1. Copy the full SHA
    81d8132 View commit details
  2. Copy the full SHA
    6f897b3 View commit details
  3. Merge pull request #109 from ZLLentz/enh_normal_fallback

    ENH: add an alarm circle fallback for devices without hints
    ZLLentz authored Sep 9, 2022
    Copy the full SHA
    6f03362 View commit details

Commits on Nov 3, 2022

  1. Copy the full SHA
    1736d75 View commit details
  2. Merge pull request #112 from ZLLentz/maint_default_timeout

    MAINT: increase the default timeout to help TMO load properly
    ZLLentz authored Nov 3, 2022
    Copy the full SHA
    3b53413 View commit details

Commits on Nov 15, 2022

  1. Copy the full SHA
    61f764e View commit details

Commits on Nov 16, 2022

  1. Merge pull request #113 from ZLLentz/maint_auto_fix_precommit

    MAINT: scripted fix for precommit
    ZLLentz authored Nov 16, 2022
    Copy the full SHA
    cdb5234 View commit details

Commits on Nov 17, 2022

  1. Copy the full SHA
    3ab5c84 View commit details
  2. Merge pull request #115 from ZLLentz/maint_py310

    MAINT: make sure we pass ints to addWidget for python 3.10
    ZLLentz authored Nov 17, 2022
    Copy the full SHA
    046a49c View commit details

Commits on Jan 24, 2023

  1. ENH: add --skip_happi flag

    tangkong committed Jan 24, 2023
    Copy the full SHA
    0e085f1 View commit details
  2. Copy the full SHA
    dac5441 View commit details
  3. Copy the full SHA
    67094a5 View commit details

Commits on Jan 31, 2023

  1. Merge pull request #117 from tangkong/enh_skip_happi

    ENH: add --skip_happi flag
    tangkong authored Jan 31, 2023
    Copy the full SHA
    75861b6 View commit details

Commits on Feb 22, 2023

  1. CLN: removing run_tests.py

    Performed by pcds-migration-tools DeleteFiles
    klauer committed Feb 22, 2023
    Copy the full SHA
    eaf9c06 View commit details
  2. MNT: updating LICENSE from template

    Performed by pcds-migration-tools AddFileFromTemplate
    klauer committed Feb 22, 2023
    Copy the full SHA
    20135e6 View commit details
  3. MNT: updating AUTHORS.rst from template

    Performed by pcds-migration-tools AddFileFromTemplate
    klauer committed Feb 22, 2023
    Copy the full SHA
    3b29620 View commit details
  4. MNT: updating CONTRIBUTING.rst from template

    Performed by pcds-migration-tools AddFileFromTemplate
    klauer committed Feb 22, 2023
    Copy the full SHA
    cb3d0d0 View commit details
  5. MNT: updating .pre-commit-config.yaml from template

    Performed by pcds-migration-tools AddFileFromTemplate
    klauer committed Feb 22, 2023
    Copy the full SHA
    c6d916a View commit details
  6. MNT: updating .flake8 from template

    Performed by pcds-migration-tools AddFileFromTemplate
    klauer committed Feb 22, 2023
    Copy the full SHA
    3eae3e9 View commit details
  7. MNT: updating .coveragerc from template

    Performed by pcds-migration-tools AddFileFromTemplate
    klauer committed Feb 22, 2023
    Copy the full SHA
    51bf912 View commit details
  8. MNT: updating .git_archival.txt from template

    Performed by pcds-migration-tools AddFileFromTemplate
    klauer committed Feb 22, 2023
    Copy the full SHA
    2647e14 View commit details
  9. MNT: updating .gitattributes from template

    Performed by pcds-migration-tools AddFileFromTemplate
    klauer committed Feb 22, 2023
    Copy the full SHA
    4955eb8 View commit details
  10. CI: migrate to GitHub actions

    Performed by pcds-migration-tools GitHubActionsMigration
    klauer committed Feb 22, 2023
    Copy the full SHA
    3ec5e25 View commit details
  11. DOC: update Sphinx configuration

    Performed by pcds-migration-tools UpdateSphinx
    klauer committed Feb 22, 2023
    Copy the full SHA
    21e599d View commit details
  12. STY: update repository to Python 3.9+ standards

    Performed by pcds-migration-tools RunPyupgrade
    klauer committed Feb 22, 2023
    Copy the full SHA
    ca1af8f View commit details
  13. BLD: migrate to pyproject.toml

    Performed by pcds-migration-tools PyprojectTomlMigration
    klauer committed Feb 22, 2023
    Copy the full SHA
    dd72bd3 View commit details
  14. BLD: migrate to setuptools-scm

    Performed by pcds-migration-tools SetuptoolsScmMigration
    klauer committed Feb 22, 2023
    Copy the full SHA
    3ff7601 View commit details
  15. BLD: update conda-recipe

    Performed by pcds-migration-tools UpdateCondaRecipe
    klauer committed Feb 22, 2023
    Copy the full SHA
    ba77dd3 View commit details
  16. MNT: cleaning code with pycln

    Performed by pcds-migration-tools RunPycln
    klauer committed Feb 22, 2023
    Copy the full SHA
    bf74c0e View commit details
  17. DEV: pre-commit autoupdate

    klauer committed Feb 22, 2023
    Copy the full SHA
    d8b3b66 View commit details
  18. MNT: 'pre-commit run'

    Performed by pcds-migration-tools RunPrecommit
    klauer committed Feb 22, 2023
    Copy the full SHA
    988c76a View commit details
  19. Copy the full SHA
    7b5c215 View commit details
  20. TST: move tests into package

    klauer committed Feb 22, 2023
    Copy the full SHA
    2faecd8 View commit details
  21. BLD: remove empty scripts line

    klauer committed Feb 22, 2023
    Copy the full SHA
    5dc89a7 View commit details
  22. Copy the full SHA
    ece5bde View commit details
  23. Copy the full SHA
    ac2e133 View commit details

Commits on Feb 23, 2023

  1. Copy the full SHA
    18653aa View commit details

Commits on Feb 27, 2023

  1. FIX: modernize demo

    klauer committed Feb 27, 2023
    Copy the full SHA
    01120e2 View commit details

Commits on Feb 28, 2023

  1. Copy the full SHA
    3439506 View commit details

Commits on Mar 1, 2023

  1. Copy the full SHA
    29c75d1 View commit details

Commits on Mar 7, 2023

  1. Merge pull request #118 from klauer/mnt_upgrade

    DEV/MNT: migrate to GitHub Actions and pyproject.toml [LCLSPC-603]
    klauer authored Mar 7, 2023
    Copy the full SHA
    1d9be04 View commit details

Commits on Apr 20, 2023

  1. Copy the full SHA
    1766b19 View commit details
  2. Merge pull request #123 from pcdshub/maint_secrets

    MAINT: bulk secrets and readme update
    tangkong authored Apr 20, 2023
    Copy the full SHA
    a7ac25c View commit details

Commits on Oct 5, 2023

  1. Copy the full SHA
    9156f7c View commit details

Commits on Oct 6, 2023

  1. Copy the full SHA
    c495b2d View commit details
8 changes: 4 additions & 4 deletions .coveragerc
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
[run]
source =
lucid
lucid
[report]
omit =
#tests
*/tests/*
*test*
#versioning
.*version.*
*_version.py
#tests
*test*
lucid/tests/*
23 changes: 23 additions & 0 deletions .flake8
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
[flake8]
exclude = .git,__pycache__,build,dist,lucid/_version.py
max-line-length = 88
select = C,E,F,W,B,B950
extend-ignore = E203, E501, E226, W503, W504

# Explanation section:
# B950
# This takes into account max-line-length but only triggers when the value
# has been exceeded by more than 10% (96 characters).
# E203: Whitespace before ':'
# This is recommended by black in relation to slice formatting.
# E501: Line too long (82 > 79 characters)
# Our line length limit is 88 (above 79 defined in E501). Ignore it.
# E226: Missing whitespace around arithmetic operator
# This is a stylistic choice which you'll find everywhere in pcdsdevices, for
# example. Formulas can be easier to read when operators and operands
# have no whitespace between them.
#
# W503: Line break occurred before a binary operator
# W504: Line break occurred after a binary operator
# flake8 wants us to choose one of the above two. Our choice
# is to make no decision.
4 changes: 4 additions & 0 deletions .git_archival.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
node: $Format:%H$
node-date: $Format:%cI$
describe-name: $Format:%(describe:tags=true,match=*[0-9]*)$
ref-names: $Format:%D$
2 changes: 1 addition & 1 deletion .gitattributes
Original file line number Diff line number Diff line change
@@ -1 +1 @@
lucid/_version.py export-subst
.git_archival.txt export-subst
25 changes: 25 additions & 0 deletions .github/workflows/standard.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
name: PCDS Standard Testing

on:
push:
pull_request:
release:
types:
- created

jobs:
standard:
uses: pcdshub/pcds-ci-helpers/.github/workflows/python-standard.yml@master
secrets: inherit
with:
# The workflow needs to know the package name. This can be determined
# automatically if the repository name is the same as the import name.
package-name: "lucid"
# Extras that will be installed for both conda/pip:
testing-extras: ""
# Extras to be installed only for conda-based testing:
conda-testing-extras: ""
# Extras to be installed only for pip-based testing:
pip-testing-extras: ""
# Set if using setuptools-scm for the conda-build workflow
use-setuptools-scm: true
13 changes: 9 additions & 4 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
@@ -1,8 +1,13 @@
# See https://pre-commit.com for more information
# See https://pre-commit.com/hooks.html for more hooks
exclude: |
(?x)^(
lucid/_version.py|
)$
repos:
- repo: https://github.com/pre-commit/pre-commit-hooks
rev: v4.0.1
rev: v4.4.0
hooks:
- id: no-commit-to-branch
- id: trailing-whitespace
@@ -17,12 +22,12 @@ repos:
exclude: '^(conda-recipe/meta.yaml)$'
- id: debug-statements

- repo: https://gitlab.com/pycqa/flake8.git
rev: 3.9.2
- repo: https://github.com/pycqa/flake8.git
rev: 6.0.0
hooks:
- id: flake8

- repo: https://github.com/timothycrosley/isort
rev: 5.9.2
rev: 5.12.0
hooks:
- id: isort
52 changes: 0 additions & 52 deletions .travis.yml

This file was deleted.

13 changes: 13 additions & 0 deletions AUTHORS.rst
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
=======
Credits
=======

Maintainer
----------

* SLAC National Accelerator Laboratory <>

Contributors
------------

Interested? See: `CONTRIBUTING.rst <CONTRIBUTING.rst>`_
103 changes: 103 additions & 0 deletions CONTRIBUTING.rst
Original file line number Diff line number Diff line change
@@ -0,0 +1,103 @@
============
Contributing
============

Contributions are welcome, and they are greatly appreciated! Every little bit
helps, and credit will always be given.

You can contribute in many ways:

Types of Contributions
----------------------

Report Bugs
~~~~~~~~~~~

Report bugs at https://github.com/pcdshub/lucid/issues.

If you are reporting a bug, please include:

* Any details about your local setup that might be helpful in troubleshooting.
* Detailed steps to reproduce the bug.

Fix Bugs
~~~~~~~~

Look through the GitHub issues for bugs. Anything tagged with "bug"
is open to whoever wants to implement it.

Implement Features
~~~~~~~~~~~~~~~~~~

Look through the GitHub issues for features. Anything tagged with "feature"
is open to whoever wants to implement it.

Write Documentation
~~~~~~~~~~~~~~~~~~~

lucid could always use more documentation, whether
as part of the official lucid docs, in docstrings,
or even on the web in blog posts, articles, and such.

Submit Feedback
~~~~~~~~~~~~~~~

The best way to send feedback is to file an issue at https://github.com/pcdshub/lucid/issues.

If you are proposing a feature:

* Explain in detail how it would work.
* Keep the scope as narrow as possible, to make it easier to implement.
* Remember that this is a volunteer-driven project, and that contributions
are welcome :)

Get Started!
------------

Ready to contribute? Here's how to set up `lucid` for local development.

1. Fork the `lucid` repo on GitHub.
2. Clone your fork locally::

$ git clone git@github.com:your_name_here/lucid.git

3. Install your local copy into a new conda environment. Assuming you have conda installed, this is how you set up your fork for local development::

$ conda create -n lucid python=3.9 pip
$ cd lucid/
$ pip install -e .

4. Create a branch for local development::

$ git checkout -b name-of-your-bugfix-or-feature

Now you can make your changes locally.

5. Install and enable ``pre-commit`` for this repository::

$ pip install pre-commit
$ pre-commit install

6. Add new tests for any additional functionality or bugs you may have discovered. And, of course, be sure that all previous tests still pass by running::

$ pytest -v

7. Commit your changes and push your branch to GitHub::

$ git add .
$ git commit -m "Your detailed description of your changes."
$ git push origin name-of-your-bugfix-or-feature

8. Submit a pull request through the GitHub website.

Pull Request Guidelines
-----------------------

Before you submit a pull request, check that it meets these guidelines:

1. The pull request should include tests.
2. If the pull request adds functionality, the docs should be updated. Put your
new functionality into a function with a docstring, and add the feature to
the list in README.rst.
3. The pull request should work for Python 3.9 and up. Check the GitHub Actions status
and make sure that the tests pass for all supported Python versions.
62 changes: 31 additions & 31 deletions LICENSE.md
Original file line number Diff line number Diff line change
@@ -1,39 +1,39 @@
Copyright (c) 2018, The Board of Trustees of the Leland Stanford Junior
University, through SLAC National Accelerator Laboratory (subject to receipt
of any required approvals from the U.S. Dept. of Energy). All rights reserved.
Redistribution and use in source and binary forms, with or without
Copyright (c) 2023, The Board of Trustees of the Leland Stanford Junior
University, through SLAC National Accelerator Laboratory (subject to receipt
of any required approvals from the U.S. Dept. of Energy). All rights reserved.
Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions are met:

(1) Redistributions of source code must retain the above copyright notice,
this list of conditions and the following disclaimer.

(2) Redistributions in binary form must reproduce the above copyright notice,
this list of conditions and the following disclaimer in the documentation
and/or other materials provided with the distribution.
(1) Redistributions of source code must retain the above copyright notice,
this list of conditions and the following disclaimer.

(3) Neither the name of the Leland Stanford Junior University, SLAC National
Accelerator Laboratory, U.S. Dept. of Energy nor the names of its
contributors may be used to endorse or promote products derived from this
software without specific prior written permission.
(2) Redistributions in binary form must reproduce the above copyright notice,
this list of conditions and the following disclaimer in the documentation
and/or other materials provided with the distribution.

THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER, THE UNITED STATES GOVERNMENT,
OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT
OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING
IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY
(3) Neither the name of the Leland Stanford Junior University, SLAC National
Accelerator Laboratory, U.S. Dept. of Energy nor the names of its
contributors may be used to endorse or promote products derived from this
software without specific prior written permission.

THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER, THE UNITED STATES GOVERNMENT,
OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT
OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING
IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY
OF SUCH DAMAGE.

You are under no obligation whatsoever to provide any bug fixes, patches, or
upgrades to the features, functionality or performance of the source code
("Enhancements") to anyone; however, if you choose to make your Enhancements
available either publicly, or directly to SLAC National Accelerator Laboratory,
without imposing a separate written license agreement for such Enhancements,
then you hereby grant the following license: a non-exclusive, royalty-free
You are under no obligation whatsoever to provide any bug fixes, patches, or
upgrades to the features, functionality or performance of the source code
("Enhancements") to anyone; however, if you choose to make your Enhancements
available either publicly, or directly to SLAC National Accelerator Laboratory,
without imposing a separate written license agreement for such Enhancements,
then you hereby grant the following license: a non-exclusive, royalty-free
perpetual license to install, use, modify, prepare derivative works, incorporate
into other computer software, distribute, and sublicense such Enhancements or
into other computer software, distribute, and sublicense such Enhancements or
derivative works thereof, in binary and source code form.
10 changes: 8 additions & 2 deletions MANIFEST.in
Original file line number Diff line number Diff line change
@@ -1,5 +1,11 @@
include AUTHORS.rst
include CONTRIBUTING.rst
include LICENSE.md
include versioneer.py
include README.md
include lucid/*.css
include lucid/_version.py
include lucid/logo.png
include lucid/*.css

include requirements.txt
include dev-requirements.txt
include docs-requirements.txt
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
# LUCID
# Lucid
**L**CLS **U**ser **C**ontrol and **I**nterface **D**esign
Loading