Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 7 additions & 7 deletions .appveyor.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
skip_branch_with_pr: true

environment:
FLUTTER_VERSION: 3.27.4
FLUTTER_VERSION: 3.29.3
GITHUB_TOKEN:
secure: 9SKIwc3VSfYJ5IChvNR74mEv2nb0ZFftUzn3sGRdXipXEfKSxY50DoodChHvlqZduQNhjg0oyLWAAa3n+iwWvVM2yI7Cgb14lFNClijz/kHI/PibnjDMNvLKaAygcfAc

Expand Down Expand Up @@ -62,7 +62,7 @@ for:
test_script:
- export SERIOUS_PYTHON_SITE_PACKAGES=$APPVEYOR_BUILD_FOLDER/site-packages
- cd src/serious_python/example/flet_example
- dart run serious_python:main package app/src -p Darwin -r flet -r --pre
- dart run serious_python:main package app/src -p Darwin -r flet
- flutter test integration_test -d macos

# ======================================
Expand All @@ -89,7 +89,7 @@ for:
test_script:
- export SERIOUS_PYTHON_SITE_PACKAGES=$APPVEYOR_BUILD_FOLDER/site-packages
- cd src/serious_python/example/flet_example
- dart run serious_python:main package app/src -p iOS -r flet -r --pre
- dart run serious_python:main package app/src -p iOS -r flet
- flutter build ios --no-codesign
# - flutter drive --driver=test_driver/integration_test.dart --target=integration_test/app_test.dart

Expand Down Expand Up @@ -125,7 +125,7 @@ for:
test_script:
- export SERIOUS_PYTHON_SITE_PACKAGES=$APPVEYOR_BUILD_FOLDER/site-packages
- cd src/serious_python/example/flet_example
- dart run serious_python:main package app/src -p Android -r flet -r --pre
- dart run serious_python:main package app/src -p Android -r flet
- flutter test integration_test -d emulator-5554


Expand Down Expand Up @@ -153,7 +153,7 @@ for:
test_script:
- set SERIOUS_PYTHON_SITE_PACKAGES=%APPVEYOR_BUILD_FOLDER%\site-packages
- cd src/serious_python/example/flet_example
- dart run serious_python:main package app/src -p Windows -r flet -r --pre
- dart run serious_python:main package app/src -p Windows -r flet
- flutter test integration_test -d windows

# ======================================
Expand All @@ -174,7 +174,7 @@ for:
test_script:
- export SERIOUS_PYTHON_SITE_PACKAGES=$APPVEYOR_BUILD_FOLDER/site-packages
- cd src/serious_python/example/flet_example
- dart run serious_python:main package app/src -p Linux -r flet -r --pre
- dart run serious_python:main package app/src -p Linux -r flet
- xvfb-run flutter test integration_test -d linux

# ======================================
Expand All @@ -199,7 +199,7 @@ for:
test_script:
- export SERIOUS_PYTHON_SITE_PACKAGES=$APPVEYOR_BUILD_FOLDER/site-packages
- cd src/serious_python/example/flet_example
- dart run serious_python:main package app/src -p Linux -r flet -r --pre
- dart run serious_python:main package app/src -p Linux -r flet
- xvfb-run flutter test integration_test -d linux

# =========================================
Expand Down
3 changes: 3 additions & 0 deletions .fvmrc
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
{
"flutter": "3.29.3"
}
5 changes: 5 additions & 0 deletions src/serious_python/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
## 0.9.3

