Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

HHL Slits Added to APS Tools #934

Merged
merged 10 commits into from
Feb 28, 2024
Merged

HHL Slits Added to APS Tools #934

merged 10 commits into from
Feb 28, 2024

Conversation

MDecarabas
Copy link
Collaborator

@prjemian
Copy link
Contributor

[action-black] Checking python code using the black formatter...
would reformat /github/workspace/apstools/devices/hhl_slits.py

Oh no! 💥 💔 💥
1 file would be reformatted, 159 files would be left unchanged.

@prjemian
Copy link
Contributor

More files need to be updated:


from .hhl_slits import HHLSlits

@MDecarabas
Copy link
Collaborator Author

[action-black] Checking python code using the black formatter...
would reformat /github/workspace/apstools/devices/hhl_slits.py
Oh no! 💥 💔 💥
1 file would be reformatted, 159 files would be left unchanged.

No idea why this is happening. Formatted using vscode extension and then separately using the Conda-forge package. No change to the file

@prjemian
Copy link
Contributor

~apstools.devices.xia_slit.XiaSlit2D

    ~apstools.devices.hhl_slits.HHLSlits
    ~apstools.devices.xia_slit.XiaSlit2D


.. automodule:: apstools.devices.hhl_slits
    :members:
    :private-members:
    :show-inheritance:
    :inherited-members:```

@prjemian
Copy link
Contributor

[action-black] Checking python code using the black formatter...
would reformat /github/workspace/apstools/devices/hhl_slits.py
Oh no! 💥 💔 💥
1 file would be reformatted, 159 files would be left unchanged.

No idea why this is happening. Formatted using vscode extension and then separately using the Conda-forge package. No change to the file

I agree. The logs are not informative. I can check out your branch and diagnose locally. Meanwhile, is there a verbosity level we can add to the workflow?

- name: Run black
uses: rickstaa/action-black@v1
with:
black_args: ". --check"

Consult the repo for the action.

@canismarko
Copy link
Collaborator

Black v24 dropped recently, and picks up stuff that black v23 does not. I had to upgrade my local env to black v24.

@prjemian
Copy link
Contributor

Locally, this is the change:
image

Blank line 45 removed after method signature.

@prjemian
Copy link
Contributor

@MDecarabas - Did you test this with the actual EPICS controls, with the HHL slits at 25-ID? That's one type of review.

Copy link
Contributor

@prjemian prjemian left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM!

@prjemian
Copy link
Contributor

Er, one more thing to update is the CHANGES.rst file (the release notes).

@prjemian
Copy link
Contributor

This file: https://github.com/BCDA-APS/apstools/blob/hhl_slits/CHANGES.rst

Add entry for the new support, following previous examples.

@MDecarabas
Copy link
Collaborator Author

@MDecarabas - Did you test this with the actual EPICS controls, with the HHL slits at 25-ID? That's one type of review.

Yes I did

@prjemian
Copy link
Contributor

Change history addition, such as:

apstools/CHANGES.rst

Lines 43 to 47 in 7a5eaca

New Features
------------
* Add (ophyd) device support for:
* DG-645 digital delay/pulse generator.

(New section under the 1.6.19 release notes.)

@prjemian
Copy link
Contributor

Also note the expected date of Feb 29 has been pushed by a month to Mar 31. Feb 29 was not realistic.

@prjemian
Copy link
Contributor

You can change that text, as well.

@MDecarabas MDecarabas merged commit 767640c into main Feb 28, 2024
13 checks passed
@prjemian prjemian deleted the hhl_slits branch February 28, 2024 20:40
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Hoist support for HHL white beam slits from haven
4 participants