Revert "Merge branch 'master' of github.com:ledatelescope/bifrost"

This reverts commit 09b9b3f, reversing changes made to c57de22.
ledatelescope · Jun 3, 2024 · dce4eb1 · dce4eb1
1 parent 09b9b3f
commit dce4eb1
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 3 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -24,6 +24,8 @@ 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"
@@ -49,7 +51,7 @@ jobs:
             gawk \
             gnu-sed \
             pkg-config
-      - uses: actions/setup-python@v5.1.0
+      - uses: actions/setup-python@v5.0.0
         with:
           python-version: ${{ matrix.python-version }}
       - name: "Software Install - Python"

diff --git a/test/test_scripts.py b/test/test_scripts.py
@@ -53,7 +53,7 @@
     pass
 run_scripts_tests &= (sys.version_info[0] >= 3)
 
-_LINT_RE = re.compile(r'(?P<module>.*?)\:(?P<line>\d+)\: \[(?P<type>.*?)\] (?P<info>.*)')
+_LINT_RE = re.compile('(?P<module>.*?)\:(?P<line>\d+)\: \[(?P<type>.*?)\] (?P<info>.*)')
 
 @unittest.skipUnless(run_scripts_tests, "requires the 'pylint' module")
 class ScriptTest(unittest.TestCase):

diff --git a/test/test_tutorial.py b/test/test_tutorial.py
@@ -32,6 +32,7 @@
 import unittest
 import glob
 import sys
+import re
 import os
 from tempfile import mkdtemp
 from shutil import rmtree

diff --git a/tools/like_pmap.py b/tools/like_pmap.py
@@ -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(r'(?P<addr>[0-9a-f]+).*[(anon)|(mapped)]=(?P<size>\d+).*(swapcache=(?P<swap>\d+))?.*N(?P<binding>\d+)=(?P<size2>\d+)')
+    _numaRE = re.compile('(?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'):