Skip to content

Commit

Permalink
Dump dependency and tool versions (#60)
Browse files Browse the repository at this point in the history
This updates to the latest `pyo3` version as that fixed some blockers, and it switches `uv` back to using a managed python install, as that is fixed now as well.
  • Loading branch information
Swatinem authored Jan 7, 2025
1 parent 996ecb2 commit 508185c
Show file tree
Hide file tree
Showing 8 changed files with 94 additions and 102 deletions.
8 changes: 1 addition & 7 deletions .envrc
Original file line number Diff line number Diff line change
@@ -1,8 +1,2 @@
# using uv-managed python is currently broken because it sets a wrong `libdir`:
# https://github.com/astral-sh/rye/discussions/851
# https://github.com/astral-sh/rye/issues/646
# https://github.com/astral-sh/uv/issues/8879
# https://github.com/astral-sh/uv/issues/8429
# https://github.com/astral-sh/uv/issues/7369
uv sync --no-install-project --python-preference only-system
uv sync --no-install-project
source .venv/bin/activate
7 changes: 4 additions & 3 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
/.*_cache
/.venv
/*.xml
/target
.venv
__pycache__
.coverage
/*.xml
.coverage
66 changes: 33 additions & 33 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 1 addition & 2 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,7 @@ name = "test_results_parser"
crate-type = ["cdylib", "rlib"]

[dependencies]
# Version 0.23 currently suffers from https://github.com/PyO3/pyo3/issues/4723
pyo3 = { version = "0.22.6", features = ["abi3-py312"] }
pyo3 = { version = "0.23.3", features = ["abi3-py312"] }
quick-xml = "0.37.1"
regex = "1.11.1"
serde = { version = "1.0.215", features = ["derive"] }
Expand Down
2 changes: 1 addition & 1 deletion pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ features = ["pyo3/extension-module"]
[tool.uv]
dev-dependencies = [
"pytest>=8.3.3",
"pytest-cov>=5.0.0",
"pytest-cov>=6.0.0",
"pytest-reportlog>=0.4.0",
"maturin>=1.7.4",
]
2 changes: 1 addition & 1 deletion src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ pyo3::create_exception!(test_results_parser, ComputeNameError, PyException);
/// A Python module implemented in Rust.
#[pymodule]
fn test_results_parser(py: Python, m: &Bound<PyModule>) -> PyResult<()> {
m.add("ParserError", py.get_type_bound::<ParserError>())?;
m.add("ParserError", py.get_type::<ParserError>())?;
m.add_class::<testrun::Testrun>()?;
m.add_class::<testrun::Outcome>()?;
m.add_class::<testrun::Framework>()?;
Expand Down
2 changes: 0 additions & 2 deletions src/testrun.rs
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,6 @@ use pyo3::class::basic::CompareOp;
use pyo3::{prelude::*, pyclass};

#[derive(Clone, Copy, Debug, PartialEq)]
// See https://github.com/PyO3/pyo3/issues/4723
#[allow(ambiguous_associated_items)]
#[pyclass(eq, eq_int)]
pub enum Outcome {
Pass,
Expand Down
Loading

0 comments on commit 508185c

Please sign in to comment.