ci: fix ci/test issues

Author: eldipa

.github/workflows/test.yml

@@ -1,13 +1,13 @@
 name: test
 on: [pull_request]
 jobs:
-  byexample-test:
+  byexample-linux-test:
     name: "Byexample Python (ver: ${{ matrix.python-version }}) (os: ${{ matrix.os }})"
     runs-on: ${{ matrix.os }}
     strategy:
         matrix:
             python-version: ["3.7.17", "3.8.18", "3.9.25", "3.10.20", "3.11.15", "3.12.13", "3.13.12", "3.14.3"]
-            os: [ubuntu-22.04, macos-26]
+            os: [ubuntu-22.04]
     env:
         TERM: xterm-color
     steps:
@@ -24,6 +24,29 @@ jobs:
       - run: make examples-test
       - run: make corner-test
 
+  byexample-mac-test:
+    name: "Byexample Python (ver: ${{ matrix.python-version }}) (os: ${{ matrix.os }})"
+    runs-on: ${{ matrix.os }}
+    strategy:
+        matrix:
+            python-version: ["3.7.17", "3.8.18", "3.9.25", "3.10.20", "3.11.15", "3.12.13", "3.13.12", "3.14.3"]
+            os: [macos-26-intel]
+    env:
+        TERM: xterm-color
+    steps:
+      - uses: actions/checkout@v2
+      - name: Setup python
+        uses: actions/setup-python@v6
+        with:
+          python-version: ${{ matrix.python-version }}
+      - run: make deps-dev
+      - run: make install-from-pkg-tgz
+      - run: make lib-test
+      - run: make modules-test
+      - run: make docs-test
+      - run: make examples-test
+      - run: make corner-test
+
   source-code-test:
     name: "Source code"
     runs-on: ubuntu-22.04
@@ -70,7 +93,7 @@ jobs:
     runs-on: ${{ matrix.os }}
     strategy:
         matrix:
-            os: [ubuntu-22.04, macos-26]
+            os: [ubuntu-22.04, macos-26-intel]
     steps:
       - uses: actions/checkout@v2
       - name: Setup python
@@ -87,7 +110,7 @@ jobs:
     runs-on: ${{ matrix.os }}
     strategy:
         matrix:
-            os: [ubuntu-22.04, macos-26]
+            os: [ubuntu-22.04, macos-26-intel]
     steps:
       - uses: actions/checkout@v2
       - name: Setup python
@@ -104,7 +127,7 @@ jobs:
     strategy:
         matrix:
             ruby-version: ["2.4", "2.5", "2.6", "2.7", "3.0", "3.1"]
-            os: [ubuntu-22.04, macos-26]
+            os: [ubuntu-22.04, macos-26-intel]
     steps:
       - uses: actions/checkout@v2
       - name: Setup python
@@ -124,7 +147,7 @@ jobs:
     runs-on: ${{ matrix.os }}
     strategy:
         matrix:
-            os: [ubuntu-22.04, macos-26]
+            os: [ubuntu-22.04, macos-26-intel]
     steps:
       - uses: actions/checkout@v2
       - name: Setup python
@@ -141,7 +164,7 @@ jobs:
     strategy:
         matrix:
             node-version: [10.x, 12.x, 14.x, 15.x, 16.x]
-            os: [ubuntu-22.04, macos-26]
+            os: [ubuntu-22.04, macos-26-intel]
     steps:
       - uses: actions/checkout@v2
       - name: Setup python
@@ -162,7 +185,7 @@ jobs:
     strategy:
         matrix:
             go-version: [{go: "1.19", yaegi: "v0.14.0"}, {go: "1.18", yaegi: "v0.14.0"}, {go: "1.17", yaegi: "v0.13.0"}, {go: "1.16", yaegi: "v0.13.0"}]
-            os: [ubuntu-22.04, macos-26]
+            os: [ubuntu-22.04, macos-26-intel]
     steps:
       - uses: actions/checkout@v2
       - name: Setup python
@@ -185,7 +208,7 @@ jobs:
     strategy:
       matrix:
             java: [ '11', '13', '15' ]
-            os: [ubuntu-22.04, macos-26]
+            os: [ubuntu-22.04, macos-26-intel]
     steps:
       - uses: actions/checkout@v2
       - name: Setup python

byexample/expected.py

