From 123039eb378bcbcea249d713e7f3acaf9a7bdea8 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 25 Nov 2023 00:50:02 +0100 Subject: [PATCH 1/2] python311Packages.sqlmodel: init at 0.0.12 Module to work with SQL databases https://github.com/tiangolo/sqlmodel --- .../python-modules/sqlmodel/default.nix | 58 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 60 insertions(+) create mode 100644 pkgs/development/python-modules/sqlmodel/default.nix diff --git a/pkgs/development/python-modules/sqlmodel/default.nix b/pkgs/development/python-modules/sqlmodel/default.nix new file mode 100644 index 000000000000..5b7449d4a796 --- /dev/null +++ b/pkgs/development/python-modules/sqlmodel/default.nix @@ -0,0 +1,58 @@ +{ lib +, buildPythonPackage +, fastapi +, fetchFromGitHub +, poetry-core +, pydantic +, pytest-asyncio +, pytestCheckHook +, pythonOlder +, sqlalchemy +}: + +buildPythonPackage rec { + pname = "sqlmodel"; + version = "0.0.12"; + pyproject = true; + + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "tiangolo"; + repo = "sqlmodel"; + rev = "refs/tags/${version}"; + hash = "sha256-ER8NGDcCCCXT8lsm8fgJUaLyjdf5v2/UdrBw5T9EeXQ="; + }; + + nativeBuildInputs = [ + poetry-core + ]; + + propagatedBuildInputs = [ + pydantic + sqlalchemy + ]; + + nativeCheckInputs = [ + fastapi + pytest-asyncio + pytestCheckHook + ]; + + pythonImportsCheck = [ + "sqlmodel" + ]; + + disabledTestPaths = [ + # Coverage + "tests/test_tutorial/test_create_db_and_table/test_tutorial001.py" + ]; + + meta = with lib; { + description = "Module to work with SQL databases"; + homepage = "https://github.com/tiangolo/sqlmodel"; + changelog = "https://github.com/tiangolo/sqlmodel/releases/tag/${version}"; + license = licenses.mit; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 35554ba70d38..96d3d6df2dc2 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -13417,6 +13417,8 @@ self: super: with self; { sqlmap = callPackage ../development/python-modules/sqlmap { }; + sqlmodel = callPackage ../development/python-modules/sqlmodel { }; + sqlobject = callPackage ../development/python-modules/sqlobject { }; sqlparse = callPackage ../development/python-modules/sqlparse { }; From 15b9f1bee93bf3717fcae7204729e52f0e500047 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 25 Nov 2023 00:50:38 +0100 Subject: [PATCH 2/2] python311Packages.pgvector: 0.2.3 -> 0.2.4 Diff: https://github.com/pgvector/pgvector-python/compare/refs/tags/v0.2.3...v0.2.4 Changelog: https://github.com/pgvector/pgvector-python/blob/refs/tags/v0.2.4/CHANGELOG.md --- pkgs/development/python-modules/pgvector/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pgvector/default.nix b/pkgs/development/python-modules/pgvector/default.nix index 389a917668bf..383029504b54 100644 --- a/pkgs/development/python-modules/pgvector/default.nix +++ b/pkgs/development/python-modules/pgvector/default.nix @@ -13,11 +13,12 @@ , pytestCheckHook , pythonOlder , sqlalchemy +, sqlmodel }: buildPythonPackage rec { pname = "pgvector"; - version = "0.2.3"; + version = "0.2.4"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -26,7 +27,7 @@ buildPythonPackage rec { owner = "pgvector"; repo = "pgvector-python"; rev = "refs/tags/v${version}"; - hash = "sha256-KQROG0cHvKmdWssr7Git3JH0YguRPno/ZzYiQL7VhwU="; + hash = "sha256-XKoaEwLW59pV4Dwis7p2L65XoO2zUEa1kXxz6Lgs2d8="; }; propagatedBuildInputs = [ @@ -44,6 +45,7 @@ buildPythonPackage rec { pytest-asyncio pytestCheckHook sqlalchemy + sqlmodel ]; env = {