* Fix: Hidden files in site-packages are skipped when building macOS app.
* Fix: Do not delete package metadata in `.dist-info` directories ([#164](https://github.com/flet-dev/serious-python/issues/164)).

## 0.9.2

* Breaking change: multiple `--requirements` options of `package` command must be passed as `--requirements DEP_1 --requirements DEP_2 ...` (or `-r DEP_1 -r DEP_2 ...`) instead of `-r DEP_1,DEP_2,...` to support dependency specifications with commas, e.g. `pandas>=2.2,<3`.
Expand Down
3 changes: 1 addition & 2 deletions src/serious_python/bin/package_command.dart
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ import 'macos_utils.dart' as macos_utils;
import 'sitecustomize.dart';

const mobilePyPiUrl = "https://pypi.flet.dev";
const pyodideRootUrl = "https://cdn.jsdelivr.net/pyodide/v0.27.2/full";
const pyodideRootUrl = "https://cdn.jsdelivr.net/pyodide/v0.27.7/full";
const pyodideLockFile = "pyodide-lock.json";

const buildPythonVersion = "3.12.9";
Expand Down Expand Up @@ -71,7 +71,6 @@ const junkFilesDesktop = [
"**.pyx",
"**.a",
"**.pdb",
"**.dist-info",
"__pycache__",
"**/__pycache__",
];
Expand Down
92 changes: 46 additions & 46 deletions src/serious_python/example/flask_example/pubspec.lock
Original file line number Diff line number Diff line change
Expand Up @@ -21,42 +21,42 @@ packages:
dependency: transitive
description:
name: async
sha256: "947bfcf187f74dbc5e146c9eb9c0f10c9f8b30743e341481c1e2ed3ecc18c20c"
sha256: "758e6d74e971c3e5aceb4110bfd6698efc7f501675bcfe0c775459a8140750eb"
url: "https://pub.dev"
source: hosted
version: "2.11.0"
version: "2.13.0"
boolean_selector:
dependency: transitive
description:
name: boolean_selector
sha256: "6cfb5af12253eaf2b368f07bacc5a80d1301a071c73360d746b7f2e32d762c66"
sha256: "8aab1771e1243a5063b8b0ff68042d67334e3feab9e95b9490f9a6ebf73b42ea"
url: "https://pub.dev"
source: hosted
version: "2.1.1"
version: "2.1.2"
characters:
dependency: transitive
description:
name: characters
sha256: "04a925763edad70e8443c99234dc3328f442e811f1d8fd1a72f1c8ad0f69a605"
sha256: f71061c654a3380576a52b451dd5532377954cf9dbd272a78fc8479606670803
url: "https://pub.dev"
source: hosted
version: "1.3.0"
version: "1.4.0"
clock:
dependency: transitive
description:
name: clock
sha256: cb6d7f03e1de671e34607e909a7213e31d7752be4fb66a86d29fe1eb14bfb5cf
sha256: fddb70d9b5277016c77a80201021d40a2247104d9f4aa7bab7157b7e3f05b84b
url: "https://pub.dev"
source: hosted
version: "1.1.1"
version: "1.1.2"
collection:
dependency: transitive
description:
name: collection
sha256: ee67cb0715911d28db6bf4af1026078bd6f0128b07a5f66fb2ed94ec6783c09a
sha256: "2f5709ae4d3d59dd8f7cd309b4e023046b57d8a6c82130785d2b0e5868084e76"
url: "https://pub.dev"
source: hosted
version: "1.18.0"
version: "1.19.1"
crypto:
dependency: transitive
description:
Expand All @@ -77,10 +77,10 @@ packages:
dependency: transitive
description:
name: fake_async
sha256: "511392330127add0b769b75a987850d136345d9227c6b94c96a04cf4a391bf78"
sha256: "5368f224a74523e8d2e7399ea1638b37aecfca824a3cc4dfdf77bf1fa905ac44"
url: "https://pub.dev"
source: hosted
version: "1.3.1"
version: "1.3.3"
ffi:
dependency: transitive
description:
Expand Down Expand Up @@ -143,18 +143,18 @@ packages:
dependency: transitive
description:
name: leak_tracker
sha256: "7f0df31977cb2c0b88585095d168e689669a2cc9b97c309665e3386f3e9d341a"
sha256: "6bb818ecbdffe216e81182c2f0714a2e62b593f4a4f13098713ff1685dfb6ab0"
url: "https://pub.dev"
source: hosted
version: "10.0.4"
version: "10.0.9"
leak_tracker_flutter_testing:
dependency: transitive
description:
name: leak_tracker_flutter_testing
sha256: "06e98f569d004c1315b991ded39924b21af84cf14cc94791b8aea337d25b57f8"
sha256: f8b613e7e6a13ec79cfdc0e97638fddb3ab848452eff057653abd3edba760573
url: "https://pub.dev"
source: hosted
version: "3.0.3"
version: "3.0.9"
leak_tracker_testing:
dependency: transitive
description:
Expand All @@ -175,34 +175,34 @@ packages:
dependency: transitive
description:
name: matcher
sha256: d2323aa2060500f906aa31a895b4030b6da3ebdcc5619d14ce1aada65cd161cb
sha256: dc58c723c3c24bf8d3e2d3ad3f2f9d7bd9cf43ec6feaa64181775e60190153f2
url: "https://pub.dev"
source: hosted
version: "0.12.16+1"
version: "0.12.17"
material_color_utilities:
dependency: transitive
description:
name: material_color_utilities
sha256: "0e0a020085b65b6083975e499759762399b4475f766c21668c4ecca34ea74e5a"
sha256: f7142bb1154231d7ea5f96bc7bde4bda2a0945d2806bb11670e30b850d56bdec
url: "https://pub.dev"
source: hosted
version: "0.8.0"
version: "0.11.1"
meta:
dependency: transitive
description:
name: meta
sha256: "7687075e408b093f36e6bbf6c91878cc0d4cd10f409506f7bc996f68220b9136"
sha256: e3641ec5d63ebf0d9b41bd43201a66e3fc79a65db5f61fc181f04cd27aab950c
url: "https://pub.dev"
source: hosted
version: "1.12.0"
version: "1.16.0"
path:
dependency: transitive
description:
name: path
sha256: "087ce49c3f0dc39180befefc60fdb4acd8f8620e5682fe2476afd0b3688bb4af"
sha256: "75cca69d1490965be98c73ceaea117e8a04dd21217b37b292c9ddbec0d955bc5"
url: "https://pub.dev"
source: hosted
version: "1.9.0"
version: "1.9.1"
path_provider:
dependency: transitive
description:
Expand Down Expand Up @@ -281,42 +281,42 @@ packages:
path: "../.."
relative: true
source: path
version: "0.9.0"
version: "0.9.3"
serious_python_android:
dependency: transitive
description:
path: "../../../serious_python_android"
relative: true
source: path
version: "0.9.0"
version: "0.9.3"
serious_python_darwin:
dependency: transitive
description:
path: "../../../serious_python_darwin"
relative: true
source: path
version: "0.9.0"
version: "0.9.3"
serious_python_linux:
dependency: transitive
description:
path: "../../../serious_python_linux"
relative: true
source: path
version: "0.9.0"
version: "0.9.3"
serious_python_platform_interface:
dependency: transitive
description:
path: "../../../serious_python_platform_interface"
relative: true
source: path
version: "0.9.0"
version: "0.9.3"
serious_python_windows:
dependency: transitive
description:
path: "../../../serious_python_windows"
relative: true
source: path
version: "0.9.0"
version: "0.9.3"
shelf:
dependency: transitive
description:
Expand All @@ -329,55 +329,55 @@ packages:
dependency: transitive
description: flutter
source: sdk
version: "0.0.99"
version: "0.0.0"
source_span:
dependency: transitive
description:
name: source_span
sha256: "53e943d4206a5e30df338fd4c6e7a077e02254531b138a15aec3bd143c1a8b3c"
sha256: "254ee5351d6cb365c859e20ee823c3bb479bf4a293c22d17a9f1bf144ce86f7c"
url: "https://pub.dev"
source: hosted
version: "1.10.0"
version: "1.10.1"
stack_trace:
dependency: transitive
description:
name: stack_trace
sha256: "73713990125a6d93122541237550ee3352a2d84baad52d375a4cad2eb9b7ce0b"
sha256: "8b27215b45d22309b5cddda1aa2b19bdfec9df0e765f2de506401c071d38d1b1"
url: "https://pub.dev"
source: hosted
version: "1.11.1"
version: "1.12.1"
stream_channel:
dependency: transitive
description:
name: stream_channel
sha256: ba2aa5d8cc609d96bbb2899c28934f9e1af5cddbd60a827822ea467161eb54e7
sha256: "969e04c80b8bcdf826f8f16579c7b14d780458bd97f56d107d3950fdbeef059d"
url: "https://pub.dev"
source: hosted
version: "2.1.2"
version: "2.1.4"
string_scanner:
dependency: transitive
description:
name: string_scanner
sha256: "556692adab6cfa87322a115640c11f13cb77b3f076ddcc5d6ae3c20242bedcde"
sha256: "921cd31725b72fe181906c6a94d987c78e3b98c2e205b397ea399d4054872b43"
url: "https://pub.dev"
source: hosted
version: "1.2.0"
version: "1.4.1"
term_glyph:
dependency: transitive
description:
name: term_glyph
sha256: a29248a84fbb7c79282b40b8c72a1209db169a2e0542bce341da992fe1bc7e84
sha256: "7f554798625ea768a7518313e58f83891c7f5024f88e46e7182a4558850a4b8e"
url: "https://pub.dev"
source: hosted
version: "1.2.1"
version: "1.2.2"
test_api:
dependency: transitive
description:
name: test_api
sha256: "9955ae474176f7ac8ee4e989dadfb411a58c30415bcfb648fa04b2b8a03afa7f"
sha256: fb31f383e2ee25fbbfe06b40fe21e1e458d14080e3c67e7ba0acfde4df4e0bbd
url: "https://pub.dev"
source: hosted
version: "0.7.0"
version: "0.7.4"
toml:
dependency: transitive
description:
Expand Down Expand Up @@ -406,10 +406,10 @@ packages:
dependency: transitive
description:
name: vm_service
sha256: "3923c89304b715fb1eb6423f017651664a03bf5f4b29983627c4da791f74a4ec"
sha256: ddfa8d30d89985b96407efce8acbdd124701f96741f2d981ca860662f1c0dc02
url: "https://pub.dev"
source: hosted
version: "14.2.1"
version: "15.0.0"
web:
dependency: transitive
description:
Expand All @@ -427,5 +427,5 @@ packages:
source: hosted
version: "1.0.4"
sdks:
dart: ">=3.4.0 <4.0.0"
dart: ">=3.7.0-0 <4.0.0"
flutter: ">=3.22.0"
4 changes: 2 additions & 2 deletions src/serious_python/example/flet_example/app/src/main.py
Original file line number Diff line number Diff line change
Expand Up @@ -44,10 +44,10 @@ def check_ssl(e):
ft.Row(
[
ft.IconButton(
ft.icons.REMOVE, key="test:decrement", on_click=minus_click
ft.Icons.REMOVE, key="test:decrement", on_click=minus_click
),
txt_number,
ft.IconButton(ft.icons.ADD, key="test:increment", on_click=plus_click),
ft.IconButton(ft.Icons.ADD, key="test:increment", on_click=plus_click),
],
alignment=ft.MainAxisAlignment.CENTER,
expand=True,
Expand Down
4 changes: 2 additions & 2 deletions src/serious_python/example/flet_example/app/src/main_async.py
Original file line number Diff line number Diff line change
Expand Up @@ -23,10 +23,10 @@ async def plus_click(e):
ft.Row(
[
ft.IconButton(
ft.icons.REMOVE, key="test:decrement", on_click=minus_click
ft.Icons.REMOVE, key="test:decrement", on_click=minus_click
),
txt_number,
ft.IconButton(ft.icons.ADD, key="test:increment", on_click=plus_click),
ft.IconButton(ft.Icons.ADD, key="test:increment", on_click=plus_click),
],
alignment=ft.MainAxisAlignment.CENTER,
)
Expand Down
Original file line number Diff line number Diff line change
@@ -1,2 +1 @@
--pre
flet
Loading