@@ -348,7 +348,7 @@ def _get_captures_by_incremental_match(
             >>> expected = r'aa<...>bb<...>ddd<...>eee<...>cc'
             >>> got = r'aaAAbbBBxxxddeeeCCcc'
 
-            >>> expected_regexs = ['\A', 'aa', '(.*?)', 'bb', '(.*?)', 'ddd',
+            >>> expected_regexs = ['\\A', 'aa', '(.*?)', 'bb', '(.*?)', 'ddd',
             ...                    '(.*?)', 'eee', '(.*?)', 'cc', r'\n*\Z']
             >>> charnos = [0, 0, 2, 7, 9, 14, 17, 22, 25, 30, 32]
             >>> rcounts   = [0, 2, 0, 2, 0, 3, 0, 3, 0, 2, 0]
@@ -396,7 +396,7 @@ def _get_captures_by_incremental_match(
             >>> expected = r'aa<foo>bb<b-r>ddd<baz>eee<z-z>cc'
             >>> got = r'aaAAbbBBxxxddeeeCCcc'
 
-            >>> expected_regexs = ['\A', 'aa', '(?P<foo>.*?)', 'bb',
+            >>> expected_regexs = ['\\A', 'aa', '(?P<foo>.*?)', 'bb',
             ...                     '(?P<b_r>.*?)', 'ddd', '(?P<baz>.*?)',
             ...                     'eee', '(?P<z_z>.*?)', 'cc', r'\n*\Z']
             >>> charnos = [0, 0, 2, 7, 9, 14, 17, 22, 25, 30, 32]
@@ -423,7 +423,7 @@ def _get_captures_by_incremental_match(
             >>> expected = 'aa<foo>bb\ncc\ndd<bar>ee'
             >>> got = 'aaAAbb\nxx\nxxAAee'
 
-            >>> expected_regexs = ['\A', 'aa', '(?P<foo>.*?)', 'bb\n',
+            >>> expected_regexs = ['\\A', 'aa', '(?P<foo>.*?)', 'bb\n',
             ...                     'cc\n', 'dd', '(?P<bar>.*?)',
             ...                     'ee', r'\n*\Z']
             >>> charnos = [0, 0, 2, 7, 10, 13, 15, 20, 22]
@@ -442,7 +442,7 @@ def _get_captures_by_incremental_match(
 
             >>> expected = 'aa<foo>bb\ncc\ndd<foo>ee'
 
-            >>> expected_regexs = ['\A', 'aa', '(?P<foo>.*?)', 'bb\n',
+            >>> expected_regexs = ['\\A', 'aa', '(?P<foo>.*?)', 'bb\n',
             ...                     'cc\n', 'dd', '(?P=foo)',
             ...                     'ee', r'\n*\Z']
             >>> rcounts   = [0, 2, 0, 3, 3, 2, 1, 2, 0] # notice the +1

byexample/log.py

@@ -334,6 +334,7 @@ def log_with(logger_name, child=True):
     finally:
         _logger_stack.pop()
 
+
 class _DummyRLock:
     '''
     A dummy reentrant lock to emulate a lock (acquire/release) but without
@@ -364,6 +365,7 @@ def __enter__(self):
     def __exit__(self, exc_type, exc_value, traceback):
         self.release()
 
+
 class XStreamHandler(logging.StreamHandler):
     def __init__(self, *args, **kargs):
         logging.StreamHandler.__init__(self, *args, **kargs)

byexample/prof.py

@@ -23,10 +23,11 @@
 with the elapsed time in nanoseconds:
 
 >>> foo()           # byexample: +timeout=8
-stdin>::foo 1<...>
+stdin<...>::foo 1<...>
 
 The function name is prefixed by the name of the module. In this case,
-"stdin>".
+"stdin>" plus some prefix like "stdin>-11" or "stdin-11>"
+(but this prefix depends on the Python version used).
 
 Nested profiled functions will print a larger stack trace:
 
@@ -36,8 +37,8 @@
 ...     foo()
 
 >>> gus()           # byexample: +timeout=8 +paste
-stdin>::gus;stdin>::foo 1<...>
-stdin>::gus 2<...>
+stdin<...>::gus;stdin<...>::foo 1<...>
+stdin<...>::gus 2<...>
 
 Two one-liner stack traces were printed: one for foo() called from
 gus() and the other for gus() only.
@@ -63,7 +64,7 @@
 ...         time.sleep(2)
 
 >>> bar()           # byexample: +timeout=8
-stdin>::bar 2<...>
+stdin<...>::bar 2<...>
 
 By default the context manager uses the name of the calling function
 for the stack trace.
@@ -78,8 +79,8 @@
 ...         time.sleep(2)
 
 >>> baz()           # byexample: +timeout=8
-stdin>::baz::head 1<...>
-stdin>::baz::tail 2<...>
+stdin<...>::baz::head 1<...>
+stdin<...>::baz::tail 2<...>
 
 Nested is possible too:
 
@@ -92,9 +93,9 @@
 ...             time.sleep(3)
 
 >>> nested()           # byexample: +timeout=12
-stdin>::nested;stdin>::nested;stdin>::nested 3<...>
-stdin>::nested;stdin>::nested 2<...>
-stdin>::nested 1<...>
+stdin<...>::nested;stdin<...>::nested;stdin<...>::nested 3<...>
+stdin<...>::nested;stdin<...>::nested 2<...>
+stdin<...>::nested 1<...>
 
 The engine is thread safe. Due how the engine works
 the traces may be written out of order and they may be

docs/languages/python.md

@@ -372,7 +372,7 @@ executed and with the output returned by the interpreter.
 
 >>> sys
 Traceback <...>
-NameError: name 'sys' is not defined
+NameError: name 'sys' is not defined<...>
 ```
 
 ### Empty lines

docs/overview/usage.md

@@ -89,7 +89,7 @@ The help included in ``byexample`` should give you a quick overview of its
 capabilities
 
 ```
-$ byexample -h                                # byexample: +norm-ws -tags +rm=  +diff=ndiff
+$ byexample -h                                # byexample: +norm-ws -capture +rm=  +diff=ndiff
 usage: byexample -l <languages> [--ff] [--timeout <secs>] [-j <n>] [--dry]
                  [--skip <file> [<file> ...]] [--capture-env-var <var names>]
                  [-d {none,unified,ndiff,context,tool}] [--difftool <cmd>]
@@ -105,7 +105,7 @@ positional arguments:
   <file>                files that have the examples to run.
  
 Language Selection:
-  -l <languages>, --language <languages>, --languages <languages>
+  -l<...> --language<...> --languages <languages>
                         select which languages to parse and run. Comma
                         separated syntax is also accepted.
  
@@ -114,21 +114,21 @@ Execution Options:
   --timeout <secs>      timeout in seconds to complete each example (2 by
                         default); this can be changed per example with this
                         option.
-  -j <n>, --jobs <n>    run <n> jobs in parallel (1 by default); <n> can be an
+  -j<...> --jobs <n>    run <n> jobs in parallel (1 by default); <n> can be an
                         integer or the string "cpu" or "cpu<n>": "cpu" means
                         use all the cpus available; "cpu<n>" multiply it by
                         <n> the cpus available.
   --dry                 do not run any example, only parse them.
   --skip <file> [<file> ...]
                         skip these files
-  --capture-env-var <var names>, --capture-env-vars <var names>
+  --capture-env-var<...> --capture-env-vars <var names>
                         capture some environment variables and put them in the
                         clipboard so they can be pasted and used in
                         conditional executions. Comma separated syntax is also
                         accepted.
  
 Diff Options:
-  -d {none,unified,ndiff,context,tool}, --diff {none,unified,ndiff,context,tool}
+  -d<...> --diff {none,unified,ndiff,context,tool}
                         select diff algorithm (none by default).
   --difftool <cmd>      command line to the external diff program; the tokens
                         %e and %g are replaced by the file names with the
@@ -140,12 +140,12 @@ Diff Options:
                         disables all of that.
  
 Miscellaneous Options:
-  -o <options>, --options <options>
+  -o<...> --options <options>
                         add additional options; see --show-options to list
                         them.
   --show-options        show the available options for the selected languages
                         (with -l)
-  -m <dir>, --modules <dir>
+  -m<...> --modules <dir>
                         append a directory for searching modules there.
   --encoding <enc>[:<error>]
                         select the encoding and optionally the error handler

docs/recipes/arguments-per-environment.md

@@ -1,7 +1,6 @@
 <!--
 Check that we have byexample installed first
 $ hash byexample                                    # byexample: +fail-fast
-$ hash j2                                           # byexample: +fail-fast
 
 $ alias byexample=byexample\ --pretty\ none\ --dry
 
@@ -66,8 +65,8 @@ docs/overview/*.md
 Then:
 
 ```shell
-$ osname=$(uname) j2 test/ds/template.args > test/ds/good.args
-$ byexample @test/ds/good.args
+$ osname=$(uname) j2 test/ds/template.args > test/ds/good.args  # byexample: +pass
+$ byexample @test/ds/good.args                                  # byexample: +pass
 ```
 
 `j2` is one of many engines based on

requirements-dev.txt

@@ -1,6 +1,5 @@
 yapf
 twine
 coverage
-j2cli
 wheel
 setuptools