From 18d1fd8d57d24d7a434f3f83d2111ff081db8ad1 Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Mon, 21 Oct 2024 22:22:41 +0000 Subject: [PATCH 01/14] [pre-commit.ci] pre-commit autoupdate MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit updates: - [github.com/pre-commit/mirrors-mypy: v1.11.2 → v1.12.1](https://github.com/pre-commit/mirrors-mypy/compare/v1.11.2...v1.12.1) - [github.com/pre-commit/mirrors-mypy: v1.11.2 → v1.12.1](https://github.com/pre-commit/mirrors-mypy/compare/v1.11.2...v1.12.1) - [github.com/pre-commit/mirrors-mypy: v1.11.2 → v1.12.1](https://github.com/pre-commit/mirrors-mypy/compare/v1.11.2...v1.12.1) - [github.com/astral-sh/ruff-pre-commit: v0.6.9 → v0.7.0](https://github.com/astral-sh/ruff-pre-commit/compare/v0.6.9...v0.7.0) --- .pre-commit-config.yaml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 5850a78..c87ba73 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -10,7 +10,7 @@ repos: - id: end-of-file-fixer - id: trailing-whitespace - repo: https://github.com/pre-commit/mirrors-mypy - rev: v1.11.2 + rev: v1.12.1 hooks: - id: mypy additional_dependencies: @@ -35,7 +35,7 @@ repos: exclude: ".*/test_.*\\.py|.*/conftest\\.py|src/rest_api_postgres/python/.*|src/pyp3_mock_data/.*|src/pyo3_mock_data/.*" args: [--explicit-package-bases] # This is because of the mono repo type setup - repo: https://github.com/pre-commit/mirrors-mypy - rev: v1.11.2 + rev: v1.12.1 hooks: - id: mypy pass_filenames: false @@ -51,14 +51,14 @@ repos: ] entry: bash -c 'cd src/rest_api_postgres/python && mypy -p app "$@"' -- - repo: https://github.com/pre-commit/mirrors-mypy - rev: v1.11.2 + rev: v1.12.1 hooks: - id: mypy pass_filenames: false files: ^src/pyp3_mock_data/ entry: bash -c 'cd src/pyo3_mock_data && mypy -p pyp3_mock_data "$@"' -- - repo: https://github.com/astral-sh/ruff-pre-commit - rev: v0.6.9 + rev: v0.7.0 hooks: - id: ruff args: [--fix, --exit-non-zero-on-fix] From 23f1201b39ccfb46b916cabde4e5e041b71497bd Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Mon, 28 Oct 2024 22:48:32 +0000 Subject: [PATCH 02/14] [pre-commit.ci] pre-commit autoupdate MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit updates: - [github.com/pre-commit/mirrors-mypy: v1.12.1 → v1.13.0](https://github.com/pre-commit/mirrors-mypy/compare/v1.12.1...v1.13.0) - [github.com/pre-commit/mirrors-mypy: v1.12.1 → v1.13.0](https://github.com/pre-commit/mirrors-mypy/compare/v1.12.1...v1.13.0) - [github.com/pre-commit/mirrors-mypy: v1.12.1 → v1.13.0](https://github.com/pre-commit/mirrors-mypy/compare/v1.12.1...v1.13.0) - [github.com/astral-sh/ruff-pre-commit: v0.7.0 → v0.7.1](https://github.com/astral-sh/ruff-pre-commit/compare/v0.7.0...v0.7.1) --- .pre-commit-config.yaml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index c87ba73..9c1efce 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -10,7 +10,7 @@ repos: - id: end-of-file-fixer - id: trailing-whitespace - repo: https://github.com/pre-commit/mirrors-mypy - rev: v1.12.1 + rev: v1.13.0 hooks: - id: mypy additional_dependencies: @@ -35,7 +35,7 @@ repos: exclude: ".*/test_.*\\.py|.*/conftest\\.py|src/rest_api_postgres/python/.*|src/pyp3_mock_data/.*|src/pyo3_mock_data/.*" args: [--explicit-package-bases] # This is because of the mono repo type setup - repo: https://github.com/pre-commit/mirrors-mypy - rev: v1.12.1 + rev: v1.13.0 hooks: - id: mypy pass_filenames: false @@ -51,14 +51,14 @@ repos: ] entry: bash -c 'cd src/rest_api_postgres/python && mypy -p app "$@"' -- - repo: https://github.com/pre-commit/mirrors-mypy - rev: v1.12.1 + rev: v1.13.0 hooks: - id: mypy pass_filenames: false files: ^src/pyp3_mock_data/ entry: bash -c 'cd src/pyo3_mock_data && mypy -p pyp3_mock_data "$@"' -- - repo: https://github.com/astral-sh/ruff-pre-commit - rev: v0.7.0 + rev: v0.7.1 hooks: - id: ruff args: [--fix, --exit-non-zero-on-fix] From 61b24c43afcaf66ab924931a532d61624dd5a96f Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Mon, 4 Nov 2024 22:40:05 +0000 Subject: [PATCH 03/14] [pre-commit.ci] pre-commit autoupdate MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit updates: - [github.com/astral-sh/ruff-pre-commit: v0.7.1 → v0.7.2](https://github.com/astral-sh/ruff-pre-commit/compare/v0.7.1...v0.7.2) --- .pre-commit-config.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 9c1efce..772c8ac 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -58,7 +58,7 @@ repos: files: ^src/pyp3_mock_data/ entry: bash -c 'cd src/pyo3_mock_data && mypy -p pyp3_mock_data "$@"' -- - repo: https://github.com/astral-sh/ruff-pre-commit - rev: v0.7.1 + rev: v0.7.2 hooks: - id: ruff args: [--fix, --exit-non-zero-on-fix] From 910bf2595cf9411ae2124c0608c8d93257bcda9d Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Mon, 11 Nov 2024 22:23:27 +0000 Subject: [PATCH 04/14] [pre-commit.ci] pre-commit autoupdate MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit updates: - [github.com/astral-sh/ruff-pre-commit: v0.7.2 → v0.7.3](https://github.com/astral-sh/ruff-pre-commit/compare/v0.7.2...v0.7.3) --- .pre-commit-config.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 772c8ac..a09ecd4 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -58,7 +58,7 @@ repos: files: ^src/pyp3_mock_data/ entry: bash -c 'cd src/pyo3_mock_data && mypy -p pyp3_mock_data "$@"' -- - repo: https://github.com/astral-sh/ruff-pre-commit - rev: v0.7.2 + rev: v0.7.3 hooks: - id: ruff args: [--fix, --exit-non-zero-on-fix] From 1bbed0fc5dc799eb17fdcdbe6ed38a41bee1dcbe Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Mon, 18 Nov 2024 22:24:55 +0000 Subject: [PATCH 05/14] [pre-commit.ci] pre-commit autoupdate MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit updates: - [github.com/astral-sh/ruff-pre-commit: v0.7.3 → v0.7.4](https://github.com/astral-sh/ruff-pre-commit/compare/v0.7.3...v0.7.4) --- .pre-commit-config.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index a09ecd4..626a27f 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -58,7 +58,7 @@ repos: files: ^src/pyp3_mock_data/ entry: bash -c 'cd src/pyo3_mock_data && mypy -p pyp3_mock_data "$@"' -- - repo: https://github.com/astral-sh/ruff-pre-commit - rev: v0.7.3 + rev: v0.7.4 hooks: - id: ruff args: [--fix, --exit-non-zero-on-fix] From d9cc3fbe90cd87c858f0f2b0bf59de7f642cce16 Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Mon, 25 Nov 2024 22:22:48 +0000 Subject: [PATCH 06/14] [pre-commit.ci] pre-commit autoupdate MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit updates: - [github.com/astral-sh/ruff-pre-commit: v0.7.4 → v0.8.0](https://github.com/astral-sh/ruff-pre-commit/compare/v0.7.4...v0.8.0) --- .pre-commit-config.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 626a27f..1295ff1 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -58,7 +58,7 @@ repos: files: ^src/pyp3_mock_data/ entry: bash -c 'cd src/pyo3_mock_data && mypy -p pyp3_mock_data "$@"' -- - repo: https://github.com/astral-sh/ruff-pre-commit - rev: v0.7.4 + rev: v0.8.0 hooks: - id: ruff args: [--fix, --exit-non-zero-on-fix] From 222525dad088960f1e626bb0a0dc73c2f5e40ccb Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Mon, 2 Dec 2024 22:49:20 +0000 Subject: [PATCH 07/14] [pre-commit.ci] pre-commit autoupdate MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit updates: - [github.com/astral-sh/ruff-pre-commit: v0.8.0 → v0.8.1](https://github.com/astral-sh/ruff-pre-commit/compare/v0.8.0...v0.8.1) --- .pre-commit-config.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 1295ff1..edb024a 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -58,7 +58,7 @@ repos: files: ^src/pyp3_mock_data/ entry: bash -c 'cd src/pyo3_mock_data && mypy -p pyp3_mock_data "$@"' -- - repo: https://github.com/astral-sh/ruff-pre-commit - rev: v0.8.0 + rev: v0.8.1 hooks: - id: ruff args: [--fix, --exit-non-zero-on-fix] From 99755ec8f07877c3bcabf3e88dd9ccce97359989 Mon Sep 17 00:00:00 2001 From: Paul Sanders Date: Mon, 2 Dec 2024 19:41:36 -0500 Subject: [PATCH 08/14] Fix clippy error --- src/simple_csv/rust/src/main.rs | 1 - 1 file changed, 1 deletion(-) diff --git a/src/simple_csv/rust/src/main.rs b/src/simple_csv/rust/src/main.rs index f95cb41..5f2b8f9 100644 --- a/src/simple_csv/rust/src/main.rs +++ b/src/simple_csv/rust/src/main.rs @@ -79,7 +79,6 @@ fn main() { } #[cfg(test)] - mod tests { use super::*; use approx::assert_abs_diff_eq; From 75615aa7638447f14b7242601886cb91834422a9 Mon Sep 17 00:00:00 2001 From: Paul Sanders Date: Mon, 2 Dec 2024 19:52:09 -0500 Subject: [PATCH 09/14] Fix additional clippy error --- src/parallelism/rust/src/main.rs | 1 - 1 file changed, 1 deletion(-) diff --git a/src/parallelism/rust/src/main.rs b/src/parallelism/rust/src/main.rs index 33cd63a..76b3132 100644 --- a/src/parallelism/rust/src/main.rs +++ b/src/parallelism/rust/src/main.rs @@ -107,7 +107,6 @@ fn main() { // Tests #[cfg(test)] - mod tests { use super::*; From 7199ac5a4182f2a042bf3b3766aed4675cf55756 Mon Sep 17 00:00:00 2001 From: Paul Sanders Date: Mon, 2 Dec 2024 19:55:50 -0500 Subject: [PATCH 10/14] Skip mypy in pre-commit ci --- .pre-commit-config.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index edb024a..51a9878 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -1,5 +1,5 @@ ci: - skip: [fmt] + skip: [fmt, mypy] repos: - repo: https://github.com/pre-commit/pre-commit-hooks From 1d51dce2a74dc09af4a9a1e920a1f1ceed997a61 Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Mon, 9 Dec 2024 22:27:46 +0000 Subject: [PATCH 11/14] [pre-commit.ci] pre-commit autoupdate MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit updates: - [github.com/astral-sh/ruff-pre-commit: v0.8.1 → v0.8.2](https://github.com/astral-sh/ruff-pre-commit/compare/v0.8.1...v0.8.2) --- .pre-commit-config.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 51a9878..348bb93 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -58,7 +58,7 @@ repos: files: ^src/pyp3_mock_data/ entry: bash -c 'cd src/pyo3_mock_data && mypy -p pyp3_mock_data "$@"' -- - repo: https://github.com/astral-sh/ruff-pre-commit - rev: v0.8.1 + rev: v0.8.2 hooks: - id: ruff args: [--fix, --exit-non-zero-on-fix] From f19117eafd7ce346cd24853448c882d7bab8ad22 Mon Sep 17 00:00:00 2001 From: Paul Sanders Date: Tue, 24 Dec 2024 11:57:35 -0500 Subject: [PATCH 12/14] Fix compile error --- Cargo.lock | 26 +++++++++++++------------- src/pyo3_mock_data/Cargo.toml | 2 +- src/pyo3_mock_data/src/lib.rs | 5 +---- 3 files changed, 15 insertions(+), 18 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 4077250..5b8ea2c 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1,6 +1,6 @@ # This file is automatically @generated by Cargo. # It is not intended for manual editing. -version = 3 +version = 4 [[package]] name = "addr2line" @@ -2064,15 +2064,15 @@ dependencies = [ [[package]] name = "pyo3" -version = "0.21.2" +version = "0.23.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a5e00b96a521718e08e03b1a622f01c8a8deb50719335de3f60b3b3950f069d8" +checksum = "e484fd2c8b4cb67ab05a318f1fd6fa8f199fcc30819f08f07d200809dba26c15" dependencies = [ "cfg-if", "indoc", "libc", "memoffset", - "parking_lot", + "once_cell", "portable-atomic", "pyo3-build-config", "pyo3-ffi", @@ -2082,9 +2082,9 @@ dependencies = [ [[package]] name = "pyo3-build-config" -version = "0.21.2" +version = "0.23.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7883df5835fafdad87c0d888b266c8ec0f4c9ca48a5bed6bbb592e8dedee1b50" +checksum = "dc0e0469a84f208e20044b98965e1561028180219e35352a2afaf2b942beff3b" dependencies = [ "once_cell", "target-lexicon", @@ -2092,9 +2092,9 @@ dependencies = [ [[package]] name = "pyo3-ffi" -version = "0.21.2" +version = "0.23.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "01be5843dc60b916ab4dad1dca6d20b9b4e6ddc8e15f50c47fe6d85f1fb97403" +checksum = "eb1547a7f9966f6f1a0f0227564a9945fe36b90da5a93b3933fc3dc03fae372d" dependencies = [ "libc", "pyo3-build-config", @@ -2102,9 +2102,9 @@ dependencies = [ [[package]] name = "pyo3-macros" -version = "0.21.2" +version = "0.23.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "77b34069fc0682e11b31dbd10321cbf94808394c56fd996796ce45217dfac53c" +checksum = "fdb6da8ec6fa5cedd1626c886fc8749bdcbb09424a86461eb8cdf096b7c33257" dependencies = [ "proc-macro2", "pyo3-macros-backend", @@ -2114,11 +2114,11 @@ dependencies = [ [[package]] name = "pyo3-macros-backend" -version = "0.21.2" +version = "0.23.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "08260721f32db5e1a5beae69a55553f56b99bd0e1c3e6e0a5e8851a9d0f5a85c" +checksum = "38a385202ff5a92791168b1136afae5059d3ac118457bb7bc304c197c2d33e7d" dependencies = [ - "heck 0.4.1", + "heck 0.5.0", "proc-macro2", "pyo3-build-config", "quote", diff --git a/src/pyo3_mock_data/Cargo.toml b/src/pyo3_mock_data/Cargo.toml index 7478c18..35bc287 100644 --- 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.23.3", 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/src/lib.rs b/src/pyo3_mock_data/src/lib.rs index b99ab3b..a1cece6 100644 --- a/src/pyo3_mock_data/src/lib.rs +++ b/src/pyo3_mock_data/src/lib.rs @@ -162,10 +162,7 @@ fn generate_mock_persons( #[pymodule] fn _pyo3_mock_data(py: Python, m: &Bound<'_, PyModule>) -> PyResult<()> { m.add_function(wrap_pyfunction!(generate_mock_persons, m)?)?; - m.add( - "FileNotFoundError", - py.get_type_bound::(), - )?; + m.add("FileNotFoundError", py.get_type::())?; Ok(()) } From f547e6e0fbe4d504a9f6fc0140802e677df4d679 Mon Sep 17 00:00:00 2001 From: Paul Sanders Date: Tue, 24 Dec 2024 12:03:32 -0500 Subject: [PATCH 13/14] Update pre-commit hooks --- .pre-commit-config.yaml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 348bb93..9806a79 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -10,7 +10,7 @@ repos: - id: end-of-file-fixer - id: trailing-whitespace - repo: https://github.com/pre-commit/mirrors-mypy - rev: v1.13.0 + rev: v1.14.0 hooks: - id: mypy additional_dependencies: @@ -35,7 +35,7 @@ repos: exclude: ".*/test_.*\\.py|.*/conftest\\.py|src/rest_api_postgres/python/.*|src/pyp3_mock_data/.*|src/pyo3_mock_data/.*" args: [--explicit-package-bases] # This is because of the mono repo type setup - repo: https://github.com/pre-commit/mirrors-mypy - rev: v1.13.0 + rev: v1.14.0 hooks: - id: mypy pass_filenames: false @@ -51,14 +51,14 @@ repos: ] entry: bash -c 'cd src/rest_api_postgres/python && mypy -p app "$@"' -- - repo: https://github.com/pre-commit/mirrors-mypy - rev: v1.13.0 + rev: v1.14.0 hooks: - id: mypy pass_filenames: false files: ^src/pyp3_mock_data/ entry: bash -c 'cd src/pyo3_mock_data && mypy -p pyp3_mock_data "$@"' -- - repo: https://github.com/astral-sh/ruff-pre-commit - rev: v0.8.2 + rev: v0.8.4 hooks: - id: ruff args: [--fix, --exit-non-zero-on-fix] From fcb264757727b2e4aea9a08ab8b6a7c450e88ac8 Mon Sep 17 00:00:00 2001 From: Paul Sanders Date: Tue, 24 Dec 2024 12:05:50 -0500 Subject: [PATCH 14/14] Fix type error --- src/mock_data/python/main.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/mock_data/python/main.py b/src/mock_data/python/main.py index 1ed0cb0..98d8f3d 100644 --- a/src/mock_data/python/main.py +++ b/src/mock_data/python/main.py @@ -57,7 +57,7 @@ def generate_fake_persons(faker: Faker, locations: list[Location], num: int) -> id=i, name=f"{faker.first_name()} {faker.last_name()}", age=random.randint(22, 65), - isMarried=faker.random_element(elements=("true", "false")), + isMarried=faker.random_element(elements=(True, False)), city=location["city"], state=location["state"], country=location["country"],