Skip to content

Commit e9f2e4c

Browse files
committed
flet.version.version can't be empty
1 parent 9ea3a90 commit e9f2e4c

File tree

5 files changed

+11
-16
lines changed

5 files changed

+11
-16
lines changed

sdk/python/packages/flet-cli/src/flet_cli/commands/build_base.py

Lines changed: 2 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1015,11 +1015,7 @@ def create_flutter_project(self, second_pass=False):
10151015
"tool.flet.template.ref"
10161016
)
10171017
if not template_ref:
1018-
template_ref = (
1019-
version.Version(flet.version.version).base_version
1020-
if flet.version.version
1021-
else flet.version.from_git()
1022-
)
1018+
template_ref = version.Version(flet.version.version).base_version
10231019
hash.update(template_ref)
10241020

10251021
template_dir = self.options.template_dir or self.get_pyproject(
@@ -1621,12 +1617,7 @@ def package_python_app(self):
16211617
hash.update(reqs_txt_contents)
16221618
package_args.extend(["-r", "-r", "-r", str(requirements_txt)])
16231619
else:
1624-
flet_version = (
1625-
flet.version.version
1626-
if flet.version.version
1627-
else flet.version.from_git()
1628-
)
1629-
package_args.extend(["-r", f"flet=={flet_version}"])
1620+
package_args.extend(["-r", f"flet=={flet.version.version}"])
16301621

16311622
# site-packages variable
16321623
if self.package_platform != "Pyodide":

sdk/python/packages/flet-cli/src/flet_cli/commands/create.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ def handle(self, options: argparse.Namespace) -> None:
7575
}
7676

7777
template_ref = options.template_ref
78-
if not template_ref and flet.version.version:
78+
if not template_ref:
7979
template_ref = version.Version(flet.version.version).base_version
8080

8181
out_dir = Path(options.output_directory).resolve()

sdk/python/packages/flet-cli/src/flet_cli/commands/doctor.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,7 @@ def handle(self, options: argparse.Namespace) -> None:
3333
def check_flet_version(self) -> None:
3434
"""Check and print Flet version."""
3535
with console.status("[bold white]Checking Flet version..."):
36-
flet_version = flet.version.version or "Unknown"
37-
console.print(f"[green]✔ Flet Version:[/green] {flet_version}")
36+
console.print(f"[green]✔ Flet Version:[/green] {flet.version.version}")
3837

3938
def check_python_version(self) -> None:
4039
"""Check and print Python version."""

sdk/python/packages/flet-desktop/src/flet_desktop/__init__.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -211,7 +211,7 @@ def __download_flet_client(file_name):
211211
if not ver:
212212
import flet.version
213213

214-
ver = flet.version.version or flet.version.from_git()
214+
ver = flet.version.version
215215
temp_arch = Path(tempfile.gettempdir()).joinpath(file_name)
216216
flet_url = f"https://github.com/flet-dev/flet/releases/download/v{ver}/{file_name}"
217217
logger.info(f"Downloading Flet v{ver} from {flet_url} to {temp_arch}")

sdk/python/packages/flet-web/src/flet_web/__init__.py

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,4 +13,9 @@ def get_package_web_dir():
1313
return web_root_dir or str(Path(__file__).parent.joinpath("web"))
1414

1515

16-
__all__ = ["patch_font_manifest_json", "patch_index_html", "patch_manifest_json"]
16+
__all__ = [
17+
"get_package_web_dir",
18+
"patch_font_manifest_json",
19+
"patch_index_html",
20+
"patch_manifest_json",
21+
]

0 commit comments

Comments
 (0)