Fix pyo3_mock_data CI build failure

thedataquarry · Oct 16, 2024 · 3236d51 · 3236d51
1 parent 0280849
commit 3236d51
Show file tree

Hide file tree

Showing 7 changed files with 210 additions and 35 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/src/pyo3_mock_data/Cargo.toml b/src/pyo3_mock_data/Cargo.toml
@@ -11,7 +11,7 @@ crate-type = ["cdylib"]
 [dependencies]
 csv = "1.3.0"
 fake = { version = "2.9.2", features = ["derive"] }
-pyo3 = { version = "0.21.0", features = ["abi3-py38"] }
+pyo3 = { version = "0.22.5", features = ["extension-module"] }
 rand = "0.8.5"
 serde = { version = "1.0.193", features = ["derive"] }
 unicode-normalization = "0.1.22"
diff --git a/src/pyo3_mock_data/Makefile b/src/pyo3_mock_data/Makefile
@@ -8,12 +8,12 @@ lint:
 	cargo clippy --all-targets --quiet
 
 develop:
-	maturin develop
+	uv run maturin develop
 
 release:
-	maturin develop -r
+	uv run maturin develop -r
 
 test: develop
-	pytest
+	uv run pytest
 
 all: format check lint test
diff --git a/src/pyo3_mock_data/README.md b/src/pyo3_mock_data/README.md
@@ -31,7 +31,6 @@ makes sense to write a Rust extension that can be called from Python, which is t
 
 The dataset should be in the following format:
 
-
 ```json
 {
   "id": "int",
@@ -82,12 +81,12 @@ Install the dependencies in a virtual environment via `requirements.txt`.
 
 ```bash
 # First time setup
-python -m venv venv
-source venv/bin/activate
-pip install -r requirements.txt
+uv venv
+source .venv/bin/activate
+uv sync --frozen
 
 # For subsequent runs, simply activate the environment
-source venv/bin/activate
+source .venv/bin/activate
 ```
 
 ### Build the Rust module
@@ -100,7 +99,7 @@ or directly.
 make develop
 
 # Directly with Maturin
-maturin develop
+uv run maturin develop
 ```
 
 ### Run script
@@ -115,9 +114,9 @@ that someone :joy:.
 
 ```bash
 # Generate 10 mock person profiles
-python main.py -n 10
+uv run python main.py -n 10
 # Generate 1000 mock person profiles
-python main.py -n 1000
+uv run python main.py -n 1000
 ```
 
 ### Run tests
@@ -130,8 +129,8 @@ running the tests. If you run manually don't forget the build step before testin
 make test
 
 # manually
-maturin develop
-pytest
+uv run maturin develop
+uv run pytest
 
 ==================================================================================== test session starts =====================================================================================
 platform linux -- Python 3.12.2, pytest-8.0.0, pluggy-1.4.0
@@ -165,7 +164,7 @@ can be done with either the provide Makefile or manually.
 make release
 
 # Manually
-maturin develop -r
+uv run maturin develop -r
 ```
 
 ## Performance

diff --git a/src/pyo3_mock_data/pyproject.toml b/src/pyo3_mock_data/pyproject.toml
@@ -4,20 +4,27 @@ build-backend = "maturin"
 
 [project]
 name = "pyo3-mock-data"
-requires-python = ">=3.8"
+requires-python = ">=3.9"
 
 [tool.maturin]
 module-name = "pyo3_mock_data._pyo3_mock_data"
 binding = "pyo3"
-# features = ["pyo3/extension-module"]
+features = ["pyo3/extension-module"]
+
+[tool.uv]
+dev-dependencies = [
+  "maturin==1.7.3",
+  "mypy==1.12.0",
+  "pytest==8.3.3",
+]
 
 [tool.mypy]
 check_untyped_defs = true
 disallow_untyped_defs = true
 
 [tool.ruff]
 line-length = 100
-target-version = "py38"
+target-version = "py39"
 fix = true
 
 [tool.ruff.lint]

diff --git a/src/pyo3_mock_data/requirements.txt b/src/pyo3_mock_data/requirements.txt