Skip to content

Commit 0ddad89

Browse files
committed
Remove irrelevant files
1 parent 4f9e236 commit 0ddad89

File tree

9 files changed

+14
-258
lines changed

9 files changed

+14
-258
lines changed
File renamed without changes.

Jenkinsfile

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

Jenkinsfile_linux

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

README.md

Lines changed: 5 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,11 @@
11
# genie_python
22

3-
The ISIS Python-based instrument control and scripting library.
3+
Instrument control and scripting library at the ISIS Neutron & Muon source.
44

5-
## Instrument initialisation
5+
---
66

7-
By default when setting an instrument the init_default.py file is loaded.
8-
This file checks for the existence of a folder called C:\Instrument\Settings\config\NDX%INSTNAME%\Python and adds this to the sys path if it does.
9-
If this path exists and contains a file called init_%INSTNAME%.py, it will load it too.
7+
Documentation: https://isiscomputinggroup.github.io/genie/genie_python
108

11-
On the NDX any files in C:\Instrument\Settings\config\NDX%INSTNAME%\Python can be added to SVN for safe keeping.
9+
Source: https://github.com/ISISComputingGroup/genie
1210

13-
Python modules can be imported directly from the C:\Instrument\Settings\config\NDX%INSTNAME%\Python directory. If running on a client it is necessary to have a copy of the Python directory for the instrument being connected to in the correct location.
14-
15-
Folders inside the Python directory must have a `__init__.py` file for them to be available to be imported.
16-
17-
## Start-up
18-
The line "from genie_python import *" in genie_startup is responsible for loading all the genie_python stuff!
19-
This file also contains code for disabling quickedit and for making genie_python guess the instrument name.
20-
21-
As genie_python is running inside IPython we use c.TerminalIPythonApp.exec_files to run genie_start.py, so everything is imported correctly.
11+
PyPi: https://pypi.org/project/genie_python/

mantid_requirements.txt

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

parse_rules

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

pyproject.toml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,9 +28,6 @@ classifiers = [
2828
dependencies = [
2929
# EPICS Channel access lib
3030
"CaChannel",
31-
# Caffi provides some EPICS CA definitions if CaChannel is falling back to using caffi backend
32-
# (not used if CaChannel._ca is available)
33-
"caffi",
3431
# Send log messages to graylog
3532
"graypy",
3633
# genie_python will install ipython completers

src/genie_python/genie_cachannel_wrapper.py

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,13 @@
2121
dbf_type_to_DBR_TIME,
2222
)
2323
except ImportError:
24-
from caffi.ca import AlarmCondition, AlarmSeverity, dbf_type_to_DBR_STS, dbf_type_to_DBR_TIME
24+
# Note: caffi dynamically added to dependencies by CaChannel if not using built backend.
25+
from caffi.ca import ( # type: ignore[reportMissingImports]
26+
AlarmCondition,
27+
AlarmSeverity,
28+
dbf_type_to_DBR_STS,
29+
dbf_type_to_DBR_TIME,
30+
)
2531

2632
if TYPE_CHECKING:
2733
from genie_python.genie import PVValue

src/genie_python/genie_dae.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,8 @@
2222
try:
2323
from CaChannel._ca import AlarmCondition, AlarmSeverity
2424
except ImportError:
25-
from caffi.ca import AlarmCondition, AlarmSeverity
25+
# Note: caffi dynamically added to dependencies by CaChannel if not using built backend.
26+
from caffi.ca import AlarmCondition, AlarmSeverity # type: ignore[reportMissingImports]
2627

2728
from genie_python.genie_cachannel_wrapper import CaChannelWrapper
2829
from genie_python.genie_change_cache import ChangeCache

0 commit comments

Comments
 (0)