Skip to content

Commit 111b8f9

Browse files
flet build: allow dependencies with commas and other fixes (#5067)
* `flet build`: allow dependencies with commas Fix #5033 * Update change log * Do not set SERIOUS_PYTHON_SITE_PACKAGES when packaging for Pyodide * Changelog updated
1 parent 00c3597 commit 111b8f9

File tree

4 files changed

+29
-11
lines changed

4 files changed

+29
-11
lines changed

CHANGELOG.md

+8
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,13 @@
11
# Flet changelog
22

3+
## 0.27.6
4+
5+
* Fix `flet build`: allow dependencies with commas ([#5033](https://github.com/flet-dev/flet/issues/5033))
6+
* Show app startup screen by default ([#5036](https://github.com/flet-dev/flet/issues/5036))
7+
* fix: `Textfield` cursor position changes when modifying field content in `on_change` ([#5019](https://github.com/flet-dev/flet/issues/5019))
8+
* Remove deperecated `Control.update_async()` method ([#5005](https://github.com/flet-dev/flet/issues/5005))
9+
* fix: incorrect positioning of non-FAB controls assigned to page.floating_action_button ([#5049](https://github.com/flet-dev/flet/issues/5049))
10+
311
## 0.27.5
412

513
* Added `FletApp.showAppStartupScreen` and `FletApp.appStartupScreenMessage` properties.

packages/flet/CHANGELOG.md

+8
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,11 @@
1+
# 0.27.6
2+
3+
* Fix `flet build`: allow dependencies with commas ([#5033](https://github.com/flet-dev/flet/issues/5033))
4+
* Show app startup screen by default ([#5036](https://github.com/flet-dev/flet/issues/5036))
5+
* fix: `Textfield` cursor position changes when modifying field content in `on_change` ([#5019](https://github.com/flet-dev/flet/issues/5019))
6+
* Remove deperecated `Control.update_async()` method ([#5005](https://github.com/flet-dev/flet/issues/5005))
7+
* fix: incorrect positioning of non-FAB controls assigned to page.floating_action_button ([#5049](https://github.com/flet-dev/flet/issues/5049))
8+
19
# 0.27.5
210

311
* Added `FletApp.showAppStartupScreen` and `FletApp.appStartupScreenMessage` properties.

packages/flet/pubspec.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ name: flet
22
description: Write entire Flutter app in Python or add server-driven UI experience into existing Flutter app.
33
homepage: https://flet.dev
44
repository: https://github.com/flet-dev/flet/packages/flet
5-
version: 0.27.5
5+
version: 0.27.6
66

77
# This package supports all platforms listed below.
88
platforms:

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

+12-10
Original file line numberDiff line numberDiff line change
@@ -1740,7 +1740,6 @@ def package_python_app(self):
17401740
package_env = {}
17411741

17421742
# requirements
1743-
package_args.append("--requirements")
17441743
requirements_txt = self.python_app_path.joinpath("requirements.txt")
17451744

17461745
toml_dependencies = (
@@ -1774,7 +1773,8 @@ def package_python_app(self):
17741773
if dev_packages_configured:
17751774
toml_dependencies.append("--no-cache-dir")
17761775

1777-
package_args.append(",".join(toml_dependencies))
1776+
for toml_dep in toml_dependencies:
1777+
package_args.extend(["-r", toml_dep])
17781778

17791779
elif requirements_txt.exists():
17801780
if self.verbose > 1:
@@ -1785,17 +1785,18 @@ def package_python_app(self):
17851785
style=verbose2_style,
17861786
)
17871787
hash.update(reqs_txt_contents)
1788-
package_args.append(f"-r,{requirements_txt}")
1788+
package_args.extend(["-r", "-r", "-r", str(requirements_txt)])
17891789
else:
17901790
flet_version = (
17911791
flet.version.version if flet.version.version else update_version()
17921792
)
1793-
package_args.append(f"flet=={flet_version}")
1793+
package_args.extend(["-r", f"flet=={flet_version}"])
17941794

17951795
# site-packages variable
1796-
package_env["SERIOUS_PYTHON_SITE_PACKAGES"] = str(
1797-
self.build_dir / "site-packages"
1798-
)
1796+
if self.package_platform != "Pyodide":
1797+
package_env["SERIOUS_PYTHON_SITE_PACKAGES"] = str(
1798+
self.build_dir / "site-packages"
1799+
)
17991800

18001801
# flutter-packages variable
18011802
if self.flutter_packages_temp_dir.exists():
@@ -1953,9 +1954,10 @@ def flutter_build(self):
19531954
build_env = {}
19541955

19551956
# site-packages variable
1956-
build_env["SERIOUS_PYTHON_SITE_PACKAGES"] = str(
1957-
self.build_dir / "site-packages"
1958-
)
1957+
if self.package_platform != "Pyodide":
1958+
build_env["SERIOUS_PYTHON_SITE_PACKAGES"] = str(
1959+
self.build_dir / "site-packages"
1960+
)
19591961

19601962
android_signing_key_store = (
19611963
self.options.android_signing_key_store

0 commit comments

Comments
 (0)