Skip to content

Commit c9725e2

Browse files
DataTrinyDataTriny
authored
fix: Update pyo3 dependency to 0.29 (#724)
1 parent 4023b41 commit c9725e2

3 files changed

Lines changed: 103 additions & 44 deletions

File tree

‎Cargo.lock‎

Lines changed: 12 additions & 28 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎common/Cargo.toml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ features = ["schemars", "serde"]
1616

1717
[dependencies]
1818
enumn = { version = "0.1.6", optional = true }
19-
pyo3 = { version = "0.26", optional = true }
19+
pyo3 = { version = "0.29", optional = true }
2020
schemars = { version = "1", optional = true }
2121
serde = { version = "1.0", default-features = false, features = ["alloc", "derive"], optional = true }
2222
serde_json = { version = "1.0", default-features = false, optional = true }

‎common/src/lib.rs‎

Lines changed: 90 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,12 @@ pub use geometry::{Affine, Point, Rect, Size, Vec2};
5151
#[cfg_attr(feature = "serde", serde(rename_all = "camelCase"))]
5252
#[cfg_attr(
5353
feature = "pyo3",
54-
pyclass(module = "accesskit", rename_all = "SCREAMING_SNAKE_CASE", eq)
54+
pyclass(
55+
module = "accesskit",
56+
rename_all = "SCREAMING_SNAKE_CASE",
57+
eq,
58+
from_py_object
59+
)
5560
)]
5661
#[repr(u8)]
5762
pub enum Role {
@@ -273,7 +278,12 @@ pub enum Role {
273278
#[cfg_attr(feature = "serde", serde(rename_all = "camelCase"))]
274279
#[cfg_attr(
275280
feature = "pyo3",
276-
pyclass(module = "accesskit", rename_all = "SCREAMING_SNAKE_CASE", eq)
281+
pyclass(
282+
module = "accesskit",
283+
rename_all = "SCREAMING_SNAKE_CASE",
284+
eq,
285+
from_py_object
286+
)
277287
)]
278288
#[repr(u8)]
279289
pub enum Action {
@@ -396,7 +406,12 @@ fn action_mask_to_action_vec(mask: u32) -> Vec<Action> {
396406
#[cfg_attr(feature = "serde", serde(rename_all = "camelCase"))]
397407
#[cfg_attr(
398408
feature = "pyo3",
399-
pyclass(module = "accesskit", rename_all = "SCREAMING_SNAKE_CASE", eq)
409+
pyclass(
410+
module = "accesskit",
411+
rename_all = "SCREAMING_SNAKE_CASE",
412+
eq,
413+
from_py_object
414+
)
400415
)]
401416
#[repr(u8)]
402417
pub enum Orientation {
@@ -413,7 +428,12 @@ pub enum Orientation {
413428
#[cfg_attr(feature = "serde", serde(rename_all = "camelCase"))]
414429
#[cfg_attr(
415430
feature = "pyo3",
416-
pyclass(module = "accesskit", rename_all = "SCREAMING_SNAKE_CASE", eq)
431+
pyclass(
432+
module = "accesskit",
433+
rename_all = "SCREAMING_SNAKE_CASE",
434+
eq,
435+
from_py_object
436+
)
417437
)]
418438
#[repr(u8)]
419439
pub enum TextDirection {
@@ -434,7 +454,12 @@ pub enum TextDirection {
434454
#[cfg_attr(feature = "serde", serde(rename_all = "camelCase"))]
435455
#[cfg_attr(
436456
feature = "pyo3",
437-
pyclass(module = "accesskit", rename_all = "SCREAMING_SNAKE_CASE", eq)
457+
pyclass(
458+
module = "accesskit",
459+
rename_all = "SCREAMING_SNAKE_CASE",
460+
eq,
461+
from_py_object
462+
)
438463
)]
439464
#[repr(u8)]
440465
pub enum Invalid {
@@ -450,7 +475,12 @@ pub enum Invalid {
450475
#[cfg_attr(feature = "serde", serde(rename_all = "camelCase"))]
451476
#[cfg_attr(
452477
feature = "pyo3",
453-
pyclass(module = "accesskit", rename_all = "SCREAMING_SNAKE_CASE", eq)
478+
pyclass(
479+
module = "accesskit",
480+
rename_all = "SCREAMING_SNAKE_CASE",
481+
eq,
482+
from_py_object
483+
)
454484
)]
455485
#[repr(u8)]
456486
pub enum Toggled {
@@ -476,7 +506,12 @@ impl From<bool> for Toggled {
476506
#[cfg_attr(feature = "serde", serde(rename_all = "camelCase"))]
477507
#[cfg_attr(
478508
feature = "pyo3",
479-
pyclass(module = "accesskit", rename_all = "SCREAMING_SNAKE_CASE", eq)
509+
pyclass(
510+
module = "accesskit",
511+
rename_all = "SCREAMING_SNAKE_CASE",
512+
eq,
513+
from_py_object
514+
)
480515
)]
481516
#[repr(u8)]
482517
pub enum SortDirection {
@@ -492,7 +527,12 @@ pub enum SortDirection {
492527
#[cfg_attr(feature = "serde", serde(rename_all = "camelCase"))]
493528
#[cfg_attr(
494529
feature = "pyo3",
495-
pyclass(module = "accesskit", rename_all = "SCREAMING_SNAKE_CASE", eq)
530+
pyclass(
531+
module = "accesskit",
532+
rename_all = "SCREAMING_SNAKE_CASE",
533+
eq,
534+
from_py_object
535+
)
496536
)]
497537
#[repr(u8)]
498538
pub enum AriaCurrent {
@@ -512,7 +552,12 @@ pub enum AriaCurrent {
512552
#[cfg_attr(feature = "serde", serde(rename_all = "camelCase"))]
513553
#[cfg_attr(
514554
feature = "pyo3",
515-
pyclass(module = "accesskit", rename_all = "SCREAMING_SNAKE_CASE", eq)
555+
pyclass(
556+
module = "accesskit",
557+
rename_all = "SCREAMING_SNAKE_CASE",
558+
eq,
559+
from_py_object
560+
)
516561
)]
517562
#[repr(u8)]
518563
pub enum AutoComplete {
@@ -528,7 +573,12 @@ pub enum AutoComplete {
528573
#[cfg_attr(feature = "serde", serde(rename_all = "camelCase"))]
529574
#[cfg_attr(
530575
feature = "pyo3",
531-
pyclass(module = "accesskit", rename_all = "SCREAMING_SNAKE_CASE", eq)
576+
pyclass(
577+
module = "accesskit",
578+
rename_all = "SCREAMING_SNAKE_CASE",
579+
eq,
580+
from_py_object
581+
)
532582
)]
533583
#[repr(u8)]
534584
pub enum Live {
@@ -544,7 +594,12 @@ pub enum Live {
544594
#[cfg_attr(feature = "serde", serde(rename_all = "camelCase"))]
545595
#[cfg_attr(
546596
feature = "pyo3",
547-
pyclass(module = "accesskit", rename_all = "SCREAMING_SNAKE_CASE", eq)
597+
pyclass(
598+
module = "accesskit",
599+
rename_all = "SCREAMING_SNAKE_CASE",
600+
eq,
601+
from_py_object
602+
)
548603
)]
549604
#[repr(u8)]
550605
pub enum HasPopup {
@@ -562,7 +617,12 @@ pub enum HasPopup {
562617
#[cfg_attr(feature = "serde", serde(rename_all = "camelCase"))]
563618
#[cfg_attr(
564619
feature = "pyo3",
565-
pyclass(module = "accesskit", rename_all = "SCREAMING_SNAKE_CASE", eq)
620+
pyclass(
621+
module = "accesskit",
622+
rename_all = "SCREAMING_SNAKE_CASE",
623+
eq,
624+
from_py_object
625+
)
566626
)]
567627
#[repr(u8)]
568628
pub enum ListStyle {
@@ -582,7 +642,12 @@ pub enum ListStyle {
582642
#[cfg_attr(feature = "serde", serde(rename_all = "camelCase"))]
583643
#[cfg_attr(
584644
feature = "pyo3",
585-
pyclass(module = "accesskit", rename_all = "SCREAMING_SNAKE_CASE", eq)
645+
pyclass(
646+
module = "accesskit",
647+
rename_all = "SCREAMING_SNAKE_CASE",
648+
eq,
649+
from_py_object
650+
)
586651
)]
587652
#[repr(u8)]
588653
pub enum TextAlign {
@@ -599,7 +664,12 @@ pub enum TextAlign {
599664
#[cfg_attr(feature = "serde", serde(rename_all = "camelCase"))]
600665
#[cfg_attr(
601666
feature = "pyo3",
602-
pyclass(module = "accesskit", rename_all = "SCREAMING_SNAKE_CASE", eq)
667+
pyclass(
668+
module = "accesskit",
669+
rename_all = "SCREAMING_SNAKE_CASE",
670+
eq,
671+
from_py_object
672+
)
603673
)]
604674
#[repr(u8)]
605675
pub enum VerticalOffset {
@@ -614,7 +684,12 @@ pub enum VerticalOffset {
614684
#[cfg_attr(feature = "serde", serde(rename_all = "camelCase"))]
615685
#[cfg_attr(
616686
feature = "pyo3",
617-
pyclass(module = "accesskit", rename_all = "SCREAMING_SNAKE_CASE", eq)
687+
pyclass(
688+
module = "accesskit",
689+
rename_all = "SCREAMING_SNAKE_CASE",
690+
eq,
691+
from_py_object
692+
)
618693
)]
619694
#[repr(u8)]
620695
pub enum TextDecorationStyle {

0 commit comments

Comments
 (0)