From 3335d172720bc0c0a6b41c0a9e5be0e67fdcd30c Mon Sep 17 00:00:00 2001 From: Ayush Shukla <71904196+ayushuk@users.noreply.github.com> Date: Tue, 7 May 2024 18:05:21 -0400 Subject: [PATCH] =?UTF-8?q?=F0=9F=A7=B9=20Remove=20PROS=204=20Prompts=20(#?= =?UTF-8?q?346)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pros/conductor/conductor.py | 33 +++------------------------------ 1 file changed, 3 insertions(+), 30 deletions(-) diff --git a/pros/conductor/conductor.py b/pros/conductor/conductor.py index 8e0d9e44..6c8c7235 100644 --- a/pros/conductor/conductor.py +++ b/pros/conductor/conductor.py @@ -303,20 +303,7 @@ def apply_template(self, project: Project, identifier: Union[str, BaseTemplate], if not confirm: raise dont_send( InvalidTemplateException(f'Not downgrading')) - elif not project.use_early_access and template.version[0] == '3' and not self.warn_early_access: - confirm = ui.confirm(f'PROS 4 is now in early access. ' - f'Please use the --early-access flag if you would like to use it.\n' - f'Do you want to use PROS 4 instead?') - self.warn_early_access = True - if confirm: # use pros 4 - project.use_early_access = True - project.save() - kwargs['version'] = '>=0' - kwargs['early_access'] = True - # Recall the function with early access enabled - return self.apply_template(project, identifier, **kwargs) - - self.save() + if not isinstance(template, LocalTemplate): with ui.Notification(): template = self.fetch_template(self.get_depot(template.metadata['origin']), template, **kwargs) @@ -371,22 +358,8 @@ def new_project(self, path: str, no_default_libs: bool = False, **kwargs) -> Pro else: use_early_access = self.use_early_access kwargs["early_access"] = use_early_access - if kwargs["version_source"]: # If true, then the user has not specified a version - if not use_early_access and self.warn_early_access: - ui.echo(f"PROS 4 is now in early access. " - f"If you would like to use it, use the --early-access flag.") - elif not use_early_access and not self.warn_early_access: - confirm = ui.confirm(f'PROS 4 is now in early access. ' - f'Please use the --early-access flag if you would like to use it.\n' - f'Do you want to use PROS 4 instead?') - self.warn_early_access = True - if confirm: - use_early_access = True - kwargs['early_access'] = True - elif use_early_access: - ui.echo(f'Early access is enabled. Using PROS 4.') - elif use_early_access: - ui.echo(f'Early access is enabled.') + if use_early_access: + ui.echo(f'Early access is enabled. Experimental features have been applied.') if not is_pathname_valid(str(Path(path).absolute())): raise dont_send(ValueError('Project path contains invalid characters.'))