Skip to content

Commit 18acf16

Browse files
authored
Merge pull request #50 from DiamondLightSource/remove-virtac
Remove virtac
2 parents f570406 + b9a31fc commit 18acf16

25 files changed

+6
-10948
lines changed

.vscode/launch.json

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -19,16 +19,5 @@
1919
"PYTEST_RAISE": "1",
2020
},
2121
},
22-
{
23-
"name": "Python Debugger: Virtac",
24-
"type": "debugpy",
25-
"request": "launch",
26-
"program": "/venv/bin/virtac",
27-
"console": "integratedTerminal",
28-
"env": {
29-
"EPICS_CA_SERVER_PORT": "7064",
30-
"EPICS_CA_REPEATER_PORT": "7065",
31-
},
32-
},
3322
]
3423
}

Dockerfile

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -8,16 +8,13 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
88
graphviz \
99
&& rm -rf /var/lib/apt/lists/*
1010

11-
WORKDIR /virtac
12-
COPY . /virtac/
11+
WORKDIR /atip
12+
COPY . /atip/
1313

1414
# Set up a virtual environment and put it in PATH
1515
RUN python -m venv /venv
1616
ENV PATH=/venv/bin:$PATH
1717
RUN pip install .
1818

19-
ENV EPICS_CA_SERVER_PORT=8064
20-
ENV EPICS_CA_REPEATER_PORT=8065
21-
22-
ENTRYPOINT [ "virtac" ]
23-
CMD ["-v"]
19+
ENTRYPOINT [ "atip" ]
20+
CMD ["--version"]

docs/_api.rst

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,4 +14,3 @@ API
1414
:recursive:
1515

1616
atip
17-
virtac

docs/reference.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ Technical reference material including APIs and release notes.
77
:glob:
88
99
Atip API <_api/atip>
10-
Virtac API <_api/virtac>
1110
genindex
1211
Release Notes <https://github.com/DiamondLightSource/atip/releases>
1312
```

docs/tutorials.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,5 +9,4 @@ Tutorials for installation and typical usage. New users start here.
99
tutorials/installation
1010
tutorials/overview
1111
tutorials/atip_example
12-
tutorials/virtac_example
1312
```

docs/tutorials/overview.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ publishing the same control system interface as the live machine. At Diamond
3030
Light Source this has been implemented with EPICS, using
3131
[PythonSoftIOC](<https://github.com/Araneidae/pythonIoc>)
3232

33-
More documentation on how to use the virtual accelerator can be found [here](<https://github.com/DiamondLightSource/atip/tutorials/VIRTAC_example>)
33+
The diamond virtual accelerator can be found [here](<https://github.com/DiamondLightSource/virtac>)
3434

3535

3636
## Helpful tips:

docs/tutorials/virtac_example.md

Lines changed: 0 additions & 159 deletions
This file was deleted.

pyproject.toml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,6 @@ dev = [
4747

4848
[project.scripts]
4949
atip = "atip.__main__:main"
50-
virtac = "virtac.atip_ioc_entry:main"
5150

5251
[project.urls]
5352
GitHub = "https://github.com/DiamondLightSource/atip"

src/atip/__main__.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
from argparse import ArgumentParser
44
from collections.abc import Sequence
55

6-
from . import __version__
6+
from atip import __version__
77

88
__all__ = ["main"]
99

src/virtac/__init__.py

Lines changed: 0 additions & 7 deletions
This file was deleted.

0 commit comments

Comments
 (0)