Skip to content
Merged
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
4 changes: 4 additions & 0 deletions src/serious_python/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
## 1.0.0

* **Breaking change:** `--platform` argument value `Pyodide` has been renamed to `Emscripten` to match what `platform.system()` returns in the Pyodide runtime, so PEP 508 markers like `platform_system != 'Emscripten'` work consistently.

## 0.9.12

* Fix web packaging to skip `site-packages` when appropriate ([#199](https://github.com/flet-dev/serious-python/pull/199)).
Expand Down
2 changes: 1 addition & 1 deletion src/serious_python/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ To package Python files for the specific platform:
dart run serious_python:main package app/src -p {platform}
```

where `{platform}` can be one of the following: `Android`, `iOS`, `macOS`, `Windows`, `Linux` or `Pyodide`.
where `{platform}` can be one of the following: `Android`, `iOS`, `macOS`, `Windows`, `Linux` or `Emscripten`.

By default, the command creates `app/app.zip` asset, but you can change its path/name with `--asset` argument:

Expand Down
10 changes: 5 additions & 5 deletions src/serious_python/bin/package_command.dart
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ const platforms = {
"x86_64": {"tag": "android-24-x86_64", "mac_ver": ""},
"x86": {"tag": "android-24-x86", "mac_ver": ""}
},
"Pyodide": {
"Emscripten": {
"": {"tag": "pyodide-2024.0-wasm32", "mac_ver": ""}
},
"Darwin": {
Expand Down Expand Up @@ -96,7 +96,7 @@ class PackageCommand extends Command {
PackageCommand() {
argParser.addOption('platform',
abbr: "p",
allowed: ["iOS", "Android", "Pyodide", "Windows", "Linux", "Darwin"],
allowed: ["iOS", "Android", "Emscripten", "Windows", "Linux", "Darwin"],
mandatory: true,
help: "Install dependencies for specific platform, e.g. 'Android'.");
argParser.addMultiOption('arch',
Expand Down Expand Up @@ -195,13 +195,13 @@ class PackageCommand extends Command {
}

bool isMobile = (platform == "iOS" || platform == "Android");
bool isWeb = platform == "Pyodide";
bool isWeb = platform == "Emscripten";

var junkFiles = isMobile ? junkFilesMobile : junkFilesDesktop;

// Extra indexs
List<String> extraPyPiIndexes = [mobilePyPiUrl];
if (platform == "Pyodide") {
if (platform == "Emscripten") {
pyodidePyPiServer = await startSimpleServer();
extraPyPiIndexes.add(
"http://${pyodidePyPiServer.address.host}:${pyodidePyPiServer.port}/simple");
Expand Down Expand Up @@ -430,7 +430,7 @@ class PackageCommand extends Command {
}

// copy site packages to temp dir for web platform
if (platform == "Pyodide" && requirements.isNotEmpty) {
if (platform == "Emscripten" && requirements.isNotEmpty) {
final sitePackagesSrcDir = Directory(sitePackagesRoot);
if (await sitePackagesSrcDir.exists()) {
stdout.writeln("Copying site packages to app archive");
Expand Down
20 changes: 10 additions & 10 deletions src/serious_python/example/flask_example/pubspec.lock
Original file line number Diff line number Diff line change
Expand Up @@ -175,10 +175,10 @@ packages:
dependency: transitive
description:
name: matcher
sha256: "12956d0ad8390bbcc63ca2e1469c0619946ccb52809807067a7020d57e647aa6"
sha256: dc0b7dc7651697ea4ff3e69ef44b0407ea32c487a39fff6a4004fa585e901861
url: "https://pub.dev"
source: hosted
version: "0.12.18"
version: "0.12.19"
material_color_utilities:
dependency: transitive
description:
Expand Down Expand Up @@ -289,42 +289,42 @@ packages:
path: "../.."
relative: true
source: path
version: "0.9.12"
version: "1.0.0"
serious_python_android:
dependency: transitive
description:
path: "../../../serious_python_android"
relative: true
source: path
version: "0.9.12"
version: "1.0.0"
serious_python_darwin:
dependency: transitive
description:
path: "../../../serious_python_darwin"
relative: true
source: path
version: "0.9.12"
version: "1.0.0"
serious_python_linux:
dependency: transitive
description:
path: "../../../serious_python_linux"
relative: true
source: path
version: "0.9.12"
version: "1.0.0"
serious_python_platform_interface:
dependency: transitive
description:
path: "../../../serious_python_platform_interface"
relative: true
source: path
version: "0.9.12"
version: "1.0.0"
serious_python_windows:
dependency: transitive
description:
path: "../../../serious_python_windows"
relative: true
source: path
version: "0.9.12"
version: "1.0.0"
shelf:
dependency: transitive
description:
Expand Down Expand Up @@ -382,10 +382,10 @@ packages:
dependency: transitive
description:
name: test_api
sha256: "93167629bfc610f71560ab9312acdda4959de4df6fac7492c89ff0d3886f6636"
sha256: "8161c84903fd860b26bfdefb7963b3f0b68fee7adea0f59ef805ecca346f0c7a"
url: "https://pub.dev"
source: hosted
version: "0.7.9"
version: "0.7.10"
toml:
dependency: transitive
description:
Expand Down
2 changes: 1 addition & 1 deletion src/serious_python/example/flet_example/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ dart run serious_python:main package app/src -p Linux --requirements -r,app/src/
For web:

```
dart run serious_python:main package app/src -p Pyodide --requirements -r,app/src/requirements.txt
dart run serious_python:main package app/src -p Emscripten --requirements -r,app/src/requirements.txt
```

Important: to make `serious_python` work in your own Android app:
Expand Down
58 changes: 29 additions & 29 deletions src/serious_python/example/flet_example/pubspec.lock
Original file line number Diff line number Diff line change
Expand Up @@ -37,10 +37,10 @@ packages:
dependency: transitive
description:
name: characters
sha256: f71061c654a3380576a52b451dd5532377954cf9dbd272a78fc8479606670803
sha256: faf38497bda5ead2a8c7615f4f7939df04333478bf32e4173fcb06d428b5716b
url: "https://pub.dev"
source: hosted
version: "1.4.0"
version: "1.4.1"
clock:
dependency: transitive
description:
Expand Down Expand Up @@ -117,10 +117,10 @@ packages:
dependency: transitive
description:
name: fake_async
sha256: "6a95e56b2449df2273fd8c45a662d6947ce1ebb7aafe80e550a3f68297f3cacc"
sha256: "5368f224a74523e8d2e7399ea1638b37aecfca824a3cc4dfdf77bf1fa905ac44"
url: "https://pub.dev"
source: hosted
version: "1.3.2"
version: "1.3.3"
ffi:
dependency: transitive
description:
Expand Down Expand Up @@ -280,10 +280,10 @@ packages:
dependency: transitive
description:
name: intl
sha256: d6f56758b7d3014a48af9701c085700aac781a92a87a62b1333b46d8879661cf
sha256: "3df61194eb431efc39c4ceba583b95633a403f46c9fd341e550ce0bfa50e9aa5"
url: "https://pub.dev"
source: hosted
version: "0.19.0"
version: "0.20.2"
js:
dependency: transitive
description:
Expand All @@ -304,26 +304,26 @@ packages:
dependency: transitive
description:
name: leak_tracker
sha256: c35baad643ba394b40aac41080300150a4f08fd0fd6a10378f8f7c6bc161acec
sha256: "33e2e26bdd85a0112ec15400c8cbffea70d0f9c3407491f672a2fad47915e2de"
url: "https://pub.dev"
source: hosted
version: "10.0.8"
version: "11.0.2"
leak_tracker_flutter_testing:
dependency: transitive
description:
name: leak_tracker_flutter_testing
sha256: f8b613e7e6a13ec79cfdc0e97638fddb3ab848452eff057653abd3edba760573
sha256: "1dbc140bb5a23c75ea9c4811222756104fbcd1a27173f0c34ca01e16bea473c1"
url: "https://pub.dev"
source: hosted
version: "3.0.9"
version: "3.0.10"
leak_tracker_testing:
dependency: transitive
description:
name: leak_tracker_testing
sha256: "6ba465d5d76e67ddf503e1161d1f4a6bc42306f9d66ca1e8f079a47290fb06d3"
sha256: "8d5a2d49f4a66b49744b23b018848400d23e54caf9463f4eb20df3eb8acb2eb1"
url: "https://pub.dev"
source: hosted
version: "3.0.1"
version: "3.0.2"
lints:
dependency: transitive
description:
Expand Down Expand Up @@ -352,26 +352,26 @@ packages:
dependency: transitive
description:
name: matcher
sha256: dc58c723c3c24bf8d3e2d3ad3f2f9d7bd9cf43ec6feaa64181775e60190153f2
sha256: dc0b7dc7651697ea4ff3e69ef44b0407ea32c487a39fff6a4004fa585e901861
url: "https://pub.dev"
source: hosted
version: "0.12.17"
version: "0.12.19"
material_color_utilities:
dependency: transitive
description:
name: material_color_utilities
sha256: f7142bb1154231d7ea5f96bc7bde4bda2a0945d2806bb11670e30b850d56bdec
sha256: "9c337007e82b1889149c82ed242ed1cb24a66044e30979c44912381e9be4c48b"
url: "https://pub.dev"
source: hosted
version: "0.11.1"
version: "0.13.0"
meta:
dependency: transitive
description:
name: meta
sha256: e3641ec5d63ebf0d9b41bd43201a66e3fc79a65db5f61fc181f04cd27aab950c
sha256: "23f08335362185a5ea2ad3a4e597f1375e78bce8a040df5c600c8d3552ef2394"
url: "https://pub.dev"
source: hosted
version: "1.16.0"
version: "1.17.0"
package_info_plus:
dependency: "direct main"
description:
Expand Down Expand Up @@ -562,42 +562,42 @@ packages:
path: "../.."
relative: true
source: path
version: "0.9.12"
version: "1.0.0"
serious_python_android:
dependency: transitive
description:
path: "../../../serious_python_android"
relative: true
source: path
version: "0.9.12"
version: "1.0.0"
serious_python_darwin:
dependency: transitive
description:
path: "../../../serious_python_darwin"
relative: true
source: path
version: "0.9.12"
version: "1.0.0"
serious_python_linux:
dependency: transitive
description:
path: "../../../serious_python_linux"
relative: true
source: path
version: "0.9.12"
version: "1.0.0"
serious_python_platform_interface:
dependency: transitive
description:
path: "../../../serious_python_platform_interface"
relative: true
source: path
version: "0.9.12"
version: "1.0.0"
serious_python_windows:
dependency: transitive
description:
path: "../../../serious_python_windows"
relative: true
source: path
version: "0.9.12"
version: "1.0.0"
shared_preferences:
dependency: transitive
description:
Expand Down Expand Up @@ -719,10 +719,10 @@ packages:
dependency: transitive
description:
name: test_api
sha256: fb31f383e2ee25fbbfe06b40fe21e1e458d14080e3c67e7ba0acfde4df4e0bbd
sha256: "8161c84903fd860b26bfdefb7963b3f0b68fee7adea0f59ef805ecca346f0c7a"
url: "https://pub.dev"
source: hosted
version: "0.7.4"
version: "0.7.10"
toml:
dependency: transitive
description:
Expand Down Expand Up @@ -839,10 +839,10 @@ packages:
dependency: transitive
description:
name: vector_math
sha256: "80b3257d1492ce4d091729e3a67a60407d227c27241d6927be0130c98e741803"
sha256: d530bd74fea330e6e364cda7a85019c434070188383e1cd8d9777ee586914c5b
url: "https://pub.dev"
source: hosted
version: "2.1.4"
version: "2.2.0"
vm_service:
dependency: transitive
description:
Expand Down Expand Up @@ -924,5 +924,5 @@ packages:
source: hosted
version: "6.5.0"
sdks:
dart: ">=3.7.0 <4.0.0"
dart: ">=3.9.0-0 <4.0.0"
flutter: ">=3.22.0"
2 changes: 1 addition & 1 deletion src/serious_python/example/run_example/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ dart run serious_python:main package app/src -p Linux -r -r -r app/src/requireme
For Pyodide:

```
dart run serious_python:main package app/src -p Pyodide -r -r -r app/src/requirements.txt
dart run serious_python:main package app/src -p Emscripten -r -r -r app/src/requirements.txt
```

For Android:
Expand Down
Loading
Loading