Skip to content

Commit

Permalink
Merge pull request #6 from PyO3/davidhewitt-patch-1-1
Browse files Browse the repository at this point in the history
update CI to run targeting main
  • Loading branch information
davidhewitt authored Oct 10, 2024
2 parents 98dee5d + 5fbc57c commit 38e34c5
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 6 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,10 @@ name: CI
on:
push:
branches:
- master
- main
pull_request:
branches:
- master
- main

env:
CARGO_TERM_COLOR: always
Expand Down
4 changes: 2 additions & 2 deletions src/async_std.rs
Original file line number Diff line number Diff line change
Expand Up @@ -34,13 +34,13 @@ pub mod re_exports {

/// <span class="module-item stab portability" style="display: inline; border-radius: 3px; padding: 2px; font-size: 80%; line-height: 1.2;"><code>attributes</code></span> Provides the boilerplate for the `async-std` runtime and runs an async fn as main
#[cfg(feature = "attributes")]
pub use pyo3_asyncio_macros_0_21::async_std_main as main;
pub use pyo3_async_runtimes_macros::async_std_main as main;

/// <span class="module-item stab portability" style="display: inline; border-radius: 3px; padding: 2px; font-size: 80%; line-height: 1.2;"><code>attributes</code></span>
/// <span class="module-item stab portability" style="display: inline; border-radius: 3px; padding: 2px; font-size: 80%; line-height: 1.2;"><code>testing</code></span>
/// Registers an `async-std` test with the `pyo3-asyncio` test harness
#[cfg(all(feature = "attributes", feature = "testing"))]
pub use pyo3_asyncio_macros_0_21::async_std_test as test;
pub use pyo3_async_runtimes_macros::async_std_test as test;

struct AsyncStdJoinErr(Box<dyn Any + Send + 'static>);

Expand Down
4 changes: 2 additions & 2 deletions src/tokio.rs
Original file line number Diff line number Diff line change
Expand Up @@ -43,13 +43,13 @@ pub mod re_exports {

/// <span class="module-item stab portability" style="display: inline; border-radius: 3px; padding: 2px; font-size: 80%; line-height: 1.2;"><code>attributes</code></span>
#[cfg(feature = "attributes")]
pub use pyo3_asyncio_macros_0_21::tokio_main as main;
pub use pyo3_async_runtimes_macros::tokio_main as main;

/// <span class="module-item stab portability" style="display: inline; border-radius: 3px; padding: 2px; font-size: 80%; line-height: 1.2;"><code>attributes</code></span>
/// <span class="module-item stab portability" style="display: inline; border-radius: 3px; padding: 2px; font-size: 80%; line-height: 1.2;"><code>testing</code></span>
/// Registers a `tokio` test with the `pyo3-asyncio` test harness
#[cfg(all(feature = "attributes", feature = "testing"))]
pub use pyo3_asyncio_macros_0_21::tokio_test as test;
pub use pyo3_async_runtimes_macros::tokio_test as test;

enum Pyo3Runtime {
Borrowed(&'static Runtime),
Expand Down

0 comments on commit 38e34c5

Please sign in to comment.