dls-controls->diamonlightsource

Author: gilesknap

.devcontainer/devcontainer.json

@@ -2,7 +2,7 @@
 // https://github.com/microsoft/vscode-dev-containers/tree/v0.194.0/containers/ubuntu
 {
     "name": "dev-c7",
-    "image": "ghcr.io/dls-controls/dev-c7:latest",
+    "image": "ghcr.io/diamondlightsource/dev-c7:latest",
     "remoteEnv": {
         "DISPLAY": "${localEnv:DISPLAY}",
         "HOME": "${localEnv:HOME}",
@@ -40,4 +40,4 @@
         "--storage-opt=ignore_chown_errors=true",
         "--runtime=/usr/bin/crun"
     ]
-}
+}

.vscode/settings.json

@@ -10,7 +10,7 @@
     "python.languageServer": "Pylance",
     "editor.formatOnSave": true,
     "editor.codeActionsOnSave": {
-        "source.organizeImports": true
+        "source.organizeImports": "explicit"
     },
     "workbench.colorCustomizations": {
         "activityBar.background": "#521D07",

CONTRIBUTING.rst

@@ -7,7 +7,7 @@ filing a new one. If you have a great idea but it involves big changes, please
 file a ticket before making a pull request! We want to make sure you don't spend
 your time coding something that might not fit the scope of the project.
 
-.. _GitHub: https://github.com/dls-controls/dev-c7/issues
+.. _GitHub: https://github.com/diamondlightsource/dev-c7/issues
 
 Testing
 -------
@@ -23,7 +23,7 @@ Make Container Image
 
 The image can be made locally with the script ``build-dec-c7``. The
 resulting image will be placed in the local cache with the tag
-``ghcr.io/dls-controls/dev-c7:latest``.
+``ghcr.io/diamondlightsource/dev-c7:latest``.
 
 Since this is the default tag that ``run-dev-c7`` uses you can now use it
 launch and try out the new container image.
@@ -67,7 +67,7 @@ To make a new release, please follow this checklist:
 - make changes on a branch and test locally with ``build-dev-c7``
 - add any required updates to the docs and test with ``docs/make_docs.sh``
 - push the changes to GitHub
-- Go to https://github.com/dls-controls/dev-c7/pulls and create a PR to main
+- Go to https://github.com/diamondlightsource/dev-c7/pulls and create a PR to main
 - GitHub actions will make an image to verify that it builds
 - Await approval for the PR
 - Choose a new PEP440 compliant release number
@@ -76,5 +76,5 @@ To make a new release, please follow this checklist:
 - Submit the release
 - GitHub Actions will publish the image to ghcr.io and the docs to GitHub Pages
 
-.. _release: https://github.com/dls-controls/dev-c7/releases
+.. _release: https://github.com/diamondlightsource/dev-c7/releases
 

README.rst

@@ -9,25 +9,25 @@ This repo defines a container and launch script for re-creating the
 DLS Controls RHEL7 developer environment on a RHEL8 Workstation.
 
 ============== ==============================================================
-Source code    https://github.com/dls-controls/dev-c7
-Documentation  https://dls-controls.github.io/dev-c7
-Releases       https://github.com/dls-controls/dev-c7/releases
-Images         https://ghcr.io/dls-controls/dev-c7
+Source code    https://github.com/diamondlightsource/dev-c7
+Documentation  https://diamondlightsource.github.io/dev-c7
+Releases       https://github.com/diamondlightsource/dev-c7/releases
+Images         https://ghcr.io/diamondlightsource/dev-c7
 ============== ==============================================================
 
 Quick Start
 ===========
 
-See the tutorial at `Quick Start <https://dls-controls.github.io/dev-c7/main/tutorials/start.html>`_.
+See the tutorial at `Quick Start <https://diamondlightsource.github.io/dev-c7/main/tutorials/start.html>`_.
 
 
 
-.. |code_ci| image:: https://github.com/dls-controls/dev-c7/workflows/Code%20CI/badge.svg?branch=main
-    :target: https://github.com/dls-controls/dev-c7/actions?query=workflow%3A%22Code+CI%22
+.. |code_ci| image:: https://github.com/diamondlightsource/dev-c7/workflows/Code%20CI/badge.svg?branch=main
+    :target: https://github.com/diamondlightsource/dev-c7/actions?query=workflow%3A%22Code+CI%22
     :alt: Code CI
 
-.. |docs_ci| image:: https://github.com/dls-controls/dev-c7/workflows/Docs%20CI/badge.svg?branch=main
-    :target: https://github.com/dls-controls/dev-c7/actions?query=workflow%3A%22Docs+CI%22
+.. |docs_ci| image:: https://github.com/diamondlightsource/dev-c7/workflows/Docs%20CI/badge.svg?branch=main
+    :target: https://github.com/diamondlightsource/dev-c7/actions?query=workflow%3A%22Docs+CI%22
     :alt: Docs CI
 
 .. |license| image:: https://img.shields.io/badge/License-Apache%202.0-blue.svg
@@ -38,6 +38,6 @@ See the tutorial at `Quick Start <https://dls-controls.github.io/dev-c7/main/tut
     Anything below this line is used when viewing README.rst and will be replaced
     when included in index.rst
 
-See https://dls-controls.github.io/dev-c7 for detailed documentation.
+See https://diamondlightsource.github.io/dev-c7 for detailed documentation.
 
 .. |quick| target:: tutorials/start.html

build-dev-c7.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 
-name=ghcr.io/dls-controls/dev-c7
+name=ghcr.io/diamondlightsource/dev-c7
 
 set -e
 podman build\

c7

@@ -4,7 +4,7 @@
 
 # NOTE that changes to this file should also be propgated to .devcontainer.json
 
-image=ghcr.io/dls-controls/dev-c7
+image=ghcr.io/diamondlightsource/dev-c7
 version=latest
 hostname=$(hostname)
 changed=false
@@ -93,15 +93,15 @@ shift $((OPTIND-1))
 if [[ ${install_devcontainer_json} == true ]] ; then
     mkdir -p .devcontainer
     cd .devcontainer
-    wget -nv https://raw.githubusercontent.com/dls-controls/dev-c7/main/.devcontainer/devcontainer.json
+    wget -nv https://raw.githubusercontent.com/diamondlightsource/dev-c7/main/.devcontainer/devcontainer.json
     echo
     echo "Installed devcontainer.json. Try 'Reopen in Container' or 'Reload Window'."
     exit 0
 fi
 
 if ! grep overlay ~/.config/containers/storage.conf &> /dev/null; then
     echo "ERROR: dev-c7 requires overlay filesystem."
-    echo "Please see https://dls-controls.github.io/dev-c7/main/how-to/podman.html"
+    echo "Please see https://diamondlightsource.github.io/dev-c7/main/how-to/podman.html"
     exit 1
 fi
 
@@ -218,7 +218,7 @@ elif [[ ${running} == "false" ]]; then
     # Prior to sleep we update the default shell to be bash,
     # this is because podman adds a user in etc/passwd but fails to honor
     # /etc/adduser.conf
-    version_tag=$(podman inspect --format='{{index .Labels "org.opencontainers.image.version"}}' ghcr.io/dls-controls/dev-c7:${version})
+    version_tag=$(podman inspect --format='{{index .Labels "org.opencontainers.image.version"}}' ghcr.io/diamondlightsource/dev-c7:${version})
     echo "Creating new dev-c7 container version ${version_tag:- Unknown} ..."
     ${logging}
 

docker/Dockerfile

@@ -2,7 +2,7 @@
 # hosted on RHEL8
 #
 # This is a stopgap so that we can use effort to promote the
-# kubernetes model https://github.com/dls-controls instead of spending
+# kubernetes model https://github.com/diamondlightsource instead of spending
 # effort in rebuilding our toolchain for RHEL8
 
 FROM centos:7

docs/explanations/how_it_works.rst

@@ -33,7 +33,7 @@ Images are stored in a container registry such as DockerHub or GitHub Container
 Registry https://ghcr.io. The image for ``dev-c7`` is stored alongside its source
 code here:
 
-    https://ghcr.io/dls-controls/dev-c7:latest
+    https://ghcr.io/diamondlightsource/dev-c7:latest
 
 The ``c7`` script uses ``podman run`` to create a container based on
 the above image. The container is an isolated execution environment with

docs/how-to/Dockerfile

@@ -1,4 +1,4 @@
-FROM ghcr.io/dls-controls/dev-c7:latest
+FROM ghcr.io/diamondlightsource/dev-c7:latest
 
 # dev tools and libraries
 RUN yum update -y && \

docs/how-to/containers.rst

@@ -64,12 +64,12 @@ container image.
 To experiment with making additions to the dev-c7 project, first clone
 the project and do a test build of the container::
 
-    git clone https://dls-controls.github.io/dev-c7/main/index.html
+    git clone https://diamondlightsource.github.io/dev-c7/main/index.html
     cd dev-c7
     ./build-dev-c7
 
 ``build-dev-c7`` will create a container image with the tag
-``ghcr.io/dls-controls/dev-c7``. This is the same tag that ``c7``
+``ghcr.io/diamondlightsource/dev-c7``. This is the same tag that ``c7``
 uses so it will launch a container based on your newly built image.
 
 .. note::