From b4e082b2e7db3a3a82a14c54904641e0e2439ed5 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 7 Jan 2023 09:19:28 +0000 Subject: [PATCH 1/3] python310Packages.sqlalchemy-continuum: 1.3.13 -> 1.3.14 --- .../python-modules/sqlalchemy-continuum/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/sqlalchemy-continuum/default.nix b/pkgs/development/python-modules/sqlalchemy-continuum/default.nix index 0d2ef66cfa88..1d7191a1828f 100644 --- a/pkgs/development/python-modules/sqlalchemy-continuum/default.nix +++ b/pkgs/development/python-modules/sqlalchemy-continuum/default.nix @@ -13,11 +13,11 @@ buildPythonPackage rec { pname = "SQLAlchemy-Continuum"; - version = "1.3.13"; + version = "1.3.14"; src = fetchPypi { inherit pname version; - sha256 = "sha256-JTqlHQmaVH2qKz7CFyCqpous3ecOpoFrxVlzasbc21I="; + sha256 = "sha256-1+k/lx6R8tW9gM3M2kqaVEwpmx8cMhDXeqCjyd8O2hM="; }; propagatedBuildInputs = [ From 65ea52793a8f0afde364f64f321a0e343229cb11 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 7 Jan 2023 10:26:18 +0100 Subject: [PATCH 2/3] python310Packages.sqlalchemy-continuum: add changelog --- .../python-modules/sqlalchemy-continuum/default.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/sqlalchemy-continuum/default.nix b/pkgs/development/python-modules/sqlalchemy-continuum/default.nix index 1d7191a1828f..2fe47baf4fe1 100644 --- a/pkgs/development/python-modules/sqlalchemy-continuum/default.nix +++ b/pkgs/development/python-modules/sqlalchemy-continuum/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-1+k/lx6R8tW9gM3M2kqaVEwpmx8cMhDXeqCjyd8O2hM="; + hash = "sha256-1+k/lx6R8tW9gM3M2kqaVEwpmx8cMhDXeqCjyd8O2hM="; }; propagatedBuildInputs = [ @@ -40,6 +40,8 @@ buildPythonPackage rec { meta = with lib; { homepage = "https://github.com/kvesteri/sqlalchemy-continuum/"; description = "Versioning and auditing extension for SQLAlchemy"; + changelog = "https://github.com/kvesteri/sqlalchemy-continuum/blob/${version}/CHANGES.rst"; license = licenses.bsd3; + maintainers = with maintainers; [ ]; }; } From 3b898e7270dfd75c434d85f713e533ebebd8330a Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 7 Jan 2023 10:42:19 +0100 Subject: [PATCH 3/3] python310Packages.sqlalchemy-continuum: normalize pname - move to optional-dependencies --- .../sqlalchemy-continuum/default.nix | 54 ++++++++++++++----- 1 file changed, 42 insertions(+), 12 deletions(-) diff --git a/pkgs/development/python-modules/sqlalchemy-continuum/default.nix b/pkgs/development/python-modules/sqlalchemy-continuum/default.nix index 2fe47baf4fe1..4338763d65dd 100644 --- a/pkgs/development/python-modules/sqlalchemy-continuum/default.nix +++ b/pkgs/development/python-modules/sqlalchemy-continuum/default.nix @@ -1,22 +1,29 @@ { lib -, fetchPypi , buildPythonPackage +, fetchPypi , flask , flask-login , flask-sqlalchemy , flexmock +, psycopg2 +, pymysql , pytestCheckHook +, pythonOlder , sqlalchemy -, sqlalchemy-utils , sqlalchemy-i18n +, sqlalchemy-utils }: buildPythonPackage rec { - pname = "SQLAlchemy-Continuum"; + pname = "sqlalchemy-continuum"; version = "1.3.14"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchPypi { - inherit pname version; + pname = "SQLAlchemy-Continuum"; + inherit version; hash = "sha256-1+k/lx6R8tW9gM3M2kqaVEwpmx8cMhDXeqCjyd8O2hM="; }; @@ -25,21 +32,44 @@ buildPythonPackage rec { sqlalchemy-utils ]; + passthru.optional-dependencies = { + flask = [ + flask + ]; + flask-login = [ + flask-login + ]; + flask-sqlalchemy = [ + flask-sqlalchemy + ]; + flexmock = [ + flexmock + ]; + i18n = [ + sqlalchemy-i18n + ]; + }; + + checkInputs = [ + psycopg2 + pymysql + pytestCheckHook + ] ++ passthru.optional-dependencies.flask + ++ passthru.optional-dependencies.flask-login + ++ passthru.optional-dependencies.flask-sqlalchemy + ++ passthru.optional-dependencies.flexmock + ++ passthru.optional-dependencies.i18n; + # indicate tests that we don't have a database server at hand DB = "sqlite"; - checkInputs = [ - pytestCheckHook - sqlalchemy-i18n - flask - flask-login - flask-sqlalchemy - flexmock + pythonImportsCheck = [ + "sqlalchemy_continuum" ]; meta = with lib; { - homepage = "https://github.com/kvesteri/sqlalchemy-continuum/"; description = "Versioning and auditing extension for SQLAlchemy"; + homepage = "https://github.com/kvesteri/sqlalchemy-continuum/"; changelog = "https://github.com/kvesteri/sqlalchemy-continuum/blob/${version}/CHANGES.rst"; license = licenses.bsd3; maintainers = with maintainers; [ ];