Skip to content

Commit

Permalink
Merge branch 'master' of github.com:ledatelescope/bifrost
Browse files Browse the repository at this point in the history
  • Loading branch information
sarah chastain committed Jun 3, 2024
2 parents c57de22 + 72230f2 commit 09b9b3f
Show file tree
Hide file tree
Showing 4 changed files with 3 additions and 6 deletions.
4 changes: 1 addition & 3 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,6 @@ jobs:
include:
- os: ubuntu-20.04
python-version: '3.6'
- os: macos-latest
python-version: '3.6'
fail-fast: false
steps:
- name: "Software Install - Ubuntu"
Expand All @@ -51,7 +49,7 @@ jobs:
gawk \
gnu-sed \
pkg-config
- uses: actions/setup-python@v5.0.0
- uses: actions/setup-python@v5.1.0
with:
python-version: ${{ matrix.python-version }}
- name: "Software Install - Python"
Expand Down
2 changes: 1 addition & 1 deletion test/test_scripts.py
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@
pass
run_scripts_tests &= (sys.version_info[0] >= 3)

_LINT_RE = re.compile('(?P<module>.*?)\:(?P<line>\d+)\: \[(?P<type>.*?)\] (?P<info>.*)')
_LINT_RE = re.compile(r'(?P<module>.*?)\:(?P<line>\d+)\: \[(?P<type>.*?)\] (?P<info>.*)')

@unittest.skipUnless(run_scripts_tests, "requires the 'pylint' module")
class ScriptTest(unittest.TestCase):
Expand Down
1 change: 0 additions & 1 deletion test/test_tutorial.py
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,6 @@
import unittest
import glob
import sys
import re
import os
from tempfile import mkdtemp
from shutil import rmtree
Expand Down
2 changes: 1 addition & 1 deletion tools/like_pmap.py
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@ def main(args):
raise RuntimeError("Cannot find NUMA memory info for PID: %i" % args.pid)

# Parse out the anonymous entries in this file
_numaRE = re.compile('(?P<addr>[0-9a-f]+).*[(anon)|(mapped)]=(?P<size>\d+).*(swapcache=(?P<swap>\d+))?.*N(?P<binding>\d+)=(?P<size2>\d+)')
_numaRE = re.compile(r'(?P<addr>[0-9a-f]+).*[(anon)|(mapped)]=(?P<size>\d+).*(swapcache=(?P<swap>\d+))?.*N(?P<binding>\d+)=(?P<size2>\d+)')
areas = {}
files = {}
for line in numaInfo.split('\n'):
Expand Down

0 comments on commit 09b9b3f

Please sign in to comment.