Skip to content

Commit 9fd7dfe

Browse files
committed
Do not run tox here: it has not all Python versions and will be run in the PR.
1 parent dc13a26 commit 9fd7dfe

File tree

2 files changed

+13
-4
lines changed

2 files changed

+13
-4
lines changed

src/zope/meta/config_package.py

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -163,6 +163,13 @@ def handle_command_line_arguments():
163163
action='store_false',
164164
default=True,
165165
help='Do not try to do steps that require GitHub admin rights.')
166+
parser.add_argument(
167+
'--started-from-auto-update',
168+
dest='started_from_auto_update',
169+
action='store_true',
170+
default=False,
171+
help=argparse.SUPPRESS # no to be used by humans
172+
)
166173

167174
args = parser.parse_args()
168175
return args
@@ -725,9 +732,10 @@ def configure(self):
725732
meta_f.write('\n')
726733
tomlkit.dump(meta_cfg, meta_f)
727734

728-
tox_path = shutil.which('tox') or (
729-
pathlib.Path(cwd) / 'bin' / 'tox')
730-
call(tox_path, '-p', 'auto', '--parallel-no-spinner')
735+
if not self.args.started_from_auto_update:
736+
tox_path = shutil.which('tox') or (
737+
pathlib.Path(cwd) / 'bin' / 'tox')
738+
call(tox_path, '-p', 'auto')
731739

732740
updating = git_branch(self.branch_name)
733741

src/zope/meta/update_python_support.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -159,7 +159,8 @@ def main():
159159
if args.auto_update:
160160
# Admin commands are interactive, we do them unconditionally
161161
# later here:
162-
config_package_args.append('--no-admin')
162+
config_package_args.extend(
163+
['--no-admin', '--started-from-auto-update'])
163164
if not args.commit:
164165
config_package_args.append('--no-commit')
165166

0 commit comments

Comments
 (0)