aboutsummaryrefslogtreecommitdiff
path: root/nixpkgs/pkgs/development/python-modules
diff options
context:
space:
mode:
Diffstat (limited to 'nixpkgs/pkgs/development/python-modules')
-rw-r--r--nixpkgs/pkgs/development/python-modules/alot/default.nix2
-rw-r--r--nixpkgs/pkgs/development/python-modules/apache-airflow/default.nix9
-rw-r--r--nixpkgs/pkgs/development/python-modules/azure-mgmt-batch/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/azure-mgmt-hanaonazure/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/azure-mgmt-imagebuilder/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/azure-mgmt-loganalytics/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/azure-mgmt-signalr/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/azure-servicebus/default.nix7
-rw-r--r--nixpkgs/pkgs/development/python-modules/batchgenerators/default.nix8
-rw-r--r--nixpkgs/pkgs/development/python-modules/buildbot/default.nix15
-rw-r--r--nixpkgs/pkgs/development/python-modules/buildbot/pkg.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/buildbot/plugins.nix10
-rw-r--r--nixpkgs/pkgs/development/python-modules/buildbot/worker.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/celery/default.nix12
-rw-r--r--nixpkgs/pkgs/development/python-modules/clickclick/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/cookiecutter/default.nix5
-rw-r--r--nixpkgs/pkgs/development/python-modules/django-versatileimagefield/default.nix3
-rw-r--r--nixpkgs/pkgs/development/python-modules/django/2_2.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/flask-autoindex/default.nix8
-rw-r--r--nixpkgs/pkgs/development/python-modules/flower/default.nix32
-rw-r--r--nixpkgs/pkgs/development/python-modules/google-api-python-client/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/google_api_core/default.nix17
-rw-r--r--nixpkgs/pkgs/development/python-modules/google_auth/default.nix14
-rw-r--r--nixpkgs/pkgs/development/python-modules/gst-python/default.nix2
-rw-r--r--nixpkgs/pkgs/development/python-modules/jupyter-sphinx/default.nix32
-rw-r--r--nixpkgs/pkgs/development/python-modules/mautrix/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/minio/default.nix23
-rw-r--r--nixpkgs/pkgs/development/python-modules/owslib/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/papis/default.nix2
-rw-r--r--nixpkgs/pkgs/development/python-modules/parsy/default.nix2
-rw-r--r--nixpkgs/pkgs/development/python-modules/pillow/default.nix26
-rw-r--r--nixpkgs/pkgs/development/python-modules/pre-commit/default.nix16
-rw-r--r--nixpkgs/pkgs/development/python-modules/pre-commit/hook-tmpl-use-the-hardcoded-path-to-pre-commit.patch32
-rw-r--r--nixpkgs/pkgs/development/python-modules/pre-commit/languages-use-the-hardcoded-path-to-python-binaries.patch26
-rw-r--r--nixpkgs/pkgs/development/python-modules/pulp/default.nix11
-rw-r--r--nixpkgs/pkgs/development/python-modules/py4j/default.nix1
-rw-r--r--nixpkgs/pkgs/development/python-modules/pyatspi/default.nix2
-rw-r--r--nixpkgs/pkgs/development/python-modules/pygobject/3.nix2
-rw-r--r--nixpkgs/pkgs/development/python-modules/pymupdf/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/pytest-factoryboy/default.nix43
-rw-r--r--nixpkgs/pkgs/development/python-modules/pythonmagick/default.nix43
-rw-r--r--nixpkgs/pkgs/development/python-modules/shellingham/default.nix1
-rw-r--r--nixpkgs/pkgs/development/python-modules/telethon/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/tenacity/default.nix15
-rw-r--r--nixpkgs/pkgs/development/python-modules/toggl-cli/default.nix23
-rw-r--r--nixpkgs/pkgs/development/python-modules/uamqp/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/wtforms/default.nix18
-rw-r--r--nixpkgs/pkgs/development/python-modules/zope-hookable/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/zope_i18nmessageid/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/zope_lifecycleevent/default.nix11
50 files changed, 403 insertions, 138 deletions
diff --git a/nixpkgs/pkgs/development/python-modules/alot/default.nix b/nixpkgs/pkgs/development/python-modules/alot/default.nix
index a2012132024..04b2d898e66 100644
--- a/nixpkgs/pkgs/development/python-modules/alot/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/alot/default.nix
@@ -61,6 +61,6 @@ buildPythonPackage rec {
description = "Terminal MUA using notmuch mail";
license = licenses.gpl3;
platforms = platforms.linux;
- maintainers = with maintainers; [ aepsil0n ];
+ maintainers = with maintainers; [ edibopp ];
};
}
diff --git a/nixpkgs/pkgs/development/python-modules/apache-airflow/default.nix b/nixpkgs/pkgs/development/python-modules/apache-airflow/default.nix
index 706648f56a3..f8ef6b9492a 100644
--- a/nixpkgs/pkgs/development/python-modules/apache-airflow/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/apache-airflow/default.nix
@@ -52,13 +52,16 @@
, typing
, nose
, python
-, isPy3k
+, pythonOlder
+, pythonAtLeast
}:
buildPythonPackage rec {
pname = "apache-airflow";
version = "1.10.5";
- disabled = (!isPy3k);
+ # Upstream does not yet support python 3.8
+ # https://github.com/apache/airflow/issues/8674
+ disabled = pythonOlder "3.5" || pythonAtLeast "3.8";
src = fetchFromGitHub rec {
owner = "apache";
@@ -189,6 +192,6 @@ buildPythonPackage rec {
description = "Programmatically author, schedule and monitor data pipelines";
homepage = "http://airflow.apache.org/";
license = licenses.asl20;
- maintainers = with maintainers; [ costrouc ingenieroariel ];
+ maintainers = with maintainers; [ bhipple costrouc ingenieroariel ];
};
}
diff --git a/nixpkgs/pkgs/development/python-modules/azure-mgmt-batch/default.nix b/nixpkgs/pkgs/development/python-modules/azure-mgmt-batch/default.nix
index 19be6d28e17..5a1b7600ecf 100644
--- a/nixpkgs/pkgs/development/python-modules/azure-mgmt-batch/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/azure-mgmt-batch/default.nix
@@ -10,12 +10,12 @@
buildPythonPackage rec {
pname = "azure-mgmt-batch";
- version = "8.0.0";
+ version = "9.0.0";
src = fetchPypi {
inherit pname version;
extension = "zip";
- sha256 = "228ea058361763a5a31273df7d813b9134d0ecff4567c533eb7e1afaf772fbc7";
+ sha256 = "03417eecfa1fac906e674cb1cb43ed7da27a96277277b091d7c389ba39f6c3fe";
};
propagatedBuildInputs = [
diff --git a/nixpkgs/pkgs/development/python-modules/azure-mgmt-hanaonazure/default.nix b/nixpkgs/pkgs/development/python-modules/azure-mgmt-hanaonazure/default.nix
index c23ebfc2ce9..fd0c527344c 100644
--- a/nixpkgs/pkgs/development/python-modules/azure-mgmt-hanaonazure/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/azure-mgmt-hanaonazure/default.nix
@@ -10,12 +10,12 @@
buildPythonPackage rec {
pname = "azure-mgmt-hanaonazure";
- version = "0.13.0";
+ version = "0.14.0";
src = fetchPypi {
inherit pname version;
extension = "zip";
- sha256 = "cc4058174e371a0b68b305cd5a082fcca47f3446dd9aefd9ada72da4bd637da9";
+ sha256 = "7f8b912ca62431c1697b4914c12cc5f8123e60ee6c65d123591f937744d204e0";
};
propagatedBuildInputs = [
diff --git a/nixpkgs/pkgs/development/python-modules/azure-mgmt-imagebuilder/default.nix b/nixpkgs/pkgs/development/python-modules/azure-mgmt-imagebuilder/default.nix
index f5b04c36b0d..404caf4ebf5 100644
--- a/nixpkgs/pkgs/development/python-modules/azure-mgmt-imagebuilder/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/azure-mgmt-imagebuilder/default.nix
@@ -5,13 +5,13 @@
}:
buildPythonPackage rec {
- version = "0.3.0";
+ version = "0.4.0";
pname = "azure-mgmt-imagebuilder";
disabled = isPy27;
src = fetchPypi {
inherit pname version;
- sha256 = "0r4sxr3pbcci5qif1ip1lrix3cryj0b3asqch3zds4q705jiakc4";
+ sha256 = "4c9291bf16b40b043637e5e4f15650f71418ac237393e62219cab478a7951733";
extension = "zip";
};
diff --git a/nixpkgs/pkgs/development/python-modules/azure-mgmt-loganalytics/default.nix b/nixpkgs/pkgs/development/python-modules/azure-mgmt-loganalytics/default.nix
index eb4772ce543..69c1aaffada 100644
--- a/nixpkgs/pkgs/development/python-modules/azure-mgmt-loganalytics/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/azure-mgmt-loganalytics/default.nix
@@ -11,12 +11,12 @@
buildPythonPackage rec {
pname = "azure-mgmt-loganalytics";
- version = "0.5.0";
+ version = "0.6.0";
src = fetchPypi {
inherit pname version;
extension = "zip";
- sha256 = "16f4c4f676ea718b7e1c59bd9a516fcfc796f1aff844b183a7ce9afe69fb214d";
+ sha256 = "a1527fe8b1e8a47558bfa03bd6c587706d8fb9213142aea42da07397daa2d039";
};
propagatedBuildInputs = [
diff --git a/nixpkgs/pkgs/development/python-modules/azure-mgmt-signalr/default.nix b/nixpkgs/pkgs/development/python-modules/azure-mgmt-signalr/default.nix
index 2ccb773c105..8192064626e 100644
--- a/nixpkgs/pkgs/development/python-modules/azure-mgmt-signalr/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/azure-mgmt-signalr/default.nix
@@ -9,12 +9,12 @@
buildPythonPackage rec {
pname = "azure-mgmt-signalr";
- version = "0.3.0";
+ version = "0.4.0";
src = fetchPypi {
inherit pname version;
extension = "zip";
- sha256 = "08b2i6wz9n13h77ahay1hvmg8abk2vvs7kn4y7xip9gi6ij8fv0a";
+ sha256 = "6503ddda9d6f4b634dfeb8eb4bcd14ede5e0900585f6c83bf9010cf82215c126";
};
propagatedBuildInputs = [
diff --git a/nixpkgs/pkgs/development/python-modules/azure-servicebus/default.nix b/nixpkgs/pkgs/development/python-modules/azure-servicebus/default.nix
index 02460b27952..2a3552d1fb5 100644
--- a/nixpkgs/pkgs/development/python-modules/azure-servicebus/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/azure-servicebus/default.nix
@@ -10,12 +10,12 @@
buildPythonPackage rec {
pname = "azure-servicebus";
- version = "0.50.2";
+ version = "0.50.3";
src = fetchPypi {
inherit pname version;
extension = "zip";
- sha256 = "836649d510aa2b7467bc87d8dab18f2db917b63aa2fe8f3e5d0bb44011e465f5";
+ sha256 = "2b1e60c81fcf5b6a5bb3ceddb27f24543f479912e39a4706a390a16d8c0a71f4";
};
buildInputs = [
@@ -29,6 +29,9 @@ buildPythonPackage rec {
# has no tests
doCheck = false;
+ # python2 will fail due to pep 420
+ pythonImportsCheck = lib.optionals isPy3k [ "azure.servicebus" ];
+
meta = with lib; {
description = "This is the Microsoft Azure Service Bus Client Library";
homepage = "https://github.com/Azure/azure-sdk-for-python";
diff --git a/nixpkgs/pkgs/development/python-modules/batchgenerators/default.nix b/nixpkgs/pkgs/development/python-modules/batchgenerators/default.nix
index 63aa7883e3a..bfc52c99ef5 100644
--- a/nixpkgs/pkgs/development/python-modules/batchgenerators/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/batchgenerators/default.nix
@@ -2,6 +2,7 @@
, buildPythonPackage
, isPy27
, fetchFromGitHub
+, fetchpatch
, pytest
, unittest2
, future
@@ -27,6 +28,13 @@ buildPythonPackage rec {
};
+ patches = [
+ (fetchpatch {
+ url = "https://github.com/MIC-DKFZ/batchgenerators/pull/59.patch";
+ sha256 = "171b3dm40yn0wi91m9s2nq3j565s1w39jpdf1mvc03rn75i8vdp0";
+ })
+ ];
+
propagatedBuildInputs = [
future numpy pillow scipy scikitlearn scikitimage threadpoolctl
];
diff --git a/nixpkgs/pkgs/development/python-modules/buildbot/default.nix b/nixpkgs/pkgs/development/python-modules/buildbot/default.nix
index b088480f5de..f9a73d24831 100644
--- a/nixpkgs/pkgs/development/python-modules/buildbot/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/buildbot/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, buildPythonPackage, fetchPypi, fetchpatch, makeWrapper, isPy3k,
+{ stdenv, lib, buildPythonPackage, fetchFromGitHub, fetchpatch, makeWrapper, isPy3k,
python, twisted, jinja2, zope_interface, future, sqlalchemy,
sqlalchemy_migrate, dateutil, txaio, autobahn, pyjwt, pyyaml, treq,
txrequests, pyjade, boto3, moto, mock, python-lz4, setuptoolsTrial,
@@ -25,12 +25,17 @@ let
package = buildPythonPackage rec {
pname = "buildbot";
- version = "2.7.0";
+ version = "2.8.0";
- src = fetchPypi {
- inherit pname version;
- sha256 = "0jj8fh611n7xc3vsfbgpqsllp38cfj3spkr2kz3ara2x7jvh3406";
+ # tests fail with the 2.8.0 sdist, so fetchFromGitHub instead
+ # https://github.com/buildbot/buildbot/pull/5322
+ src = fetchFromGitHub {
+ owner = "buildbot";
+ repo = "buildbot";
+ rev = "v${version}";
+ sha256 = "0akd61mgjp53c3vyf2yyzd0xf0cjwpvsi7g8pz72xrvnil1s4w7k";
};
+ sourceRoot = "./source/master";
propagatedBuildInputs = [
# core
diff --git a/nixpkgs/pkgs/development/python-modules/buildbot/pkg.nix b/nixpkgs/pkgs/development/python-modules/buildbot/pkg.nix
index cb3124ec7e3..12a7e99984f 100644
--- a/nixpkgs/pkgs/development/python-modules/buildbot/pkg.nix
+++ b/nixpkgs/pkgs/development/python-modules/buildbot/pkg.nix
@@ -2,11 +2,11 @@
buildPythonPackage rec {
pname = "buildbot-pkg";
- version = "2.7.0";
+ version = "2.8.0";
src = fetchPypi {
inherit pname version;
- sha256 = "03zb09r8w8dvd9qas7h6gdwlqc7q482ikph6h3708lpnkn72xdkb";
+ sha256 = "09sf36h8q8wrp0n57nb9915k86qdjyjj4xpdzy8q4s9z121iw0xz";
};
postPatch = ''
diff --git a/nixpkgs/pkgs/development/python-modules/buildbot/plugins.nix b/nixpkgs/pkgs/development/python-modules/buildbot/plugins.nix
index cd35f14fb37..abb5d356540 100644
--- a/nixpkgs/pkgs/development/python-modules/buildbot/plugins.nix
+++ b/nixpkgs/pkgs/development/python-modules/buildbot/plugins.nix
@@ -7,7 +7,7 @@
src = fetchPypi {
inherit pname version;
- sha256 = "1d8xdk4rq4p3fw03cvz7d1pmpjjbyrnzzjifzv46q88vk7jakgxi";
+ sha256 = "1xq7pqvvsvgd2n38yzk0bqx943ldxsldrdcldwjshazq831rbdbn";
};
# Remove unneccessary circular dependency on buildbot
@@ -34,7 +34,7 @@
src = fetchPypi {
inherit pname version;
- sha256 = "03pl75avi6cmmhjvfn0a0b4drn35yv37kvgn04zjdwa3m6p3haa8";
+ sha256 = "0ixq8x845glnykpab2z0vhwp69nbw98mg0df34kf32wjvm8j6kjh";
};
buildInputs = [ buildbot-pkg ];
@@ -56,7 +56,7 @@
src = fetchPypi {
inherit pname version;
- sha256 = "0rzjk3qmlvid8qag3r00zaszchncl1nl8l2yapvc1zqh2dqlln58";
+ sha256 = "1gn0amv8l0n0ny1x78g8x4rpfsnhcs9gkws2zw3nx78y4pbs6lw5";
};
buildInputs = [ buildbot-pkg ];
@@ -78,7 +78,7 @@
src = fetchPypi {
inherit pname version;
- sha256 = "1n4j73y9kwfqk7dz1fh1bpan68vlpnbz7idxpmsphyay8w8y9dd4";
+ sha256 = "04c0m4liyl4aaksq9x8wncasacfv0vgl0igafnhf440cf9lhkkwy";
};
buildInputs = [ buildbot-pkg ];
@@ -100,7 +100,7 @@
src = fetchPypi {
inherit pname version;
- sha256 = "1babkcgxczs6zfk2b6jmsy2vwbrgdydrp2px1mfwa3wmv8fwlssg";
+ sha256 = "0c7lr4q3dvz3zhbnsvs2chsc6yn2jh10dnh1y66axdxk8hpqs3nc";
};
buildInputs = [ buildbot-pkg ];
diff --git a/nixpkgs/pkgs/development/python-modules/buildbot/worker.nix b/nixpkgs/pkgs/development/python-modules/buildbot/worker.nix
index 365ca0bcf14..4f77fb7ae06 100644
--- a/nixpkgs/pkgs/development/python-modules/buildbot/worker.nix
+++ b/nixpkgs/pkgs/development/python-modules/buildbot/worker.nix
@@ -3,11 +3,11 @@
buildPythonPackage (rec {
pname = "buildbot-worker";
- version = "2.7.0";
+ version = "2.8.0";
src = fetchPypi {
inherit pname version;
- sha256 = "1vwy46acvczgk1hhpsqdwpcw55j4hm5pkw6j01f92axiga8r5jk6";
+ sha256 = "19pabha9jh3jnz9micfn5y4khnx4q6g1zc27wvfw6663mw6spykx";
};
propagatedBuildInputs = [ twisted future ];
diff --git a/nixpkgs/pkgs/development/python-modules/celery/default.nix b/nixpkgs/pkgs/development/python-modules/celery/default.nix
index d0d4f2e69fb..740023c1fdb 100644
--- a/nixpkgs/pkgs/development/python-modules/celery/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/celery/default.nix
@@ -4,14 +4,16 @@
buildPythonPackage rec {
pname = "celery";
- version = "4.4.2";
+ version = "4.4.4";
src = fetchPypi {
inherit pname version;
- sha256 = "0ps1c6ill7q0m5kzb87hisgshdk3kzpa6cvcjch1d1wa07whp2hh";
+ sha256 = "0zk42fxznrhww0dxak9b6nkfqg02z49zr839k6ql7nk3him7n0y2";
};
postPatch = ''
+ substituteInPlace requirements/default.txt \
+ --replace "kombu>=4.6.10,<4.7" "kombu"
substituteInPlace requirements/test.txt \
--replace "moto==1.3.7" moto \
--replace "pytest>=4.3.1,<4.4.0" pytest
@@ -20,9 +22,13 @@ buildPythonPackage rec {
# ignore test that's incompatible with pytest5
# test_eventlet touches network
# test_mongodb requires pymongo
+ # test_multi tries to create directories under /var
checkPhase = ''
- pytest -k 'not restore_current_app_fallback and not msgpack and not on_apply' \
+ pytest -k 'not restore_current_app_fallback and not msgpack and not on_apply and not pytest' \
+ --ignore=t/unit/contrib/test_pytest.py \
--ignore=t/unit/concurrency/test_eventlet.py \
+ --ignore=t/unit/bin/test_multi.py \
+ --ignore=t/unit/apps/test_multi.py \
--ignore=t/unit/backends/test_mongodb.py
'';
diff --git a/nixpkgs/pkgs/development/python-modules/clickclick/default.nix b/nixpkgs/pkgs/development/python-modules/clickclick/default.nix
index d35c356c822..b2e23dc55bd 100644
--- a/nixpkgs/pkgs/development/python-modules/clickclick/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/clickclick/default.nix
@@ -14,8 +14,10 @@ buildPythonPackage rec {
checkInputs = [ pytestCheckHook pytestcov ];
propagatedBuildInputs = [ flake8 click pyyaml six ];
- disabledTests = lib.optionals isPy36 [
+ # test_cli asserts on exact quoting style of output
+ disabledTests = [
"test_cli"
+ ] ++ lib.optionals isPy36 [
"test_choice_default"
];
diff --git a/nixpkgs/pkgs/development/python-modules/cookiecutter/default.nix b/nixpkgs/pkgs/development/python-modules/cookiecutter/default.nix
index 34c21372aee..873cbe142d9 100644
--- a/nixpkgs/pkgs/development/python-modules/cookiecutter/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/cookiecutter/default.nix
@@ -1,6 +1,7 @@
{ stdenv, buildPythonPackage, fetchPypi, isPyPy
, pytest, pytestcov, pytest-mock, freezegun
-, jinja2, future, binaryornot, click, whichcraft, poyo, jinja2_time, requests }:
+, jinja2, future, binaryornot, click, whichcraft, poyo, jinja2_time, requests
+, python-slugify }:
buildPythonPackage rec {
pname = "cookiecutter";
@@ -16,7 +17,7 @@ buildPythonPackage rec {
checkInputs = [ pytest pytestcov pytest-mock freezegun ];
propagatedBuildInputs = [
- jinja2 future binaryornot click whichcraft poyo jinja2_time requests
+ jinja2 future binaryornot click whichcraft poyo jinja2_time requests python-slugify
];
# requires network access for cloning git repos
diff --git a/nixpkgs/pkgs/development/python-modules/django-versatileimagefield/default.nix b/nixpkgs/pkgs/development/python-modules/django-versatileimagefield/default.nix
index 90993db4c5b..4eb9a8da773 100644
--- a/nixpkgs/pkgs/development/python-modules/django-versatileimagefield/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/django-versatileimagefield/default.nix
@@ -4,6 +4,7 @@
, django
, python
, pillow
+, python_magic
}:
buildPythonPackage rec {
@@ -14,7 +15,7 @@ buildPythonPackage rec {
inherit pname version;
sha256 = "8322ee9d7bf5ffa5360990320d2cc2efc7017feff35422636d49f625721edf82";
};
- propagatedBuildInputs = [ pillow ];
+ propagatedBuildInputs = [ pillow python_magic ];
checkInputs = [ django ];
diff --git a/nixpkgs/pkgs/development/python-modules/django/2_2.nix b/nixpkgs/pkgs/development/python-modules/django/2_2.nix
index 70cba819e92..42af34659c0 100644
--- a/nixpkgs/pkgs/development/python-modules/django/2_2.nix
+++ b/nixpkgs/pkgs/development/python-modules/django/2_2.nix
@@ -6,13 +6,13 @@
buildPythonPackage rec {
pname = "Django";
- version = "2.2.11";
+ version = "2.2.13";
disabled = !isPy3k;
src = fetchPypi {
inherit pname version;
- sha256 = "0l0gndky4nwc1jk68b31m583a9g0fhmll903p0xislyyddz3iqk5";
+ sha256 = "103db5gmny6bkq9jgr2m6gdfy1n29bj2v87184y1zgpdmkv71ww4";
};
patches = stdenv.lib.optional withGdal
diff --git a/nixpkgs/pkgs/development/python-modules/flask-autoindex/default.nix b/nixpkgs/pkgs/development/python-modules/flask-autoindex/default.nix
index 48a80f09771..26b6977116f 100644
--- a/nixpkgs/pkgs/development/python-modules/flask-autoindex/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/flask-autoindex/default.nix
@@ -1,9 +1,11 @@
-{ stdenv
+{ lib
, buildPythonPackage
+, pythonOlder
, fetchPypi
, flask
, flask-silk
, future
+, pathlib
}:
buildPythonPackage rec {
@@ -19,9 +21,11 @@ buildPythonPackage rec {
flask
flask-silk
future
+ ] ++ lib.optionals (pythonOlder "3.4") [
+ pathlib
];
- meta = with stdenv.lib; {
+ meta = with lib; {
description = "The mod_autoindex for Flask";
longDescription = ''
Flask-AutoIndex generates an index page for your Flask application automatically.
diff --git a/nixpkgs/pkgs/development/python-modules/flower/default.nix b/nixpkgs/pkgs/development/python-modules/flower/default.nix
index 2b578134174..3a2f987ed51 100644
--- a/nixpkgs/pkgs/development/python-modules/flower/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/flower/default.nix
@@ -1,22 +1,42 @@
-{ lib, buildPythonPackage, fetchPypi, Babel, celery, importlib-metadata, pytz, tornado, mock }:
+{ lib
+, buildPythonPackage
+, fetchPypi
+, Babel
+, celery
+, future
+, humanize
+, importlib-metadata
+, mock
+, pytz
+, tornado
+}:
buildPythonPackage rec {
pname = "flower";
version = "0.9.4";
-
+
src = fetchPypi {
inherit pname version;
sha256 = "25782840f7ffc25dcf478d94535a2d815448de4aa6c71426be6abfa9ca417448";
};
- propagatedBuildInputs = [ Babel celery importlib-metadata pytz tornado ];
-
+ # flower and humanize aren't listed in setup.py but imported
+ propagatedBuildInputs = [
+ Babel
+ celery
+ future
+ importlib-metadata
+ pytz
+ tornado
+ humanize
+ ];
+
checkInputs = [ mock ];
-
+
meta = with lib; {
description = "Celery Flower";
homepage = "https://github.com/mher/flower";
- license = licenses.bsdOriginal;
+ license = licenses.bsdOriginal;
maintainers = [ maintainers.arnoldfarkas ];
};
}
diff --git a/nixpkgs/pkgs/development/python-modules/google-api-python-client/default.nix b/nixpkgs/pkgs/development/python-modules/google-api-python-client/default.nix
index 12668e979d2..c70496b2b9f 100644
--- a/nixpkgs/pkgs/development/python-modules/google-api-python-client/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/google-api-python-client/default.nix
@@ -4,11 +4,11 @@
buildPythonPackage rec {
pname = "google-api-python-client";
- version = "1.8.4";
+ version = "1.9.1";
src = fetchPypi {
inherit pname version;
- sha256 = "06csvbpdv3kl806nqvh5hpag86wpafp1q9r07m7kc1fw3xhi5qmv";
+ sha256 = "0nfqf62g3l7ij779ind41p800ahdjijkhqx8nq6y029p98672c52";
};
# No tests included in archive
diff --git a/nixpkgs/pkgs/development/python-modules/google_api_core/default.nix b/nixpkgs/pkgs/development/python-modules/google_api_core/default.nix
index f3209c2d520..1efec99d8f7 100644
--- a/nixpkgs/pkgs/development/python-modules/google_api_core/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/google_api_core/default.nix
@@ -1,14 +1,16 @@
{ lib, buildPythonPackage, fetchPypi, pythonOlder, isPy27
-, google_auth, protobuf, googleapis_common_protos, requests, setuptools, grpcio, mock }:
+, google_auth, protobuf, googleapis_common_protos, requests, setuptools, grpcio
+, mock
+}:
buildPythonPackage rec {
pname = "google-api-core";
- version = "1.16.0";
+ version = "1.17.0";
disabled = isPy27; # google namespace no longer works on python2
src = fetchPypi {
inherit pname version;
- sha256 = "1qh30ji399gngv2j1czzvi3h0mgx3lfdx2n8qp8vii7ihyh65scj";
+ sha256 = "12fn05x2fdhqmcaspjkkny2lh66hnnl0xf6pz3idxhlx8w5jl274";
};
propagatedBuildInputs = [
@@ -27,8 +29,13 @@ buildPythonPackage rec {
];
meta = with lib; {
- description = "This library is not meant to stand-alone. Instead it defines common helpers used by all Google API clients.";
- homepage = "https://github.com/GoogleCloudPlatform/google-cloud-python";
+ description = "Core Library for Google Client Libraries";
+ longDescription = ''
+ This library is not meant to stand-alone. Instead it defines common
+ helpers used by all Google API clients.
+ '';
+ homepage = "https://github.com/googleapis/python-api-core";
+ changelog = "https://github.com/googleapis/python-api-core/blob/v${version}/CHANGELOG.md";
license = licenses.asl20;
maintainers = with maintainers; [ ];
};
diff --git a/nixpkgs/pkgs/development/python-modules/google_auth/default.nix b/nixpkgs/pkgs/development/python-modules/google_auth/default.nix
index d8c6a12aeaa..92369abec6d 100644
--- a/nixpkgs/pkgs/development/python-modules/google_auth/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/google_auth/default.nix
@@ -17,11 +17,11 @@
buildPythonPackage rec {
pname = "google-auth";
- version = "1.11.3";
+ version = "1.16.0";
src = fetchPypi {
inherit pname version;
- sha256 = "05av4clwv7kdk1v55ibcv8aim6dwfg1mi4wy0vv91fr6wq3205zc";
+ sha256 = "1xd7fi7vhqbbkvwjg5fgj8bkbfjwxx4f2bb0zsnj8wci46qk4dqv";
};
propagatedBuildInputs = [ six pyasn1-modules cachetools rsa setuptools ];
@@ -43,8 +43,14 @@ buildPythonPackage rec {
'';
meta = with stdenv.lib; {
- description = "This library simplifies using Google’s various server-to-server authentication mechanisms to access Google APIs.";
- homepage = "https://google-auth.readthedocs.io/en/latest/";
+ description = "Google Auth Python Library";
+ longDescription = ''
+ This library simplifies using Google’s various server-to-server
+ authentication mechanisms to access Google APIs.
+ '';
+ homepage = "https://github.com/googleapis/google-auth-library-python";
+ changelog = "https://github.com/googleapis/google-auth-library-python/blob/v${version}/CHANGELOG.md";
+ # Documentation: https://googleapis.dev/python/google-auth/latest/index.html
license = licenses.asl20;
maintainers = with maintainers; [ ];
};
diff --git a/nixpkgs/pkgs/development/python-modules/gst-python/default.nix b/nixpkgs/pkgs/development/python-modules/gst-python/default.nix
index 11080d3fbc8..dc15e4b043d 100644
--- a/nixpkgs/pkgs/development/python-modules/gst-python/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/gst-python/default.nix
@@ -22,7 +22,7 @@ buildPythonPackage rec {
src = fetchurl {
url = "${meta.homepage}/src/gst-python/${pname}-${version}.tar.xz";
- sha256 = "II3zFI1z2fQW0BZWRzdYXY6nY9kSAXMtRLX+aIxiiKg=";
+ sha256 = "1a48ca66izmm8hnp608jv5isg3jxb0vlfmhns0bg9nbkilag7390";
};
nativeBuildInputs = [
diff --git a/nixpkgs/pkgs/development/python-modules/jupyter-sphinx/default.nix b/nixpkgs/pkgs/development/python-modules/jupyter-sphinx/default.nix
new file mode 100644
index 00000000000..9f2143e2f20
--- /dev/null
+++ b/nixpkgs/pkgs/development/python-modules/jupyter-sphinx/default.nix
@@ -0,0 +1,32 @@
+{ lib
+, buildPythonPackage
+, fetchPypi
+, nbformat
+, sphinx
+, ipywidgets
+, pythonOlder
+}:
+
+buildPythonPackage rec {
+ pname = "jupyter-sphinx";
+ version = "0.2.4";
+
+ src = fetchPypi {
+ inherit version;
+ pname = "jupyter_sphinx";
+ sha256 = "b5ba1efdd1488b385de0068036a665932ed93998e40ce3a342c60f0926781fd9";
+ };
+
+ propagatedBuildInputs = [ nbformat sphinx ipywidgets ];
+
+ doCheck = false;
+
+ disabled = pythonOlder "3.5";
+
+ meta = with lib; {
+ description = "Jupyter Sphinx Extensions";
+ homepage = "https://github.com/jupyter/jupyter-sphinx/";
+ license = licenses.bsd3;
+ };
+
+} \ No newline at end of file
diff --git a/nixpkgs/pkgs/development/python-modules/mautrix/default.nix b/nixpkgs/pkgs/development/python-modules/mautrix/default.nix
index a9310af1432..1bf23111422 100644
--- a/nixpkgs/pkgs/development/python-modules/mautrix/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/mautrix/default.nix
@@ -4,11 +4,11 @@
buildPythonPackage rec {
pname = "mautrix";
- version = "0.4.2";
+ version = "0.5.0";
src = fetchPypi {
inherit pname version;
- sha256 = "0f8pzi7ip82p7hn6d9xrgp5wsl4s3w6gmjsgb8gjy2606f7czqyg";
+ sha256 = "0hcm2hwryfr6js33zcl2k95wbjrgcj89pi90lka0hjw9vs9bmdz6";
};
propagatedBuildInputs = [
diff --git a/nixpkgs/pkgs/development/python-modules/minio/default.nix b/nixpkgs/pkgs/development/python-modules/minio/default.nix
index f1255f3636c..6fdc962cdb4 100644
--- a/nixpkgs/pkgs/development/python-modules/minio/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/minio/default.nix
@@ -1,19 +1,34 @@
{ lib, buildPythonPackage, isPy3k, fetchPypi
-, urllib3, future, python-dateutil , pytz, faker, mock, nose }:
+, configparser
+, faker
+, future
+, mock
+, nose
+, python-dateutil
+, pytz
+, pytestCheckHook
+, urllib3
+}:
buildPythonPackage rec {
pname = "minio";
version = "5.0.10";
+ disabled = !isPy3k;
src = fetchPypi {
inherit pname version;
sha256 = "6ecb7637a35f806733e9d112eacfa599a58d7c3d4698fda2b5c86fff5d34b417";
};
- disabled = !isPy3k;
+ propagatedBuildInputs = [
+ configparser
+ future
+ python-dateutil
+ pytz
+ urllib3
+ ];
- checkInputs = [ faker mock nose ];
- propagatedBuildInputs = [ urllib3 python-dateutil pytz future ];
+ checkInputs = [ faker mock nose pytestCheckHook ];
meta = with lib; {
description = "Simple APIs to access any Amazon S3 compatible object storage server";
diff --git a/nixpkgs/pkgs/development/python-modules/owslib/default.nix b/nixpkgs/pkgs/development/python-modules/owslib/default.nix
index e5dea71c8fd..b19e41116f0 100644
--- a/nixpkgs/pkgs/development/python-modules/owslib/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/owslib/default.nix
@@ -1,4 +1,4 @@
-{ lib, buildPythonPackage, fetchPypi, dateutil, requests, pytz, pyproj , pytest } :
+{ lib, buildPythonPackage, fetchPypi, dateutil, requests, pytz, pyproj , pytest, pyyaml } :
buildPythonPackage rec {
pname = "OWSLib";
version = "0.19.2";
@@ -9,7 +9,7 @@ buildPythonPackage rec {
};
buildInputs = [ pytest ];
- propagatedBuildInputs = [ dateutil pyproj pytz requests ];
+ propagatedBuildInputs = [ dateutil pyproj pytz requests pyyaml ];
# 'tests' dir not included in pypy distribution archive.
doCheck = false;
diff --git a/nixpkgs/pkgs/development/python-modules/papis/default.nix b/nixpkgs/pkgs/development/python-modules/papis/default.nix
index 39b324dd55c..fbfb72bb8a0 100644
--- a/nixpkgs/pkgs/development/python-modules/papis/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/papis/default.nix
@@ -19,7 +19,7 @@ buildPythonPackage rec {
owner = "papis";
repo = pname;
rev = "v${version}";
- sha256 = "kzA8nlglbjHDPEB7HRAY2dza1Umn/OYUu+ydbA1OJ5Y=";
+ sha256 = "15i79q6nr7gcpcafdz5797axmp6r3081sys07k1k2vi5b2g3qc4k";
};
propagatedBuildInputs = [
diff --git a/nixpkgs/pkgs/development/python-modules/parsy/default.nix b/nixpkgs/pkgs/development/python-modules/parsy/default.nix
index 156da088547..ab4aeba84b6 100644
--- a/nixpkgs/pkgs/development/python-modules/parsy/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/parsy/default.nix
@@ -21,6 +21,6 @@ buildPythonPackage rec {
homepage = "https://github.com/python-parsy/parsy";
description = "Easy-to-use parser combinators, for parsing in pure Python";
license = [ licenses.mit ];
- maintainers = with maintainers; [ aepsil0n ];
+ maintainers = with maintainers; [ edibopp ];
};
}
diff --git a/nixpkgs/pkgs/development/python-modules/pillow/default.nix b/nixpkgs/pkgs/development/python-modules/pillow/default.nix
index 4e8a47569b7..2f9fac6c3d1 100644
--- a/nixpkgs/pkgs/development/python-modules/pillow/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pillow/default.nix
@@ -1,32 +1,40 @@
{ stdenv, buildPythonPackage, fetchPypi, isPyPy
, olefile
, freetype, libjpeg, zlib, libtiff, libwebp, tcl, lcms2, tk, libX11
-, pytestrunner
-, pytest
+, openjpeg, libimagequant
+, pytest, pytestrunner, pyroma, numpy
+, isPy3k
}:
+
buildPythonPackage rec {
pname = "Pillow";
- version = "6.2.2";
+ version = "7.1.2";
+
+ disabled = !isPy3k;
src = fetchPypi {
inherit pname version;
- sha256 = "db9ff0c251ed066d367f53b64827cc9e18ccea001b986d08c265e53625dab950";
+ sha256 = "1pdh1zzdwxilvsjg6rnl4q810pc2p2y16q6lx9gzzihb25h9kd50";
};
- doCheck = !stdenv.isDarwin && !isPyPy;
-
# Disable imagefont tests, because they don't work well with infinality:
# https://github.com/python-pillow/Pillow/issues/1259
postPatch = ''
rm Tests/test_imagefont.py
'';
+ checkPhase = ''
+ runHook preCheck
+ python -m pytest -v -x -W always
+ runHook postCheck
+ '';
+
propagatedBuildInputs = [ olefile ];
- checkInputs = [ pytest pytestrunner ];
+ checkInputs = [ pytest pytestrunner pyroma numpy ];
buildInputs = [
- freetype libjpeg zlib libtiff libwebp tcl lcms2 ]
+ freetype libjpeg openjpeg libimagequant zlib libtiff libwebp tcl lcms2 ]
++ stdenv.lib.optionals (isPyPy) [ tk libX11 ];
# NOTE: we use LCMS_ROOT as WEBP root since there is not other setting for webp.
@@ -45,6 +53,8 @@ buildPythonPackage rec {
sed -i "setup.py" \
-e 's|^FREETYPE_ROOT =.*$|FREETYPE_ROOT = ${libinclude freetype}|g ;
s|^JPEG_ROOT =.*$|JPEG_ROOT = ${libinclude libjpeg}|g ;
+ s|^JPEG2K_ROOT =.*$|JPEG2K_ROOT = ${libinclude openjpeg}|g ;
+ s|^IMAGEQUANT_ROOT =.*$|IMAGEQUANT_ROOT = ${libinclude' libimagequant}|g ;
s|^ZLIB_ROOT =.*$|ZLIB_ROOT = ${libinclude zlib}|g ;
s|^LCMS_ROOT =.*$|LCMS_ROOT = ${libinclude lcms2}|g ;
s|^TIFF_ROOT =.*$|TIFF_ROOT = ${libinclude libtiff}|g ;
diff --git a/nixpkgs/pkgs/development/python-modules/pre-commit/default.nix b/nixpkgs/pkgs/development/python-modules/pre-commit/default.nix
index 6d0a7d301ed..a933093bef4 100644
--- a/nixpkgs/pkgs/development/python-modules/pre-commit/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pre-commit/default.nix
@@ -6,6 +6,7 @@
, identify
, importlib-metadata
, importlib-resources
+, isPy27
, nodeenv
, python
, six
@@ -15,16 +16,18 @@
buildPythonPackage rec {
pname = "pre-commit";
- version = "1.21.0";
+ version = "2.4.0";
+ disabled = isPy27;
src = fetchPypi {
inherit version;
pname = "pre_commit";
- sha256 = "0l5qg1cw4a0670m96s0ryy5mqz5aslfrrnwpriqgmrnsgdixhj4g";
+ sha256 = "1l0lcl3l2544m2k8jlmblfsjn0p2hdxrzzwy646xpvp0rcs2wgkh";
};
patches = [
./hook-tmpl-use-the-hardcoded-path-to-pre-commit.patch
+ ./languages-use-the-hardcoded-path-to-python-binaries.patch
];
propagatedBuildInputs = [
@@ -36,9 +39,8 @@ buildPythonPackage rec {
six
toml
virtualenv
- importlib-metadata
- ] ++ lib.optional (pythonOlder "3.7") importlib-resources
- ++ lib.optional (pythonOlder "3.2") futures;
+ ] ++ lib.optional (pythonOlder "3.8") importlib-metadata
+ ++ lib.optional (pythonOlder "3.7") importlib-resources;
# slow and impure
doCheck = false;
@@ -46,6 +48,10 @@ buildPythonPackage rec {
preFixup = ''
substituteInPlace $out/${python.sitePackages}/pre_commit/resources/hook-tmpl \
--subst-var-by pre-commit $out
+ substituteInPlace $out/${python.sitePackages}/pre_commit/languages/python.py \
+ --subst-var-by virtualenv ${virtualenv}
+ substituteInPlace $out/${python.sitePackages}/pre_commit/languages/node.py \
+ --subst-var-by nodeenv ${nodeenv}
'';
meta = with lib; {
diff --git a/nixpkgs/pkgs/development/python-modules/pre-commit/hook-tmpl-use-the-hardcoded-path-to-pre-commit.patch b/nixpkgs/pkgs/development/python-modules/pre-commit/hook-tmpl-use-the-hardcoded-path-to-pre-commit.patch
index 23115bbbd20..4c1b6421e09 100644
--- a/nixpkgs/pkgs/development/python-modules/pre-commit/hook-tmpl-use-the-hardcoded-path-to-pre-commit.patch
+++ b/nixpkgs/pkgs/development/python-modules/pre-commit/hook-tmpl-use-the-hardcoded-path-to-pre-commit.patch
@@ -1,25 +1,15 @@
-From d9e6999e32112602ec276634cb004eda3ca64ec3 Mon Sep 17 00:00:00 2001
-From: "Wael M. Nasreddine" <wael.nasreddine@gmail.com>
-Date: Mon, 13 Jan 2020 11:04:58 -0800
-Subject: [PATCH] hook-tmpl: use the hardcoded path to pre-commit, if found
-
----
- pre_commit/resources/hook-tmpl | 2 ++
- 1 file changed, 2 insertions(+)
-
diff --git a/pre_commit/resources/hook-tmpl b/pre_commit/resources/hook-tmpl
-index 213d16e..3a99211 100755
+index 299144e..6d12543 100755
--- a/pre_commit/resources/hook-tmpl
+++ b/pre_commit/resources/hook-tmpl
-@@ -107,6 +107,8 @@ def _exe() -> Tuple[str, ...]:
- except OSError:
- pass
-
-+ if os.path.isfile('@pre-commit@/bin/pre-commit') and os.access('@pre-commit@/bin/pre-commit', os.X_OK):
-+ return ('@pre-commit@/bin/pre-commit', 'run')
- if distutils.spawn.find_executable('pre-commit'):
- return ('pre-commit', 'run')
-
---
-2.23.1
+@@ -25,8 +25,8 @@ ARGS.append('--')
+ ARGS.extend(sys.argv[1:])
+ DNE = '`pre-commit` not found. Did you forget to activate your virtualenv?'
+-if os.access(INSTALL_PYTHON, os.X_OK):
+- CMD = [INSTALL_PYTHON, '-mpre_commit']
++if os.access('@pre-commit@/bin/pre-commit', os.X_OK):
++ CMD = ['@pre-commit@/bin/pre-commit']
+ elif which('pre-commit'):
+ CMD = ['pre-commit']
+ else:
diff --git a/nixpkgs/pkgs/development/python-modules/pre-commit/languages-use-the-hardcoded-path-to-python-binaries.patch b/nixpkgs/pkgs/development/python-modules/pre-commit/languages-use-the-hardcoded-path-to-python-binaries.patch
new file mode 100644
index 00000000000..c1bead48b34
--- /dev/null
+++ b/nixpkgs/pkgs/development/python-modules/pre-commit/languages-use-the-hardcoded-path-to-python-binaries.patch
@@ -0,0 +1,26 @@
+diff --git a/pre_commit/languages/node.py b/pre_commit/languages/node.py
+index 26f4919..4885ec1 100644
+--- a/pre_commit/languages/node.py
++++ b/pre_commit/languages/node.py
+@@ -82,7 +82,7 @@ def install_environment(
+ envdir = fr'\\?\{os.path.normpath(envdir)}'
+ with clean_path_on_failure(envdir):
+ cmd = [
+- sys.executable, '-mnodeenv', '--prebuilt', '--clean-src', envdir,
++ '@nodeenv@/bin/nodeenv', '--prebuilt', '--clean-src', envdir,
+ ]
+ if version != C.DEFAULT:
+ cmd.extend(['-n', version])
+diff --git a/pre_commit/languages/python.py b/pre_commit/languages/python.py
+index e17376e..0c1d2ab 100644
+--- a/pre_commit/languages/python.py
++++ b/pre_commit/languages/python.py
+@@ -204,7 +204,7 @@ def install_environment(
+ ) -> None:
+ envdir = prefix.path(helpers.environment_dir(ENVIRONMENT_DIR, version))
+ python = norm_version(version)
+- venv_cmd = (sys.executable, '-mvirtualenv', envdir, '-p', python)
++ venv_cmd = ('@virtualenv@/bin/virtualenv', envdir, '-p', python)
+ install_cmd = ('python', '-mpip', 'install', '.', *additional_dependencies)
+
+ with clean_path_on_failure(envdir):
diff --git a/nixpkgs/pkgs/development/python-modules/pulp/default.nix b/nixpkgs/pkgs/development/python-modules/pulp/default.nix
index 049d8720f45..ab6fda9d3d4 100644
--- a/nixpkgs/pkgs/development/python-modules/pulp/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pulp/default.nix
@@ -1,18 +1,23 @@
-{ stdenv, fetchPypi, buildPythonPackage, pyparsing }:
+{ stdenv
+, fetchPypi
+, buildPythonPackage
+, pyparsing
+}:
buildPythonPackage rec {
pname = "PuLP";
- version = "2.0";
+ version = "2.1";
src = fetchPypi {
inherit pname version;
- sha256 = "fb0b0e8073aa82f3459c4241b9625e0ccd26c0838ad8253c6bc67e041901b765";
+ sha256 = "06swbi7wygh7y0kxc85q1pdhzk662375d9a5jnahgr76hkwwkybn";
};
propagatedBuildInputs = [ pyparsing ];
# only one test that requires an extra
doCheck = false;
+ pythonImportsCheck = [ "pulp" ];
meta = with stdenv.lib; {
homepage = "https://github.com/coin-or/pulp";
diff --git a/nixpkgs/pkgs/development/python-modules/py4j/default.nix b/nixpkgs/pkgs/development/python-modules/py4j/default.nix
index cf3a68a6472..db117e04d12 100644
--- a/nixpkgs/pkgs/development/python-modules/py4j/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/py4j/default.nix
@@ -7,7 +7,6 @@ buildPythonPackage rec {
src = fetchPypi {
inherit pname version;
- extension= "zip";
sha256 = "36ec57f43ff8ced260a18aa9a4e46c3500a730cac8860e259cbaa546c2b9db2f";
};
diff --git a/nixpkgs/pkgs/development/python-modules/pyatspi/default.nix b/nixpkgs/pkgs/development/python-modules/pyatspi/default.nix
index b704e54321b..74b9f7dfdeb 100644
--- a/nixpkgs/pkgs/development/python-modules/pyatspi/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pyatspi/default.nix
@@ -7,7 +7,7 @@ buildPythonPackage rec {
src = fetchurl {
url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
- sha256 = "UTbBv5GeEB1OyQGiduhupg5Ygaj/d2PjVvGYQOX/4d0=";
+ sha256 = "1pg1zzjl167iavin6xzzm20mh3m6dvl7d8h1r571s44yj6zw2dji";
};
nativeBuildInputs = [ pkgconfig ];
diff --git a/nixpkgs/pkgs/development/python-modules/pygobject/3.nix b/nixpkgs/pkgs/development/python-modules/pygobject/3.nix
index 2a1b8bcb410..74606902722 100644
--- a/nixpkgs/pkgs/development/python-modules/pygobject/3.nix
+++ b/nixpkgs/pkgs/development/python-modules/pygobject/3.nix
@@ -9,7 +9,7 @@ buildPythonPackage rec {
src = fetchurl {
url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
- sha256 = "hoPS37W6qeUBqaZO66XCwRF+rbeBqxzXqdJVg0r22u8=";
+ sha256 = "1vysyr586mfjm7biraw1nynpw4f1qajynkm6m40ybadsnpgx50w6";
};
outputs = [ "out" "dev" ];
diff --git a/nixpkgs/pkgs/development/python-modules/pymupdf/default.nix b/nixpkgs/pkgs/development/python-modules/pymupdf/default.nix
index 1625b15f2ee..c91892585d6 100644
--- a/nixpkgs/pkgs/development/python-modules/pymupdf/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pymupdf/default.nix
@@ -1,11 +1,11 @@
{ stdenv, buildPythonPackage, fetchPypi, mupdf, swig }:
buildPythonPackage rec {
pname = "PyMuPDF";
- version = "1.16.18";
+ version = "1.17.0";
src = fetchPypi {
inherit pname version;
- sha256 = "0gpcmmcjgwc6x4rn6nm3akiijdkpa9nahsw2x8a0i7z7kzj4firk";
+ sha256 = "0de92a8fb65db6e661594cc5865a340a2daac3cb9bb58e030820769ece1343c1";
};
patchPhase = ''
diff --git a/nixpkgs/pkgs/development/python-modules/pytest-factoryboy/default.nix b/nixpkgs/pkgs/development/python-modules/pytest-factoryboy/default.nix
new file mode 100644
index 00000000000..44a59730146
--- /dev/null
+++ b/nixpkgs/pkgs/development/python-modules/pytest-factoryboy/default.nix
@@ -0,0 +1,43 @@
+{ stdenv
+, fetchFromGitHub
+, buildPythonPackage
+, pytestCheckHook
+, pytest
+, inflection
+, factory_boy
+, pytestcache
+, pytestcov
+, pytestpep8
+, mock
+}:
+
+buildPythonPackage rec {
+ pname = "pytest-factoryboy";
+ version = "2.0.3";
+
+ src = fetchFromGitHub {
+ owner = "pytest-dev";
+ repo = "pytest-factoryboy";
+ rev = version;
+ sha256 = "0m1snyybq2k51khlydhisq300vzys897vdbsicph628iran950hn";
+ };
+
+ propagatedBuildInputs = [ factory_boy inflection pytest ];
+
+ # The project uses tox, which we can't. So we simply run pytest manually.
+ checkInputs = [
+ mock
+ pytestCheckHook
+ pytestcache
+ pytestcov
+ pytestpep8
+ ];
+ pytestFlagsArray = [ "--ignore=docs" ];
+
+ meta = with stdenv.lib; {
+ description = "Integration of factory_boy into the pytest runner.";
+ homepage = "https://pytest-factoryboy.readthedocs.io/en/latest/";
+ maintainers = with maintainers; [ winpat ];
+ license = licenses.mit;
+ };
+}
diff --git a/nixpkgs/pkgs/development/python-modules/pythonmagick/default.nix b/nixpkgs/pkgs/development/python-modules/pythonmagick/default.nix
new file mode 100644
index 00000000000..a647fa1005b
--- /dev/null
+++ b/nixpkgs/pkgs/development/python-modules/pythonmagick/default.nix
@@ -0,0 +1,43 @@
+{ lib
+, buildPythonPackage
+, fetchurl
+, python
+, pkg-config
+, imagemagick
+, autoreconfHook
+, boost
+, isPy3k
+, pythonImportsCheckHook
+}:
+
+buildPythonPackage rec {
+ pname = "pythonmagick";
+ version = "0.9.16";
+ format = "other";
+
+ src = fetchurl {
+ url = "mirror://imagemagick/python/releases/PythonMagick-${version}.tar.xz";
+ sha256 = "137278mfb5079lns2mmw73x8dhpzgwha53dyl00mmhj2z25varpn";
+ };
+
+ postPatch = ''
+ rm configure
+ '';
+
+ configureFlags = [ "--with-boost=${boost}" ];
+
+ nativeBuildInputs = [ pkg-config autoreconfHook pythonImportsCheckHook ];
+ buildInputs = [ python boost imagemagick ];
+
+ pythonImportsCheck = [
+ "PythonMagick"
+ ];
+
+ disabled = isPy3k;
+
+ meta = with lib; {
+ homepage = "http://www.imagemagick.org/script/api.php";
+ license = licenses.imagemagick;
+ description = "PythonMagick provides object oriented bindings for the ImageMagick Library.";
+ };
+}
diff --git a/nixpkgs/pkgs/development/python-modules/shellingham/default.nix b/nixpkgs/pkgs/development/python-modules/shellingham/default.nix
index c14c5ec4265..238d394ee11 100644
--- a/nixpkgs/pkgs/development/python-modules/shellingham/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/shellingham/default.nix
@@ -4,6 +4,7 @@
buildPythonPackage rec {
pname = "shellingham";
version = "1.3.2";
+ format = "pyproject";
src = fetchPypi {
inherit pname version;
diff --git a/nixpkgs/pkgs/development/python-modules/telethon/default.nix b/nixpkgs/pkgs/development/python-modules/telethon/default.nix
index a125cfd9bff..f8c0661f0cd 100644
--- a/nixpkgs/pkgs/development/python-modules/telethon/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/telethon/default.nix
@@ -2,12 +2,12 @@
buildPythonPackage rec {
pname = "telethon";
- version = "1.10.10";
+ version = "1.14.0";
src = fetchPypi {
inherit version;
pname = "Telethon";
- sha256 = "0zm3577f1l5g0i0gcxr3s0nrqy0i81ppr6vp31p550vvnlnkjsqj";
+ sha256 = "1fg12gcg6ca7rjh7m3g48m30cx4aaw5g09855nlyz2sa1kw3gfyq";
};
propagatedBuildInputs = [
diff --git a/nixpkgs/pkgs/development/python-modules/tenacity/default.nix b/nixpkgs/pkgs/development/python-modules/tenacity/default.nix
index 17ce469dc1c..18570c90c00 100644
--- a/nixpkgs/pkgs/development/python-modules/tenacity/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/tenacity/default.nix
@@ -1,22 +1,23 @@
-{ lib, buildPythonPackage, fetchPypi, isPy27
-, pbr, six, futures, monotonic, setuptools_scm
-, pytest, sphinx, tornado
+{ lib, buildPythonPackage, fetchPypi, isPy27, isPy3k
+, pbr, six, futures, monotonic, typing, setuptools_scm
+, pytest, sphinx, tornado, typeguard
}:
buildPythonPackage rec {
pname = "tenacity";
- version = "6.0.0";
+ version = "6.2.0";
src = fetchPypi {
inherit pname version;
- sha256 = "72f397c2bb1887e048726603f3f629ea16f88cb3e61e4ed3c57e98582b8e3571";
+ sha256 = "16ikf6n6dw1kzncs6vjc4iccl76f9arln59jhiiai27lzbkr1bi9";
};
nativeBuildInputs = [ pbr setuptools_scm ];
propagatedBuildInputs = [ six ]
- ++ lib.optionals isPy27 [ futures monotonic ];
+ ++ lib.optionals isPy27 [ futures monotonic typing ];
- checkInputs = [ pytest sphinx tornado ];
+ checkInputs = [ pytest sphinx tornado ]
+ ++ lib.optionals isPy3k [ typeguard ];
checkPhase = if isPy27 then ''
pytest --ignore='tenacity/tests/test_asyncio.py'
'' else ''
diff --git a/nixpkgs/pkgs/development/python-modules/toggl-cli/default.nix b/nixpkgs/pkgs/development/python-modules/toggl-cli/default.nix
index 62d3f2dde24..29715dd2f53 100644
--- a/nixpkgs/pkgs/development/python-modules/toggl-cli/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/toggl-cli/default.nix
@@ -1,13 +1,26 @@
-{ stdenv, buildPythonPackage, fetchPypi, twine, pbr, click, click-completion, validate-email,
-pendulum, ptable, requests, inquirer, pythonOlder, pytest, pytestcov, pytest-mock, faker, factory_boy,
-setuptools }:
+{ stdenv, buildPythonPackage, fetchPypi, pythonAtLeast, pythonOlder
+, click
+, click-completion
+, factory_boy
+, faker
+, inquirer
+, pbr
+, pendulum
+, ptable
+, pytest
+, pytestcov
+, pytest-mock
+, requests
+, setuptools
+, twine
+, validate-email
+}:
buildPythonPackage rec {
pname = "toggl-cli";
version = "2.1.0";
-
- disabled = pythonOlder "3.5";
+ disabled = pythonOlder "3.5" || pythonAtLeast "3.8";
src = fetchPypi {
pname = "togglCli";
diff --git a/nixpkgs/pkgs/development/python-modules/uamqp/default.nix b/nixpkgs/pkgs/development/python-modules/uamqp/default.nix
index 35ef67326ce..e1527ea27e6 100644
--- a/nixpkgs/pkgs/development/python-modules/uamqp/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/uamqp/default.nix
@@ -11,11 +11,11 @@
buildPythonPackage rec {
pname = "uamqp";
- version = "1.2.7";
+ version = "1.2.8";
src = fetchPypi {
inherit pname version;
- sha256 = "d5ac4f6e66baf466cb1c5e00d52f5da3a42bf811724522475b7e2125fbae4aae";
+ sha256 = "12yq435h27iv1kzgq3gl7c7hxdivvc2sl0l1kslgf2wxw53n7jgj";
};
buildInputs = [
diff --git a/nixpkgs/pkgs/development/python-modules/wtforms/default.nix b/nixpkgs/pkgs/development/python-modules/wtforms/default.nix
index 98c3b1be93b..410abbbb622 100644
--- a/nixpkgs/pkgs/development/python-modules/wtforms/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/wtforms/default.nix
@@ -1,29 +1,29 @@
{ stdenv
, buildPythonPackage
, fetchPypi
-, Babel
+, markupsafe
}:
buildPythonPackage rec {
- version = "2.1";
- pname = "wtforms";
+ version = "2.3.1";
+ pname = "WTForms";
src = fetchPypi {
inherit pname version;
- extension = "zip";
- sha256 = "0vyl26y9cg409cfyj8rhqxazsdnd0jipgjw06civhrd53yyi1pzz";
+ sha256 = "0whrd9cqhlibm31yqhvhp9illddxf0cpgcn3v806f7ajmsri66l6";
};
+ propagatedBuildInputs = [ markupsafe ];
+
# Django tests are broken "django.core.exceptions.AppRegistryNotReady: Apps aren't loaded yet."
- # This is fixed in master I believe but not yet in 2.1;
doCheck = false;
- propagatedBuildInputs = [ Babel ];
-
meta = with stdenv.lib; {
- homepage = "https://github.com/wtforms/wtforms";
description = "A flexible forms validation and rendering library for Python";
+ homepage = "https://github.com/wtforms/wtforms";
+ changelog = "https://github.com/wtforms/wtforms/blob/${version}/CHANGES.rst";
license = licenses.bsd3;
+ maintainers = [ maintainers.bhipple ];
};
}
diff --git a/nixpkgs/pkgs/development/python-modules/zope-hookable/default.nix b/nixpkgs/pkgs/development/python-modules/zope-hookable/default.nix
index c9e6311cf32..6c19ffbec02 100644
--- a/nixpkgs/pkgs/development/python-modules/zope-hookable/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/zope-hookable/default.nix
@@ -6,12 +6,12 @@
buildPythonPackage rec {
pname = "zope-hookable";
- version = "4.2.0";
+ version = "5.0.1";
src = fetchPypi {
pname = "zope.hookable";
inherit version;
- sha256 = "c1df3929a3666fc5a0c80d60a0c1e6f6ef97c7f6ed2f1b7cf49f3e6f3d4dde15";
+ sha256 = "0hc82lfr7bk53nvbxvjkibkarngyrzgfk2i6bg8wshl0ly0pdl19";
};
checkInputs = [ zope_testing ];
diff --git a/nixpkgs/pkgs/development/python-modules/zope_i18nmessageid/default.nix b/nixpkgs/pkgs/development/python-modules/zope_i18nmessageid/default.nix
index f63650bb4b4..ca5f818cd62 100644
--- a/nixpkgs/pkgs/development/python-modules/zope_i18nmessageid/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/zope_i18nmessageid/default.nix
@@ -2,6 +2,8 @@
, buildPythonPackage
, fetchPypi
, six
+, coverage
+, zope_testrunner
}:
buildPythonPackage rec {
@@ -15,6 +17,8 @@ buildPythonPackage rec {
propagatedBuildInputs = [ six ];
+ checkInputs = [ coverage zope_testrunner ];
+
meta = with stdenv.lib; {
homepage = "https://github.com/zopefoundation/zope.i18nmessageid";
description = "Message Identifiers for internationalization";
diff --git a/nixpkgs/pkgs/development/python-modules/zope_lifecycleevent/default.nix b/nixpkgs/pkgs/development/python-modules/zope_lifecycleevent/default.nix
index 2beabc8a61c..6494aa7a71a 100644
--- a/nixpkgs/pkgs/development/python-modules/zope_lifecycleevent/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/zope_lifecycleevent/default.nix
@@ -1,8 +1,10 @@
{ stdenv
, buildPythonPackage
, fetchPypi
+, isPy3k
, zope_event
, zope_component
+, zope_interface
}:
buildPythonPackage rec {
@@ -16,6 +18,15 @@ buildPythonPackage rec {
propagatedBuildInputs = [ zope_event zope_component ];
+ # namespace colides with local directory
+ doCheck = false;
+
+ # zope uses pep 420 namespaces for python3, doesn't work with nix + python2
+ pythonImportsCheck = stdenv.lib.optionals isPy3k [
+ "zope.lifecycleevent"
+ "zope.interface"
+ ];
+
meta = with stdenv.lib; {
homepage = "https://github.com/zopefoundation/zope.lifecycleevent";
description = "Object life-cycle events";