Skip to content

Commit a53d39a

Browse files
committed
WIP: ci test with net-opt
1 parent 2745a46 commit a53d39a

File tree

3 files changed

+9
-9
lines changed

3 files changed

+9
-9
lines changed

.github/workflows/build.yml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -19,35 +19,35 @@ jobs:
1919
os: ubuntu-latest
2020
python: "2.7"
2121
base: "7.0"
22-
pvxs: "master"
22+
pvxs: "net-opt"
2323
profile: latest
2424

2525
- name: Make Linux py2.7 e7.0
2626
os: ubuntu-latest
2727
python: "2.7"
2828
base: "7.0"
29-
pvxs: "master"
29+
pvxs: "net-opt"
3030
profile: deb9
3131

3232
- name: Make Linux p3.8 e7.0
3333
os: ubuntu-latest
3434
python: "3.8"
3535
base: "7.0"
36-
pvxs: "master"
36+
pvxs: "net-opt"
3737
profile: deb10
3838

3939
- name: Make Linux py2.7 e3.15
4040
os: ubuntu-latest
4141
python: "2.7"
4242
base: "3.15"
43-
pvxs: "master"
43+
pvxs: "net-opt"
4444
profile: deb8
4545

4646
- name: Make Linux py2.7 e3.14
4747
os: ubuntu-latest
4848
python: "2.7"
4949
base: "3.14"
50-
pvxs: "master"
50+
pvxs: "net-opt"
5151
profile: deb8
5252

5353
# Check build from .tar
@@ -312,7 +312,7 @@ jobs:
312312
run: |
313313
echo "PRE=$PRE"
314314
python -m pip install setuptools wheel nose2
315-
python -m pip install --only-binary numpy $PRE setuptools-dso epicscorelibs pvxslibs
315+
python -m pip install --only-binary numpy $PRE setuptools-dso epicscorelibs git+https://github.com/mdavidsaver/pvxs@net-opt#egg=pvxslibs
316316
python setup.py sdist --formats=gztar
317317
ls dist/*
318318
@@ -357,7 +357,7 @@ jobs:
357357
which python
358358
python -m pip install -U pip
359359
python -m pip install setuptools wheel nose2
360-
python -m pip install --only-binary numpy $PRE setuptools-dso epicscorelibs pvxslibs
360+
python -m pip install --only-binary numpy $PRE setuptools-dso epicscorelibs git+https://github.com/mdavidsaver/pvxs@net-opt#egg=pvxslibs
361361
if [ "${{ matrix.profile }}" ]
362362
then
363363
python -m pip install --only-binary numpy -r requirements-${{ matrix.profile }}.txt

pyproject.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
[build-system]
2-
requires = ["setuptools", "setuptools_dso>=1.3a1", "wheel", "numpy", "Cython>=0.20", "epicscorelibs>=7.0.3.99.2.0a1", "pvxslibs"]
2+
requires = ["setuptools", "setuptools_dso>=1.3a1", "wheel", "numpy", "Cython>=0.20", "epicscorelibs>=7.0.3.99.2.0a1", "pvxslibs @ git+https://github.com/mdavidsaver/pvxs@net-opt#egg=pvxslibs"]

setup.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -127,7 +127,7 @@
127127
ext_modules = exts,
128128
install_requires = [
129129
epicscorelibs.version.abi_requires(),
130-
pvxslibs.version.abi_requires(),
130+
'pvxslibs @ git+https://github.com/mdavidsaver/pvxs@net-opt#egg=pvxslibs',
131131
# assume ABI forward compatibility as indicated by
132132
# https://github.com/numpy/numpy/blob/master/numpy/core/setup_common.py#L28
133133
'numpy >=%s'%numpy.version.short_version,

0 commit comments

Comments
 (0)