Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
30 commits
Select commit Hold shift + click to select a range
2fef68f
MNT: uvify the repo
ZLLentz Apr 29, 2026
23e3688
ENH: first pass at generating ui xml snippits from typhos generation …
ZLLentz Apr 29, 2026
7778480
BLD: line_profiler is used in the tests too
ZLLentz Apr 29, 2026
6196680
MNT: commit updated lockfile
ZLLentz Apr 29, 2026
72576b8
ENH: unmacro the generated file
ZLLentz Apr 29, 2026
a36fbec
MNT: ignore code complexity check, typhos is not ready yet
ZLLentz Apr 29, 2026
c60efac
ENH: get exporter to run from command line
ZLLentz Apr 29, 2026
5878c3a
MNT: stop masking embedded and engineering templates with detailed tree
ZLLentz Apr 29, 2026
d21e7b4
FIX: ignore this error, doesn't seem to matter?
ZLLentz Apr 29, 2026
770dbea
FIX: house of cards situation? Re-enable tree for embedded.
ZLLentz Apr 29, 2026
60d4290
ENH: add simple placeholder for display title
ZLLentz Apr 29, 2026
5943e7f
MNT: run code from function instead of from dict
ZLLentz Apr 29, 2026
97b6943
ENH: it kind of works now, super messy
ZLLentz Apr 30, 2026
0711793
FIX: comboboxes were incorrect
ZLLentz Apr 30, 2026
3abfa87
ENH: put placeholders at original size to make the screen look almost…
ZLLentz Apr 30, 2026
7a508cc
ENH: add advisory macros after generating ui
ZLLentz Apr 30, 2026
322b1eb
Merge branch 'master' into enh_ui_exporter
ZLLentz Apr 30, 2026
3e7a28d
MNT: refactor to consolidate xml building logic
ZLLentz Apr 30, 2026
cc527a8
DOC: fix outdated docstring
ZLLentz Apr 30, 2026
8eb74fc
ENH: include the push button press value in export
ZLLentz Apr 30, 2026
120e465
ENH: add normal typhos default command button text
ZLLentz Apr 30, 2026
93765c6
FIX: size function was setting width twice instead of both width and …
ZLLentz Apr 30, 2026
de25f65
DOC: explain that we have to resave in designer for now
ZLLentz Apr 30, 2026
9e6ff31
DOC: simplify doc release process: no more pre-release notes
ZLLentz Apr 30, 2026
be9b89e
DOC: also remove upcoming release notes section
ZLLentz Apr 30, 2026
8dc573f
DOC: remove reference to pre-release notes in pre-merge checklist
ZLLentz Apr 30, 2026
aab2c33
STY: pre-commit run --all-files and manual fixes too
ZLLentz Apr 30, 2026
65b73a4
TST: kluge this one test, I changed how engineering screens work a li…
ZLLentz Apr 30, 2026
f0477da
FIX: less messy cleanup when we delete a line edit very early
ZLLentz Apr 30, 2026
f2792b8
DOC: actually use the correct link
ZLLentz Apr 30, 2026
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
23 changes: 0 additions & 23 deletions .flake8

This file was deleted.

2 changes: 0 additions & 2 deletions .github/PULL_REQUEST_TEMPLATE.md
Original file line number Diff line number Diff line change
Expand Up @@ -26,5 +26,3 @@
- [ ] Code has been checked for threading issues (no blocking tasks in GUI thread)
- [ ] Test suite passes locally
- [ ] Test suite passes on GitHub Actions
- [ ] Ran ``docs/pre-release-notes.sh`` and created a pre-release documentation page
- [ ] Pre-release docs include context, functional descriptions, and contributors as appropriate
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -116,3 +116,6 @@ ENV/
*.swp
*~
.vscode

# Versioning
_version.py
45 changes: 21 additions & 24 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,28 +6,25 @@ exclude: |
)$

repos:
- repo: https://github.com/pre-commit/pre-commit-hooks
rev: v5.0.0
hooks:
- id: no-commit-to-branch
- id: trailing-whitespace
- id: end-of-file-fixer
- id: check-ast
- id: check-case-conflict
- id: check-json
- id: check-merge-conflict
- id: check-symlinks
- id: check-xml
- id: check-yaml
exclude: '^(conda-recipe/meta.yaml)$'
- id: debug-statements
- repo: https://github.com/pre-commit/pre-commit-hooks
rev: v6.0.0
hooks:
- id: no-commit-to-branch
- id: trailing-whitespace
- id: end-of-file-fixer
- id: check-ast
- id: check-case-conflict
- id: check-json
- id: check-merge-conflict
- id: check-symlinks
- id: check-xml
- id: check-yaml
exclude: '^(conda-recipe/meta.yaml)$'
- id: debug-statements

- repo: https://github.com/pycqa/flake8.git
rev: 7.2.0
hooks:
- id: flake8

- repo: https://github.com/timothycrosley/isort
rev: 6.0.1
hooks:
- id: isort
- repo: https://github.com/astral-sh/ruff-pre-commit
rev: v0.15.6
hooks:
- id: ruff-check # run the linter
args: [ --fix ] # and the safe fixes
- id: ruff-format # run the formatter
11 changes: 0 additions & 11 deletions conda-recipe/meta.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,6 @@ build:
noarch: python
script: {{ PYTHON }} -m pip install . -vv



requirements:
build:
- python >=3.9
Expand All @@ -34,16 +32,13 @@ requirements:
- pydm >=1.19.1
- pyqt =5
- pyqtgraph
- pyyaml
- qdarkstyle
- qtawesome
- qtpy
- timechart >=1.2.4
run_constrained:
- happi >=1.14.0



test:
commands:
- typhos --help
Expand All @@ -54,18 +49,12 @@ test:
- caproto
- doctr
- doctr-versions-menu
- flake8
- ipython>=7.16
- jinja2<3.1
- line_profiler
- pcdsdevices>=8.4.0
- pytest
- pytest-benchmark
- pytest-qt
- pytest-timeout
- simplejson



about:
dev_url: https://github.com/pcdshub/typhos
Expand Down
12 changes: 0 additions & 12 deletions dev-requirements.txt

This file was deleted.

5 changes: 0 additions & 5 deletions docs-requirements.txt

This file was deleted.

37 changes: 0 additions & 37 deletions docs/pre-release-notes.sh

This file was deleted.

114 changes: 0 additions & 114 deletions docs/release_notes.py

This file was deleted.

1 change: 0 additions & 1 deletion docs/source/index.rst
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,6 @@ Related Projects
python_methods.rst
templates.rst
release_notes.rst
upcoming_changes.rst

.. toctree::
:maxdepth: 3
Expand Down
Loading
Loading