Skip to content

Commit 288378e

Browse files
committed
review of changes manifesto
1 parent 3a87e80 commit 288378e

File tree

5 files changed

+11
-12
lines changed

5 files changed

+11
-12
lines changed

docs/explanations/changes.md

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -55,15 +55,15 @@ When a beamline repository is updated, it is still possible to deploy old versio
5555
User Project Versioning
5656
-----------------------
5757

58-
The documentation has recommended using DateVer for beamline repos and generic IOC repos. This is because both types of repo have many parts with different version schemes so SemVer is not really applicable. DateVer is not required and you are free to use any scheme you wish for these repositories.
58+
The documentation has recommended using DateVer for beamline repos and generic IOC repos. This is because SemVer is not really applicable to these. However, DateVer is not required and you are free to use any scheme you wish for these repositories.
5959

6060
It is easy to determine which template version and thus which `ec` SemVer version your repository was last updated from. Inspect the file `.copier_answers.yml` in the root of your repository. This file contains the version of the template that was used to create the repository in the field `_commit`.
6161

6262

6363
Types of Changes
6464
----------------
6565

66-
Changes to the framework are likely to be initiated in one of three places in the described under the following headings. As far as possible such changes will be backwards compatible going forward, and if they are not then a major version release will be made.
66+
Changes to the framework are likely to be initiated in one the places described under the following headings. As far as possible such changes will be backwards compatible going forward, and if they are not then a major version release will be made.
6767

6868
### ibek
6969

@@ -79,9 +79,8 @@ Changes here affect how IOCs and other services are deployed into Kubernetes. Th
7979
The Generic IOC template is well established and stable. However, each time a new target architecture is added, this will need updates to the CI. We will be supporting Windows and ARM targets in future. These changes should certainly be backwards compatible and not affect existing projects.
8080

8181

82-
ibek-support
83-
------------
82+
### ibek-support
8483

85-
`ibek-support` is a unique project in that it is a submodule of all Generic IOCs. It is expected that there will be constant change to this module as new support modules are added. However, such changes will almost entirely be adding new folders and not affect existing generic IOCs. We encourage users to fork this repository, add their own support modules and submit PRs back to the original so that a wide range of support modules can be shared.
84+
`ibek-support` is a unique project in that it is a submodule of all Generic IOCs. It is expected that there will be constant change to this module as new support modules are added. However, such changes will almost entirely be adding new folders and not affect existing generic IOCs. We encourage users to fork this repository, add their own support modules and submit PRs back to the original so that a wide range of support modules can be shared (a branch rather than fork is preferred for internal developers).
8685

8786
If there is a need to change the CLI that ibek-support uses, then a new version of `ibek` will be released. Only generic IOCs that have been updated to pick up the new version of `ibek` would be able to use these changes. Because older generic IOCs will retain the old commit of the 'ibek-support' submodule, they will not be affected by the changes until they are updated.

docs/how-to/own_tools.md

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,5 +17,6 @@ epics-containers has been tested with
1717
- vscode
1818
- Github Codespaces
1919

20-
TODO: add instructions for using other editors. Potentially we could enhance
21-
the epics-containers-cli to support other editors with minimal effort.
20+
If you prefer console based editors like vim or emacs, then you will get the best results by launching the development containers defined in the epics-containers using the devcontainer CLI as described here <https://containers.dev/supporting#devcontainer-cli>.
21+
22+
In addition you could install your editor inside the developer container by adding an apt-install command into the `epics-containers` user personalization file. See [details here](https://github.com/epics-containers/epics-containers.github.io/blob/3a87e808e1c7983430a30c5a4dcd0d0661895d60/.devcontainer/postCreateCommand#L23-L27)

docs/images/dependency_matrix.png

-2.79 KB
Loading

docs/tutorials/create_beamline.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ and c is the class of beamline.
1212

1313
:::{note}
1414
You may choose your own naming convention, but lower case letters,
15-
numbers and hyphens only are recommended for both domain names and
15+
numbers and hyphens only are required for both domain names and
1616
IOC names. This is a restriction that helm introduces for package names.
1717
:::
1818

docs/tutorials/setup_workstation.md

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ The tools you need to install are:
66

77
- Visual Studio Code
88
- a container platform, either podman or docker
9-
- Python 3.10 or later + a Python virtual environment
9+
- Python 3.11 or later + a Python virtual environment
1010
- git client for version control
1111

1212
Visual Studio Code is recommended because it has excellent integration with
@@ -61,13 +61,12 @@ devcontainer in the next tutorial.
6161
### Setup Docker or Podman
6262

6363
:::{Note}
64-
**DLS Users**: RHEL 8 Workstations at DLS have podman 4.4.1 installed by default.
64+
**DLS Users**: RHEL 8 Workstations at DLS have podman 4.6.1 installed by default.
6565
RHEL 7 Workstations are not supported.
6666
:::
6767

6868
Next install docker or podman as your container platform. epics-containers
69-
has been tested with podman 4.4.1 on RedHat 8, and Docker 24.0.5 on
70-
for Ubuntu 22.04.
69+
has been tested with podman 4.4.1 and higher on RedHat 8, and Docker 24.0.5 and higher on for Ubuntu 22.04 and higher.
7170

7271
If you are using docker, simply replace `podman` with `docker` in the commands listed in these tutorials. `docker` users should also take a look at this page: [](../reference/docker.md)
7372

0 commit comments

Comments
 (0)