summary refs log tree commit diff
diff options
context:
space:
mode:
authorSandro <sandro.jaeckel@gmail.com>2023-07-25 19:24:02 +0200
committerGitHub <noreply@github.com>2023-07-25 19:24:02 +0200
commitf816d2543e1ca961581f2aba033edbd78a9b25ca (patch)
treeaa3754bc2a266b54b32192e2d11970ce69c982f0
parent4f0a1ccd82a2283fcf1221fbcb2b0bf6f05195fb (diff)
parent9d8f99b18d4527cbb939a18c25c3df0be4bf2376 (diff)
downloadnixpkgs-f816d2543e1ca961581f2aba033edbd78a9b25ca.tar
nixpkgs-f816d2543e1ca961581f2aba033edbd78a9b25ca.tar.gz
nixpkgs-f816d2543e1ca961581f2aba033edbd78a9b25ca.tar.bz2
nixpkgs-f816d2543e1ca961581f2aba033edbd78a9b25ca.tar.lz
nixpkgs-f816d2543e1ca961581f2aba033edbd78a9b25ca.tar.xz
nixpkgs-f816d2543e1ca961581f2aba033edbd78a9b25ca.tar.zst
nixpkgs-f816d2543e1ca961581f2aba033edbd78a9b25ca.zip
Merge pull request #243766 from tjni/sqlalchemy-continuum
python310Packages.sqlalchemy-continuum: 1.3.14 -> 1.4.0
-rw-r--r--pkgs/development/python-modules/sqlalchemy-continuum/default.nix18
1 files changed, 3 insertions, 15 deletions
diff --git a/pkgs/development/python-modules/sqlalchemy-continuum/default.nix b/pkgs/development/python-modules/sqlalchemy-continuum/default.nix
index e978defcbf4..fa0d3ad6cad 100644
--- a/pkgs/development/python-modules/sqlalchemy-continuum/default.nix
+++ b/pkgs/development/python-modules/sqlalchemy-continuum/default.nix
@@ -4,7 +4,6 @@
 , flask
 , flask-login
 , flask-sqlalchemy
-, flexmock
 , psycopg2
 , pymysql
 , pytestCheckHook
@@ -16,7 +15,7 @@
 
 buildPythonPackage rec {
   pname = "sqlalchemy-continuum";
-  version = "1.3.14";
+  version = "1.4.0";
   format = "setuptools";
 
   disabled = pythonOlder "3.7";
@@ -24,7 +23,7 @@ buildPythonPackage rec {
   src = fetchPypi {
     pname = "SQLAlchemy-Continuum";
     inherit version;
-    hash = "sha256-1+k/lx6R8tW9gM3M2kqaVEwpmx8cMhDXeqCjyd8O2hM=";
+    hash = "sha256-Rk+aWxBjUrXuRPE5MSyzWMWS0l7qrjU3wOrHLC+vteU=";
   };
 
   propagatedBuildInputs = [
@@ -42,9 +41,6 @@ buildPythonPackage rec {
     flask-sqlalchemy = [
       flask-sqlalchemy
     ];
-    flexmock = [
-      flexmock
-    ];
     i18n = [
       sqlalchemy-i18n
     ];
@@ -57,12 +53,7 @@ buildPythonPackage rec {
   ] ++ lib.flatten (builtins.attrValues passthru.optional-dependencies);
 
   # Indicate tests that we don't have a database server at hand
-  DB = "sqlite";
-
-  disabledTestPaths = [
-    # Test doesn't support latest SQLAlchemy
-    "tests/plugins/test_flask.py"
-  ];
+  env.DB = "sqlite";
 
   pythonImportsCheck = [
     "sqlalchemy_continuum"
@@ -74,8 +65,5 @@ buildPythonPackage rec {
     changelog = "https://github.com/kvesteri/sqlalchemy-continuum/blob/${version}/CHANGES.rst";
     license = licenses.bsd3;
     maintainers = with maintainers; [ ];
-
-    # https://github.com/kvesteri/sqlalchemy-continuum/issues/326
-    broken = versionAtLeast sqlalchemy.version "2";
   };
 }