Changeset 6e1e2d0 for tests/pybin/settings.py

Timestamp:

May 1, 2023, 4:19:09 PM (2 years ago)

Author:

caparsons <caparson@…>

Branches:

ADT, ast-experimental, master

Children:

c083c3d

Parents:

a50fdfb (diff), 985b624 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

resolved merge conflicts

File:

• tests/pybin/settings.py (modified) (2 diffs)

tests/pybin/settings.py

@@ -126 +126 @@
         global archive
         global install
+        global invariant
 
         global continue_
@@ -140 +141 @@
         all_install  = [Install(o)      for o in list(dict.fromkeys(options.install))]
         archive      = os.path.abspath(os.path.join(original_path, options.archive_errors)) if options.archive_errors else None
+        invariant    = options.invariant
         continue_    = options.continue_
         dry_run      = options.dry_run # must be called before tools.config_hash()