Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Replaced dls-controls with DiamondLightSource #168

Merged
merged 1 commit into from
Jul 16, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
30 changes: 15 additions & 15 deletions CHANGELOG.rst
Original file line number Diff line number Diff line change
Expand Up @@ -220,18 +220,18 @@ Added:
Last release as an EPICS module rather than a Python package


.. _Unreleased: https://github.com/dls-controls/pythonIoc/compare/4.5.0...HEAD
.. _4.5.0: https://github.com/dls-controls/pythonIoc/compare/4.4.0...4.5.0
.. _4.4.0: https://github.com/dls-controls/pythonIoc/compare/4.3.0...4.4.0
.. _4.3.0: https://github.com/dls-controls/pythonIoc/compare/4.2.0...4.3.0
.. _4.2.0: https://github.com/dls-controls/pythonIoc/compare/4.1.0...4.2.0
.. _4.1.0: https://github.com/dls-controls/pythonIoc/compare/4.0.2...4.1.0
.. _4.0.2: https://github.com/dls-controls/pythonIoc/compare/4.0.1...4.0.2
.. _4.0.1: https://github.com/dls-controls/pythonIoc/compare/3.2.1...4.0.1
.. _3.2.1: https://github.com/dls-controls/pythonIoc/compare/3.2...3.2.1
.. _3.2: https://github.com/dls-controls/pythonIoc/compare/3.1...3.2
.. _3.1: https://github.com/dls-controls/pythonIoc/compare/3.0...3.1
.. _3.0: https://github.com/dls-controls/pythonIoc/compare/3.0b2...3.0
.. _3.0b2: https://github.com/dls-controls/pythonIoc/compare/3.0b1...3.0b2
.. _3.0b1: https://github.com/dls-controls/pythonIoc/compare/2-16...3.0b1
.. _2-16: https://github.com/dls-controls/pythonIoc/releases/tag/2-16
.. _Unreleased: https://github.com/DiamondLightSource/pythonIoc/compare/4.5.0...HEAD
.. _4.5.0: https://github.com/DiamondLightSource/pythonIoc/compare/4.4.0...4.5.0
.. _4.4.0: https://github.com/DiamondLightSource/pythonIoc/compare/4.3.0...4.4.0
.. _4.3.0: https://github.com/DiamondLightSource/pythonIoc/compare/4.2.0...4.3.0
.. _4.2.0: https://github.com/DiamondLightSource/pythonIoc/compare/4.1.0...4.2.0
.. _4.1.0: https://github.com/DiamondLightSource/pythonIoc/compare/4.0.2...4.1.0
.. _4.0.2: https://github.com/DiamondLightSource/pythonIoc/compare/4.0.1...4.0.2
.. _4.0.1: https://github.com/DiamondLightSource/pythonIoc/compare/3.2.1...4.0.1
.. _3.2.1: https://github.com/DiamondLightSource/pythonIoc/compare/3.2...3.2.1
.. _3.2: https://github.com/DiamondLightSource/pythonIoc/compare/3.1...3.2
.. _3.1: https://github.com/DiamondLightSource/pythonIoc/compare/3.0...3.1
.. _3.0: https://github.com/DiamondLightSource/pythonIoc/compare/3.0b2...3.0
.. _3.0b2: https://github.com/DiamondLightSource/pythonIoc/compare/3.0b1...3.0b2
.. _3.0b1: https://github.com/DiamondLightSource/pythonIoc/compare/2-16...3.0b1
.. _2-16: https://github.com/DiamondLightSource/pythonIoc/releases/tag/2-16
4 changes: 2 additions & 2 deletions CONTRIBUTING.rst
Original file line number Diff line number Diff line change
Expand Up @@ -8,14 +8,14 @@ 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.

.. _dls_controls repository: https://github.com/dls-controls/pythonIoc/issues
.. _dls_controls repository: https://github.com/DiamondLightSource/pythonIoc/issues

Running the tests
-----------------

To get the source source code and run the unit tests, run::

$ git clone git://github.com/dls-controls/pythonSoftIoc.git
$ git clone git://github.com/DiamondLightSource/pythonSoftIoc.git
$ cd pythonSoftIoc
$ git submodule init
$ git submodule update
Expand Down
20 changes: 10 additions & 10 deletions README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,9 @@ asyncio for concurrency. PVs are served over Channel Access and PVAccess.

============== ==============================================================
PyPI ``pip install softioc``
Source code https://github.com/dls-controls/pythonSoftIOC
Documentation https://dls-controls.github.io/pythonSoftIOC
Changelog https://github.com/dls-controls/pythonSoftIOC/blob/master/CHANGELOG.rst
Source code https://github.com/DiamondLightSource/pythonSoftIOC
Documentation https://DiamondLightSource.github.io/pythonSoftIOC
Changelog https://github.com/DiamondLightSource/pythonSoftIOC/blob/master/CHANGELOG.rst
============== ==============================================================

A simple example of the use of this library:
Expand Down Expand Up @@ -47,16 +47,16 @@ A simple example of the use of this library:
# Finally leave the IOC running with an interactive shell.
softioc.interactive_ioc(globals())

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

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

