Skip to content

Commit a1eddfa

Browse files
authored
Merge pull request #15 from DiamondLightSource/migrate-dls-controls-diamondlightsource
Replaced dls-controls with DiamondLightSource
2 parents 1638b3f + 1a3ae33 commit a1eddfa

File tree

5 files changed

+20
-20
lines changed

5 files changed

+20
-20
lines changed

CONTRIBUTING.rst

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ filing a new one. If you have a great idea but it involves big changes, please
77
file a ticket before making a pull request! We want to make sure you don't spend
88
your time coding something that might not fit the scope of the project.
99

10-
.. _GitHub: https://github.com/dls-controls/dls-pmac-control/issues
10+
.. _GitHub: https://github.com/DiamondLightSource/dls-pmac-control/issues
1111

1212
Running the tests
1313
-----------------
@@ -17,7 +17,7 @@ To run in a container
1717

1818
Use vscode devcontainer as follows::
1919

20-
$ git clone git://github.com/dls-controls/dls-pmac-control.git
20+
$ git clone git://github.com/DiamondLightSource/dls-pmac-control.git
2121
$ vscode dls-pmac-control
2222
Click on 'Reopen in Container' when prompted
2323
In a vscode Terminal:
@@ -30,7 +30,7 @@ To run locally
3030
Get the source source code and run the unit tests directly
3131
on your workstation as follows::
3232

33-
$ git clone git://github.com/dls-controls/dls-pmac-control.git
33+
$ git clone git://github.com/DiamondLightSource/dls-pmac-control.git
3434
$ cd dls-pmac-control
3535
$ virtualenv .venv
3636
$ source .venv/bin/activate
@@ -135,7 +135,7 @@ To make a new release, please follow this checklist:
135135
Note that tagging and pushing to the main branch has the same effect except that
136136
you will not get the option to edit the release notes.
137137

138-
.. _release: https://github.com/dls-controls/dls-pmac-control/releases
138+
.. _release: https://github.com/DiamondLightSource/dls-pmac-control/releases
139139

140140

141141
Checking Dependencies

README.rst

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -10,22 +10,22 @@ end to control the DeltaTau PMAC, Power PMAC and Geobrick motor control systems.
1010
============== ==============================================================
1111
PyPI ``pip install dls-pmaccontrol``
1212
launch with ``dls-pmac-control``
13-
Source code https://github.com/dls-controls/dls-pmac-control
14-
Documentation https://dls-controls.github.io/dls-pmac-control
15-
Releases https://github.com/dls-controls/dls-pmac-control/releases
13+
Source code https://github.com/DiamondLightSource/dls-pmac-control
14+
Documentation https://DiamondLightSource.github.io/dls-pmac-control
15+
Releases https://github.com/DiamondLightSource/dls-pmac-control/releases
1616
============== ==============================================================
1717

1818

19-
.. |code_ci| image:: https://github.com/dls-controls/dls-pmac-control/workflows/Code%20CI/badge.svg?branch=master
20-
:target: https://github.com/dls-controls/dls-pmac-control/actions?query=workflow%3A%22Code+CI%22
19+
.. |code_ci| image:: https://github.com/DiamondLightSource/dls-pmac-control/workflows/Code%20CI/badge.svg?branch=master
20+
:target: https://github.com/DiamondLightSource/dls-pmac-control/actions?query=workflow%3A%22Code+CI%22
2121
:alt: Code CI
2222

23-
.. |docs_ci| image:: https://github.com/dls-controls/dls-pmac-control/workflows/Docs%20CI/badge.svg?branch=master
24-
:target: https://github.com/dls-controls/dls-pmac-control/actions?query=workflow%3A%22Docs+CI%22
23+
.. |docs_ci| image:: https://github.com/DiamondLightSource/dls-pmac-control/workflows/Docs%20CI/badge.svg?branch=master
24+
:target: https://github.com/DiamondLightSource/dls-pmac-control/actions?query=workflow%3A%22Docs+CI%22
2525
:alt: Docs CI
2626

27-
.. |coverage| image:: https://codecov.io/gh/dls-controls/dls-pmac-control/branch/master/graph/badge.svg
28-
:target: https://codecov.io/gh/dls-controls/dls-pmac-control
27+
.. |coverage| image:: https://codecov.io/gh/DiamondLightSource/dls-pmac-control/branch/master/graph/badge.svg
28+
:target: https://codecov.io/gh/DiamondLightSource/dls-pmac-control
2929
:alt: Test Coverage
3030

3131
.. |pypi_version| image:: https://img.shields.io/pypi/v/dls-pmaccontrol.svg
@@ -40,4 +40,4 @@ Releases https://github.com/dls-controls/dls-pmac-control/releases
4040
Anything below this line is used when viewing README.rst and will be replaced
4141
when included in index.rst
4242
43-
See https://dls-controls.github.io/dls-pmac-control for more detailed documentation.
43+
See https://DiamondLightSource.github.io/dls-pmac-control for more detailed documentation.

docs/reference.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ Technical reference material including APIs and release notes.
88
.. toctree::
99
:caption: Reference
1010

11-
Releases <https://github.com/dls-controls/dls-pmac-control/releases>
11+
Releases <https://github.com/DiamondLightSource/dls-pmac-control/releases>
1212
Index <genindex.html#http://>
1313

1414
..

docs/tutorials/installation.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ You can now use ``pip`` to install the library::
3030
If you require a feature that is not currently released you can also install
3131
from github::
3232

33-
python3 -m pip install git+https://github.com/dls-controls/dls-pmac-control.git
33+
python3 -m pip install git+https://github.com/DiamondLightSource/dls-pmac-control.git
3434

3535
The library should now be installed and the commandline interface on your path.
3636
You can check the version that has been installed by typing::
@@ -42,4 +42,4 @@ Running in a container
4242

4343
To pull the container from github container registry and run::
4444
45-
docker run ghcr.io/dls-controls/dls-pmac-control:main --version
45+
docker run ghcr.io/DiamondLightSource/dls-pmac-control:main --version

setup.cfg

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
name = dls_pmaccontrol
44
description = Delta Tau pmac control utility
5-
url = https://github.com/dls-controls/dls-pmac-control
5+
url = https://github.com/DiamondLightSource/dls-pmac-control
66
author = Ulrik Kofoed Pederson
77
maintainer = Giles Knap
88
author_email = [email protected]
@@ -29,8 +29,8 @@ setup_requires =
2929
# Specify any package dependencies below.
3030
include_package_data = True
3131
install_requires =
32-
# dls-pmaclib @ git+https://github.com/dls-controls/dls-pmac-lib.git@5b6acbfb1ec71ac50957c37e761d76529b16380f
33-
# dls-pmaclib @ https://github.com/dls-controls/dls-pmac-lib/archive/refs/tags/3.0.0.zip
32+
# dls-pmaclib @ git+https://github.com/DiamondLightSource/dls-pmac-lib.git@5b6acbfb1ec71ac50957c37e761d76529b16380f
33+
# dls-pmaclib @ https://github.com/DiamondLightSource/dls-pmac-lib/archive/refs/tags/3.0.0.zip
3434
dls-pmaclib >= 3.0.1-beta1
3535
numpy
3636
pyqt5

0 commit comments

Comments
 (0)