git.iko.soy/typeable/nixpkgs
on master help sign in
Merge pull request #105198 from SuperSandro2000/fix-web-py
commit2f5037444ea14f93554364f334281bac8348f2de authorSandro <sandro.jaeckel@gmail.com> dateSun 3 Jan 2021, 09:26 (6 years ago) parentada393115ec468
5 files changed+47−8
pkgs/development/python-modules/WSME/default.nix+3 pkgs/development/python-modules/cheroot/default.nix+8−2 pkgs/development/python-modules/dbutils/default.nix+21 pkgs/development/python-modules/web/default.nix+13−6 pkgs/top-level/python-packages.nix+2
pkgs/development/python-modules/WSME/default.nix+3
@@ -1,6 +1,7 @@
11{ lib
22, buildPythonPackage
33, fetchPypi
4+, pythonAtLeast
45, pbr
56, six
67, simplegeneric
@@ -23,6 +24,8 @@ buildPythonPackage rec {
2324 pname = "WSME";
2425 version = "0.10.0";
2526
27+ disabled = pythonAtLeast "3.9";
28+
2629 src = fetchPypi {
2730 inherit pname version;
2831 sha256 = "965b9ce48161e5c50d84aedcf50dca698f05bf07e9d489201bccaec3141cd304";
pkgs/development/python-modules/cheroot/default.nix+8−2
@@ -1,4 +1,5 @@
11{ lib, stdenv, fetchPypi, buildPythonPackage, isPy3k
2+, jaraco_functools
23, jaraco_text
34, more-itertools
45, portend
@@ -23,12 +24,17 @@ buildPythonPackage rec {
2324
2425 src = fetchPypi {
2526 inherit pname version;
26− sha256 = "1089c28a9c320d19fdf9a4b0ed6ace23a0948db1c171a36ac985f3741bc62865";
27+ sha256 = "0r98qqdp9ww5r5ma6wf1n66r9813rrmfvc54z7yij39jkj5c528h";
2728 };
2829
2930 nativeBuildInputs = [ setuptools_scm setuptools-scm-git-archive ];
3031
31− propagatedBuildInputs = [ more-itertools six ];
32+ propagatedBuildInputs = [
33+ # install_requires
34+ jaraco_functools
35+
36+ more-itertools six
37+ ];
3238
3339 checkInputs = [
3440 jaraco_text
pkgs/development/python-modules/dbutils/default.nixnew file+21
@@ -0,0 +1,21 @@
1+{ stdenv, buildPythonPackage, fetchPypi, pytestCheckHook }:
2+
3+buildPythonPackage rec {
4+ version = "2.0";
5+ pname = "dbutils";
6+
7+ src = fetchPypi {
8+ inherit version;
9+ pname = "DBUtils";
10+ sha256 = "131ifm2c2a7bipij597i8fvjka0dk2qv1xr2ghcvbc30jlkvag2g";
11+ };
12+
13+ checkInputs = [ pytestCheckHook ];
14+
15+ meta = with stdenv.lib; {
16+ description = "Database connections for multi-threaded environments";
17+ homepage = "https://webwareforpython.github.io/DBUtils/";
18+ license = licenses.mit;
19+ maintainers = with maintainers; [ SuperSandro2000 ];
20+ };
21+}
pkgs/development/python-modules/web/default.nix+13−6
@@ -1,19 +1,26 @@
1−{ stdenv
2−, buildPythonPackage
3−, fetchPypi
4−, isPy3k
1+{ stdenv, buildPythonPackage, fetchPypi, pytestCheckHook
2+, cheroot
3+, dbutils, mysqlclient, pymysql, mysql-connector, psycopg2
54}:
65
76buildPythonPackage rec {
87 version = "0.62";
98 pname = "web.py";
10− disabled = isPy3k;
119
1210 src = fetchPypi {
1311 inherit pname version;
1412 sha256 = "5ce684caa240654cae5950da8b4b7bc178812031e08f990518d072bd44ab525e";
1513 };
1614
15+ propagatedBuildInputs = [ cheroot ];
16+
17+ # requires multiple running databases
18+ doCheck = false;
19+
20+ pythonImportsCheck = [ "web" ];
21+
22+ checkInputs = [ pytestCheckHook dbutils mysqlclient pymysql mysql-connector psycopg2 ];
23+
1724 meta = with stdenv.lib; {
1825 description = "Makes web apps";
1926 longDescription = ''
@@ -22,7 +29,7 @@ buildPythonPackage rec {
2229 '';
2330 homepage = "https://webpy.org/";
2431 license = licenses.publicDomain;
25− maintainers = with maintainers; [ layus ];
32+ maintainers = with maintainers; [ layus SuperSandro2000 ];
2633 };
2734
2835}
pkgs/top-level/python-packages.nix+2
@@ -1552,6 +1552,8 @@ in {
15521552
15531553 dbus-python = callPackage ../development/python-modules/dbus { inherit (pkgs) dbus pkgconfig; };
15541554
1555+ dbutils = callPackage ../development/python-modules/dbutils { };
1556+
15551557 dcmstack = callPackage ../development/python-modules/dcmstack { };
15561558
15571559 ddt = callPackage ../development/python-modules/ddt { };