Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
26 commits
Select commit Hold shift + click to select a range
e8a4452
Initial toml file
tacaswell Aug 26, 2025
66b23e0
Regenerate with current versions
tacaswell Aug 26, 2025
d807c6a
FIX: account for changes to Python stdlib
tacaswell Aug 28, 2025
706ff1e
Initial packages required to get profile to import
tacaswell Aug 28, 2025
44cb1e4
MNT: use raw strings for invalid string escapes
tacaswell Aug 29, 2025
efc292d
Add hdf5 plugins and standardize Python pinning
tacaswell Sep 3, 2025
590a669
update lockfile
tacaswell Sep 3, 2025
bcbf47e
Update lock file
tacaswell Sep 4, 2025
9963e48
update core pins
tacaswell Sep 4, 2025
a6e13f5
regenerate lock
tacaswell Sep 4, 2025
0aa203d
Update versions
tacaswell Sep 4, 2025
e21252e
Adding more third-party floors
tacaswell Sep 4, 2025
277db38
Remove accidental 'default' environment
tacaswell Sep 5, 2025
c15f034
Update versions
tacaswell Sep 5, 2025
cd67c0c
MNT: update ophyd-async and pull more from CF
tacaswell Sep 9, 2025
123c7ca
Manage envs when lanuching terminal
tacaswell Oct 22, 2025
6fe00a0
Update and regenerate lock
tacaswell Oct 22, 2025
576248b
MNT: change from deprecated section name
tacaswell Nov 7, 2025
25ae68a
Update pixi.toml for new packages
tacaswell Nov 7, 2025
a5fe158
BLD: update lock file
tacaswell Nov 7, 2025
689e927
Add pvxslibs
tacaswell Nov 17, 2025
16a51cf
Update pixi.toml for new packages
tacaswell Nov 17, 2025
556cc36
ENH: switch ophyd-async for conda-forge
tacaswell Nov 24, 2025
a7e2bfd
MNT: ignore PYTHONPATH when launching terminal
tacaswell Nov 24, 2025
020c73e
update bluesky and databroker pins
tacaswell Nov 25, 2025
2d4eff5
regenerate lock
tacaswell Nov 25, 2025
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 .gitattributes
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
# SCM syntax highlighting & preventing 3-way merges
pixi.lock merge=binary linguist-language=YAML linguist-generated=true
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -144,3 +144,6 @@ target/
dump.rdb

**/auto-generated/
# pixi environments
.pixi/*
!.pixi/config.toml
10,468 changes: 10,468 additions & 0 deletions pixi.lock

Large diffs are not rendered by default.

62 changes: 62 additions & 0 deletions pixi.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,62 @@
[workspace]
channels = ["conda-forge"]
name = "csx-profile-collection"
platforms = ["linux-64"]
version = "2025.3.1"

[system-requirements]
libc = "2.17"

[feature.profile.dependencies]
bluesky-base = "==1.14.6"
bluesky-queueserver = "*"
matplotlib-base= ">=3.9.3,<4"
networkx = ">=3.4.2,<4"
nslsii = "==0.11.4"
numpy = "*"
ophyd = ">=1.11.0"
pyepics = "*"
python = ">=3.12,<3.13"
semver = ">=3.0.4,<4"
tiled-client = ">=0.1.6"
gobject-introspection = ">=1.84.0,<2"
pygobject = ">=3.50.0,<4"
hklpy = ">=1.1.2,<2"
hdf5-external-filter-plugins = ">=0.1.0,<0.2"
blosc-hdf5-plugin = ">=1.0.1,<2"
databroker = "==2.0.0"
epicscorelibs = ">=7.0.7.99.1.1,<8"
bluesky-tiled-plugins = ">=2.0.0b68"
ophyd-async = ">=0.13.7,<0.14"


[feature.profile.pypi-dependencies]
pvxslibs = ">=1.3.2, <2"


[feature.qs.dependencies]
bluesky-queueserver = "*"
bluesky-httpserver = "*"

[feature.qs.tasks]
# This section needs some development work to understand the best way to
# thread the required configuration through both the task and files checked into
# the profile. These will interact with the ansible roles for pushing out the
# systemd units
qs-backend = "start-re-manager --profile-dir=."
qs-server = "uvicorn --host localhost --port 60610 bluesky_httpserver.server:app"


[feature.terminal.dependencies]
ipython = ">=9.5.0"
pyside6 = "*"
numpy = ">2"


[feature.terminal.tasks]
start = "unset SESSION_MANAGER PYTHONPATH && MPLBACKEND=qtagg ipython --profile-dir=."
pvs = "ipython --profile-dir=. -c 'get_pv_types(); exit()'"

[environments]
terminal = {features=["profile", "terminal"], solve-group="profile"}
qs = {features=["profile", "qs"], solve-group="profile"}
2 changes: 1 addition & 1 deletion startup/csx1/devices/stats_plugin.py
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ class StatsPluginCSX(PluginBase):
Due to https://github.com/areaDetector/ADCore/pull/333
"""
_default_suffix = 'Stats1:'
_suffix_re = 'Stats\d:'
_suffix_re = r'Stats\d:'
_html_docs = ['NDPluginStats.html']
_plugin_type = 'NDPluginStats'

Expand Down
2 changes: 1 addition & 1 deletion startup/csx1/plans/xpcs.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
from ..startup.detectors import fccd
from collections import Iterable
from collections.abc import Iterable
import itertools
import time
import bluesky.preprocessors as bpp
Expand Down
Loading