From 8e8c43a7c6e78602be35ae45bb078c5f41360f47 Mon Sep 17 00:00:00 2001 From: Pete R Jemian Date: Tue, 23 Apr 2024 10:24:51 -0500 Subject: [PATCH 1/4] DOC #965 --- CHANGES.rst | 1 + docs/source/index.rst | 15 +++++++++++++-- 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/CHANGES.rst b/CHANGES.rst index a353eba6a..2090d1753 100644 --- a/CHANGES.rst +++ b/CHANGES.rst @@ -16,6 +16,7 @@ Change History ############## +History of changes in the *apstools* project. Project `milestones `_ describe future plans. diff --git a/docs/source/index.rst b/docs/source/index.rst index 875e7d54c..b484ee323 100644 --- a/docs/source/index.rst +++ b/docs/source/index.rst @@ -7,8 +7,9 @@ Library of Python tools for use with Bluesky at the APS. The `apstools` package provides supplemental support for data acquisition using the `Bluesky framework `__ at the `Advanced Photon Source `__. The support consists of a thin Python -interface to `EPICS `__ hardware, record structures, and -databases not already supported in `ophyd `__. +interface to `EPICS `__ hardware, records, +databases, and and other structures not already supported in `ophyd +`__. .. toctree:: :maxdepth: 1 @@ -40,6 +41,16 @@ databases not already supported in `ophyd `__. Command-line or GUI programs provided by *apstools*. + .. grid-item-card:: :material-regular:`info;3em` :ref:`about` + + Links to source code, license ... + + .. grid-item-card:: :material-regular:`timeline;3em` :ref:`Changes ` + + History of changes in *apstools*. + + +.. _about: About ----- From bd505cfb882940047d2e5219e155f572e1238b40 Mon Sep 17 00:00:00 2001 From: Pete R Jemian Date: Tue, 23 Apr 2024 10:28:04 -0500 Subject: [PATCH 2/4] DOC #965 --- docs/source/index.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/source/index.rst b/docs/source/index.rst index b484ee323..8e58581ad 100644 --- a/docs/source/index.rst +++ b/docs/source/index.rst @@ -45,7 +45,7 @@ databases, and and other structures not already supported in `ophyd Links to source code, license ... - .. grid-item-card:: :material-regular:`timeline;3em` :ref:`Changes ` + .. grid-item-card:: :material-regular:`timeline;3em` :ref:`History ` History of changes in *apstools*. From 13939018dbf25cc5f6fa640a2b6a8bf5b12fe1f9 Mon Sep 17 00:00:00 2001 From: Pete R Jemian Date: Thu, 27 Jun 2024 13:04:59 -0500 Subject: [PATCH 3/4] DOC #965 remove repeated word --- docs/source/index.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/source/index.rst b/docs/source/index.rst index 8e58581ad..1df489de6 100644 --- a/docs/source/index.rst +++ b/docs/source/index.rst @@ -8,7 +8,7 @@ The `apstools` package provides supplemental support for data acquisition using the `Bluesky framework `__ at the `Advanced Photon Source `__. The support consists of a thin Python interface to `EPICS `__ hardware, records, -databases, and and other structures not already supported in `ophyd +databases, and other structures not already supported in `ophyd `__. .. toctree:: From b78cc90c48f4af4d62788d2567089b7f5e99f06e Mon Sep 17 00:00:00 2001 From: Pete R Jemian Date: Thu, 27 Jun 2024 13:17:28 -0500 Subject: [PATCH 4/4] CI #965 bypass ruff workflow due to bug --- .github/workflows/code.yml | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/.github/workflows/code.yml b/.github/workflows/code.yml index 04c796a39..9fa2657fa 100644 --- a/.github/workflows/code.yml +++ b/.github/workflows/code.yml @@ -31,11 +31,16 @@ jobs: set -vxeuo pipefail python -m pip install --upgrade pip - - name: Run ruff - uses: davidslusser/actions_python_ruff@v1.0.1 - with: - python_version: "3.11" - + # - name: Run ruff + # uses: davidslusser/actions_python_ruff@v1.0.1 + # with: + # python_version: "3.11" + # https://github.com/davidslusser/actions_python_ruff/issues/2 + + - run: pip install ruff + - run: | + ruff check . + install-catalogs: name: Install & cache databroker catalogs runs-on: ubuntu-latest