Skip to content

Commit

Permalink
Merge pull request #29 from epics-python/revert-28-migrate-dls-contro…
Browse files Browse the repository at this point in the history
…ls-epics-python

Revert "Replaced dls-controls with epics-python"
  • Loading branch information
coretl committed Jul 15, 2024
2 parents 740d1a8 + c0e591e commit 2de1ce8
Show file tree
Hide file tree
Showing 6 changed files with 15 additions and 15 deletions.
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/epics-python/epicsdbbuilder/issues
.. _dls_controls repository: https://github.com/dls-controls/epicsdbbuilder/issues

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

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

$ git clone git://github.com/epics-python/epicsdbbuilder.git
$ git clone git://github.com/dls-controls/epicsdbbuilder.git
$ cd epicsdbbuilder
$ pipenv install --dev
$ pipenv run tests
Expand Down
2 changes: 1 addition & 1 deletion Pipfile
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ verify_ssl = true

[dev-packages]
# Switch to main repo after PR https://github.com/Holzhaus/sphinx-multiversion/pull/64 is merged
sphinx-multiversion = {editable = true,git = "https://github.com/epics-python/sphinx-multiversion.git",ref = "only-arg"}
sphinx-multiversion = {editable = true,git = "https://github.com/dls-controls/sphinx-multiversion.git",ref = "only-arg"}

# Make sure lockfile is usable on other platforms
atomicwrites = "*"
Expand Down
2 changes: 1 addition & 1 deletion Pipfile.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

18 changes: 9 additions & 9 deletions README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ dbd entries are checked to reduce the number of errors in the database.

============== ==============================================================
PyPI ``pip install epicsdbbuilder``
Source code https://github.com/epics-python/epicsdbbuilder
Documentation https://epics-python.github.io/epicsdbbuilder
Source code https://github.com/dls-controls/epicsdbbuilder
Documentation https://dls-controls.github.io/epicsdbbuilder
============== ==============================================================

A simple example of the use of this library is the following:
Expand All @@ -27,16 +27,16 @@ A simple example of the use of this library is the following:
WriteRecords('output.db')
.. |code_ci| image:: https://github.com/epics-python/epicsdbbuilder/workflows/Code%20CI/badge.svg?branch=master
:target: https://github.com/epics-python/epicsdbbuilder/actions?query=workflow%3A%22Code+CI%22
.. |code_ci| image:: https://github.com/dls-controls/epicsdbbuilder/workflows/Code%20CI/badge.svg?branch=master
:target: https://github.com/dls-controls/epicsdbbuilder/actions?query=workflow%3A%22Code+CI%22
:alt: Code CI

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

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

.. |pypi_version| image:: https://img.shields.io/pypi/v/epicsdbbuilder.svg
Expand All @@ -51,6 +51,6 @@ A simple example of the use of this library is the following:
Anything below this line is used when viewing README.rst and will be replaced
when included in index.rst
See https://epics-python.github.io/epicsdbbuilder for more detailed documentation.
See https://dls-controls.github.io/epicsdbbuilder for more detailed documentation.


2 changes: 1 addition & 1 deletion epicsdbbuilder/_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/DiamondLightSource/versiongit)
# versiongit-1.0 (https://github.com/dls-controls/versiongit)
import os
import re
import sys
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 = epicsdbbuilder
description = EPICS Database Builder
url = https://github.com/epics-python/epicsdbbuilder
url = https://github.com/dls-controls/epicsdbbuilder
author = Michael Abbott
author_email = Michael.Abbott@diamond.ac.uk
license = Apache License 2.0
Expand Down

0 comments on commit 2de1ce8

Please sign in to comment.