Bump PyO3 to >=0.27

kdam/CHANGELOG.md

@@ -7,6 +7,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+- Bump up pyo3 >=0.27
+
 ## [0.6.3] - 2025-06-10
 
 ### Changed

kdam/Cargo.toml

@@ -12,17 +12,17 @@ repository = "https://github.com/clitic/kdam/tree/main/kdam"
 version = "0.6.3"
 
 [dependencies]
-colorgrad = { version = "0.7", optional = true }
+colorgrad = { version = "0.8", optional = true }
 formatx = { version = "0.2.4", optional = true }
 kdam_derive = { version = "0.1.1", path = "../kdam_derive", optional = true }
-pyo3 = { version = ">=0.23,<0.26", optional = true }
+pyo3 = { version = ">=0.27", optional = true }
 rayon = { version = "1.10", optional = true }
 terminal_size = "0.4"
 unicode-segmentation = { version = "1", optional = true }
 unicode-width = { version = "0.2", optional = true }
 
 [target.'cfg(windows)'.dependencies]
-windows-sys = { version = "0.59.0", features = ["Win32_Foundation", "Win32_System_Console"] }
+windows-sys = { version = "0.61.0", features = ["Win32_Foundation", "Win32_System_Console"] }
 
 [features]
 derive = ["dep:kdam_derive"]

kdam/examples/coloured/gradient.rs

