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

Optics #4

Open
wants to merge 19 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions .github/workflows/code.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,8 @@ jobs:

steps:
- uses: actions/checkout@v4
with:
fetch-depth: 0

- uses: actions/setup-python@v5
with:
Expand Down
6 changes: 3 additions & 3 deletions docs/source/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,12 @@
# -- Project information -----------------------------------------------------
# https://www.sphinx-doc.org/en/master/usage/configuration.html#project-information

import instrument
import tomo_instrument

project = "instrument"
project = "tomo_instrument"
copyright = "2023-2024, APS BCDA"
author = "APS BCDA"
version = instrument.__version__
version = tomo_instrument.__version__
release = version.split("+")[0]
if "+" in version:
release += "..."
Expand Down
2 changes: 1 addition & 1 deletion src/instrument/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

configure_logging()

__package__ = "instrument"
__package__ = "tomo_instrument"
try:
from setuptools_scm import get_version

Expand Down
1 change: 1 addition & 0 deletions src/instrument/devices/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
from ophyd.sim import motor as sim_motor # noqa: F401
from ophyd.sim import noisy_det as sim_det # noqa: F401

from ..devices.mct_optics import optics # noqa: F401
from ..utils.aps_functions import host_on_aps_subnet

if host_on_aps_subnet():
Expand Down
Loading