Skip to content

Commit e8913db

Browse files
committed
Move install extras to setup.cfg
This makes dls-py3 happy when making an internal DLS build
1 parent 416b66b commit e8913db

File tree

3 files changed

+14
-11
lines changed

3 files changed

+14
-11
lines changed

Pipfile

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -12,13 +12,9 @@ pytest-asyncio = "*"
1212

1313
[packages]
1414
# All other package requirements from setup.py
15-
softioc = {editable = true, path = "."}
15+
softioc = {editable = true, extras = ["useful"], path = "."}
1616
# Apart from the epicscorelibs which comes from pyproject.toml so needs to be here too
17-
epicscorelibs = "*"
18-
# Add some other useful extras
19-
cothread = "*"
20-
scipy = "*"
21-
aioca = ">=1.1"
17+
# epicscorelibs = "*"
2218

2319
[scripts]
2420
# Put coverage here so we don't interfere with debugging in the IDE

Pipfile.lock

Lines changed: 4 additions & 5 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

setup.cfg

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,14 @@ softioc =
3131
devIocStats.dbd
3232
iocStatsDb/*
3333

34+
[options.extras_require]
35+
# Useful extras for use at DLS
36+
useful =
37+
# make sure a python 3.9 compatible scipy and matplotlib are selected
38+
cothread
39+
scipy
40+
aioca >=1.1
41+
3442
[flake8]
3543
max-line-length = 80
3644
extend-ignore =

0 commit comments

Comments
 (0)