flet-cli 1.1.0.dev4__tar.gz → 1.1.1__tar.gz
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- {flet_cli-1.1.0.dev4 → flet_cli-1.1.1}/PKG-INFO +3 -3
- {flet_cli-1.1.0.dev4 → flet_cli-1.1.1}/pyproject.toml +3 -3
- {flet_cli-1.1.0.dev4 → flet_cli-1.1.1}/src/flet_cli/commands/build_base.py +54 -0
- {flet_cli-1.1.0.dev4 → flet_cli-1.1.1}/src/flet_cli/commands/publish.py +26 -23
- flet_cli-1.1.1/src/flet_cli/utils/project_dependencies.py +431 -0
- {flet_cli-1.1.0.dev4 → flet_cli-1.1.1}/src/flet_cli/utils/pyodide.py +54 -8
- flet_cli-1.1.1/src/flet_cli/version.py +1 -0
- {flet_cli-1.1.0.dev4 → flet_cli-1.1.1}/src/flet_cli.egg-info/PKG-INFO +3 -3
- {flet_cli-1.1.0.dev4 → flet_cli-1.1.1}/src/flet_cli.egg-info/SOURCES.txt +2 -0
- {flet_cli-1.1.0.dev4 → flet_cli-1.1.1}/src/flet_cli.egg-info/requires.txt +2 -2
- flet_cli-1.1.1/tests/test_build_web_fonts.py +161 -0
- {flet_cli-1.1.0.dev4 → flet_cli-1.1.1}/tests/test_project_dependencies.py +236 -0
- flet_cli-1.1.1/tests/test_pyodide_runtime.py +180 -0
- flet_cli-1.1.0.dev4/src/flet_cli/utils/project_dependencies.py +0 -208
- flet_cli-1.1.0.dev4/src/flet_cli/version.py +0 -1
- {flet_cli-1.1.0.dev4 → flet_cli-1.1.1}/README.md +0 -0
- {flet_cli-1.1.0.dev4 → flet_cli-1.1.1}/setup.cfg +0 -0
- {flet_cli-1.1.0.dev4 → flet_cli-1.1.1}/src/flet_cli/__pyinstaller/__init__.py +0 -0
- {flet_cli-1.1.0.dev4 → flet_cli-1.1.1}/src/flet_cli/__pyinstaller/config.py +0 -0
- {flet_cli-1.1.0.dev4 → flet_cli-1.1.1}/src/flet_cli/__pyinstaller/hook-flet.py +0 -0
- {flet_cli-1.1.0.dev4 → flet_cli-1.1.1}/src/flet_cli/__pyinstaller/hook-flet_desktop.py +0 -0
- {flet_cli-1.1.0.dev4 → flet_cli-1.1.1}/src/flet_cli/__pyinstaller/macos_utils.py +0 -0
- {flet_cli-1.1.0.dev4 → flet_cli-1.1.1}/src/flet_cli/__pyinstaller/rthooks/pyi_rth_localhost_fletd.py +0 -0
- {flet_cli-1.1.0.dev4 → flet_cli-1.1.1}/src/flet_cli/__pyinstaller/rthooks.dat +0 -0
- {flet_cli-1.1.0.dev4 → flet_cli-1.1.1}/src/flet_cli/__pyinstaller/utils.py +0 -0
- {flet_cli-1.1.0.dev4 → flet_cli-1.1.1}/src/flet_cli/__pyinstaller/win_utils.py +0 -0
- {flet_cli-1.1.0.dev4 → flet_cli-1.1.1}/src/flet_cli/cli.py +0 -0
- {flet_cli-1.1.0.dev4 → flet_cli-1.1.1}/src/flet_cli/commands/base.py +0 -0
- {flet_cli-1.1.0.dev4 → flet_cli-1.1.1}/src/flet_cli/commands/build.py +0 -0
- {flet_cli-1.1.0.dev4 → flet_cli-1.1.1}/src/flet_cli/commands/clean.py +0 -0
- {flet_cli-1.1.0.dev4 → flet_cli-1.1.1}/src/flet_cli/commands/create.py +0 -0
- {flet_cli-1.1.0.dev4 → flet_cli-1.1.1}/src/flet_cli/commands/debug.py +0 -0
- {flet_cli-1.1.0.dev4 → flet_cli-1.1.1}/src/flet_cli/commands/devices.py +0 -0
- {flet_cli-1.1.0.dev4 → flet_cli-1.1.1}/src/flet_cli/commands/doctor.py +0 -0
- {flet_cli-1.1.0.dev4 → flet_cli-1.1.1}/src/flet_cli/commands/emulators.py +0 -0
- {flet_cli-1.1.0.dev4 → flet_cli-1.1.1}/src/flet_cli/commands/flutter_base.py +0 -0
- {flet_cli-1.1.0.dev4 → flet_cli-1.1.1}/src/flet_cli/commands/mcp.py +0 -0
- {flet_cli-1.1.0.dev4 → flet_cli-1.1.1}/src/flet_cli/commands/options.py +0 -0
- {flet_cli-1.1.0.dev4 → flet_cli-1.1.1}/src/flet_cli/commands/pack.py +0 -0
- {flet_cli-1.1.0.dev4 → flet_cli-1.1.1}/src/flet_cli/commands/run.py +0 -0
- {flet_cli-1.1.0.dev4 → flet_cli-1.1.1}/src/flet_cli/commands/serve.py +0 -0
- {flet_cli-1.1.0.dev4 → flet_cli-1.1.1}/src/flet_cli/commands/test.py +0 -0
- {flet_cli-1.1.0.dev4 → flet_cli-1.1.1}/src/flet_cli/commands/test_host.py +0 -0
- {flet_cli-1.1.0.dev4 → flet_cli-1.1.1}/src/flet_cli/utils/android.py +0 -0
- {flet_cli-1.1.0.dev4 → flet_cli-1.1.1}/src/flet_cli/utils/android_sdk.py +0 -0
- {flet_cli-1.1.0.dev4 → flet_cli-1.1.1}/src/flet_cli/utils/app_excludes.py +0 -0
- {flet_cli-1.1.0.dev4 → flet_cli-1.1.1}/src/flet_cli/utils/cli.py +0 -0
- {flet_cli-1.1.0.dev4 → flet_cli-1.1.1}/src/flet_cli/utils/distros.py +0 -0
- {flet_cli-1.1.0.dev4 → flet_cli-1.1.1}/src/flet_cli/utils/examples.py +0 -0
- {flet_cli-1.1.0.dev4 → flet_cli-1.1.1}/src/flet_cli/utils/extension_settings.py +0 -0
- {flet_cli-1.1.0.dev4 → flet_cli-1.1.1}/src/flet_cli/utils/flutter.py +0 -0
- {flet_cli-1.1.0.dev4 → flet_cli-1.1.1}/src/flet_cli/utils/hash_stamp.py +0 -0
- {flet_cli-1.1.0.dev4 → flet_cli-1.1.1}/src/flet_cli/utils/ios_sign.py +0 -0
- {flet_cli-1.1.0.dev4 → flet_cli-1.1.1}/src/flet_cli/utils/jdk.py +0 -0
- {flet_cli-1.1.0.dev4 → flet_cli-1.1.1}/src/flet_cli/utils/linux_deps.py +0 -0
- {flet_cli-1.1.0.dev4 → flet_cli-1.1.1}/src/flet_cli/utils/log_format.py +0 -0
- {flet_cli-1.1.0.dev4 → flet_cli-1.1.1}/src/flet_cli/utils/macos_sign.py +0 -0
- {flet_cli-1.1.0.dev4 → flet_cli-1.1.1}/src/flet_cli/utils/merge.py +0 -0
- {flet_cli-1.1.0.dev4 → flet_cli-1.1.1}/src/flet_cli/utils/plist.py +0 -0
- {flet_cli-1.1.0.dev4 → flet_cli-1.1.1}/src/flet_cli/utils/processes.py +0 -0
- {flet_cli-1.1.0.dev4 → flet_cli-1.1.1}/src/flet_cli/utils/pyproject_toml.py +0 -0
- {flet_cli-1.1.0.dev4 → flet_cli-1.1.1}/src/flet_cli/utils/python_versions.py +0 -0
- {flet_cli-1.1.0.dev4 → flet_cli-1.1.1}/src/flet_cli/utils/template_cache.py +0 -0
- {flet_cli-1.1.0.dev4 → flet_cli-1.1.1}/src/flet_cli.egg-info/dependency_links.txt +0 -0
- {flet_cli-1.1.0.dev4 → flet_cli-1.1.1}/src/flet_cli.egg-info/entry_points.txt +0 -0
- {flet_cli-1.1.0.dev4 → flet_cli-1.1.1}/src/flet_cli.egg-info/top_level.txt +0 -0
- {flet_cli-1.1.0.dev4 → flet_cli-1.1.1}/tests/test_app_excludes.py +0 -0
- {flet_cli-1.1.0.dev4 → flet_cli-1.1.1}/tests/test_build_android.py +0 -0
- {flet_cli-1.1.0.dev4 → flet_cli-1.1.1}/tests/test_build_app_path.py +0 -0
- {flet_cli-1.1.0.dev4 → flet_cli-1.1.1}/tests/test_build_copy_output.py +0 -0
- {flet_cli-1.1.0.dev4 → flet_cli-1.1.1}/tests/test_build_icons.py +0 -0
- {flet_cli-1.1.0.dev4 → flet_cli-1.1.1}/tests/test_build_ios.py +0 -0
- {flet_cli-1.1.0.dev4 → flet_cli-1.1.1}/tests/test_build_linux.py +0 -0
- {flet_cli-1.1.0.dev4 → flet_cli-1.1.1}/tests/test_build_list_options.py +0 -0
- {flet_cli-1.1.0.dev4 → flet_cli-1.1.1}/tests/test_build_macos.py +0 -0
- {flet_cli-1.1.0.dev4 → flet_cli-1.1.1}/tests/test_build_macos_signing.py +0 -0
- {flet_cli-1.1.0.dev4 → flet_cli-1.1.1}/tests/test_build_package_cache.py +0 -0
- {flet_cli-1.1.0.dev4 → flet_cli-1.1.1}/tests/test_build_platform_settings.py +0 -0
- {flet_cli-1.1.0.dev4 → flet_cli-1.1.1}/tests/test_build_splash.py +0 -0
- {flet_cli-1.1.0.dev4 → flet_cli-1.1.1}/tests/test_build_svg.py +0 -0
- {flet_cli-1.1.0.dev4 → flet_cli-1.1.1}/tests/test_build_template.py +0 -0
- {flet_cli-1.1.0.dev4 → flet_cli-1.1.1}/tests/test_build_version.py +0 -0
- {flet_cli-1.1.0.dev4 → flet_cli-1.1.1}/tests/test_build_windows_arm64.py +0 -0
- {flet_cli-1.1.0.dev4 → flet_cli-1.1.1}/tests/test_clean.py +0 -0
- {flet_cli-1.1.0.dev4 → flet_cli-1.1.1}/tests/test_cli_pass_through_args.py +0 -0
- {flet_cli-1.1.0.dev4 → flet_cli-1.1.1}/tests/test_cli_positionals.py +0 -0
- {flet_cli-1.1.0.dev4 → flet_cli-1.1.1}/tests/test_create.py +0 -0
- {flet_cli-1.1.0.dev4 → flet_cli-1.1.1}/tests/test_extension_settings.py +0 -0
- {flet_cli-1.1.0.dev4 → flet_cli-1.1.1}/tests/test_find_platform_image.py +0 -0
- {flet_cli-1.1.0.dev4 → flet_cli-1.1.1}/tests/test_flutter.py +0 -0
- {flet_cli-1.1.0.dev4 → flet_cli-1.1.1}/tests/test_linux_desktop_entry.py +0 -0
- {flet_cli-1.1.0.dev4 → flet_cli-1.1.1}/tests/test_log_format.py +0 -0
- {flet_cli-1.1.0.dev4 → flet_cli-1.1.1}/tests/test_macos_sign.py +0 -0
- {flet_cli-1.1.0.dev4 → flet_cli-1.1.1}/tests/test_pack_extensions.py +0 -0
- {flet_cli-1.1.0.dev4 → flet_cli-1.1.1}/tests/test_plist.py +0 -0
- {flet_cli-1.1.0.dev4 → flet_cli-1.1.1}/tests/test_python_versions.py +0 -0
- {flet_cli-1.1.0.dev4 → flet_cli-1.1.1}/tests/test_run_assets_dir.py +0 -0
- {flet_cli-1.1.0.dev4 → flet_cli-1.1.1}/tests/test_run_desktop_dependency.py +0 -0
- {flet_cli-1.1.0.dev4 → flet_cli-1.1.1}/tests/test_run_script_args.py +0 -0
- {flet_cli-1.1.0.dev4 → flet_cli-1.1.1}/tests/test_run_watcher_unavailable.py +0 -0
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
Metadata-Version: 2.4
|
|
2
2
|
Name: flet-cli
|
|
3
|
-
Version: 1.1.
|
|
3
|
+
Version: 1.1.1
|
|
4
4
|
Summary: Flet CLI
|
|
5
5
|
Author-email: "Appveyor Systems Inc." <hello@flet.dev>
|
|
6
6
|
License-Expression: Apache-2.0
|
|
@@ -9,8 +9,8 @@ Project-URL: Repository, https://github.com/flet-dev/flet
|
|
|
9
9
|
Project-URL: Documentation, https://flet.dev/docs
|
|
10
10
|
Requires-Python: >=3.10
|
|
11
11
|
Description-Content-Type: text/markdown
|
|
12
|
-
Requires-Dist: flet==1.1.
|
|
13
|
-
Requires-Dist: flet-platform-assets==1.1.
|
|
12
|
+
Requires-Dist: flet==1.1.1
|
|
13
|
+
Requires-Dist: flet-platform-assets==1.1.1
|
|
14
14
|
Requires-Dist: watchdog>=4.0.0
|
|
15
15
|
Requires-Dist: packaging>=25.0
|
|
16
16
|
Requires-Dist: qrcode>=7.4.2
|
|
@@ -1,14 +1,14 @@
|
|
|
1
1
|
[project]
|
|
2
2
|
name = "flet-cli"
|
|
3
|
-
version = "1.1.
|
|
3
|
+
version = "1.1.1"
|
|
4
4
|
description = "Flet CLI"
|
|
5
5
|
authors = [{ name = "Appveyor Systems Inc.", email = "hello@flet.dev" }]
|
|
6
6
|
license = "Apache-2.0"
|
|
7
7
|
readme = "README.md"
|
|
8
8
|
requires-python = ">=3.10"
|
|
9
9
|
dependencies = [
|
|
10
|
-
"flet==1.1.
|
|
11
|
-
"flet-platform-assets==1.1.
|
|
10
|
+
"flet==1.1.1",
|
|
11
|
+
"flet-platform-assets==1.1.1",
|
|
12
12
|
"watchdog >=4.0.0",
|
|
13
13
|
"packaging >=25.0",
|
|
14
14
|
"qrcode >=7.4.2",
|
|
@@ -75,9 +75,13 @@ from flet_cli.utils.log_format import annotation_path
|
|
|
75
75
|
from flet_cli.utils.merge import merge_dict
|
|
76
76
|
from flet_cli.utils.plist import is_supported_plist_value, parse_cli_plist_value
|
|
77
77
|
from flet_cli.utils.project_dependencies import (
|
|
78
|
+
FletVersionConflictError,
|
|
78
79
|
get_poetry_dependencies,
|
|
79
80
|
get_project_dependencies,
|
|
81
|
+
pin_flet_dependencies,
|
|
82
|
+
read_requirements,
|
|
80
83
|
read_requirements_file_text,
|
|
84
|
+
requirements_use_hashes,
|
|
81
85
|
)
|
|
82
86
|
from flet_cli.utils.pyproject_toml import load_pyproject_toml
|
|
83
87
|
from flet_cli.utils.python_versions import (
|
|
@@ -1667,6 +1671,15 @@ class BaseBuildCommand(BaseFlutterCommand):
|
|
|
1667
1671
|
if checkout:
|
|
1668
1672
|
details += f' with ref "{template_ref}"'
|
|
1669
1673
|
console.log(details, style=verbose1_style, markup=False)
|
|
1674
|
+
if not second_pass:
|
|
1675
|
+
# Templates before 1.1.1 shipped a FontManifest.json that
|
|
1676
|
+
# replaced the one Flutter generates, so the fonts of
|
|
1677
|
+
# Dart packages were never loaded. Re-rendering keeps
|
|
1678
|
+
# files the template no longer has; a template that
|
|
1679
|
+
# still has one writes it back.
|
|
1680
|
+
(self.flutter_dir / "web" / "assets" / "FontManifest.json").unlink(
|
|
1681
|
+
missing_ok=True
|
|
1682
|
+
)
|
|
1670
1683
|
try:
|
|
1671
1684
|
from cookiecutter.main import cookiecutter
|
|
1672
1685
|
|
|
@@ -1763,6 +1776,20 @@ class BaseBuildCommand(BaseFlutterCommand):
|
|
|
1763
1776
|
pubspec = merge_dict(pubspec, pyproject_pubspec)
|
|
1764
1777
|
self.save_yaml(self.pubspec_path, pubspec)
|
|
1765
1778
|
|
|
1779
|
+
if self.config_platform == "web" and self.template_data.get("no_cdn"):
|
|
1780
|
+
# Declare Roboto before Flutter runs so both build and debug
|
|
1781
|
+
# include it in the generated manifest alongside package fonts.
|
|
1782
|
+
# An app's own Roboto declaration takes precedence.
|
|
1783
|
+
fonts = pubspec.setdefault("flutter", {}).setdefault("fonts", [])
|
|
1784
|
+
if not any(font.get("family") == "Roboto" for font in fonts):
|
|
1785
|
+
fonts.append(
|
|
1786
|
+
{
|
|
1787
|
+
"family": "Roboto",
|
|
1788
|
+
"fonts": [{"asset": "web/assets/fonts/roboto.woff2"}],
|
|
1789
|
+
}
|
|
1790
|
+
)
|
|
1791
|
+
self.save_yaml(self.pubspec_path, pubspec)
|
|
1792
|
+
|
|
1766
1793
|
# make backup of pubspec.yaml
|
|
1767
1794
|
shutil.copyfile(self.pubspec_path, f"{self.pubspec_path}.orig")
|
|
1768
1795
|
|
|
@@ -2139,6 +2166,22 @@ class BaseBuildCommand(BaseFlutterCommand):
|
|
|
2139
2166
|
return True
|
|
2140
2167
|
return False
|
|
2141
2168
|
|
|
2169
|
+
def _pin_flet_dependencies(self, dependencies: list[str]) -> list[str]:
|
|
2170
|
+
"""
|
|
2171
|
+
Pin the app's Flet packages to the CLI's version, or stop the build.
|
|
2172
|
+
|
|
2173
|
+
Args:
|
|
2174
|
+
dependencies: The app's requirements.
|
|
2175
|
+
|
|
2176
|
+
Returns:
|
|
2177
|
+
The pinned requirements.
|
|
2178
|
+
"""
|
|
2179
|
+
try:
|
|
2180
|
+
return pin_flet_dependencies(dependencies, flet.version.flet_version)
|
|
2181
|
+
except FletVersionConflictError as e:
|
|
2182
|
+
self.skip_flutter_doctor = True
|
|
2183
|
+
self.cleanup(1, escape(str(e)))
|
|
2184
|
+
|
|
2142
2185
|
def _site_packages_missing(self) -> bool:
|
|
2143
2186
|
"""
|
|
2144
2187
|
Whether any required platform package directory has no package files.
|
|
@@ -2477,6 +2520,7 @@ class BaseBuildCommand(BaseFlutterCommand):
|
|
|
2477
2520
|
if dev_packages_configured:
|
|
2478
2521
|
toml_dependencies.append("--no-cache-dir")
|
|
2479
2522
|
|
|
2523
|
+
toml_dependencies = self._pin_flet_dependencies(toml_dependencies)
|
|
2480
2524
|
for toml_dep in toml_dependencies:
|
|
2481
2525
|
package_args.extend(["-r", toml_dep])
|
|
2482
2526
|
|
|
@@ -2492,6 +2536,16 @@ class BaseBuildCommand(BaseFlutterCommand):
|
|
|
2492
2536
|
)
|
|
2493
2537
|
hash.update(reqs_txt_contents)
|
|
2494
2538
|
package_args.extend(["-r", "-r", "-r", str(requirements_txt)])
|
|
2539
|
+
|
|
2540
|
+
# pip reads the file itself, so the pins go next to it. A file
|
|
2541
|
+
# with hashes is only checked: pip rejects requirements that
|
|
2542
|
+
# have no hash.
|
|
2543
|
+
file_dependencies = read_requirements(requirements_txt)
|
|
2544
|
+
pinned_dependencies = self._pin_flet_dependencies(file_dependencies)
|
|
2545
|
+
if not requirements_use_hashes(reqs_txt_contents):
|
|
2546
|
+
for dep in pinned_dependencies:
|
|
2547
|
+
if dep not in file_dependencies:
|
|
2548
|
+
package_args.extend(["-r", dep])
|
|
2495
2549
|
else:
|
|
2496
2550
|
package_args.extend(["-r", f"flet=={flet.version.flet_version}"])
|
|
2497
2551
|
|
|
@@ -14,8 +14,12 @@ from flet.utils import (
|
|
|
14
14
|
)
|
|
15
15
|
from flet_cli.commands.base import BaseCommand
|
|
16
16
|
from flet_cli.utils.project_dependencies import (
|
|
17
|
+
FletVersionConflictError,
|
|
17
18
|
get_poetry_dependencies,
|
|
18
19
|
get_project_dependencies,
|
|
20
|
+
override_dependencies,
|
|
21
|
+
pin_flet_dependencies,
|
|
22
|
+
read_requirements,
|
|
19
23
|
)
|
|
20
24
|
from flet_cli.utils.pyodide import ensure_pyodide
|
|
21
25
|
from flet_cli.utils.pyproject_toml import load_pyproject_toml
|
|
@@ -214,6 +218,28 @@ class Command(BaseCommand):
|
|
|
214
218
|
os.path.basename(script_path),
|
|
215
219
|
)
|
|
216
220
|
|
|
221
|
+
requirements_txt = project_dir.joinpath(reqs_filename)
|
|
222
|
+
deps = (
|
|
223
|
+
get_poetry_dependencies(get_pyproject("tool.poetry.dependencies"))
|
|
224
|
+
or get_project_dependencies(get_pyproject("project.dependencies"))
|
|
225
|
+
or (
|
|
226
|
+
read_requirements(requirements_txt) if requirements_txt.exists() else []
|
|
227
|
+
)
|
|
228
|
+
)
|
|
229
|
+
# The web client installs these from the archive's pyproject.toml, which an
|
|
230
|
+
# app in a subdirectory doesn't have, and without the pins below an
|
|
231
|
+
# extension listed only here would ask for a newer `flet`.
|
|
232
|
+
deps = override_dependencies(
|
|
233
|
+
deps,
|
|
234
|
+
get_project_dependencies(get_pyproject("tool.flet.web.dependencies")) or [],
|
|
235
|
+
)
|
|
236
|
+
try:
|
|
237
|
+
deps = pin_flet_dependencies(deps, flet.version.flet_version)
|
|
238
|
+
except FletVersionConflictError as e:
|
|
239
|
+
print(e)
|
|
240
|
+
sys.exit(1)
|
|
241
|
+
print(f"App dependencies: {deps}")
|
|
242
|
+
|
|
217
243
|
# delete "dist" directory
|
|
218
244
|
if options.distpath:
|
|
219
245
|
dist_dir = Path(options.distpath)
|
|
@@ -256,29 +282,6 @@ class Command(BaseCommand):
|
|
|
256
282
|
if os.path.exists(assets_dir):
|
|
257
283
|
copy_tree(assets_dir, str(dist_dir))
|
|
258
284
|
|
|
259
|
-
deps = []
|
|
260
|
-
requirements_txt = project_dir.joinpath(reqs_filename)
|
|
261
|
-
|
|
262
|
-
toml_dependencies = get_poetry_dependencies(
|
|
263
|
-
get_pyproject("tool.poetry.dependencies")
|
|
264
|
-
) or get_project_dependencies(get_pyproject("project.dependencies"))
|
|
265
|
-
|
|
266
|
-
if toml_dependencies:
|
|
267
|
-
deps = toml_dependencies
|
|
268
|
-
print(f"pyproject.toml dependencies: {deps}")
|
|
269
|
-
elif requirements_txt.exists():
|
|
270
|
-
with open(requirements_txt, encoding="utf-8") as f:
|
|
271
|
-
deps = list(
|
|
272
|
-
filter(
|
|
273
|
-
lambda dep: not dep.startswith("#"),
|
|
274
|
-
[line.rstrip() for line in f],
|
|
275
|
-
)
|
|
276
|
-
)
|
|
277
|
-
print(f"{reqs_filename} dependencies: {deps}")
|
|
278
|
-
|
|
279
|
-
if len(deps) == 0:
|
|
280
|
-
deps = [f"flet=={flet.version.flet_version}"]
|
|
281
|
-
|
|
282
285
|
temp_reqs_txt = Path(tempfile.gettempdir()).joinpath(random_string(10))
|
|
283
286
|
with open(temp_reqs_txt, "w", encoding="utf-8") as f:
|
|
284
287
|
f.writelines(dep + "\n" for dep in deps)
|
|
@@ -0,0 +1,431 @@
|
|
|
1
|
+
"""Read the Python dependencies of a Flet app and pin its Flet packages."""
|
|
2
|
+
|
|
3
|
+
# Based on: https://pypi.org/project/toml-to-requirements/
|
|
4
|
+
|
|
5
|
+
import codecs
|
|
6
|
+
import os
|
|
7
|
+
import re
|
|
8
|
+
import shlex
|
|
9
|
+
from collections.abc import Iterator
|
|
10
|
+
from pathlib import Path
|
|
11
|
+
from typing import Any, Optional
|
|
12
|
+
from urllib.parse import urlparse
|
|
13
|
+
from urllib.request import url2pathname
|
|
14
|
+
|
|
15
|
+
from packaging.requirements import InvalidRequirement, Requirement
|
|
16
|
+
from packaging.specifiers import SpecifierSet
|
|
17
|
+
from packaging.utils import canonicalize_name
|
|
18
|
+
|
|
19
|
+
FLET_PACKAGES = frozenset(
|
|
20
|
+
{
|
|
21
|
+
"flet",
|
|
22
|
+
"flet-ads",
|
|
23
|
+
"flet-audio",
|
|
24
|
+
"flet-audio-recorder",
|
|
25
|
+
"flet-camera",
|
|
26
|
+
"flet-charts",
|
|
27
|
+
"flet-cli",
|
|
28
|
+
"flet-code-editor",
|
|
29
|
+
"flet-color-pickers",
|
|
30
|
+
"flet-datatable2",
|
|
31
|
+
"flet-desktop",
|
|
32
|
+
"flet-flashlight",
|
|
33
|
+
"flet-geolocator",
|
|
34
|
+
"flet-local-auth",
|
|
35
|
+
"flet-lottie",
|
|
36
|
+
"flet-map",
|
|
37
|
+
"flet-mcp",
|
|
38
|
+
"flet-notifications",
|
|
39
|
+
"flet-permission-handler",
|
|
40
|
+
"flet-platform-assets",
|
|
41
|
+
"flet-rive",
|
|
42
|
+
"flet-secure-storage",
|
|
43
|
+
"flet-shadcn-ui",
|
|
44
|
+
"flet-spinkit",
|
|
45
|
+
"flet-video",
|
|
46
|
+
"flet-web",
|
|
47
|
+
"flet-webview",
|
|
48
|
+
}
|
|
49
|
+
)
|
|
50
|
+
"""The packages released with `flet`, at its version."""
|
|
51
|
+
|
|
52
|
+
|
|
53
|
+
class FletVersionConflictError(ValueError):
|
|
54
|
+
"""Raised when an app's requirements exclude the version of the Flet CLI."""
|
|
55
|
+
|
|
56
|
+
|
|
57
|
+
def _windows_safe(req_str: str) -> str:
|
|
58
|
+
"""Insert a space before bare `<` or `>` so Windows cmd.exe does not
|
|
59
|
+
interpret them as shell redirection when the string is passed via `-r`
|
|
60
|
+
to a `.BAT` subprocess."""
|
|
61
|
+
return re.sub(r"(?<=[^ ])([<>])", r" \1", req_str)
|
|
62
|
+
|
|
63
|
+
|
|
64
|
+
def _poetry_version_to_pep440(version: str) -> str:
|
|
65
|
+
"""Convert a Poetry version constraint to PEP 440 syntax.
|
|
66
|
+
|
|
67
|
+
- `^1.2.3` → `>=1.2.3`
|
|
68
|
+
- `~1.2.3` → `~=1.2.3` (`~=` passes through unchanged)
|
|
69
|
+
- `*` → `""` (no constraint)
|
|
70
|
+
- `1.2.3` (bare version) → `==1.2.3`
|
|
71
|
+
- Anything else is returned as-is (already PEP 440).
|
|
72
|
+
"""
|
|
73
|
+
version = version.replace(" ", "")
|
|
74
|
+
if not version or version == "*":
|
|
75
|
+
return ""
|
|
76
|
+
if version.startswith("^"):
|
|
77
|
+
return f">={version[1:]}"
|
|
78
|
+
if version.startswith("~") and not version.startswith("~="):
|
|
79
|
+
return f"~={version[1:]}"
|
|
80
|
+
# Bare version number → pin with ==
|
|
81
|
+
if version[0].isdigit():
|
|
82
|
+
return f"=={version}"
|
|
83
|
+
return version
|
|
84
|
+
|
|
85
|
+
|
|
86
|
+
def _poetry_dep_to_pep508(name: str, value: Any) -> str:
|
|
87
|
+
"""Convert a single Poetry dependency entry to a PEP 508 requirement string."""
|
|
88
|
+
suffix = ""
|
|
89
|
+
|
|
90
|
+
if isinstance(value, dict):
|
|
91
|
+
version = value.get("version")
|
|
92
|
+
if version:
|
|
93
|
+
specifier = _poetry_version_to_pep440(version)
|
|
94
|
+
markers = value.get("markers")
|
|
95
|
+
if markers is not None:
|
|
96
|
+
suffix = f"; {markers}"
|
|
97
|
+
if specifier:
|
|
98
|
+
return f"{name}{specifier}{suffix}"
|
|
99
|
+
return f"{name}{suffix}"
|
|
100
|
+
|
|
101
|
+
git_url = value.get("git")
|
|
102
|
+
if git_url:
|
|
103
|
+
url = f"git+{git_url}" if not git_url.startswith("git@") else git_url
|
|
104
|
+
rev = value.get("branch") or value.get("rev") or value.get("tag")
|
|
105
|
+
if rev:
|
|
106
|
+
url = f"{url}@{rev}"
|
|
107
|
+
subdirectory = value.get("subdirectory")
|
|
108
|
+
if subdirectory:
|
|
109
|
+
url = f"{url}#subdirectory={subdirectory}"
|
|
110
|
+
markers = value.get("markers")
|
|
111
|
+
if markers is not None:
|
|
112
|
+
suffix = f"; {markers}"
|
|
113
|
+
return f"{name} @ {url}{suffix}"
|
|
114
|
+
|
|
115
|
+
path = value.get("path")
|
|
116
|
+
if path:
|
|
117
|
+
return path
|
|
118
|
+
|
|
119
|
+
url = value.get("url")
|
|
120
|
+
if url:
|
|
121
|
+
return url
|
|
122
|
+
|
|
123
|
+
raise ValueError(f"Unsupported dependency specification: {name} = {value}")
|
|
124
|
+
|
|
125
|
+
# String value
|
|
126
|
+
specifier = _poetry_version_to_pep440(value)
|
|
127
|
+
if specifier:
|
|
128
|
+
return f"{name}{specifier}"
|
|
129
|
+
return name
|
|
130
|
+
|
|
131
|
+
|
|
132
|
+
def get_poetry_dependencies(
|
|
133
|
+
poetry_dependencies: Optional[dict[str, Any]] = None,
|
|
134
|
+
) -> Optional[list[str]]:
|
|
135
|
+
"""
|
|
136
|
+
Convert Poetry dependency declarations into pip-style requirement strings.
|
|
137
|
+
|
|
138
|
+
Args:
|
|
139
|
+
poetry_dependencies: Value from `tool.poetry.dependencies`.
|
|
140
|
+
|
|
141
|
+
Returns:
|
|
142
|
+
Sorted requirement strings or `None` when `poetry_dependencies` is `None`.
|
|
143
|
+
"""
|
|
144
|
+
if poetry_dependencies is None:
|
|
145
|
+
return None
|
|
146
|
+
|
|
147
|
+
dependencies: set[str] = {
|
|
148
|
+
_windows_safe(_poetry_dep_to_pep508(dep, ver))
|
|
149
|
+
for dep, ver in poetry_dependencies.items()
|
|
150
|
+
if dep != "python"
|
|
151
|
+
}
|
|
152
|
+
|
|
153
|
+
return sorted(dependencies)
|
|
154
|
+
|
|
155
|
+
|
|
156
|
+
def get_project_dependencies(
|
|
157
|
+
project_dependencies: Optional[list[str]] = None,
|
|
158
|
+
) -> Optional[list[str]]:
|
|
159
|
+
"""
|
|
160
|
+
Normalize PEP 621 `project.dependencies` into a sorted unique list.
|
|
161
|
+
|
|
162
|
+
Args:
|
|
163
|
+
project_dependencies: Value from `project.dependencies`.
|
|
164
|
+
|
|
165
|
+
Returns:
|
|
166
|
+
Sorted dependency strings, or `None` when input is `None`.
|
|
167
|
+
"""
|
|
168
|
+
if project_dependencies is None:
|
|
169
|
+
return None
|
|
170
|
+
|
|
171
|
+
dependencies: set[str] = set()
|
|
172
|
+
for dep in project_dependencies:
|
|
173
|
+
try:
|
|
174
|
+
req = Requirement(dep)
|
|
175
|
+
dependencies.add(_windows_safe(str(req)))
|
|
176
|
+
except Exception:
|
|
177
|
+
dependencies.add(_windows_safe(dep))
|
|
178
|
+
|
|
179
|
+
return sorted(dependencies)
|
|
180
|
+
|
|
181
|
+
|
|
182
|
+
def pin_flet_dependencies(dependencies: list[str], flet_version: str) -> list[str]:
|
|
183
|
+
"""
|
|
184
|
+
Pin `flet` and the packages released with it to the version of the Flet CLI.
|
|
185
|
+
|
|
186
|
+
An app runs in a Flet client of the CLI's version, so its Python packages must
|
|
187
|
+
have that version too. A range such as `flet>=1.0` would install the newest
|
|
188
|
+
release instead. The extensions are pinned as well because each one requires
|
|
189
|
+
its own version of `flet` exactly, and `micropip` can't step back to an older
|
|
190
|
+
extension the way pip does.
|
|
191
|
+
|
|
192
|
+
`flet==<flet_version>` is added when no requirement installs `flet` on every
|
|
193
|
+
platform, unless an entry installs a path or URL, which may provide `flet`.
|
|
194
|
+
|
|
195
|
+
Args:
|
|
196
|
+
dependencies: The app's requirements. Pip options are kept as they are.
|
|
197
|
+
flet_version: The version of the Flet CLI.
|
|
198
|
+
|
|
199
|
+
Returns:
|
|
200
|
+
The pinned requirements, or `dependencies` as they are when `flet` itself
|
|
201
|
+
comes from a path or URL, such as the one `dev_packages` sets.
|
|
202
|
+
|
|
203
|
+
Raises:
|
|
204
|
+
FletVersionConflictError: If a requirement without an environment marker
|
|
205
|
+
excludes `flet_version`.
|
|
206
|
+
"""
|
|
207
|
+
requirements = [_parse_requirement(dep) for dep in dependencies]
|
|
208
|
+
if any(
|
|
209
|
+
_is_flet_location(dep)
|
|
210
|
+
or (req is not None and canonicalize_name(req.name) == "flet" and req.url)
|
|
211
|
+
for dep, req in zip(dependencies, requirements)
|
|
212
|
+
):
|
|
213
|
+
return list(dependencies)
|
|
214
|
+
|
|
215
|
+
pinned = []
|
|
216
|
+
installs_flet = False
|
|
217
|
+
may_install_flet = False
|
|
218
|
+
for dep, req in zip(dependencies, requirements):
|
|
219
|
+
if req is None:
|
|
220
|
+
may_install_flet = may_install_flet or not dep.startswith("-")
|
|
221
|
+
elif canonicalize_name(req.name) in FLET_PACKAGES and not req.url:
|
|
222
|
+
if not req.specifier.contains(flet_version, prereleases=True):
|
|
223
|
+
if req.marker is not None:
|
|
224
|
+
# It may not apply to the target, so pip decides.
|
|
225
|
+
pinned.append(dep)
|
|
226
|
+
continue
|
|
227
|
+
raise FletVersionConflictError(
|
|
228
|
+
f"The app requires `{req}`, but this Flet CLI is version "
|
|
229
|
+
f"{flet_version}, and the app runs in a Flet client of that "
|
|
230
|
+
"version. Change the requirement, or use a Flet CLI version "
|
|
231
|
+
"that it allows."
|
|
232
|
+
)
|
|
233
|
+
req.specifier = SpecifierSet(f"=={flet_version}")
|
|
234
|
+
dep = _windows_safe(str(req))
|
|
235
|
+
installs_flet = installs_flet or (
|
|
236
|
+
canonicalize_name(req.name) == "flet" and req.marker is None
|
|
237
|
+
)
|
|
238
|
+
pinned.append(dep)
|
|
239
|
+
if not installs_flet and not may_install_flet:
|
|
240
|
+
pinned.append(f"flet=={flet_version}")
|
|
241
|
+
return pinned
|
|
242
|
+
|
|
243
|
+
|
|
244
|
+
def override_dependencies(dependencies: list[str], overrides: list[str]) -> list[str]:
|
|
245
|
+
"""
|
|
246
|
+
Append `overrides` to `dependencies`, replacing requirements of the same packages.
|
|
247
|
+
|
|
248
|
+
Args:
|
|
249
|
+
dependencies: The requirements to override.
|
|
250
|
+
overrides: The requirements that take precedence.
|
|
251
|
+
|
|
252
|
+
Returns:
|
|
253
|
+
The combined requirements.
|
|
254
|
+
"""
|
|
255
|
+
names = {
|
|
256
|
+
canonicalize_name(req.name)
|
|
257
|
+
for req in map(_parse_requirement, overrides)
|
|
258
|
+
if req is not None
|
|
259
|
+
}
|
|
260
|
+
kept = [
|
|
261
|
+
dep
|
|
262
|
+
for dep in dependencies
|
|
263
|
+
if (req := _parse_requirement(dep)) is None
|
|
264
|
+
or canonicalize_name(req.name) not in names
|
|
265
|
+
]
|
|
266
|
+
return kept + overrides
|
|
267
|
+
|
|
268
|
+
|
|
269
|
+
def _parse_requirement(dep: str) -> Optional[Requirement]:
|
|
270
|
+
"""Parse a PEP 508 requirement, or return `None` for any other entry."""
|
|
271
|
+
try:
|
|
272
|
+
return Requirement(dep)
|
|
273
|
+
except InvalidRequirement:
|
|
274
|
+
return None
|
|
275
|
+
|
|
276
|
+
|
|
277
|
+
def _is_flet_location(entry: str) -> bool:
|
|
278
|
+
"""Whether a path or URL names `flet`: a checkout, wheel, sdist or `#egg=flet`."""
|
|
279
|
+
return bool(
|
|
280
|
+
re.search(
|
|
281
|
+
r"[#&]egg=flet(&|$)"
|
|
282
|
+
r"|[/\\]flet[/\\]?(\[[^\]]*\])?\s*([#?&;]|$)"
|
|
283
|
+
r"|(^|[/\\])flet-\d[^/\\]*\.(whl|tar\.gz|zip)(\[[^\]]*\])?\s*([#?;]|$)",
|
|
284
|
+
entry,
|
|
285
|
+
re.IGNORECASE,
|
|
286
|
+
)
|
|
287
|
+
)
|
|
288
|
+
|
|
289
|
+
|
|
290
|
+
def _requirements_lines(text: str) -> Iterator[str]:
|
|
291
|
+
"""Yield the lines of a requirements file, preprocessed the way pip does."""
|
|
292
|
+
pending = ""
|
|
293
|
+
for line in [*text.splitlines(), ""]:
|
|
294
|
+
# Join before stripping comments, as pip does. Comment lines themselves
|
|
295
|
+
# never continue onto the following line.
|
|
296
|
+
if line.endswith("\\") and not line.lstrip().startswith("#"):
|
|
297
|
+
pending += line[:-1]
|
|
298
|
+
continue
|
|
299
|
+
line, pending = pending + line, ""
|
|
300
|
+
line = re.sub(r"(^|\s+)#.*$", "", line).strip()
|
|
301
|
+
if line:
|
|
302
|
+
yield re.sub(
|
|
303
|
+
r"\$\{([A-Z0-9_]+)\}",
|
|
304
|
+
lambda match: os.environ.get(match[1]) or match[0],
|
|
305
|
+
line,
|
|
306
|
+
)
|
|
307
|
+
|
|
308
|
+
|
|
309
|
+
def _requirements_options(line: str) -> Iterator[tuple[str, str]]:
|
|
310
|
+
"""Yield the `-r`, `-c` and `-e` options of a line, as (letter, value) pairs."""
|
|
311
|
+
try:
|
|
312
|
+
options = iter(shlex.split(line))
|
|
313
|
+
except ValueError:
|
|
314
|
+
# Leave malformed options for pip to report during installation.
|
|
315
|
+
return
|
|
316
|
+
for option in options:
|
|
317
|
+
if option in ("-r", "--requirement", "-c", "--constraint", "-e", "--editable"):
|
|
318
|
+
letter, value = option.lstrip("-")[0], next(options, "")
|
|
319
|
+
elif option.startswith(("--requirement=", "--constraint=", "--editable=")):
|
|
320
|
+
letter, value = option[2], option.partition("=")[2]
|
|
321
|
+
elif option.startswith(("-r", "-c", "-e")):
|
|
322
|
+
letter, value = option[1], option[2:]
|
|
323
|
+
else:
|
|
324
|
+
continue
|
|
325
|
+
if value:
|
|
326
|
+
yield letter, value
|
|
327
|
+
|
|
328
|
+
|
|
329
|
+
def _is_remote_url(value: str) -> bool:
|
|
330
|
+
"""Whether a value from a requirements file is a URL other than `file:`."""
|
|
331
|
+
return re.match(
|
|
332
|
+
r"^[a-z][a-z0-9+.-]*://", value, re.IGNORECASE
|
|
333
|
+
) is not None and not value.lower().startswith("file:")
|
|
334
|
+
|
|
335
|
+
|
|
336
|
+
def _requirements_files(path: Path) -> Iterator[tuple[str, bool]]:
|
|
337
|
+
"""
|
|
338
|
+
Yield the text of a requirements file and of the files it includes.
|
|
339
|
+
|
|
340
|
+
Includes are relative to the file that includes them. `file:` URLs are read;
|
|
341
|
+
other URLs and missing files are skipped.
|
|
342
|
+
|
|
343
|
+
Args:
|
|
344
|
+
path: The path of the requirements file.
|
|
345
|
+
|
|
346
|
+
Yields:
|
|
347
|
+
The text of a file, and whether it was included as a constraints file.
|
|
348
|
+
"""
|
|
349
|
+
visited: set[tuple[Path, bool]] = set()
|
|
350
|
+
|
|
351
|
+
def read(file: Path, constraint: bool) -> Iterator[tuple[str, bool]]:
|
|
352
|
+
key = (file.resolve(), constraint)
|
|
353
|
+
if key in visited or not file.is_file():
|
|
354
|
+
return
|
|
355
|
+
visited.add(key)
|
|
356
|
+
data = file.read_bytes()
|
|
357
|
+
encoding = (
|
|
358
|
+
"utf-16"
|
|
359
|
+
if data.startswith((codecs.BOM_UTF16_LE, codecs.BOM_UTF16_BE))
|
|
360
|
+
else "utf-8-sig"
|
|
361
|
+
)
|
|
362
|
+
text = data.decode(encoding, errors="replace").replace("\r\n", "\n")
|
|
363
|
+
yield text, constraint
|
|
364
|
+
for line in _requirements_lines(text):
|
|
365
|
+
if not line.startswith("-"):
|
|
366
|
+
continue
|
|
367
|
+
for letter, value in _requirements_options(line):
|
|
368
|
+
if value.lower().startswith("file:"):
|
|
369
|
+
value = url2pathname(urlparse(value).path)
|
|
370
|
+
if letter != "e" and not _is_remote_url(value):
|
|
371
|
+
yield from read(file.parent / value, letter == "c")
|
|
372
|
+
|
|
373
|
+
yield from read(Path(path), False)
|
|
374
|
+
|
|
375
|
+
|
|
376
|
+
def read_requirements_file_text(path: Path) -> str:
|
|
377
|
+
"""
|
|
378
|
+
Return the text of a `requirements.txt` file and of the files it includes.
|
|
379
|
+
|
|
380
|
+
A change to any of the files changes the result.
|
|
381
|
+
|
|
382
|
+
Args:
|
|
383
|
+
path: The path of the `requirements.txt` file.
|
|
384
|
+
|
|
385
|
+
Returns:
|
|
386
|
+
The concatenated text of the file and of the files it includes.
|
|
387
|
+
"""
|
|
388
|
+
return "".join(text for text, _ in _requirements_files(path))
|
|
389
|
+
|
|
390
|
+
|
|
391
|
+
def read_requirements(path: Path) -> list[str]:
|
|
392
|
+
"""
|
|
393
|
+
Return the requirements of a `requirements.txt` file and of its `-r` includes.
|
|
394
|
+
|
|
395
|
+
Args:
|
|
396
|
+
path: The path of the `requirements.txt` file.
|
|
397
|
+
|
|
398
|
+
Returns:
|
|
399
|
+
The requirements without their options, the targets of `-e` options, and
|
|
400
|
+
the URLs of `-r` includes, whose requirements can't be read here.
|
|
401
|
+
"""
|
|
402
|
+
requirements = []
|
|
403
|
+
for text, constraint in _requirements_files(path):
|
|
404
|
+
if constraint:
|
|
405
|
+
continue
|
|
406
|
+
for line in _requirements_lines(text):
|
|
407
|
+
if line.startswith("-"):
|
|
408
|
+
requirements.extend(
|
|
409
|
+
value
|
|
410
|
+
for letter, value in _requirements_options(line)
|
|
411
|
+
if letter == "e" or (letter == "r" and _is_remote_url(value))
|
|
412
|
+
)
|
|
413
|
+
else:
|
|
414
|
+
requirements.append(re.split(r"\s+-", line, maxsplit=1)[0])
|
|
415
|
+
return requirements
|
|
416
|
+
|
|
417
|
+
|
|
418
|
+
def requirements_use_hashes(text: str) -> bool:
|
|
419
|
+
"""
|
|
420
|
+
Whether the text of a requirements file uses hash-checking mode.
|
|
421
|
+
|
|
422
|
+
Args:
|
|
423
|
+
text: The text, as `read_requirements_file_text` returns it.
|
|
424
|
+
|
|
425
|
+
Returns:
|
|
426
|
+
`True` when a line has a `--hash` or `--require-hashes` option.
|
|
427
|
+
"""
|
|
428
|
+
return any(
|
|
429
|
+
re.search(r"(^|\s)--(hash|require-hashes)\b", line)
|
|
430
|
+
for line in _requirements_lines(text)
|
|
431
|
+
)
|