WIP: ci test with net-opt

epics-base · Nov 3, 2022 · a53d39a · a53d39a
1 parent 2745a46
commit a53d39a
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 9 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -19,35 +19,35 @@ jobs:
             os: ubuntu-latest
             python: "2.7"
             base: "7.0"
-            pvxs: "master"
+            pvxs: "net-opt"
             profile: latest
 
           - name: Make Linux py2.7 e7.0
             os: ubuntu-latest
             python: "2.7"
             base: "7.0"
-            pvxs: "master"
+            pvxs: "net-opt"
             profile: deb9
 
           - name: Make Linux p3.8 e7.0
             os: ubuntu-latest
             python: "3.8"
             base: "7.0"
-            pvxs: "master"
+            pvxs: "net-opt"
             profile: deb10
 
           - name: Make Linux py2.7 e3.15
             os: ubuntu-latest
             python: "2.7"
             base: "3.15"
-            pvxs: "master"
+            pvxs: "net-opt"
             profile: deb8
 
           - name: Make Linux py2.7 e3.14
             os: ubuntu-latest
             python: "2.7"
             base: "3.14"
-            pvxs: "master"
+            pvxs: "net-opt"
             profile: deb8
 
           # Check build from .tar
@@ -312,7 +312,7 @@ jobs:
         run: |
           echo "PRE=$PRE"
           python -m pip install setuptools wheel nose2
-          python -m pip install --only-binary numpy $PRE setuptools-dso epicscorelibs pvxslibs
+          python -m pip install --only-binary numpy $PRE setuptools-dso epicscorelibs git+https://github.com/mdavidsaver/pvxs@net-opt#egg=pvxslibs
           python setup.py sdist --formats=gztar
           ls dist/*
 
@@ -357,7 +357,7 @@ jobs:
           which python
           python -m pip install -U pip
           python -m pip install setuptools wheel nose2
-          python -m pip install --only-binary numpy $PRE setuptools-dso epicscorelibs pvxslibs
+          python -m pip install --only-binary numpy $PRE setuptools-dso epicscorelibs git+https://github.com/mdavidsaver/pvxs@net-opt#egg=pvxslibs
           if [ "${{ matrix.profile }}" ]
           then
             python -m pip install --only-binary numpy -r requirements-${{ matrix.profile }}.txt

diff --git a/pyproject.toml b/pyproject.toml
@@ -1,2 +1,2 @@
 [build-system]
-requires = ["setuptools", "setuptools_dso>=1.3a1", "wheel", "numpy", "Cython>=0.20", "epicscorelibs>=7.0.3.99.2.0a1", "pvxslibs"]
+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"]
diff --git a/setup.py b/setup.py
@@ -127,7 +127,7 @@
     ext_modules = exts,
     install_requires = [
         epicscorelibs.version.abi_requires(),
-        pvxslibs.version.abi_requires(),
+        'pvxslibs @ git+https://github.com/mdavidsaver/pvxs@net-opt#egg=pvxslibs',
         # assume ABI forward compatibility as indicated by
         # https://github.com/numpy/numpy/blob/master/numpy/core/setup_common.py#L28
         'numpy >=%s'%numpy.version.short_version,