From 6bdeb2a2e3b72629419d3ab9b296cf3ffa193614 Mon Sep 17 00:00:00 2001 From: eskild <42120229+iameskild@users.noreply.github.com> Date: Sun, 12 Nov 2023 20:39:13 -0800 Subject: [PATCH 1/2] Add upgrade command for 2023.11.1 (#2103) --- src/_nebari/upgrade.py | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/src/_nebari/upgrade.py b/src/_nebari/upgrade.py index 7625abd526..745ccda24e 100644 --- a/src/_nebari/upgrade.py +++ b/src/_nebari/upgrade.py @@ -648,6 +648,20 @@ def _version_specific_upgrade( return config +class Upgrade_2023_11_1(UpgradeStep): + version = "2023.11.1" + + def _version_specific_upgrade( + self, config, start_version, config_filename: Path, *args, **kwargs + ): + rich.print("\n ⚠️ Deprecation Warning ⚠️") + rich.print( + f"-> ClearML, Prefect and kbatch are no longer supported in Nebari version [green]{self.version}[/green] and will be uninstalled." + ) + + return config + + __rounded_version__ = str(rounded_ver_parse(__version__)) # Manually-added upgrade steps must go above this line From 49b4d17a56bb745fd9fb028afd510f244eb5d005 Mon Sep 17 00:00:00 2001 From: Fangchen Li Date: Sun, 12 Nov 2023 20:45:10 -0800 Subject: [PATCH 2/2] CLN: cleanup typing and typing import in init (#2107) --- src/_nebari/subcommands/init.py | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/src/_nebari/subcommands/init.py b/src/_nebari/subcommands/init.py index 72eab64ffb..f519b97f8f 100644 --- a/src/_nebari/subcommands/init.py +++ b/src/_nebari/subcommands/init.py @@ -2,7 +2,7 @@ import os import pathlib import re -import typing +from typing import Optional import questionary import rich @@ -84,17 +84,17 @@ class GitRepoEnum(str, enum.Enum): class InitInputs(schema.Base): cloud_provider: ProviderEnum = ProviderEnum.local project_name: schema.project_name_pydantic = "" - domain_name: typing.Optional[str] = None - namespace: typing.Optional[schema.namespace_pydantic] = "dev" + domain_name: Optional[str] = None + namespace: Optional[schema.namespace_pydantic] = "dev" auth_provider: AuthenticationEnum = AuthenticationEnum.password auth_auto_provision: bool = False - repository: typing.Optional[schema.github_url_pydantic] = None + repository: Optional[schema.github_url_pydantic] = None repository_auto_provision: bool = False ci_provider: CiEnum = CiEnum.none terraform_state: TerraformStateEnum = TerraformStateEnum.remote - kubernetes_version: typing.Union[str, None] = None - region: typing.Union[str, None] = None - ssl_cert_email: typing.Union[schema.email_pydantic, None] = None + kubernetes_version: Optional[str] = None + region: Optional[str] = None + ssl_cert_email: Optional[schema.email_pydantic] = None disable_prompt: bool = False output: pathlib.Path = pathlib.Path("nebari-config.yaml") @@ -490,7 +490,7 @@ def init( "Project name must (1) consist of only letters, numbers, hyphens, and underscores, (2) begin and end with a letter, and (3) contain between 3 and 16 characters.", ), ), - domain_name: typing.Optional[str] = typer.Option( + domain_name: Optional[str] = typer.Option( None, "--domain-name", "--domain",