diff --git a/pkgs/development/python-modules/databases/default.nix b/pkgs/development/python-modules/databases/default.nix index e85bdd7868c9..518d2066853a 100644 --- a/pkgs/development/python-modules/databases/default.nix +++ b/pkgs/development/python-modules/databases/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "databases"; - version = "0.5.4"; + version = "0.5.5"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "encode"; repo = pname; rev = version; - hash = "sha256-67ykx7HKGgRvJ+GRVEI/e2+x51kfHHFjh/iI4tY+6aE="; + hash = "sha256-NOXK1UCQzqvJRfzsgIfpihuD9oF52sMD+BxqUHWF8Rk="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/ormar/default.nix b/pkgs/development/python-modules/ormar/default.nix index fee9af147154..d5b9b7cf88e8 100644 --- a/pkgs/development/python-modules/ormar/default.nix +++ b/pkgs/development/python-modules/ormar/default.nix @@ -1,37 +1,39 @@ { lib -, buildPythonPackage -, pythonOlder -, fetchFromGitHub -, poetry-core -, databases -, pydantic -, sqlalchemy -, asyncpg -, psycopg2 , aiomysql -, aiosqlite -, cryptography -, orjson -, typing-extensions -, importlib-metadata , aiopg -, mysqlclient -, pymysql -, pytestCheckHook -, pytest-asyncio +, aiosqlite +, asyncpg +, buildPythonPackage +, cryptography +, databases , fastapi +, fetchFromGitHub +, importlib-metadata +, mysqlclient +, orjson +, poetry-core +, psycopg2 +, pydantic +, pymysql +, pytest-asyncio +, pytestCheckHook +, pythonOlder +, sqlalchemy +, typing-extensions }: buildPythonPackage rec { pname = "ormar"; - version = "0.10.23"; + version = "0.10.24"; format = "pyproject"; + disabled = pythonOlder "3.7"; + src = fetchFromGitHub { owner = "collerek"; repo = pname; rev = version; - sha256 = "sha256-ILJvJyd56lqlKq7+mUz26LvusYb5AOOfoA7OgNq2fT0="; + hash = "sha256-zKugeGDcYDI4VKspJPWeZCBubTqMxxfOVQCuF4pC49E="; }; nativeBuildInputs = [ @@ -39,16 +41,15 @@ buildPythonPackage rec { ]; propagatedBuildInputs = [ - databases - pydantic - sqlalchemy - asyncpg - psycopg2 aiomysql aiosqlite + asyncpg cryptography - + databases orjson + psycopg2 + pydantic + sqlalchemy ] ++ lib.optionals (pythonOlder "3.8") [ typing-extensions importlib-metadata @@ -56,24 +57,35 @@ buildPythonPackage rec { checkInputs = [ aiomysql - aiosqlite aiopg + aiosqlite asyncpg - - psycopg2 - mysqlclient - pymysql - - pytestCheckHook - pytest-asyncio fastapi + mysqlclient + psycopg2 + pymysql + pytest-asyncio + pytestCheckHook ]; - pythonImportsCheck = [ "ormar" ]; + postPatch = '' + substituteInPlace pyproject.toml \ + --replace 'SQLAlchemy = ">=1.3.18,<=1.4.29"' 'SQLAlchemy = ">=1.3.18"' \ + --replace 'databases = ">=0.3.2,!=0.5.0,!=0.5.1,!=0.5.2,!=0.5.3,<0.5.5"' 'databases = ">=0.5.5"' + ''; + + disabledTests = [ + # TypeError: Object of type bytes is not JSON serializable + "test_bulk_operations_with_json" + ]; + + pythonImportsCheck = [ + "ormar" + ]; meta = with lib; { homepage = "https://github.com/collerek/ormar"; - description = "A simple async ORM with fastapi in mind and pydantic validation."; + description = "Async ORM with fastapi in mind and pydantic validation"; license = licenses.mit; maintainers = with maintainers; [ andreasfelix ]; };