Skip to content

Commit db595de

Browse files
serious_python 0.9.2: allow requirements with commas (#148)
* Disallow comma to split multiple `--requirements` options * Fix CI
1 parent 54685dc commit db595de

File tree

18 files changed

+70
-46
lines changed

18 files changed

+70
-46
lines changed

.appveyor.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ for:
6262
test_script:
6363
- export SERIOUS_PYTHON_SITE_PACKAGES=$APPVEYOR_BUILD_FOLDER/site-packages
6464
- cd src/serious_python/example/flet_example
65-
- dart run serious_python:main package app/src -p Darwin -r flet,--pre
65+
- dart run serious_python:main package app/src -p Darwin -r flet -r --pre
6666
- flutter test integration_test -d macos
6767

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

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

131131

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

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

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

205205
# =========================================

src/serious_python/CHANGELOG.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
## 0.9.2
2+
3+
* 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`.
4+
15
## 0.9.1
26

37
* Fix `serious_python` to work on macOS 12 Monterey and built with Xcode 14.

src/serious_python/bin/package_command.dart

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -104,8 +104,8 @@ class PackageCommand extends Command {
104104
"Install dependencies for specific architectures only. Leave empty to install all supported architectures.");
105105
argParser.addMultiOption('requirements',
106106
abbr: "r",
107-
help:
108-
"Pip dependencies in the format 'dep1,dep2==version,... Allows any pip options.'");
107+
help: "The list of dependencies to install. Allows any pip options.'",
108+
splitCommas: false);
109109
argParser.addOption('asset',
110110
abbr: 'a',
111111
help:
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
dbe287483eb06feb8b1082b48aab62ad61c20d7e02acfd8f10f80e107f99e2c5
1+
bb18353320e48c8f5166c446e7c527cd2d69fd298a5e18881d64034f944a527e

src/serious_python/example/run_example/pubspec.lock

Lines changed: 29 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -53,10 +53,10 @@ packages:
5353
dependency: transitive
5454
description:
5555
name: collection
56-
sha256: a1ace0a119f20aabc852d165077c036cd864315bd99b7eaa10a60100341941bf
56+
sha256: ee67cb0715911d28db6bf4af1026078bd6f0128b07a5f66fb2ed94ec6783c09a
5757
url: "https://pub.dev"
5858
source: hosted
59-
version: "1.19.0"
59+
version: "1.18.0"
6060
crypto:
6161
dependency: transitive
6262
description:
@@ -158,18 +158,18 @@ packages:
158158
dependency: transitive
159159
description:
160160
name: leak_tracker
161-
sha256: "7bb2830ebd849694d1ec25bf1f44582d6ac531a57a365a803a6034ff751d2d06"
161+
sha256: "7f0df31977cb2c0b88585095d168e689669a2cc9b97c309665e3386f3e9d341a"
162162
url: "https://pub.dev"
163163
source: hosted
164-
version: "10.0.7"
164+
version: "10.0.4"
165165
leak_tracker_flutter_testing:
166166
dependency: transitive
167167
description:
168168
name: leak_tracker_flutter_testing
169-
sha256: "9491a714cca3667b60b5c420da8217e6de0d1ba7a5ec322fab01758f6998f379"
169+
sha256: "06e98f569d004c1315b991ded39924b21af84cf14cc94791b8aea337d25b57f8"
170170
url: "https://pub.dev"
171171
source: hosted
172-
version: "3.0.8"
172+
version: "3.0.3"
173173
leak_tracker_testing:
174174
dependency: transitive
175175
description:
@@ -198,18 +198,18 @@ packages:
198198
dependency: transitive
199199
description:
200200
name: material_color_utilities
201-
sha256: f7142bb1154231d7ea5f96bc7bde4bda2a0945d2806bb11670e30b850d56bdec
201+
sha256: "0e0a020085b65b6083975e499759762399b4475f766c21668c4ecca34ea74e5a"
202202
url: "https://pub.dev"
203203
source: hosted
204-
version: "0.11.1"
204+
version: "0.8.0"
205205
meta:
206206
dependency: transitive
207207
description:
208208
name: meta
209-
sha256: bdb68674043280c3428e9ec998512fb681678676b3c54e773629ffe74419f8c7
209+
sha256: "7687075e408b093f36e6bbf6c91878cc0d4cd10f409506f7bc996f68220b9136"
210210
url: "https://pub.dev"
211211
source: hosted
212-
version: "1.15.0"
212+
version: "1.12.0"
213213
path:
214214
dependency: "direct main"
215215
description:
@@ -278,10 +278,10 @@ packages:
278278
dependency: transitive
279279
description:
280280
name: platform
281-
sha256: "9b71283fc13df574056616011fb138fd3b793ea47cc509c189a6c3fa5f8a1a65"
281+
sha256: "12220bb4b65720483f8fa9450b4332347737cf8213dd2840d8b2c823e47243ec"
282282
url: "https://pub.dev"
283283
source: hosted
284-
version: "3.1.5"
284+
version: "3.1.4"
285285
plugin_platform_interface:
286286
dependency: transitive
287287
description:
@@ -304,42 +304,42 @@ packages:
304304
path: "../.."
305305
relative: true
306306
source: path
307-
version: "0.9.0"
307+
version: "0.9.2"
308308
serious_python_android:
309309
dependency: transitive
310310
description:
311311
path: "../../../serious_python_android"
312312
relative: true
313313
source: path
314-
version: "0.9.0"
314+
version: "0.9.2"
315315
serious_python_darwin:
316316
dependency: transitive
317317
description:
318318
path: "../../../serious_python_darwin"
319319
relative: true
320320
source: path
321-
version: "0.9.0"
321+
version: "0.9.2"
322322
serious_python_linux:
323323
dependency: transitive
324324
description:
325325
path: "../../../serious_python_linux"
326326
relative: true
327327
source: path
328-
version: "0.9.0"
328+
version: "0.9.2"
329329
serious_python_platform_interface:
330330
dependency: transitive
331331
description:
332332
path: "../../../serious_python_platform_interface"
333333
relative: true
334334
source: path
335-
version: "0.9.0"
335+
version: "0.9.2"
336336
serious_python_windows:
337337
dependency: transitive
338338
description:
339339
path: "../../../serious_python_windows"
340340
relative: true
341341
source: path
342-
version: "0.9.0"
342+
version: "0.9.2"
343343
shelf:
344344
dependency: transitive
345345
description:
@@ -352,7 +352,7 @@ packages:
352352
dependency: transitive
353353
description: flutter
354354
source: sdk
355-
version: "0.0.0"
355+
version: "0.0.99"
356356
source_span:
357357
dependency: transitive
358358
description:
@@ -365,10 +365,10 @@ packages:
365365
dependency: transitive
366366
description:
367367
name: stack_trace
368-
sha256: "9f47fd3630d76be3ab26f0ee06d213679aa425996925ff3feffdec504931c377"
368+
sha256: "73713990125a6d93122541237550ee3352a2d84baad52d375a4cad2eb9b7ce0b"
369369
url: "https://pub.dev"
370370
source: hosted
371-
version: "1.12.0"
371+
version: "1.11.1"
372372
stream_channel:
373373
dependency: transitive
374374
description:
@@ -381,10 +381,10 @@ packages:
381381
dependency: transitive
382382
description:
383383
name: string_scanner
384-
sha256: "688af5ed3402a4bde5b3a6c15fd768dbf2621a614950b17f04626c431ab3c4c3"
384+
sha256: "556692adab6cfa87322a115640c11f13cb77b3f076ddcc5d6ae3c20242bedcde"
385385
url: "https://pub.dev"
386386
source: hosted
387-
version: "1.3.0"
387+
version: "1.2.0"
388388
sync_http:
389389
dependency: transitive
390390
description:
@@ -405,10 +405,10 @@ packages:
405405
dependency: transitive
406406
description:
407407
name: test_api
408-
sha256: "664d3a9a64782fcdeb83ce9c6b39e78fd2971d4e37827b9b06c3aa1edc5e760c"
408+
sha256: "9955ae474176f7ac8ee4e989dadfb411a58c30415bcfb648fa04b2b8a03afa7f"
409409
url: "https://pub.dev"
410410
source: hosted
411-
version: "0.7.3"
411+
version: "0.7.0"
412412
toml:
413413
dependency: transitive
414414
description:
@@ -437,10 +437,10 @@ packages:
437437
dependency: transitive
438438
description:
439439
name: vm_service
440-
sha256: f6be3ed8bd01289b34d679c2b62226f63c0e69f9fd2e50a6b3c1c729a961041b
440+
sha256: "3923c89304b715fb1eb6423f017651664a03bf5f4b29983627c4da791f74a4ec"
441441
url: "https://pub.dev"
442442
source: hosted
443-
version: "14.3.0"
443+
version: "14.2.1"
444444
web:
445445
dependency: transitive
446446
description:
@@ -453,10 +453,10 @@ packages:
453453
dependency: transitive
454454
description:
455455
name: webdriver
456-
sha256: "3d773670966f02a646319410766d3b5e1037efb7f07cc68f844d5e06cd4d61c8"
456+
sha256: "003d7da9519e1e5f329422b36c4dcdf18d7d2978d1ba099ea4e45ba490ed845e"
457457
url: "https://pub.dev"
458458
source: hosted
459-
version: "3.0.4"
459+
version: "3.0.3"
460460
xdg_directories:
461461
dependency: transitive
462462
description:

src/serious_python/pubspec.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ name: serious_python
22
description: A cross-platform plugin for adding embedded Python runtime to your Flutter apps.
33
homepage: https://flet.dev
44
repository: https://github.com/flet-dev/serious-python
5-
version: 0.9.1
5+
version: 0.9.2
66

77
platforms:
88
ios:

src/serious_python_android/CHANGELOG.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
## 0.9.2
2+
3+
* 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`.
4+
15
## 0.9.1
26

37
* Fix `serious_python` to work on macOS 12 Monterey and built with Xcode 14.

src/serious_python_android/android/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
group 'com.flet.serious_python_android'
2-
version '0.9.1'
2+
version '0.9.2'
33

44
def python_version = '3.12'
55

src/serious_python_android/pubspec.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ name: serious_python_android
22
description: Android implementation of the serious_python plugin
33
homepage: https://flet.dev
44
repository: https://github.com/flet-dev/serious-python
5-
version: 0.9.1
5+
version: 0.9.2
66

77
environment:
88
sdk: ">=3.0.0 <4.0.0"

src/serious_python_darwin/CHANGELOG.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
## 0.9.2
2+
3+
* 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`.
4+
15
## 0.9.1
26

37
* Fix `serious_python` to work on macOS 12 Monterey and built with Xcode 14.

0 commit comments

Comments
 (0)