@@ -1,5 +1,5 @@
-use kdam::{term::Colorizer, tqdm, Colour};
-use std::io::{stderr, IsTerminal};
+use kdam::{Colour, term::Colorizer, tqdm};
+use std::io::{IsTerminal, stderr};
 
 fn main() {
     kdam::term::init(stderr().is_terminal());

kdam/examples/coloured/solid.rs

@@ -1,5 +1,5 @@
-use kdam::{tqdm, BarExt};
-use std::io::{stderr, IsTerminal, Result};
+use kdam::{BarExt, tqdm};
+use std::io::{IsTerminal, Result, stderr};
 
 fn main() -> Result<()> {
     kdam::term::init(stderr().is_terminal());

kdam/examples/messages/between.rs

@@ -1,4 +1,4 @@
-use kdam::{term, term::Writer, tqdm, BarExt};
+use kdam::{BarExt, term, term::Writer, tqdm};
 use std::io::Result;
 
 fn main() -> Result<()> {

kdam/examples/messages/input.rs

@@ -1,4 +1,4 @@
-use kdam::{tqdm, BarExt};
+use kdam::{BarExt, tqdm};
 use std::io::Result;
 
 fn main() -> Result<()> {

kdam/examples/messages/simple.rs

@@ -1,4 +1,4 @@
-use kdam::{tqdm, BarExt};
+use kdam::{BarExt, tqdm};
 use std::io::Result;
 
 fn main() -> Result<()> {

kdam/examples/messages/write.rs

@@ -1,4 +1,4 @@
-use kdam::{tqdm, BarExt};
+use kdam::{BarExt, tqdm};
 use std::io::Result;
 
 fn main() -> Result<()> {

kdam/examples/miscellaneous/custom.rs

@@ -1,4 +1,4 @@
-use kdam::{tqdm, Bar, BarExt};
+use kdam::{Bar, BarExt, tqdm};
 use std::{io::Result, num::NonZeroU16};
 
 #[derive(BarExt)]

kdam/examples/miscellaneous/file_copy.rs

@@ -1,4 +1,4 @@
-use kdam::{tqdm, BarExt};
+use kdam::{BarExt, tqdm};
 use std::{
     fs::File,
     io::{BufReader, Read, Result, Write},

kdam/examples/miscellaneous/file_download/Cargo.toml

@@ -4,7 +4,7 @@ version = "0.1.0"
 edition = "2021"
 
 [dependencies]
-reqwest = { version = "0.12", features = ["stream"] }
+reqwest = { version = "0.13", features = ["stream"] }
 futures-util = "0.3"
 tokio = { version = "1", features = ["full"] }
 kdam = { path = "../../.." }

kdam/examples/miscellaneous/inverse_unit.rs

@@ -1,4 +1,4 @@
-use kdam::{tqdm, BarExt};
+use kdam::{BarExt, tqdm};
 use std::io::Result;
 
 fn main() -> Result<()> {

kdam/examples/miscellaneous/max_fps.rs

@@ -1,4 +1,4 @@
-use kdam::{tqdm, BarExt};
+use kdam::{BarExt, tqdm};
 use std::io::Result;
 
 fn main() -> Result<()> {

kdam/examples/miscellaneous/monitor_mode.rs

@@ -1,4 +1,4 @@
-use kdam::{tqdm, BarExt};
+use kdam::{BarExt, tqdm};
 use std::io::Result;
 
 fn main() -> Result<()> {

kdam/examples/miscellaneous/rayon.rs

@@ -1,4 +1,4 @@
-use kdam::{rayon::prelude::*, TqdmIterator, TqdmParallelIterator};
+use kdam::{TqdmIterator, TqdmParallelIterator, rayon::prelude::*};
 use std::{
     thread::sleep,
     time::{Duration, Instant},

kdam/examples/miscellaneous/redirect_output.rs

@@ -1,4 +1,4 @@
-use kdam::{tqdm, BarExt};
+use kdam::{BarExt, tqdm};
 use std::{
     fs::File,
     io::{Result, Write},

kdam/examples/multiple/row_manager_clean.rs

@@ -1,4 +1,4 @@
-use kdam::{term, tqdm, BarExt, RowManager};
+use kdam::{BarExt, RowManager, term, tqdm};
 use std::{
     io::Result,
     sync::{Arc, Mutex},

kdam/examples/multiple/row_manager_keep.rs

@@ -1,4 +1,4 @@
-use kdam::{tqdm, BarExt, RowManager, term};
+use kdam::{BarExt, RowManager, term, tqdm};
 use std::{
     io::Result,
     sync::{Arc, Mutex},

kdam/examples/multiple/thread.rs

@@ -1,4 +1,4 @@
-use kdam::{term, tqdm, BarExt};
+use kdam::{BarExt, term, tqdm};
 use std::{io::Result, thread, time::Duration};
 
 fn main() -> Result<()> {

kdam/examples/notebook/Cargo.toml

@@ -9,7 +9,7 @@ crate-type = ["cdylib"]
 
 [dependencies]
 kdam = { path = "../..", features = ["notebook", "template"] }
-pyo3 = { version = ">=0.23,<0.26", features = ["extension-module"] }
+pyo3 = { version = ">=0.27", features = ["extension-module"] }
 
 [build-dependencies]
-pyo3-build-config = ">=0.23,<0.26"
+pyo3-build-config = ">=0.27"

kdam/examples/rich.rs

@@ -1,5 +1,5 @@
-use kdam::{term, term::Colorizer, tqdm, BarExt, Column, RichProgress, Spinner};
-use std::io::{stderr, IsTerminal, Result};
+use kdam::{BarExt, Column, RichProgress, Spinner, term, term::Colorizer, tqdm};
+use std::io::{IsTerminal, Result, stderr};
 
 fn main() -> Result<()> {
     term::init(stderr().is_terminal());

kdam/examples/showcase/animations.rs

@@ -1,4 +1,4 @@
-use kdam::{term, tqdm, Animation, BarExt};
+use kdam::{Animation, BarExt, term, tqdm};
 use std::io::Result;
 
 fn main() -> Result<()> {

kdam/examples/showcase/fira_code.rs

@@ -1,4 +1,4 @@
-use kdam::{tqdm, BarExt};
+use kdam::{BarExt, tqdm};
 use std::io::Result;
 
 fn main() -> Result<()> {

kdam/examples/showcase/spinner.rs

@@ -1,4 +1,4 @@
-use kdam::{term, term::Writer, Spinner};
+use kdam::{Spinner, term, term::Writer};
 use std::{
     num::NonZeroI16,
     time::{Duration, Instant},

kdam/examples/simple.rs

@@ -1,4 +1,4 @@
-use kdam::{tqdm, BarExt};
+use kdam::{BarExt, tqdm};
 use std::io::Result;
 
 fn main() -> Result<()> {

kdam/examples/template.rs

@@ -1,4 +1,4 @@
-use kdam::{tqdm, BarExt, Spinner};
+use kdam::{BarExt, Spinner, tqdm};
 use std::io::Result;
 
 fn main() -> Result<()> {
@@ -8,7 +8,21 @@ fn main() -> Result<()> {
         force_refresh = true,
         bar_format = "{desc suffix=' '}|{animation}| {spinner} {count}/{total} [{percentage:.0}%] in {elapsed human=true} ({rate:.1}/s, eta: {remaining human=true})",
         spinner = Spinner::new(
-            &["▁▂▃", "▂▃▄", "▃▄▅", "▄▅▆", "▅▆▇", "▆▇█", "▇█▇", "█▇▆", "▇▆▅", "▆▅▄", "▅▄▃", "▄▃▂", "▃▂▁"],
+            &[
+                "▁▂▃",
+                "▂▃▄",
+                "▃▄▅",
+                "▄▅▆",
+                "▅▆▇",
+                "▆▇█",
+                "▇█▇",
+                "█▇▆",
+                "▇▆▅",
+                "▆▅▄",
+                "▅▄▃",
+                "▄▃▂",
+                "▃▂▁"
+            ],
             30.0,
             1.0,
         )

kdam/examples/unknown.rs

@@ -1,4 +1,4 @@
-use kdam::{tqdm, BarExt};
+use kdam::{BarExt, tqdm};
 use std::io::Result;
 
 fn main() -> Result<()> {

kdam/src/lib.rs

@@ -9,7 +9,7 @@ pub mod format;
 pub mod term;
 
 pub use crate::std::{
-    monitor, Animation, Bar, BarBuilder, BarExt, BarIter, Colour, RowManager, TqdmIterator,
+    Animation, Bar, BarBuilder, BarExt, BarIter, Colour, RowManager, TqdmIterator, monitor,
 };
 
 #[cfg(feature = "derive")]

kdam/src/rich/bar.rs

@@ -1,5 +1,5 @@
 use super::styles;
-use crate::{std::Bar, term::Colorizer, BarExt};
+use crate::{BarExt, std::Bar, term::Colorizer};
 use std::num::{NonZeroI16, NonZeroU16};
 
 #[cfg(feature = "spinner")]

kdam/src/rich/styles.rs

@@ -1,5 +1,5 @@
-use std::num::{NonZeroU16, NonZeroI16};
 use crate::term::Colorizer;
+use std::num::{NonZeroI16, NonZeroU16};
 
 // Characters
 const BAR_CHR: &str = "━";
@@ -21,7 +21,9 @@ pub(super) fn bar(ncols: NonZeroU16, progress: f32) -> String {
     let ncols = ncols.get();
 
     if progress >= 1.0 {
-        BAR_CHR.repeat(ncols as usize).colorize(BAR_COMPLETED_COLOUR)
+        BAR_CHR
+            .repeat(ncols as usize)
+            .colorize(BAR_COMPLETED_COLOUR)
     } else {
         let block = (ncols as f32 * progress) as u16;
         (BAR_CHR.repeat(block as usize) + BAR_END_CHR).colorize(BAR_COLOUR)

kdam/src/spinner.rs

@@ -32,10 +32,7 @@ impl Spinner {
     /// ```
     pub fn new(frames: &[&str], interval: f32, speed: f32) -> Self {
         Self {
-            frames: frames
-                .iter()
-                .map(|x| String::from(*x))
-                .collect(),
+            frames: frames.iter().map(|x| String::from(*x)).collect(),
             interval,
             speed,
         }

kdam/src/std/bar.rs

@@ -1,13 +1,13 @@
 use super::{
-    styles::{Animation, Colour},
     BarExt,
+    styles::{Animation, Colour},
 };
 use crate::{
     format,
     term::{self, Colorizer, InitializedOutput, Writer},
 };
 use std::{
-    io::{stdin, Result, Write},
+    io::{Result, Write, stdin},
     num::NonZeroU16,
     time::Instant,
 };
@@ -27,7 +27,6 @@ use crate::spinner::Spinner;
 #[cfg(feature = "template")]
 use formatx::Template;
 
-
 /// Core implemention of console progress bar.
 ///
 /// # Example
@@ -367,7 +366,7 @@ impl Bar {
             let miniters_constraint = if self.miniters <= 1 {
                 true
             } else {
-                self.counter % self.miniters == 0
+                self.counter.is_multiple_of(self.miniters)
             };
 
             if (mininterval_constraint && miniters_constraint && delay_constraint)
@@ -449,11 +448,11 @@ impl BarExt for Bar {
     fn render(&mut self) -> String {
         #[cfg(feature = "notebook")]
         if let Some(container) = &self.container {
-            Python::with_gil(|py| -> PyResult<()> {
+            Python::attach(|py| -> PyResult<()> {
                 let pb = container
                     .bind(py)
                     .getattr("children")?
-                    .downcast::<PyTuple>()?
+                    .cast::<PyTuple>()?
                     .get_item(1)?;
 
                 pb.setattr("value", self.counter)?;
@@ -563,9 +562,9 @@ impl BarExt for Bar {
             if let Some(container) = &self.container {
                 let text = bar_format.unchecked_text();
 
-                Python::with_gil(|py| -> PyResult<()> {
+                Python::attach(|py| -> PyResult<()> {
                     let container = container.bind(py).getattr("children")?;
-                    let container = container.downcast::<PyTuple>()?;
+                    let container = container.cast::<PyTuple>()?;
                     let (lbar, rbar) = (container.get_item(0)?, container.get_item(2)?);
 
                     if let Some(index) = text.find("{animation}") {
@@ -616,9 +615,9 @@ impl BarExt for Bar {
 
         #[cfg(feature = "notebook")]
         if let Some(container) = &self.container {
-            Python::with_gil(|py| -> PyResult<()> {
+            Python::attach(|py| -> PyResult<()> {
                 let container = container.bind(py).getattr("children")?;
-                let container = container.downcast::<PyTuple>()?;
+                let container = container.cast::<PyTuple>()?;
                 let (lbar, rbar) = (container.get_item(0)?, container.get_item(2)?);
 
                 if self.indefinite() {
@@ -1001,7 +1000,7 @@ impl BarBuilder {
 
         #[cfg(feature = "notebook")]
         if notebook::running() {
-            Python::with_gil(|py| -> PyResult<()> {
+            Python::attach(|py| -> PyResult<()> {
                 let ipywidgets = PyModule::import(py, "ipywidgets")?;
                 let ipython_display = PyModule::import(py, "IPython.display")?;