Merge ffd53f7 into 6066419

palfrey · Dec 28, 2022 · 2b27d58 · 2b27d58
2 parents 6066419 + ffd53f7
commit 2b27d58
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 9 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -11,28 +11,40 @@ jobs:
     test:
         strategy:
             matrix:
-                include:
-                    - ubuntu-version: 20.04
-                      python-version: 3.8
-                    - ubuntu-version: 22.04
-                      python-version: '3.10'
+                python-version: ['3.7', '3.8', '3.9', '3.10']
 
-        runs-on: ubuntu-${{ matrix.ubuntu-version }}
+        runs-on: ubuntu-22.04
 
         steps:
             - uses: actions/checkout@v3
             - name: Set up Python ${{ matrix.python-version }}
               uses: actions/setup-python@v4
               with:
                   python-version: ${{ matrix.python-version }}
+            - name: Install boost
+              uses: MarkusJx/install-boost@v2.4.1
+              id: install-boost
+              with:
+                  # REQUIRED: Specify the required boost version
+                  # A list of supported versions can be found here:
+                  # https://github.com/MarkusJx/prebuilt-boost/blob/main/versions-manifest.json
+                  boost_version: 1.81.0
+                  platform_version: 22.04 # as per runs-on
             - name: Install dependencies
               run: |
                   python -m pip install --upgrade pip
                   pip install -r requirements.txt
-                  sudo apt-get install -y --no-install-recommends libtag1-dev libboost-python-dev lcov
-                  CPPFLAGS="-coverage" pip install -e .
+                  sudo apt-get install -y --no-install-recommends libtag1-dev lcov
+                  find ${{steps.install-boost.outputs.BOOST_ROOT}}/lib
+                  CPPFLAGS="-coverage -I${{steps.install-boost.outputs.BOOST_ROOT}}/include" \
+                    LDFLAGS="-L${{steps.install-boost.outputs.BOOST_ROOT}}/lib" \
+                    pip install -e .
+              env:
+                  LD_LIBRARY_PATH: ${{steps.install-boost.outputs.BOOST_ROOT}}/lib
             - name: Test with pytest
               run: pytest -vvv --cov=tagpy --cov-report=term-missing --cov-report=lcov --cov-fail-under=50
+              env:
+                  LD_LIBRARY_PATH: ${{steps.install-boost.outputs.BOOST_ROOT}}/lib
             - name: Python Coveralls
               uses: coverallsapp/github-action@master
               with:
@@ -41,7 +53,9 @@ jobs:
                   parallel: true
                   flag-name: Python-${{ matrix.python-version }}
             - name: LCOV
-              run: lcov --directory build --output-file cpp.info --capture --exclude "/usr/include/*" --exclude "/opt/hostedtoolcache/*"
+              run: |
+                  lcov --directory build --output-file cpp.info --capture --exclude "/usr/include/*" --exclude "/opt/hostedtoolcache/*" --exclude "/home/runner/work/tagpy/tagpy/boost/*"
+                  lcov --list cpp.info
             - name: C++ Coveralls
               uses: coverallsapp/github-action@master
               with:

diff --git a/setup.cfg b/setup.cfg
@@ -1,3 +1,6 @@
 [flake8]
 ignore = E126,E127,E128,E123,E226,E241,E242
 max-line-length=88
+
+[tool:pytest]
+norecursedirs = boost
diff --git a/setup.py b/setup.py
@@ -39,6 +39,7 @@ def main():
         "boost_python%d" % sys.version_info[0],
         "boost_python%d%d" % sys.version_info[:2],
         "boost_python-py%d%d" % sys.version_info[:2],
+        "boost_python%d%d-mt-x64" % sys.version_info[:2],
     ]
 
     for boost_option in boost_options: