diff --git a/pkgs/development/python-modules/WSME/default.nix b/pkgs/development/python-modules/WSME/default.nix index c1c6395ab25..50e90ded762 100644 --- a/pkgs/development/python-modules/WSME/default.nix +++ b/pkgs/development/python-modules/WSME/default.nix @@ -1,6 +1,7 @@ { lib , buildPythonPackage , fetchPypi +, pythonAtLeast , pbr , six , simplegeneric @@ -23,6 +24,8 @@ buildPythonPackage rec { pname = "WSME"; version = "0.10.0"; + disabled = pythonAtLeast "3.9"; + src = fetchPypi { inherit pname version; sha256 = "965b9ce48161e5c50d84aedcf50dca698f05bf07e9d489201bccaec3141cd304"; diff --git a/pkgs/development/python-modules/cheroot/default.nix b/pkgs/development/python-modules/cheroot/default.nix index 6c99b7bbf66..c9d3094d595 100644 --- a/pkgs/development/python-modules/cheroot/default.nix +++ b/pkgs/development/python-modules/cheroot/default.nix @@ -1,4 +1,5 @@ { lib, stdenv, fetchPypi, buildPythonPackage, isPy3k +, jaraco_functools , jaraco_text , more-itertools , portend @@ -23,12 +24,17 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "1089c28a9c320d19fdf9a4b0ed6ace23a0948db1c171a36ac985f3741bc62865"; + sha256 = "0r98qqdp9ww5r5ma6wf1n66r9813rrmfvc54z7yij39jkj5c528h"; }; nativeBuildInputs = [ setuptools_scm setuptools-scm-git-archive ]; - propagatedBuildInputs = [ more-itertools six ]; + propagatedBuildInputs = [ + # install_requires + jaraco_functools + + more-itertools six + ]; checkInputs = [ jaraco_text diff --git a/pkgs/development/python-modules/dbutils/default.nix b/pkgs/development/python-modules/dbutils/default.nix new file mode 100644 index 00000000000..ec57e8ada05 --- /dev/null +++ b/pkgs/development/python-modules/dbutils/default.nix @@ -0,0 +1,21 @@ +{ stdenv, buildPythonPackage, fetchPypi, pytestCheckHook }: + +buildPythonPackage rec { + version = "2.0"; + pname = "dbutils"; + + src = fetchPypi { + inherit version; + pname = "DBUtils"; + sha256 = "131ifm2c2a7bipij597i8fvjka0dk2qv1xr2ghcvbc30jlkvag2g"; + }; + + checkInputs = [ pytestCheckHook ]; + + meta = with stdenv.lib; { + description = "Database connections for multi-threaded environments"; + homepage = "https://webwareforpython.github.io/DBUtils/"; + license = licenses.mit; + maintainers = with maintainers; [ SuperSandro2000 ]; + }; +} diff --git a/pkgs/development/python-modules/web/default.nix b/pkgs/development/python-modules/web/default.nix index 769ac6d2e5f..ab91d80b8c7 100644 --- a/pkgs/development/python-modules/web/default.nix +++ b/pkgs/development/python-modules/web/default.nix @@ -1,19 +1,26 @@ -{ stdenv -, buildPythonPackage -, fetchPypi -, isPy3k +{ stdenv, buildPythonPackage, fetchPypi, pytestCheckHook +, cheroot +, dbutils, mysqlclient, pymysql, mysql-connector, psycopg2 }: buildPythonPackage rec { version = "0.62"; pname = "web.py"; - disabled = isPy3k; src = fetchPypi { inherit pname version; sha256 = "5ce684caa240654cae5950da8b4b7bc178812031e08f990518d072bd44ab525e"; }; + propagatedBuildInputs = [ cheroot ]; + + # requires multiple running databases + doCheck = false; + + pythonImportsCheck = [ "web" ]; + + checkInputs = [ pytestCheckHook dbutils mysqlclient pymysql mysql-connector psycopg2 ]; + meta = with stdenv.lib; { description = "Makes web apps"; longDescription = '' @@ -22,7 +29,7 @@ buildPythonPackage rec { ''; homepage = "https://webpy.org/"; license = licenses.publicDomain; - maintainers = with maintainers; [ layus ]; + maintainers = with maintainers; [ layus SuperSandro2000 ]; }; } diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 74f8723bc35..cfb9ac52ccb 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1552,6 +1552,8 @@ in { dbus-python = callPackage ../development/python-modules/dbus { inherit (pkgs) dbus pkgconfig; }; + dbutils = callPackage ../development/python-modules/dbutils { }; + dcmstack = callPackage ../development/python-modules/dcmstack { }; ddt = callPackage ../development/python-modules/ddt { };