.. |coverage| image:: https://codecov.io/gh/dls-controls/pythonSoftIOC/branch/master/graph/badge.svg
:target: https://codecov.io/gh/dls-controls/pythonSoftIOC
.. |coverage| image:: https://codecov.io/gh/DiamondLightSource/pythonSoftIOC/branch/master/graph/badge.svg
:target: https://codecov.io/gh/DiamondLightSource/pythonSoftIOC
:alt: Test Coverage

.. |pypi_version| image:: https://img.shields.io/pypi/v/softioc.svg
Expand All @@ -71,4 +71,4 @@ A simple example of the use of this library:
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/pythonSoftIOC for more detailed documentation.
See https://DiamondLightSource.github.io/pythonSoftIOC for more detailed documentation.
4 changes: 2 additions & 2 deletions docs/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -89,9 +89,9 @@
cothread=(
"https://diamondlightsource.github.io/cothread/master/", None
),
aioca=("https://dls-controls.github.io/aioca/master/", None),
aioca=("https://DiamondLightSource.github.io/aioca/master/", None),
epicsdbbuilder=(
"https://dls-controls.github.io/epicsdbbuilder/master/", None)
"https://DiamondLightSource.github.io/epicsdbbuilder/master/", None)
)

# -- Options for HTML output ---------------------------------------------------
Expand Down
2 changes: 1 addition & 1 deletion docs/index.rst
Original file line number Diff line number Diff line change
Expand Up @@ -78,5 +78,5 @@ Table Of Contents

reference/api
reference/contributing
Changelog <https://github.com/dls-controls/pythonSoftIOC/blob/master/CHANGELOG.rst>
Changelog <https://github.com/DiamondLightSource/pythonSoftIOC/blob/master/CHANGELOG.rst>
Index <genindex.html#http://>
2 changes: 1 addition & 1 deletion docs/reference/api.rst
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ API
.. data:: softioc.__version__
:type: str

Version number as calculated by https://github.com/dls-controls/versiongit
Version number as calculated by https://github.com/DiamondLightSource/versiongit

.. automodule:: softioc.softioc

Expand Down
2 changes: 1 addition & 1 deletion docs/tutorials/installation.rst
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ the first tutorial::
If you require a feature that is not currently released you can also install
from github::

python3 -m pip install git+git://github.com/dls-controls/pythonSoftIOC.git
python3 -m pip install git+git://github.com/DiamondLightSource/pythonSoftIOC.git

The library should now be installed and the commandline interface on your path.
You can check the version that has been installed by typing::
Expand Down
2 changes: 1 addition & 1 deletion setup.cfg
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
[metadata]
name = softioc
description = Embed an EPICS IOC in a Python process
url = https://github.com/dls-controls/pythonSoftIOC
url = https://github.com/DiamondLightSource/pythonSoftIOC
author = Michael Abbott
author_email = [email protected]
license = Apache License 2.0
Expand Down
2 changes: 1 addition & 1 deletion softioc/_version_git.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# Compute a version number from a git repo or archive

# This file is released into the public domain. Generated by:
# versiongit-1.0 (https://github.com/dls-controls/versiongit)
# versiongit-1.0 (https://github.com/DiamondLightSource/versiongit)
import os
import re
import sys
Expand Down
2 changes: 1 addition & 1 deletion softioc/extension.c
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,7 @@ static PyObject *db_put_field(PyObject *self, PyObject *args)
* callback.
* Therefore, we must ensure we relinquish the GIL while we perform this
* EPICS call, to avoid potential deadlocks.
* See https://github.com/dls-controls/pythonSoftIOC/issues/119. */
* See https://github.com/DiamondLightSource/pythonSoftIOC/issues/119. */
Py_BEGIN_ALLOW_THREADS
put_result = dbPutField(&dbAddr, dbrType, pbuffer, length);
Py_END_ALLOW_THREADS
Expand Down
2 changes: 1 addition & 1 deletion tests/test_record_values.py
Original file line number Diff line number Diff line change
Expand Up @@ -371,7 +371,7 @@ def run_ioc(record_configurations: list, conn, set_enum, get_enum):
elif creation_func in [builder.WaveformIn, builder.WaveformOut]:
kwarg["length"] = WAVEFORM_LENGTH # Must specify when no value
# Related to this issue:
# https://github.com/dls-controls/pythonSoftIOC/issues/37
# https://github.com/DiamondLightSource/pythonSoftIOC/issues/37

out_rec = creation_func(record_name, **kwarg)

Expand Down
2 changes: 1 addition & 1 deletion tests/test_records.py
Original file line number Diff line number Diff line change
Expand Up @@ -1115,7 +1115,7 @@ async def test_set_too_long_value(self):

class TestRecursiveSet:
"""Tests related to recursive set() calls. See original issue here:
https://github.com/dls-controls/pythonSoftIOC/issues/119"""
https://github.com/DiamondLightSource/pythonSoftIOC/issues/119"""

recursive_record_name = "RecursiveLongOut"

Expand Down
Loading