diff options
Diffstat (limited to 'pkgs/development/python-modules')
1028 files changed, 11235 insertions, 5001 deletions
diff --git a/pkgs/development/python-modules/Cython/default.nix b/pkgs/development/python-modules/Cython/default.nix index e22037cbbb9f2..5ceabe766b867 100644 --- a/pkgs/development/python-modules/Cython/default.nix +++ b/pkgs/development/python-modules/Cython/default.nix @@ -25,11 +25,11 @@ let in buildPythonPackage rec { pname = "Cython"; - version = "0.29.24"; + version = "0.29.28"; src = fetchPypi { inherit pname version; - sha256 = "sha256-zfBNB8NgCGDowuuq1Oj1KsP+shJFPBdkpJrAjIJ+hEM="; + sha256 = "sha256-1vrCNCgCww5RQmgo/ghP9N6xszhzZ8+Yl2uy5ktvjkU="; }; nativeBuildInputs = [ @@ -44,13 +44,6 @@ in buildPythonPackage rec { LC_ALL = "en_US.UTF-8"; patches = [ - # https://github.com/cython/cython/issues/2752, needed by sage (https://trac.sagemath.org/ticket/26855) and up to be included in 0.30 - (fetchpatch { - name = "non-int-conversion-to-pyhash.patch"; - url = "https://github.com/cython/cython/commit/28251032f86c266065e4976080230481b1a1bb29.patch"; - sha256 = "19rg7xs8gr90k3ya5c634bs8gww1sxyhdavv07cyd2k71afr83gy"; - }) - # backport Cython 3.0 trashcan support (https://github.com/cython/cython/pull/2842) to 0.X series. # it does not affect Python code unless the code explicitly uses the feature. # trashcan support is needed to avoid stack overflows during object deallocation in sage (https://trac.sagemath.org/ticket/27267) diff --git a/pkgs/development/python-modules/Mako/default.nix b/pkgs/development/python-modules/Mako/default.nix index 4c16861823fdc..d7b350b9f96bf 100644 --- a/pkgs/development/python-modules/Mako/default.nix +++ b/pkgs/development/python-modules/Mako/default.nix @@ -1,23 +1,45 @@ { lib , buildPythonPackage +, pythonOlder , fetchPypi , isPyPy + +# propagates , markupsafe + +# extras: Babel +, Babel + +# tests , mock , pytestCheckHook }: buildPythonPackage rec { pname = "Mako"; - version = "1.1.6"; + version = "1.2.0"; + + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "4e9e345a41924a954251b95b4b28e14a301145b544901332e658907a7464b6b2"; + sha256 = "sha256-mnx+kiuH2zaGIQz0nV12cDOkHUAQsoTnR2gskr3dizk="; + }; + + propagatedBuildInputs = [ + markupsafe + ]; + + passthru.extras-require = { + babel = [ + Babel + ]; }; - propagatedBuildInputs = [ markupsafe ]; - checkInputs = [ pytestCheckHook markupsafe mock ]; + checkInputs = [ + pytestCheckHook + mock + ] ++ passthru.extras-require.babel; disabledTests = lib.optionals isPyPy [ # https://github.com/sqlalchemy/mako/issues/315 @@ -29,6 +51,11 @@ buildPythonPackage rec { "test_bytestring_passthru" ]; + disabledTestPaths = [ + # lingua dependency is not packaged + "test/ext/test_linguaplugin.py" + ]; + meta = with lib; { description = "Super-fast templating language"; homepage = "https://www.makotemplates.org/"; diff --git a/pkgs/development/python-modules/Theano/default.nix b/pkgs/development/python-modules/Theano/default.nix index 480970f04a111..cd4c81056d5a7 100644 --- a/pkgs/development/python-modules/Theano/default.nix +++ b/pkgs/development/python-modules/Theano/default.nix @@ -11,10 +11,14 @@ , setuptools , six , libgpuarray -, cudaSupport ? false, cudatoolkit -, cudnnSupport ? false, cudnn +, cudaSupport ? false, cudaPackages ? {} +, cudnnSupport ? false }: +let + inherit (cudaPackages) cudatoolkit cudnn; +in + assert cudnnSupport -> cudaSupport; let @@ -39,7 +43,9 @@ let ( lib.optional cudaSupport libgpuarray_ ++ lib.optional cudnnSupport cudnn ); - libgpuarray_ = libgpuarray.override { inherit cudaSupport cudatoolkit; }; + # We need to be careful with overriding Python packages within the package set + # as this can lead to collisions! + libgpuarray_ = libgpuarray.override { inherit cudaSupport cudaPackages; }; in buildPythonPackage rec { pname = "Theano"; diff --git a/pkgs/development/python-modules/XlsxWriter/default.nix b/pkgs/development/python-modules/XlsxWriter/default.nix index 15bd1ee35fec2..5096f37e3025d 100644 --- a/pkgs/development/python-modules/XlsxWriter/default.nix +++ b/pkgs/development/python-modules/XlsxWriter/default.nix @@ -1,24 +1,36 @@ -{lib, buildPythonPackage, fetchFromGitHub}: +{ lib +, buildPythonPackage +, fetchFromGitHub +, pytestCheckHook +, pythonOlder +}: buildPythonPackage rec { + pname = "xlsxwriter"; + version = "3.0.2"; + format = "setuptools"; - pname = "XlsxWriter"; - version = "1.2.9"; + disabled = pythonOlder "3.7"; - # PyPI release tarball doesn't contain tests so let's use GitHub. See: - # https://github.com/jmcnamara/XlsxWriter/issues/327 - src = fetchFromGitHub{ + src = fetchFromGitHub { owner = "jmcnamara"; - repo = pname; + repo = "XlsxWriter"; rev = "RELEASE_${version}"; - sha256 = "08pdca5ssi50bx2xz52gkmjix2ybv5i4bjw7yd6yfiph0y0qsbsb"; + hash = "sha256-I87/8OhMoI9/BRXdmTZ1Ul+d+/x+Kg/9CuqMgTsP8Eo="; }; - meta = { - description = "A Python module for creating Excel XLSX files"; + checkInputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ + "xlsxwriter" + ]; + + meta = with lib; { + description = "Module for creating Excel XLSX files"; homepage = "https://xlsxwriter.readthedocs.io/"; - maintainers = with lib.maintainers; [ jluttine ]; - license = lib.licenses.bsd2; + license = licenses.bsd2; + maintainers = with maintainers; [ jluttine ]; }; - } diff --git a/pkgs/development/python-modules/adafruit-io/default.nix b/pkgs/development/python-modules/adafruit-io/default.nix index 88bdff440c4a7..bd44626f8bcf2 100644 --- a/pkgs/development/python-modules/adafruit-io/default.nix +++ b/pkgs/development/python-modules/adafruit-io/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "adafruit-io"; - version = "2.6.0"; + version = "2.7.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -18,8 +18,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "adafruit"; repo = "Adafruit_IO_Python"; - rev = version; - hash = "sha256-tjm+HvUuLK3IxXwuxPidJaBetj+n0BzKOuLj75bM7a8="; + rev = "refs/tags/${version}"; + hash = "sha256-BIquSrhtRv2NEOn/G6TTfYMrL2OBwwJQYZ455fznwdU="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; diff --git a/pkgs/development/python-modules/adafruit-platformdetect/default.nix b/pkgs/development/python-modules/adafruit-platformdetect/default.nix index 2671c25e59f7d..921c844e27d8d 100644 --- a/pkgs/development/python-modules/adafruit-platformdetect/default.nix +++ b/pkgs/development/python-modules/adafruit-platformdetect/default.nix @@ -6,13 +6,13 @@ buildPythonPackage rec { pname = "adafruit-platformdetect"; - version = "3.22.0"; + version = "3.22.1"; format = "setuptools"; src = fetchPypi { pname = "Adafruit-PlatformDetect"; inherit version; - sha256 = "sha256-XnB6aSTKRV72WjcXx9jPZ+FGmCNh6dvwiau7WDlyE5M="; + sha256 = "sha256-fOBs0aPekIvpwbrYxzh1wz7EKGko0Je1f/N5H0DIguw="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/adb-shell/default.nix b/pkgs/development/python-modules/adb-shell/default.nix index 907cf155ea102..792729da1fac9 100644 --- a/pkgs/development/python-modules/adb-shell/default.nix +++ b/pkgs/development/python-modules/adb-shell/default.nix @@ -28,18 +28,27 @@ buildPythonPackage rec { }; propagatedBuildInputs = [ - aiofiles cryptography - libusb1 pyasn1 rsa ]; + passthru.extras-require = { + async = [ + aiofiles + ]; + usb = [ + libusb1 + ]; + }; + checkInputs = [ mock pycryptodome pytestCheckHook - ]; + ] + ++ passthru.extras-require.async + ++ passthru.extras-require.usb; disabledTests = lib.optionals (pythonAtLeast "3.10") [ # Tests are failing with Python 3.10 diff --git a/pkgs/development/python-modules/adblock/default.nix b/pkgs/development/python-modules/adblock/default.nix index 941beb5447313..3655c7456e586 100644 --- a/pkgs/development/python-modules/adblock/default.nix +++ b/pkgs/development/python-modules/adblock/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "adblock"; - version = "0.5.1"; + version = "0.5.2"; format = "pyproject"; disabled = pythonOlder "3.6"; @@ -25,14 +25,14 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "ArniDagur"; repo = "python-adblock"; - rev = version; - sha256 = "sha256-f6PmEHVahQv8t+WOkE8DO2emivHG2t14hUSIf/l8omY="; + rev = "refs/tags/${version}"; + sha256 = "sha256-6FH+AVK7+Yg1a6oKbFV80TuGGE4Y7I3mMVzwVHdHYO4="; }; cargoDeps = rustPlatform.fetchCargoTarball { inherit src; name = "${pname}-${version}"; - hash = "sha256-x0mcykHWhheD2ycELcfR1ZQ/6WfFQzY+L/LmMipP4Rc="; + hash = "sha256-JI/C+Woi/dJWUGUum8daecjFWiQgxY6BFYZ5MpTcRvU="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/add-trailing-comma/default.nix b/pkgs/development/python-modules/add-trailing-comma/default.nix index c38a4f0614358..5b0131576cd33 100644 --- a/pkgs/development/python-modules/add-trailing-comma/default.nix +++ b/pkgs/development/python-modules/add-trailing-comma/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "add-trailing-comma"; - version = "2.2.1"; + version = "2.2.3"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "asottile"; repo = pname; rev = "v${version}"; - sha256 = "RBOL4mM9VciHHNmCTlRBIoXqeln19MKYxgv9p6GCNvU="; + sha256 = "sha256-hJVVRhaElroZ1GVlbGK49gzts2tozLqp9xfoaPdbb3I="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/aenum/default.nix b/pkgs/development/python-modules/aenum/default.nix index a360959a9a73c..8ebed55e1bc7d 100644 --- a/pkgs/development/python-modules/aenum/default.nix +++ b/pkgs/development/python-modules/aenum/default.nix @@ -8,12 +8,12 @@ buildPythonPackage rec { pname = "aenum"; - version = "3.1.8"; + version = "3.1.11"; format = "setuptools"; src = fetchPypi { inherit pname version; - sha256 = "8dbe15f446eb8264b788dfeca163fb0a043d408d212152397dc11377b851e4ae"; + sha256 = "sha256-rtLCc1R65yoNXuhpcZwCpkPaFr9QfICVj6rcfgOOP3M="; }; checkInputs = [ diff --git a/pkgs/development/python-modules/aesara/default.nix b/pkgs/development/python-modules/aesara/default.nix index 3e2e9cb2cf375..58a39422a3a3a 100644 --- a/pkgs/development/python-modules/aesara/default.nix +++ b/pkgs/development/python-modules/aesara/default.nix @@ -18,13 +18,13 @@ buildPythonPackage rec { pname = "aesara"; - version = "2.4.0"; + version = "2.5.3"; src = fetchFromGitHub { owner = "aesara-devs"; repo = "aesara"; - rev = "38d7a813646c1e350170c46bafade0e7d0e2427c"; - sha256 = "sha256-933bM15BZi4sTjnIOGAg5dc5tXVWQ9lFzktOtzj5DNQ="; + rev = "refs/tags/rel-${version}"; + sha256 = "sha256-20nc70gNdcGjtGxv2WxmYxmswNH8v7yGLkToP2iazjc="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/aesedb/default.nix b/pkgs/development/python-modules/aesedb/default.nix new file mode 100644 index 0000000000000..b6b0dce3c24b3 --- /dev/null +++ b/pkgs/development/python-modules/aesedb/default.nix @@ -0,0 +1,45 @@ +{ lib +, aiowinreg +, buildPythonPackage +, colorama +, fetchPypi +, pycryptodomex +, pythonOlder +, tqdm +, unicrypto +}: + +buildPythonPackage rec { + pname = "aesedb"; + version = "0.0.5"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; + + src = fetchPypi { + inherit pname version; + hash = "sha256-2m4VxqTD9zvUpZ1O8/SBprAzG4vUX4z3LthMpP5Hc8g="; + }; + + propagatedBuildInputs = [ + aiowinreg + colorama + pycryptodomex + tqdm + unicrypto + ]; + + # Module has no tests + doCheck = false; + + pythonImportsCheck = [ + "aesedb" + ]; + + meta = with lib; { + description = "Parser for JET databases"; + homepage = "https://github.com/skelsec/aesedb"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/afdko/default.nix b/pkgs/development/python-modules/afdko/default.nix index 66f12ffd54b0b..bbf8d555b5efd 100644 --- a/pkgs/development/python-modules/afdko/default.nix +++ b/pkgs/development/python-modules/afdko/default.nix @@ -13,13 +13,13 @@ buildPythonPackage rec { pname = "afdko"; - version = "3.7.1"; + version = "3.8.1"; - disabled = pythonOlder "3.6"; + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "05hj2mw3ppfjaig5zdk5db9vfrbbq5gmv5rzggmvvrj0yyfpr0pd"; + sha256 = "sha256-BaSpw7TiBymCvoP0/z1zynWKQJH/PjbbGf85ZI9LOZw="; }; format = "pyproject"; @@ -40,12 +40,6 @@ buildPythonPackage rec { # Use antlr4 runtime from nixpkgs and link it dynamically ./use-dynamic-system-antlr4-runtime.patch - - # Fix compatibility with latest fonttools. - (fetchpatch { - url = "https://github.com/adobe-type-tools/afdko/commit/120752c50a562e4f6c12ff4be1e3bd96ed664e82.patch"; - sha256 = "RDGIpNAuCmK+zqZOeOK7ddCjr9BuqPpcnbnxdtoE48M="; - }) ]; # setup.py will always (re-)execute cmake in buildPhase @@ -91,6 +85,8 @@ buildPythonPackage rec { # aarch64-only (?) failure, unknown reason so far # https://github.com/adobe-type-tools/afdko/issues/1425 "test_spec" + ] ++ lib.optionals (stdenv.hostPlatform.isi686) [ + "test_type1mm_inputs" ]; passthru.tests = { diff --git a/pkgs/development/python-modules/afsapi/default.nix b/pkgs/development/python-modules/afsapi/default.nix index 4bc3532f5b572..864d0caba3959 100644 --- a/pkgs/development/python-modules/afsapi/default.nix +++ b/pkgs/development/python-modules/afsapi/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "afsapi"; - version = "0.2.2"; + version = "0.2.3"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "wlcrs"; repo = "python-afsapi"; rev = version; - hash = "sha256-C4rxlkylWGsDsnMPuecrC2ELj1PvP6EelZ/kzTn4Brk="; + hash = "sha256-6nmj15jCGBRkT7Ip/VGHX5IrAbhu1LUlvXuvFhvXknY="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; diff --git a/pkgs/development/python-modules/ailment/default.nix b/pkgs/development/python-modules/ailment/default.nix index ef606a027d06c..9f6828fd63292 100644 --- a/pkgs/development/python-modules/ailment/default.nix +++ b/pkgs/development/python-modules/ailment/default.nix @@ -7,8 +7,8 @@ buildPythonPackage rec { pname = "ailment"; - version = "9.1.12332"; - format = "setuptools"; + version = "9.2.1"; + format = "pyproject"; disabled = pythonOlder "3.6"; @@ -16,7 +16,7 @@ buildPythonPackage rec { owner = "angr"; repo = pname; rev = "v${version}"; - hash = "sha256-qWKvNhiOAonUi0qpOWtwbNZa2lgBQ+gaGrAHMgDdr4Q="; + hash = "sha256-F0t4vVxi4KUUtIZc8FJD9+2qf1XA58haFfjmHwAQaWA="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/aio-geojson-generic-client/default.nix b/pkgs/development/python-modules/aio-geojson-generic-client/default.nix new file mode 100644 index 0000000000000..df13e8d7519a1 --- /dev/null +++ b/pkgs/development/python-modules/aio-geojson-generic-client/default.nix @@ -0,0 +1,51 @@ +{ lib +, aiohttp +, aresponses +, asynctest +, buildPythonPackage +, aio-geojson-client +, fetchFromGitHub +, pytest-asyncio +, pytestCheckHook +, pythonOlder +, pytz +}: + +buildPythonPackage rec { + pname = "aio-geojson-generic-client"; + version = "0.1"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "exxamalte"; + repo = "python-aio-geojson-generic-client"; + rev = "v${version}"; + hash = "sha256-6Gc3SRRQiISBZnCg7a+rCQHR4NQipBHmG5gWZZXIsxY="; + }; + + propagatedBuildInputs = [ + aiohttp + aio-geojson-client + pytz + ]; + + checkInputs = [ + aresponses + asynctest + pytest-asyncio + pytestCheckHook + ]; + + pythonImportsCheck = [ + "aio_geojson_generic_client" + ]; + + meta = with lib; { + description = "Python library for accessing GeoJSON feeds"; + homepage = "https://github.com/exxamalte/python-aio-geojson-generic-client"; + license = with licenses; [ asl20 ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/aio-georss-client/default.nix b/pkgs/development/python-modules/aio-georss-client/default.nix index 586cc6b74a827..f62c8b1bcfb7c 100644 --- a/pkgs/development/python-modules/aio-georss-client/default.nix +++ b/pkgs/development/python-modules/aio-georss-client/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "aio-georss-client"; - version = "0.9"; + version = "0.10"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "exxamalte"; repo = "python-aio-georss-client"; rev = "v${version}"; - sha256 = "sha256-cnOW9Ey6WdL2bAqPop5noETn12OeeKsMkWHKGmYCjJU="; + sha256 = "sha256-g/BlRRBImJihVlAfSMsPIPV0GJns0/pStF8TKSxpDI4="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/aio-georss-gdacs/default.nix b/pkgs/development/python-modules/aio-georss-gdacs/default.nix index b33e2e35ee1c8..96e105fab213d 100644 --- a/pkgs/development/python-modules/aio-georss-gdacs/default.nix +++ b/pkgs/development/python-modules/aio-georss-gdacs/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "aio-georss-gdacs"; - version = "0.6"; + version = "0.7"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "exxamalte"; repo = "python-aio-georss-gdacs"; rev = "v${version}"; - sha256 = "sha256-sUHVmueu70ZnXP8KoJ2mDzzEedzXYHM2yeGC4oVsZZU="; + sha256 = "sha256-6z0l0PcFTQgOBj8cBgBMPJIqWG53u7h4WbYkBqU4FNE="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/aioairzone/default.nix b/pkgs/development/python-modules/aioairzone/default.nix index b7f415d0cf1f9..fc62525915e91 100644 --- a/pkgs/development/python-modules/aioairzone/default.nix +++ b/pkgs/development/python-modules/aioairzone/default.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { pname = "aioairzone"; - version = "0.3.2"; + version = "0.3.4"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -15,8 +15,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "Noltari"; repo = pname; - rev = version; - hash = "sha256-NDw2vqnOOeFpgvU9//1WIA0hI9zY7TkiquU6DJ70b5E="; + rev = "refs/tags/${version}"; + hash = "sha256-ENdgaG30Fll5HQOTcghkmqOAiMYEY1aHRIel4Bd25Pk="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/aiobotocore/default.nix b/pkgs/development/python-modules/aiobotocore/default.nix index 01066c127be58..df800eb475521 100644 --- a/pkgs/development/python-modules/aiobotocore/default.nix +++ b/pkgs/development/python-modules/aiobotocore/default.nix @@ -10,12 +10,12 @@ buildPythonPackage rec { pname = "aiobotocore"; - version = "2.1.2"; + version = "2.2.0"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "sha256-AP1/Q8wEhNjtJ0/QvkkqoWp/6medvqlqYCu3IspMLSI="; + sha256 = "sha256-cTV5OcMCJnDXu5SDMZQUekTr/OJLFkPk5E/twe5zSbo="; }; # relax version constraints: aiobotocore works with newer botocore versions diff --git a/pkgs/development/python-modules/aioconsole/default.nix b/pkgs/development/python-modules/aioconsole/default.nix index c88f848593911..b178913c0f593 100644 --- a/pkgs/development/python-modules/aioconsole/default.nix +++ b/pkgs/development/python-modules/aioconsole/default.nix @@ -40,6 +40,8 @@ buildPythonPackage rec { disabledTests = [ "test_interact_syntax_error" + # Output and the sandbox don't work well together + "test_interact_multiple_indented_lines" ]; pythonImportsCheck = [ diff --git a/pkgs/development/python-modules/aiodiscover/default.nix b/pkgs/development/python-modules/aiodiscover/default.nix index dbc684281fb4b..d8fb5c6b38b62 100644 --- a/pkgs/development/python-modules/aiodiscover/default.nix +++ b/pkgs/development/python-modules/aiodiscover/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "aiodiscover"; - version = "1.4.8"; + version = "1.4.11"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "bdraco"; repo = pname; rev = "v${version}"; - sha256 = "sha256-ts3PnL1ePWJHHaLuC0eQKqBOt+HeEeAayeVBAIhnUWs="; + sha256 = "sha256-s5g8otQSWTAOkN4q1LrM/FxVlOnGSv8XKtIDkdwcHMg="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/aioftp/default.nix b/pkgs/development/python-modules/aioftp/default.nix index fab3a32a6a0ec..4ef05d27d9910 100644 --- a/pkgs/development/python-modules/aioftp/default.nix +++ b/pkgs/development/python-modules/aioftp/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "aioftp"; - version = "0.20.0"; + version = "0.21.2"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "sha256-N8qiKsWPaFT/t5p1eSHS0BydoXv4AL6y8gP4z4P9fsE="; + sha256 = "sha256-JWzeBdCPXLYMmKkvCqQQF/mHoRbdRvj0vKVF4+D8LSI="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/aioguardian/default.nix b/pkgs/development/python-modules/aioguardian/default.nix index baf84ad89f42b..ed902288d0f24 100644 --- a/pkgs/development/python-modules/aioguardian/default.nix +++ b/pkgs/development/python-modules/aioguardian/default.nix @@ -15,13 +15,13 @@ buildPythonPackage rec { pname = "aioguardian"; - version = "2022.03.1"; + version = "2022.03.2"; src = fetchFromGitHub { owner = "bachya"; repo = pname; rev = version; - sha256 = "sha256-UiRTyUAoTcohRkTBF5Jvd/uY2zAbHV5z4HC8Oc0QNTs="; + sha256 = "sha256-eEvvcj8tHNErU6RrWar5mxG3xbQ5wCEEYJ95hXkdY54="; }; format = "pyproject"; diff --git a/pkgs/development/python-modules/aioh2/default.nix b/pkgs/development/python-modules/aioh2/default.nix deleted file mode 100644 index 1ae997c60e8c6..0000000000000 --- a/pkgs/development/python-modules/aioh2/default.nix +++ /dev/null @@ -1,24 +0,0 @@ -{ lib, buildPythonPackage, isPy3k, fetchPypi, h2, priority }: - -buildPythonPackage rec { - pname = "aioh2"; - version = "0.2.2"; - disabled = !isPy3k; - - src = fetchPypi { - inherit pname version; - sha256 = "03i24wzpw0mrnrpck3w6qy83iigwl7n99sdrndqzxfyrc69b99wd"; - }; - - propagatedBuildInputs = [ h2 priority ]; - - doCheck = false; # https://github.com/decentfox/aioh2/issues/17 - - meta = with lib; { - homepage = "https://github.com/decentfox/aioh2"; - description = "HTTP/2 implementation with hyper-h2 on Python 3 asyncio"; - license = licenses.bsd3; - maintainers = [ maintainers.qyliss ]; - broken = true; # requires h2<4 - }; -} diff --git a/pkgs/development/python-modules/aiohomekit/default.nix b/pkgs/development/python-modules/aiohomekit/default.nix index b1938c88aa90c..66f028cf1df7e 100644 --- a/pkgs/development/python-modules/aiohomekit/default.nix +++ b/pkgs/development/python-modules/aiohomekit/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "aiohomekit"; - version = "0.7.16"; + version = "0.7.17"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -20,8 +20,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "Jc2k"; repo = pname; - rev = version; - sha256 = "sha256-dakxPhnI1m6KiOj6oQkfQ0UVA7NEBTHFGYnF6L6c8Ck="; + rev = "refs/tags/${version}"; + sha256 = "sha256-vgRiqA3xNvuw3nIzl45RXdmcbDW6OTxvReSH5SVcNEs="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/aiohttp-remotes/default.nix b/pkgs/development/python-modules/aiohttp-remotes/default.nix index be33becb26c29..4b150b9edeaea 100644 --- a/pkgs/development/python-modules/aiohttp-remotes/default.nix +++ b/pkgs/development/python-modules/aiohttp-remotes/default.nix @@ -41,6 +41,12 @@ buildPythonPackage rec { "aiohttp_remotes" ]; + pytestFlagsArray = [ + "-W" + "ignore::DeprecationWarning" + "--asyncio-mode=auto" + ]; + meta = with lib; { description = "Set of useful tools for aiohttp.web server"; homepage = "https://github.com/wikibusiness/aiohttp-remotes"; diff --git a/pkgs/development/python-modules/aiohttp-swagger/default.nix b/pkgs/development/python-modules/aiohttp-swagger/default.nix index 501c70e3ee477..a8e3499ee5844 100644 --- a/pkgs/development/python-modules/aiohttp-swagger/default.nix +++ b/pkgs/development/python-modules/aiohttp-swagger/default.nix @@ -13,6 +13,7 @@ buildPythonPackage rec { pname = "aiohttp-swagger"; version = "1.0.15"; + format = "setuptools"; disabled = pythonOlder "3.6"; @@ -20,7 +21,7 @@ buildPythonPackage rec { owner = "cr0hn"; repo = pname; rev = version; - sha256 = "sha256-M43sNpbXWXFRTd549cZhvhO35nBB6OH+ki36BzSk87Q="; + hash = "sha256-M43sNpbXWXFRTd549cZhvhO35nBB6OH+ki36BzSk87Q="; }; propagatedBuildInputs = [ @@ -41,7 +42,14 @@ buildPythonPackage rec { --replace "jinja2~=2.11.2" "jinja2>=2.11.2" ''; - pythonImportsCheck = [ "aiohttp_swagger" ]; + preCheck = '' + # The custom client is obsolete + rm tests/conftest.py + ''; + + pythonImportsCheck = [ + "aiohttp_swagger" + ]; meta = with lib; { description = "Swagger API Documentation builder for aiohttp"; diff --git a/pkgs/development/python-modules/aiohttp/default.nix b/pkgs/development/python-modules/aiohttp/default.nix index f6d9b5d97ec72..660e205fb482b 100644 --- a/pkgs/development/python-modules/aiohttp/default.nix +++ b/pkgs/development/python-modules/aiohttp/default.nix @@ -75,6 +75,10 @@ buildPythonPackage rec { "test_client_session_timeout_zero" "test_mark_formdata_as_processed" "test_requote_redirect_url_default" + # Disable tests that trigger deprecation warnings in pytest + "test_async_with_session" + "test_session_close_awaitable" + "test_close_run_until_complete_not_deprecated" ] ++ lib.optionals stdenv.is32bit [ "test_cookiejar" ] ++ lib.optionals stdenv.isDarwin [ diff --git a/pkgs/development/python-modules/aiolifx/default.nix b/pkgs/development/python-modules/aiolifx/default.nix index 2cc04130c6710..1ce640179a134 100644 --- a/pkgs/development/python-modules/aiolifx/default.nix +++ b/pkgs/development/python-modules/aiolifx/default.nix @@ -8,13 +8,14 @@ buildPythonPackage rec { pname = "aiolifx"; - version = "0.7.1"; + version = "0.8.0"; + format = "setuptools"; - disabled = pythonOlder "3.4"; + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "sha256-ktXnAgrxfDELfMQATcWHn/u6C4bKQii+mbT4mA54coo="; + hash = "sha256-7XwtTALfEFAI2Rl3JcVcncIZBTFNuXyyclpJj5jHyEU="; }; propagatedBuildInputs = [ @@ -25,10 +26,12 @@ buildPythonPackage rec { # tests are not implemented doCheck = false; - pythonImportsCheck = [ "aiolifx" ]; + pythonImportsCheck = [ + "aiolifx" + ]; meta = with lib; { - description = "API for local communication with LIFX devices over a LAN"; + description = "Module for local communication with LIFX devices over a LAN"; homepage = "https://github.com/frawau/aiolifx"; license = licenses.mit; maintainers = with maintainers; [ netixx ]; diff --git a/pkgs/development/python-modules/aionotify/default.nix b/pkgs/development/python-modules/aionotify/default.nix index e653f4cca74eb..13ae51d25227f 100644 --- a/pkgs/development/python-modules/aionotify/default.nix +++ b/pkgs/development/python-modules/aionotify/default.nix @@ -18,6 +18,11 @@ buildPythonPackage rec { disabled = pythonOlder "3.5"; + preCheck = '' + substituteInPlace tests/test_usage.py \ + --replace "asyncio.wait_for(task, timeout, loop=self.loop)" "asyncio.wait_for(task, timeout)" + ''; + checkInputs = [ asynctest ]; diff --git a/pkgs/development/python-modules/aioqsw/default.nix b/pkgs/development/python-modules/aioqsw/default.nix new file mode 100644 index 0000000000000..91dac94f20d2d --- /dev/null +++ b/pkgs/development/python-modules/aioqsw/default.nix @@ -0,0 +1,40 @@ +{ lib +, aiohttp +, buildPythonPackage +, fetchFromGitHub +, pytestCheckHook +, pythonOlder +}: + +buildPythonPackage rec { + pname = "aioqsw"; + version = "0.0.5"; + format = "setuptools"; + + disabled = pythonOlder "3.8"; + + src = fetchFromGitHub { + owner = "Noltari"; + repo = pname; + rev = version; + hash = "sha256-2MuJrWrjcRkdeVkKfv/nUVfHyBtKKsq1sC5ISSEtyEE="; + }; + + propagatedBuildInputs = [ + aiohttp + ]; + + # Module has no tests + doCheck = false; + + pythonImportsCheck = [ + "aioqsw" + ]; + + meta = with lib; { + description = "Library to fetch data from QNAP QSW switches"; + homepage = "https://github.com/Noltari/aioqsw"; + license = with licenses; [ asl20 ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/aioshelly/default.nix b/pkgs/development/python-modules/aioshelly/default.nix index d6f2c12890811..6c6ba7e93ec66 100644 --- a/pkgs/development/python-modules/aioshelly/default.nix +++ b/pkgs/development/python-modules/aioshelly/default.nix @@ -8,16 +8,16 @@ buildPythonPackage rec { pname = "aioshelly"; - version = "1.0.11"; + version = "2.0.0"; format = "setuptools"; - disabled = pythonOlder "3.8"; + disabled = pythonOlder "3.9"; src = fetchFromGitHub { owner = "home-assistant-libs"; repo = pname; rev = version; - hash = "sha256-N+8vmB41AUu4aTUTBYX6SPVsW1PARaq5mCOdhg9h0/g="; + hash = "sha256-1bIlK/5UoGq6xTjcpkAkHPBlM+ifZhnbWzGbPRdFGkU="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/aioswitcher/default.nix b/pkgs/development/python-modules/aioswitcher/default.nix index d42f242438b38..68cc3150d9f69 100644 --- a/pkgs/development/python-modules/aioswitcher/default.nix +++ b/pkgs/development/python-modules/aioswitcher/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "aioswitcher"; - version = "2.0.8"; + version = "2.0.9"; format = "pyproject"; src = fetchFromGitHub { owner = "TomerFi"; repo = pname; - rev = version; - sha256 = "sha256-4+XGSaHZNYjId0bTOwCkYpb1K/pM8WtN5/NI+GVaI7M="; + rev = "refs/tags/${version}"; + sha256 = "sha256-vsMQG664ySMQfdl4tGJKMY0MZXVl39QaFxu7kMtZWCM="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/aiotractive/default.nix b/pkgs/development/python-modules/aiotractive/default.nix index b7790751a5898..f864dd35f1a8e 100644 --- a/pkgs/development/python-modules/aiotractive/default.nix +++ b/pkgs/development/python-modules/aiotractive/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "aiotractive"; - version = "0.5.3"; + version = "0.5.4"; disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "zhulik"; repo = pname; rev = "v${version}"; - sha256 = "1rkylzbxxy3p744q1iqcvpnkn12ra6ja16vhqzidn702n4h5377j"; + sha256 = "sha256-pcGUl8mq1O1QY5EPkNhWRLCKDn2FWAF9XymXkUXWEUk="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/alembic/default.nix b/pkgs/development/python-modules/alembic/default.nix index 18698a0d68f26..ea8f4d4d1318a 100644 --- a/pkgs/development/python-modules/alembic/default.nix +++ b/pkgs/development/python-modules/alembic/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "alembic"; - version = "1.7.5"; + version = "1.7.7"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "sha256-fDKGlKLmjwPulx5jw72IWEZHA3OltTLPLJ8WAcQTsVM="; + sha256 = "sha256-SWEkgXPq186KIe+z3jePE7g5jmYw+rDrJY3HSoryTFg="; }; propagatedBuildInputs = [ @@ -42,10 +42,6 @@ buildPythonPackage rec { pytest-xdist ]; - pytestFlagsArray = [ - "--numprocesses" "$NIX_BUILD_CORES" - ]; - meta = with lib; { homepage = "https://bitbucket.org/zzzeek/alembic"; description = "A database migration tool for SQLAlchemy"; diff --git a/pkgs/development/python-modules/amberelectric/default.nix b/pkgs/development/python-modules/amberelectric/default.nix index cd49848614323..667e5fff5e19b 100644 --- a/pkgs/development/python-modules/amberelectric/default.nix +++ b/pkgs/development/python-modules/amberelectric/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "amberelectric"; - version = "1.0.3"; + version = "1.0.4"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "1hsbk2v7j1nsa083j28jb7b3rv76flan0g9wav97qccp1gjds5b0"; + sha256 = "sha256-5SWJnTxRm6mzP0RxrgA+jnV+Gp23WjqQA57wbT2V9Dk="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/amply/default.nix b/pkgs/development/python-modules/amply/default.nix index 35aa3ecb4d3a6..5a26e341958bd 100644 --- a/pkgs/development/python-modules/amply/default.nix +++ b/pkgs/development/python-modules/amply/default.nix @@ -9,11 +9,11 @@ buildPythonPackage rec { pname = "amply"; - version = "0.1.4"; + version = "0.1.5"; src = fetchPypi { inherit pname version; - sha256 = "cb12dcb49d16b168c02be128a1527ecde50211e4bd94af76ff4e67707f5a2d38"; + sha256 = "sha256-rXF7SQtrcFWQn6oZXoKkQytwb4+VhUBQFy9Ckx5HhCY="; }; nativeBuildInputs = [ setuptools-scm ]; diff --git a/pkgs/development/python-modules/amqp/default.nix b/pkgs/development/python-modules/amqp/default.nix index c23c1d012da44..d226192164d0d 100644 --- a/pkgs/development/python-modules/amqp/default.nix +++ b/pkgs/development/python-modules/amqp/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "amqp"; - version = "5.0.9"; + version = "5.1.0"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-Hl9wdCTlRAeMoZbnKuahSIfOdOAr0Sa+VLfAPJcb7xg="; + hash = "sha256-RGs+io68LOr9Qk/8qrHDU4MNSBYSVleO16ZUSOYB6+0="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/androidtv/default.nix b/pkgs/development/python-modules/androidtv/default.nix index 2ea8dc5bad5bb..f116cef3dc759 100644 --- a/pkgs/development/python-modules/androidtv/default.nix +++ b/pkgs/development/python-modules/androidtv/default.nix @@ -25,14 +25,22 @@ buildPythonPackage rec { propagatedBuildInputs = [ adb-shell - aiofiles pure-python-adb ]; + passthru.extras-require = { + async = [ + aiofiles + ]; + inherit (adb-shell.extras-require) usb; + }; + checkInputs = [ mock pytestCheckHook - ]; + ] + ++ passthru.extras-require.async + ++ passthru.extras-require.usb; disabledTests = [ # Requires git but fails anyway diff --git a/pkgs/development/python-modules/angr/default.nix b/pkgs/development/python-modules/angr/default.nix index 1881da62f5065..31629eab9d674 100644 --- a/pkgs/development/python-modules/angr/default.nix +++ b/pkgs/development/python-modules/angr/default.nix @@ -46,8 +46,8 @@ in buildPythonPackage rec { pname = "angr"; - version = "9.1.12332"; - format = "setuptools"; + version = "9.2.1"; + format = "pyproject"; disabled = pythonOlder "3.6"; @@ -55,7 +55,7 @@ buildPythonPackage rec { owner = pname; repo = pname; rev = "v${version}"; - hash = "sha256-GaW1XyFOnjU28HqptFC6+Fe41zYZMR716Nsq0dPy660="; + hash = "sha256-7t4NV1udBq3tK7czuKYUsQ+9tLahFM8DlUUBT3d6bco="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/angrop/default.nix b/pkgs/development/python-modules/angrop/default.nix index 8164190cd49c0..d32441a989c6a 100644 --- a/pkgs/development/python-modules/angrop/default.nix +++ b/pkgs/development/python-modules/angrop/default.nix @@ -9,8 +9,8 @@ buildPythonPackage rec { pname = "angrop"; - version = "9.1.12332"; - format = "setuptools"; + version = "9.2.1"; + format = "pyproject"; disabled = pythonOlder "3.6"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "angr"; repo = pname; rev = "v${version}"; - hash = "sha256-lhwlZ7eHaEMaTW7c+WCRSeGSIQ5IeEx6XALyYJH+Ey0="; + hash = "sha256-VhlsRd5IN8zF6aUU5Ji/ULkdecOpR+egU3vhYpi+KL8="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/ansi/default.nix b/pkgs/development/python-modules/ansi/default.nix index d198fde80bb82..5847e3ad0f9e8 100644 --- a/pkgs/development/python-modules/ansi/default.nix +++ b/pkgs/development/python-modules/ansi/default.nix @@ -1,17 +1,29 @@ -{ lib, buildPythonPackage, fetchPypi }: +{ lib +, buildPythonPackage +, fetchFromGitHub +, pytestCheckHook +}: buildPythonPackage rec { pname = "ansi"; - version = "0.2.0"; + version = "0.3.6"; + format = "pyproject"; - src = fetchPypi { - inherit pname version; - sha256 = "98e9b27c4bb187867a69480cbc63b843331622fec7e7d090873d806e1b5d8a80"; + src = fetchFromGitHub { + owner = "tehmaze"; + repo = pname; + rev = "${pname}-${version}"; + hash = "sha256-2gu2Dba3LOjMhbCCZrBqzlOor5KqDYThhe8OP8J3O2M="; }; - checkPhase = '' - python -c "import ansi.color" - ''; + checkInputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ + "ansi.colour" + "ansi.color" + ]; meta = with lib; { description = "ANSI cursor movement and graphics"; diff --git a/pkgs/development/python-modules/ansi2html/default.nix b/pkgs/development/python-modules/ansi2html/default.nix index 50188fe0e4a3a..1f45968974cb7 100644 --- a/pkgs/development/python-modules/ansi2html/default.nix +++ b/pkgs/development/python-modules/ansi2html/default.nix @@ -2,13 +2,14 @@ buildPythonPackage rec { pname = "ansi2html"; - version = "1.6.0"; + version = "1.7.0"; + format = "pyproject"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "0f124ea7efcf3f24f1f9398e527e688c9ae6eab26b0b84e1299ef7f94d92c596"; + sha256 = "sha256-aTFr6MaKyRxVgtOXwokOacmTzHzaUgYqx+Rfy2YNjtw="; }; nativeBuildInputs = [ setuptools-scm ]; diff --git a/pkgs/development/python-modules/ansible-compat/default.nix b/pkgs/development/python-modules/ansible-compat/default.nix index 97766cdd3aa0f..743ebab42f1e8 100644 --- a/pkgs/development/python-modules/ansible-compat/default.nix +++ b/pkgs/development/python-modules/ansible-compat/default.nix @@ -1,7 +1,7 @@ { lib , buildPythonPackage , fetchPypi -, ansible +, ansible-core , flaky , pytest-mock , pytestCheckHook @@ -35,7 +35,7 @@ buildPythonPackage rec { ''; checkInputs = [ - ansible + ansible-core flaky pytest-mock pytestCheckHook diff --git a/pkgs/development/python-modules/ansible-doctor/default.nix b/pkgs/development/python-modules/ansible-doctor/default.nix index 4792712f41e94..a56b9690bec24 100644 --- a/pkgs/development/python-modules/ansible-doctor/default.nix +++ b/pkgs/development/python-modules/ansible-doctor/default.nix @@ -1,6 +1,7 @@ -{ buildPythonPackage +{ lib +, buildPythonPackage , fetchFromGitHub -, lib +, pythonOlder # pythonPackages , anyconfig @@ -18,14 +19,16 @@ buildPythonPackage rec { pname = "ansible-doctor"; - version = "1.2.1"; + version = "1.2.4"; format = "pyproject"; + disabled = pythonOlder "3.7"; + src = fetchFromGitHub { owner = "thegeeklab"; repo = "ansible-doctor"; rev = "v${version}"; - sha256 = "sha256-2Jaf7asU4c7kw9v9dUYDL4/M2Y/2qhMM3m0jqYiobUI="; + hash = "sha256-e0FmV4U96TSC/dYJlgo5AeLdXQ7Z7rrP4JCtBxJdkhU="; }; postInstall = '' @@ -34,6 +37,7 @@ buildPythonPackage rec { postPatch = '' substituteInPlace pyproject.toml \ + --replace 'anyconfig = "0.13.0"' 'anyconfig = "*"' \ --replace 'environs = "9.5.0"' 'environs = "*"' \ --replace 'jsonschema = "4.4.0"' 'jsonschema = "*"' \ --replace '"ruamel.yaml" = "0.17.21"' '"ruamel.yaml" = "*"' @@ -58,7 +62,10 @@ buildPythonPackage rec { # no tests doCheck = false; - pythonImportsCheck = [ "ansibledoctor" ]; + + pythonImportsCheck = [ + "ansibledoctor" + ]; meta = with lib; { description = "Annotation based documentation for your Ansible roles"; diff --git a/pkgs/development/python-modules/ansible-later/default.nix b/pkgs/development/python-modules/ansible-later/default.nix index 43f24bfbf0a46..e8f40a109ab87 100644 --- a/pkgs/development/python-modules/ansible-later/default.nix +++ b/pkgs/development/python-modules/ansible-later/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { pname = "ansible-later"; - version = "2.0.9"; + version = "2.0.11"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -29,8 +29,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "thegeeklab"; repo = pname; - rev = "v${version}"; - hash = "sha256-g7/RClQB+6HsDbe/VjjKka97LcwRTKO0OD0RlCG9lWY="; + rev = "refs/tags/v${version}"; + hash = "sha256-K4GResTKKWXQ0OHpBwqTLnptQ8ipuQ9iaGZDlPqRUaI="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/ansible-lint/default.nix b/pkgs/development/python-modules/ansible-lint/default.nix index 503247580fb44..37538088b226c 100644 --- a/pkgs/development/python-modules/ansible-lint/default.nix +++ b/pkgs/development/python-modules/ansible-lint/default.nix @@ -57,10 +57,6 @@ buildPythonPackage rec { pytestCheckHook ]; - pytestFlagsArray = [ - "--numprocesses" "$NIX_BUILD_CORES" - ]; - preCheck = '' # ansible wants to write to $HOME and crashes if it can't export HOME=$(mktemp -d) diff --git a/pkgs/development/python-modules/ansible-runner/default.nix b/pkgs/development/python-modules/ansible-runner/default.nix index 0083362c753b5..ded3205f47b6d 100644 --- a/pkgs/development/python-modules/ansible-runner/default.nix +++ b/pkgs/development/python-modules/ansible-runner/default.nix @@ -1,10 +1,11 @@ { lib , stdenv -, ansible +, ansible-core , buildPythonPackage , fetchPypi , mock , openssh +, pbr , pexpect , psutil , pytest-mock @@ -26,8 +27,12 @@ buildPythonPackage rec { hash = "sha256-2m5dD+gGDL5LnY7QbDYiGdu4GYu0C49WU29GZY2bnBo="; }; + nativeBuildInputs = [ + pbr + ]; + propagatedBuildInputs = [ - ansible + ansible-core psutil pexpect python-daemon @@ -36,7 +41,7 @@ buildPythonPackage rec { ]; checkInputs = [ - ansible # required to place ansible CLI onto the PATH in tests + ansible-core # required to place ansible CLI onto the PATH in tests pytestCheckHook pytest-mock pytest-timeout diff --git a/pkgs/development/python-modules/ansible/base.nix b/pkgs/development/python-modules/ansible/base.nix deleted file mode 100644 index 173e620703a42..0000000000000 --- a/pkgs/development/python-modules/ansible/base.nix +++ /dev/null @@ -1,88 +0,0 @@ -{ lib -, callPackage -, buildPythonPackage -, fetchPypi -, installShellFiles -, cryptography -, jinja2 -, junit-xml -, lxml -, ncclient -, packaging -, paramiko -, pexpect -, psutil -, pycrypto -, pyyaml -, requests -, scp -, windowsSupport ? false, pywinrm -, xmltodict -}: - -let - ansible-collections = callPackage ./collections.nix { - version = "3.4.0"; # must be < 4.0 - sha256 = "096rbgz730njk0pg8qnc27mmz110wqrw354ca9gasb7rqg0f4d6a"; - }; -in -buildPythonPackage rec { - pname = "ansible-base"; - version = "2.10.17"; - - src = fetchPypi { - inherit pname version; - sha256 = "sha256-75JYgsqNTDwszQkc3hmeDIaQJMytDQejN9zyB7/zLzQ="; - }; - - # ansible_connection is already wrapped, so don't pass it through - # the python interpreter again, as it would break execution of - # connection plugins. - postPatch = '' - substituteInPlace lib/ansible/executor/task_executor.py \ - --replace "[python," "[" - ''; - - nativeBuildInputs = [ - installShellFiles - ]; - - propagatedBuildInputs = [ - # depend on ansible-collections instead of the other way around - ansible-collections - # from requirements.txt - cryptography - jinja2 - packaging - pyyaml - # optional dependencies - junit-xml - lxml - ncclient - paramiko - pexpect - psutil - pycrypto - requests - scp - xmltodict - ] ++ lib.optional windowsSupport pywinrm; - - postInstall = '' - installManPage docs/man/man1/*.1 - ''; - - # internal import errors, missing dependencies - doCheck = false; - - passthru = { - collections = ansible-collections; - }; - - meta = with lib; { - description = "Radically simple IT automation"; - homepage = "https://www.ansible.com"; - license = licenses.gpl3Plus; - maintainers = with maintainers; [ hexa ]; - }; -} diff --git a/pkgs/development/python-modules/ansible/core.nix b/pkgs/development/python-modules/ansible/core.nix index fc242ccd10ace..49ae39feba7b9 100644 --- a/pkgs/development/python-modules/ansible/core.nix +++ b/pkgs/development/python-modules/ansible/core.nix @@ -3,6 +3,7 @@ , buildPythonPackage , fetchPypi , installShellFiles +, ansible , cryptography , jinja2 , junit-xml @@ -21,19 +22,13 @@ , xmltodict }: -let - ansible-collections = callPackage ./collections.nix { - version = "5.5.0"; - sha256 = "sha256-uKdtc3iJyb/Q5rDyJ23PjYNtpmcGejVXdvNQTXpm1Rg="; - }; -in buildPythonPackage rec { pname = "ansible-core"; - version = "2.12.3"; + version = "2.12.5"; src = fetchPypi { inherit pname version; - sha256 = "sha256-ihNan3TJfKtndZKTdErTQ1D3GVI+i9m7kAjfTPlTryA="; + sha256 = "sha256-HMyZRPEBMxra0e1A1axmqBSRMwUq402wJnp0qnO+67M="; }; # ansible_connection is already wrapped, so don't pass it through @@ -49,8 +44,8 @@ buildPythonPackage rec { ]; propagatedBuildInputs = [ - # depend on ansible-collections instead of the other way around - ansible-collections + # depend on ansible instead of the other way around + ansible # from requirements.txt cryptography jinja2 @@ -77,10 +72,6 @@ buildPythonPackage rec { # internal import errors, missing dependencies doCheck = false; - passthru = { - collections = ansible-collections; - }; - meta = with lib; { description = "Radically simple IT automation"; homepage = "https://www.ansible.com"; diff --git a/pkgs/development/python-modules/ansible/collections.nix b/pkgs/development/python-modules/ansible/default.nix index 427e76a979cbf..1d2bb9505a27e 100644 --- a/pkgs/development/python-modules/ansible/collections.nix +++ b/pkgs/development/python-modules/ansible/default.nix @@ -1,4 +1,5 @@ { lib +, pythonOlder , buildPythonPackage , fetchPypi , jsonschema @@ -11,25 +12,30 @@ , textfsm , ttp , xmltodict + +# optionals , withJunos ? false , withNetbox ? false - -, version -, sha256 }: -buildPythonPackage rec { +let pname = "ansible"; - inherit version; + version = "5.6.0"; +in +buildPythonPackage { + inherit pname version; format = "setuptools"; + disabled = pythonOlder "3.8"; + src = fetchPypi { - inherit pname version sha256; + inherit pname version; + sha256 = "sha256-rNMHMUNBVNo3bO7rQW7hVBzfuOo8ZIAjpVo0yz7K+fM="; }; postPatch = '' - # make ansible-base depend on ansible-collection, not the other way around - sed -Ei '/ansible-(base|core)/d' setup.py + # we make ansible-core depend on ansible, not the other way around + sed -Ei '/ansible-core/d' setup.py ''; propagatedBuildInputs = lib.unique ([ diff --git a/pkgs/development/python-modules/ansible/legacy.nix b/pkgs/development/python-modules/ansible/legacy.nix deleted file mode 100644 index 50662b43f32c0..0000000000000 --- a/pkgs/development/python-modules/ansible/legacy.nix +++ /dev/null @@ -1,55 +0,0 @@ -{ lib -, fetchPypi -, buildPythonPackage -, pycrypto -, paramiko -, jinja2 -, pyyaml -, httplib2 -, six -, netaddr -, dnspython -, jmespath -, dopy -, ncclient -, windowsSupport ? false -, pywinrm -}: - -buildPythonPackage rec { - pname = "ansible"; - version = "2.9.27"; - - src = fetchPypi { - inherit pname version; - sha256 = "sha256-R5FZ5Qs72Qkg0GvFlBDDpR0/m+m04QKeEdHkotBwVzY="; - }; - - prePatch = '' - # ansible-connection is wrapped, so make sure it's not passed - # through the python interpreter. - sed -i "s/\[python, /[/" lib/ansible/executor/task_executor.py - ''; - - postInstall = '' - for m in docs/man/man1/*; do - install -vD $m -t $out/share/man/man1 - done - ''; - - propagatedBuildInputs = [ - pycrypto paramiko jinja2 pyyaml httplib2 - six netaddr dnspython jmespath dopy ncclient - ] ++ lib.optional windowsSupport pywinrm; - - # dificult to test - doCheck = false; - - meta = with lib; { - homepage = "https://www.ansible.com"; - description = "Radically simple IT automation"; - license = [ licenses.gpl3 ] ; - maintainers = with maintainers; [ joamaki costrouc hexa ]; - platforms = platforms.linux ++ platforms.darwin; - }; -} diff --git a/pkgs/development/python-modules/anybadge/default.nix b/pkgs/development/python-modules/anybadge/default.nix index bc776e42f07b4..49be7afaac7a2 100644 --- a/pkgs/development/python-modules/anybadge/default.nix +++ b/pkgs/development/python-modules/anybadge/default.nix @@ -6,14 +6,14 @@ buildPythonPackage rec { pname = "anybadge"; - version = "1.8.0"; + version = "1.9.0"; format = "setuptools"; src = fetchFromGitHub { owner = "jongracecox"; repo = pname; rev = "v${version}"; - sha256 = "sha256-xKHIoV/8qsNMcU5fd92Jjh7d7jTeYN5xakMEjR6qPX8="; + sha256 = "sha256-9C1oPZcXjrGwvkx20E+xPGje+ATD9HwOCWWn/pg+98Q="; }; # setup.py reads its version from the TRAVIS_TAG environment variable diff --git a/pkgs/development/python-modules/anyconfig/default.nix b/pkgs/development/python-modules/anyconfig/default.nix index 3e0e347bbfa3d..17794d5c8c46c 100644 --- a/pkgs/development/python-modules/anyconfig/default.nix +++ b/pkgs/development/python-modules/anyconfig/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "anyconfig"; - version = "0.12.0"; + version = "0.13.0"; src = fetchPypi { inherit pname version; - sha256 = "sha256-MJHXZ1dAaG+t6FdVU38qfGzO+oZZxbtWF04C3tdLltU="; + sha256 = "sha256-A/8uF2KvOI+7vtHBq3+fHsAGqR2n2zpouWPabneV0qw="; }; postPatch = '' diff --git a/pkgs/development/python-modules/anyio/default.nix b/pkgs/development/python-modules/anyio/default.nix index 382e64ea0f4fb..a9ae447d45ff5 100644 --- a/pkgs/development/python-modules/anyio/default.nix +++ b/pkgs/development/python-modules/anyio/default.nix @@ -2,6 +2,7 @@ , lib , buildPythonPackage , fetchFromGitHub +, fetchpatch , pythonOlder , setuptools-scm , idna @@ -19,7 +20,7 @@ buildPythonPackage rec { pname = "anyio"; - version = "3.3.4"; + version = "3.5.0"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -27,9 +28,17 @@ buildPythonPackage rec { owner = "agronholm"; repo = pname; rev = version; - sha256 = "sha256-aMnXZ+4dlybId2QhjE/3STY+Sj/vzI6K7wmqqx+P8yE="; + sha256 = "sha256-AZ9M/NBCBlMIUpRJgKbJRL/oReZDUh2Jhwtoxoo0tMs="; }; + patches = [ + (fetchpatch { + # Pytest 7.0 compatibility + url = "https://github.com/agronholm/anyio/commit/fed7cc4f95e196f68251bcb9253da3b143ea8e7e.patch"; + sha256 = "sha256-VmZmiQEmWJ4aPz0Wx+GTMZo7jXRDScnRYf2Hu2hiRVw="; + }) + ]; + preBuild = '' export SETUPTOOLS_SCM_PRETEND_VERSION=${version} ''; diff --git a/pkgs/development/python-modules/apache-airflow/default.nix b/pkgs/development/python-modules/apache-airflow/default.nix index 4ac03a8820fb8..948fae7893b85 100644 --- a/pkgs/development/python-modules/apache-airflow/default.nix +++ b/pkgs/development/python-modules/apache-airflow/default.nix @@ -65,13 +65,13 @@ , mkYarnPackage }: let - version = "2.2.3"; + version = "2.2.4"; airflow-src = fetchFromGitHub rec { owner = "apache"; repo = "airflow"; rev = version; - sha256 = "02y3az7yj4g4qaamq5s1bcvy3knd6xmvnhbfqs3kbm51irkba1zq"; + sha256 = "sha256-JCcEgCq1sB8lBaeJy7QQbWU00sGAh5vUmJAptF8M9qo="; }; # airflow bundles a web interface, which is built using webpack by an undocumented shell script in airflow's source tree. diff --git a/pkgs/development/python-modules/apache-beam/default.nix b/pkgs/development/python-modules/apache-beam/default.nix index 2eeebaaea7f8c..8d774410ca355 100644 --- a/pkgs/development/python-modules/apache-beam/default.nix +++ b/pkgs/development/python-modules/apache-beam/default.nix @@ -25,8 +25,6 @@ , pydot , pyhamcrest , pymongo -, pytest-timeout -, pytest-xdist , pytestCheckHook , python , pythonAtLeast @@ -43,26 +41,21 @@ buildPythonPackage rec { pname = "apache-beam"; - version = "2.35.0"; + version = "2.37.0"; disabled = pythonAtLeast "3.10"; src = fetchFromGitHub { owner = "apache"; repo = "beam"; rev = "v${version}"; - sha256 = "0qxkas33d8i6yj133plnadbfm74ak7arn7ldpziyiwdav3hj68sy"; + sha256 = "sha256-FmfTxRLqXUHhhAZIxCRx2+phX0bmU5rIHaftBU4yBJY="; }; - patches = [ - ./relax-deps.patch - # Fixes https://issues.apache.org/jira/browse/BEAM-9324 - ./fix-cython.patch - ]; - # See https://github.com/NixOS/nixpkgs/issues/156957. postPatch = '' substituteInPlace setup.py \ - --replace "typing-extensions>=3.7.0,<4" "typing-extensions" \ + --replace "dill>=0.3.1.1,<0.3.2" "dill" \ + --replace "httplib2>=0.8,<0.20.0" "httplib2" \ --replace "pyarrow>=0.15.1,<7.0.0" "pyarrow" ''; @@ -109,8 +102,6 @@ buildPythonPackage rec { parameterized psycopg2 pyhamcrest - pytest-timeout - pytest-xdist pytestCheckHook pyyaml requests-mock @@ -123,6 +114,18 @@ buildPythonPackage rec { preCheck = "cd $out/lib/${python.libPrefix}/site-packages"; disabledTestPaths = [ + # Fails with + # _______ ERROR collecting apache_beam/io/external/xlang_jdbcio_it_test.py _______ + # apache_beam/io/external/xlang_jdbcio_it_test.py:80: in <module> + # class CrossLanguageJdbcIOTest(unittest.TestCase): + # apache_beam/io/external/xlang_jdbcio_it_test.py:99: in CrossLanguageJdbcIOTest + # container_init: Callable[[], Union[PostgresContainer, MySqlContainer]], + # E NameError: name 'MySqlContainer' is not defined + # + # Test relies on the testcontainers package, which is not currently (as of + # 2022-04-08) available in nixpkgs. + "apache_beam/io/external/xlang_jdbcio_it_test.py" + # These tests depend on the availability of specific servers backends. "apache_beam/runners/portability/flink_runner_test.py" "apache_beam/runners/portability/samza_runner_test.py" @@ -136,12 +139,6 @@ buildPythonPackage rec { # quite elaborate testing infra with containers and multiple # different runners - I don't expect them to help debugging these # when running via our (= custom from their PoV) testing infra. - "testBuildListUnpack" - "testBuildTupleUnpack" - "testBuildTupleUnpackWithCall" - "test_convert_bare_types" - "test_incomparable_default" - "test_pardo_type_inference" "test_with_main_session" ]; diff --git a/pkgs/development/python-modules/apache-beam/fix-cython.patch b/pkgs/development/python-modules/apache-beam/fix-cython.patch deleted file mode 100644 index f73d75b4b84a4..0000000000000 --- a/pkgs/development/python-modules/apache-beam/fix-cython.patch +++ /dev/null @@ -1,41 +0,0 @@ -diff --git a/apache_beam/runners/worker/operations.py b/apache_beam/runners/worker/operations.py -index 3464c5750c..5921c72b90 100644 ---- a/apache_beam/runners/worker/operations.py -+++ b/apache_beam/runners/worker/operations.py -@@ -69,18 +69,6 @@ if TYPE_CHECKING: - from apache_beam.runners.worker.statesampler import StateSampler - from apache_beam.transforms.userstate import TimerSpec - --# Allow some "pure mode" declarations. --try: -- import cython --except ImportError: -- -- class FakeCython(object): -- @staticmethod -- def cast(type, value): -- return value -- -- globals()['cython'] = FakeCython() -- - _globally_windowed_value = GlobalWindows.windowed_value(None) - _global_window_type = type(_globally_windowed_value.windows[0]) - -@@ -149,7 +137,7 @@ class ConsumerSet(Receiver): - # type: (WindowedValue) -> None - self.update_counters_start(windowed_value) - for consumer in self.consumers: -- cython.cast(Operation, consumer).process(windowed_value) -+ consumer.process(windowed_value) - self.update_counters_finish() - - def try_split(self, fraction_of_remainder): -@@ -345,7 +333,7 @@ class Operation(object): - - def output(self, windowed_value, output_index=0): - # type: (WindowedValue, int) -> None -- cython.cast(Receiver, self.receivers[output_index]).receive(windowed_value) -+ self.receivers[output_index].receive(windowed_value) - - def add_receiver(self, operation, output_index=0): - # type: (Operation, int) -> None diff --git a/pkgs/development/python-modules/apache-beam/relax-deps.patch b/pkgs/development/python-modules/apache-beam/relax-deps.patch deleted file mode 100644 index 67bd38f5e7cc6..0000000000000 --- a/pkgs/development/python-modules/apache-beam/relax-deps.patch +++ /dev/null @@ -1,20 +0,0 @@ -diff --git a/setup.py b/setup.py -index 9429459622..2727b3becb 100644 ---- a/setup.py -+++ b/setup.py -@@ -136,12 +136,12 @@ REQUIRED_PACKAGES = [ - # version of dill. It is best to use the same version of dill on client and - # server, therefore list of allowed versions is very narrow. - # See: https://github.com/uqfoundation/dill/issues/341. -- 'dill>=0.3.1.1,<0.3.2', -+ 'dill>=0.3.1.1', - 'fastavro>=0.21.4,<2', - 'grpcio>=1.29.0,<2', - 'hdfs>=2.1.0,<3.0.0', -- 'httplib2>=0.8,<0.20.0', -- 'numpy>=1.14.3,<1.21.0', -+ 'httplib2>=0.8', -+ 'numpy>=1.14.3', - 'pymongo>=3.8.0,<4.0.0', - 'oauth2client>=2.0.1,<5', - 'protobuf>=3.12.2,<4', diff --git a/pkgs/development/python-modules/aplpy/default.nix b/pkgs/development/python-modules/aplpy/default.nix index 682ef6e17fdf0..7461c502a31de 100644 --- a/pkgs/development/python-modules/aplpy/default.nix +++ b/pkgs/development/python-modules/aplpy/default.nix @@ -11,6 +11,7 @@ , pyregion , pillow , scikitimage +, cython , shapely , pytest , pytest-astropy @@ -18,39 +19,18 @@ buildPythonPackage rec { pname = "aplpy"; - version = "2.0.3"; + version = "2.1.0"; format = "pyproject"; src = fetchPypi { - pname = "APLpy"; + pname = "aplpy"; inherit version; - sha256 = "239f3d83635ca4251536aeb577df7c60df77fc4d658097b92094719739aec3f3"; + sha256 = "sha256-KCdmBwQWt7IfHsjq7pWlbSISEpfQZDyt+SQSTDaUCV4="; }; - patches = [ - # Fixes compatibility with astropy-helpers. This patch has been merged into - # the master branch as of May 2020, and should be part of the next - # upstream release (v2.0.3 was tagged in Feb. 2019). - (fetchpatch { - url = "https://github.com/aplpy/aplpy/pull/448.patch"; - sha256 = "1pnzh7ykjc8hwahzbzyryrzv5a8fddgd1bmzbhagkrn6lmvhhpvq"; - excludes = [ "tox.ini" "azure-pipelines.yml" ".circleci/config.yml" "MANIFEST.in" ".gitignore" - "setup.cfg" "appveyor.yml" "readthedocs.yml" "CHANGES.rst" ".gitmodules" ".travis.yml" "astropy_helpers" ]; - }) - # Fix for matplotlib >= 3.4 (https://github.com/aplpy/aplpy/pull/466) - # Note: because of a security thing, github will refuse to serve this patch from the - # "normal" location - # (https://github.com/aplpy/aplpy/commit/56c1cc694fdea69e7da8506d3212c4495adb0ca5.patch) - # due to the fact that it contains the PDF magic bytes, but it will serve it from - # this githubusercontent domain. - (fetchpatch { - url = "https://patch-diff.githubusercontent.com/raw/aplpy/aplpy/pull/466/commit/56c1cc694fdea69e7da8506d3212c4495adb0ca5.patch"; - sha256 = "0jna2n1cgfzr0a27m5z94wwph7qg25hs7lycrdb2dp3943rb35g4"; - }) - ]; - propagatedBuildInputs = [ numpy + cython astropy matplotlib reproject diff --git a/pkgs/development/python-modules/apprise/default.nix b/pkgs/development/python-modules/apprise/default.nix index 11990e7d39965..8be62dfd0da1b 100644 --- a/pkgs/development/python-modules/apprise/default.nix +++ b/pkgs/development/python-modules/apprise/default.nix @@ -13,21 +13,21 @@ , pythonOlder , pyyaml , requests -, requests_oauthlib +, requests-oauthlib , six , slixmpp }: buildPythonPackage rec { pname = "apprise"; - version = "0.9.7"; + version = "0.9.8.2"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-BOMeSvwmGiZvA95+e2bceCGXRwowU5+zJAl7Sn4wKqM="; + hash = "sha256-EDKa77sU09HOBp4NVsHNwp6S4UbHyqX8T8rFGOnV8kA="; }; nativeBuildInputs = [ @@ -41,7 +41,7 @@ buildPythonPackage rec { markdown pyyaml requests - requests_oauthlib + requests-oauthlib six ]; diff --git a/pkgs/development/python-modules/approvaltests/default.nix b/pkgs/development/python-modules/approvaltests/default.nix index b74533e0d44b9..dd2f26e92d1ee 100644 --- a/pkgs/development/python-modules/approvaltests/default.nix +++ b/pkgs/development/python-modules/approvaltests/default.nix @@ -1,36 +1,58 @@ -{ lib, buildPythonPackage, fetchFromGitHub +{ lib +, buildPythonPackage +, fetchFromGitHub +, pythonOlder + +# propagates +, allpairspy , beautifulsoup4 , empty-files -, numpy , pyperclip , pytest + +# tests +, numpy +, pytestCheckHook }: buildPythonPackage rec { - version = "3.6.0"; + version = "5.0.1"; pname = "approvaltests"; + format = "setuptools"; + + disabled = pythonOlder "3.6.1"; # no tests included in PyPI tarball src = fetchFromGitHub { owner = "approvals"; repo = "ApprovalTests.Python"; - rev = "v${version}"; - sha256 = "sha256-pgGuIoYV6JRM9h7hR8IeNduqsGm+UrKq+P/T1LM30NE="; + rev = "refs/tags/v${version}"; + sha256 = "sha256-lmH/nw/7woLCDepR/rDQUqwrhuLFY+TO8sdgK1+apgc="; }; propagatedBuildInputs = [ + allpairspy beautifulsoup4 empty-files - numpy pyperclip pytest ]; - postPatch = '' - substituteInPlace setup.py \ - --replace bs4 beautifulsoup4 \ - --replace "pyperclip==1.5.27" "pyperclip>=1.5.27" - ''; + checkInputs = [ + numpy + pytestCheckHook + ]; + + disabledTests = [ + # tests expects paths below ApprovalTests.Python directory + "test_received_filename" + "test_pytest_namer" + ]; + + pythonImportsCheck = [ + "approvaltests.approvals" + "approvaltests.reporters.generic_diff_reporter_factory" + ]; meta = with lib; { description = "Assertion/verification library to aid testing"; diff --git a/pkgs/development/python-modules/appthreat-vulnerability-db/default.nix b/pkgs/development/python-modules/appthreat-vulnerability-db/default.nix index 9fc959126b37f..a6984e773dd09 100644 --- a/pkgs/development/python-modules/appthreat-vulnerability-db/default.nix +++ b/pkgs/development/python-modules/appthreat-vulnerability-db/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "appthreat-vulnerability-db"; - version = "2.0.1"; + version = "2.0.2"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -22,8 +22,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "AppThreat"; repo = "vulnerability-db"; - rev = "v${version}"; - sha256 = "sha256-fqpBnxcRBBXsjJepxDuoDbT3hk5rXAvky11sIvQS9XI="; + rev = "refs/tags/v${version}"; + sha256 = "sha256-Ozf3qmD9JRH19N/eERhDHz4LUoWwCVepLbSRCg6lWnQ="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/aprslib/default.nix b/pkgs/development/python-modules/aprslib/default.nix index 67d585d36ed0c..7c2fa222bd2cf 100644 --- a/pkgs/development/python-modules/aprslib/default.nix +++ b/pkgs/development/python-modules/aprslib/default.nix @@ -7,13 +7,13 @@ buildPythonPackage rec { pname = "aprslib"; - version = "0.7.0"; + version = "0.7.1"; src = fetchFromGitHub { owner = "rossengeorgiev"; repo = "aprs-python"; rev = "v${version}"; - sha256 = "sha256-QasyF0Ch4zdPoAgcqRavEENVGA/02/AgeWAgXYcSUjk="; + hash = "sha256-wWlzOFhWJ7hJeM3RWsPTEsLjRzN4SMXsb2Cd612HB4w="; }; checkInputs = [ diff --git a/pkgs/development/python-modules/apsw/default.nix b/pkgs/development/python-modules/apsw/default.nix index 46ae3fc34e565..dda3fe6a6836e 100644 --- a/pkgs/development/python-modules/apsw/default.nix +++ b/pkgs/development/python-modules/apsw/default.nix @@ -4,12 +4,12 @@ , fetchFromGitHub , sqlite , isPyPy -, pytestCheckHook +, python }: buildPythonPackage rec { pname = "apsw"; - version = "3.37.0-r1"; + version = "3.38.1-r1"; format = "setuptools"; disabled = isPyPy; @@ -18,34 +18,19 @@ buildPythonPackage rec { owner = "rogerbinns"; repo = "apsw"; rev = version; - sha256 = "0p6rlbk7p6hj5mbmk1a8phazw3ym6hf5103zkxzg4p1jgjgi0xpl"; + hash = "sha256-pbb6wCu1T1mPlgoydB1Y1AKv+kToGkdVUjiom2vTqf4="; }; buildInputs = [ sqlite ]; - checkInputs = [ - pytestCheckHook - ]; - - pytestFlagsArray = [ - "tests.py" - ]; - - disabledTests = [ - "testCursor" - "testLoadExtension" - "testShell" - "testVFS" - "testVFSWithWAL" - "testdb" - ] ++ lib.optionals stdenv.isDarwin [ - # This is https://github.com/rogerbinns/apsw/issues/277 but - # because we use pytestCheckHook we need to blacklist the test - # manually - "testzzForkChecker" - ]; + # Project uses custom test setup to exclude some tests by default, so using pytest + # requires more maintenance + # https://github.com/rogerbinns/apsw/issues/335 + checkPhase = '' + ${python.interpreter} setup.py test + ''; pythonImportsCheck = [ "apsw" @@ -55,6 +40,6 @@ buildPythonPackage rec { description = "A Python wrapper for the SQLite embedded relational database engine"; homepage = "https://github.com/rogerbinns/apsw"; license = licenses.zlib; - maintainers = with maintainers; [ ]; + maintainers = with maintainers; [ gador ]; }; } diff --git a/pkgs/development/python-modules/apycula/default.nix b/pkgs/development/python-modules/apycula/default.nix index d8bb92e0d3bcf..f9ffeefa296d9 100644 --- a/pkgs/development/python-modules/apycula/default.nix +++ b/pkgs/development/python-modules/apycula/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "apycula"; - version = "0.3"; + version = "0.3.1"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -20,7 +20,7 @@ buildPythonPackage rec { src = fetchPypi { inherit version; pname = "Apycula"; - hash = "sha256-Ncecrn5fQW0iAgrE3P7GZTx8E1TiFqiDMhZQSPrDvdk="; + hash = "sha256-RoWZt2Ox0XjJ6vmuCCcNCTMfwZnwJ6fSx71fmipmu2c="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/archinfo/default.nix b/pkgs/development/python-modules/archinfo/default.nix index f9affcddd122b..b9b29a7167abc 100644 --- a/pkgs/development/python-modules/archinfo/default.nix +++ b/pkgs/development/python-modules/archinfo/default.nix @@ -1,7 +1,6 @@ { lib , buildPythonPackage , fetchFromGitHub -, fetchpatch , pytestCheckHook , nose , pythonOlder @@ -9,8 +8,8 @@ buildPythonPackage rec { pname = "archinfo"; - version = "9.1.12332"; - format = "setuptools"; + version = "9.2.1"; + format = "pyproject"; disabled = pythonOlder "3.6"; @@ -18,7 +17,7 @@ buildPythonPackage rec { owner = "angr"; repo = pname; rev = "v${version}"; - hash = "sha256-nv/hwQZgKv/cM8fF6GqI8zY9GAe8aCZ/AGFOmhz+bMM="; + hash = "sha256-RWdY7tzT5wDVjAn1QIkQm8b5lIo++VzktsYZxn8taeg="; }; checkInputs = [ @@ -26,15 +25,6 @@ buildPythonPackage rec { pytestCheckHook ]; - patches = [ - # Make archinfo import without installing pyvex, https://github.com/angr/archinfo/pull/113 - (fetchpatch { - name = "fix-import-issue.patch"; - url = "https://github.com/angr/archinfo/commit/d29c108f55ffd458ff1d3d65db2d651c76b19267.patch"; - sha256 = "sha256-9vi0QyqQLIPQxFuB8qrpcnPXWOJ6d27/IXJE/Ui6HhM="; - }) - ]; - pythonImportsCheck = [ "archinfo" ]; @@ -43,6 +33,6 @@ buildPythonPackage rec { description = "Classes with architecture-specific information"; homepage = "https://github.com/angr/archinfo"; license = with licenses; [ bsd2 ]; - maintainers = [ maintainers.fab ]; + maintainers = with maintainers; [ fab ]; }; } diff --git a/pkgs/development/python-modules/arris-tg2492lg/default.nix b/pkgs/development/python-modules/arris-tg2492lg/default.nix new file mode 100644 index 0000000000000..9a883b2f68ee0 --- /dev/null +++ b/pkgs/development/python-modules/arris-tg2492lg/default.nix @@ -0,0 +1,43 @@ +{ lib +, aiohttp +, buildPythonPackage +, fetchFromGitHub +, pytest-aiohttp +, pytestCheckHook +, pythonOlder +}: + +buildPythonPackage rec { + pname = "arris-tg2492lg"; + version = "2.1.0"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "vanbalken"; + repo = pname; + rev = version; + sha256 = "sha256-C1o9HWWJ/G/7Pp6I0FbRmX2PQvUJx71L9wHRkUMtnL4="; + }; + + propagatedBuildInputs = [ + aiohttp + ]; + + checkInputs = [ + pytest-aiohttp + pytestCheckHook + ]; + + pythonImportsCheck = [ + "arris_tg2492lg" + ]; + + meta = with lib; { + description = "Library to connect to an Arris TG2492LG"; + homepage = "https://github.com/vanbalken/arris-tg2492lg"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/arrow/default.nix b/pkgs/development/python-modules/arrow/default.nix index fc66509a194a1..c09610c3be1f7 100644 --- a/pkgs/development/python-modules/arrow/default.nix +++ b/pkgs/development/python-modules/arrow/default.nix @@ -12,13 +12,13 @@ buildPythonPackage rec { pname = "arrow"; - version = "1.2.1"; + version = "1.2.2"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "c2dde3c382d9f7e6922ce636bf0b318a7a853df40ecb383b29192e6c5cc82840"; + sha256 = "sha256-Bcrx/T2aEaETWytvCYh0IRU7lFWOXvTQkLVntHFzrCs="; }; postPatch = '' diff --git a/pkgs/development/python-modules/asana/default.nix b/pkgs/development/python-modules/asana/default.nix index c7839f051478e..d179f3f94902d 100644 --- a/pkgs/development/python-modules/asana/default.nix +++ b/pkgs/development/python-modules/asana/default.nix @@ -1,37 +1,47 @@ -{ buildPythonPackage, pythonAtLeast, pytest, requests, requests_oauthlib, six -, fetchFromGitHub, responses, lib +{ lib +, buildPythonPackage +, fetchFromGitHub +, pytestCheckHook +, pythonOlder +, requests +, requests-oauthlib +, responses +, six }: buildPythonPackage rec { pname = "asana"; - version = "0.10.3"; + version = "0.10.9"; + format = "setuptools"; - # upstream reportedly doesn't support 3.7 yet, blocked on - # https://bugs.python.org/issue34226 - disabled = pythonAtLeast "3.7"; + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "asana"; repo = "python-asana"; rev = "v${version}"; - sha256 = "11nsfygcfpc2qb2gy4npi9w00cqfh88g7k3rsfq7xambz1zjdz1n"; + sha256 = "sha256-9gOkCMY15ChdhiFdzS0TjvWpVTKKEGt7XIcK6EhkSK8="; }; - checkInputs = [ pytest responses ]; - propagatedBuildInputs = [ requests requests_oauthlib six ]; + propagatedBuildInputs = [ + requests + requests-oauthlib + six + ]; - postPatch = '' - substituteInPlace setup.py \ - --replace "requests_oauthlib >= 0.8.0, == 0.8.*" "requests_oauthlib>=0.8.0<2.0" - ''; + checkInputs = [ + pytestCheckHook + responses + ]; - checkPhase = '' - py.test tests - ''; + pythonImportsCheck = [ + "asana" + ]; meta = with lib; { description = "Python client library for Asana"; homepage = "https://github.com/asana/python-asana"; license = licenses.mit; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/development/python-modules/asciimatics/default.nix b/pkgs/development/python-modules/asciimatics/default.nix index 0d7286c171f05..3854abed09f80 100644 --- a/pkgs/development/python-modules/asciimatics/default.nix +++ b/pkgs/development/python-modules/asciimatics/default.nix @@ -12,11 +12,11 @@ buildPythonPackage rec { pname = "asciimatics"; - version = "1.13.0"; + version = "1.14.0"; src = fetchPypi { inherit pname version; - sha256 = "a041826ec5add03fb882d8981c1debf9b9e98274f4f2d52ec21ef30de70c2c6e"; + sha256 = "sha256-FtIM5CIQtDTrBbpGns24KTrH7TwM4N1PcOMNctdgIic="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/asdf-standard/default.nix b/pkgs/development/python-modules/asdf-standard/default.nix new file mode 100644 index 0000000000000..bc691fb020950 --- /dev/null +++ b/pkgs/development/python-modules/asdf-standard/default.nix @@ -0,0 +1,43 @@ +{ lib +, buildPythonPackage +, fetchPypi +, importlib-resources +, pythonOlder +, setuptools-scm +}: + +buildPythonPackage rec { + pname = "asdf-standard"; + version = "1.0.2"; + format = "pyproject"; + + disabled = pythonOlder "3.7"; + + src = fetchPypi { + pname = "asdf_standard"; + inherit version; + hash = "sha256-Ic/AXdghVZtn37xU0DsrzArYtstcydFNdZH3OrNFFwA="; + }; + + nativeBuildInputs = [ + setuptools-scm + ]; + + propagatedBuildInputs = lib.optionals (pythonOlder "3.9") [ + importlib-resources + ]; + + # Circular dependency on asdf + doCheck = false; + + pythonImportsCheck = [ + "asdf_standard" + ]; + + meta = with lib; { + description = "Standards document describing ASDF"; + homepage = "https://github.com/asdf-format/asdf-standard"; + license = licenses.bsd3; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/asdf-transform-schemas/default.nix b/pkgs/development/python-modules/asdf-transform-schemas/default.nix new file mode 100644 index 0000000000000..8333e25f01aa7 --- /dev/null +++ b/pkgs/development/python-modules/asdf-transform-schemas/default.nix @@ -0,0 +1,46 @@ +{ lib +, asdf-standard +, buildPythonPackage +, fetchPypi +, importlib-resources +, pythonOlder +, setuptools-scm +}: + +buildPythonPackage rec { + pname = "asdf-transform-schemas"; + version = "0.2.2"; + format = "pyproject"; + + disabled = pythonOlder "3.7"; + + src = fetchPypi { + pname = "asdf_transform_schemas"; + inherit version; + hash = "sha256-9xqTCe0+vQmxk3roV8lM7JKIeHBEDrPphou77XJlaxU="; + }; + + nativeBuildInputs = [ + setuptools-scm + ]; + + propagatedBuildInputs = [ + asdf-standard + ] ++ lib.optionals (pythonOlder "3.9") [ + importlib-resources + ]; + + # Circular dependency on asdf + doCheck = false; + + pythonImportsCheck = [ + "asdf_transform_schemas" + ]; + + meta = with lib; { + description = "ASDF schemas for validating transform tags"; + homepage = "https://github.com/asdf-format/asdf-transform-schemas"; + license = licenses.bsd3; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/asdf/default.nix b/pkgs/development/python-modules/asdf/default.nix index 1a9ba2dd0963c..658ec10a0ae23 100644 --- a/pkgs/development/python-modules/asdf/default.nix +++ b/pkgs/development/python-modules/asdf/default.nix @@ -1,10 +1,13 @@ { lib +, asdf-standard +, asdf-transform-schemas , astropy , buildPythonPackage , fetchPypi , importlib-resources , jmespath , jsonschema +, lz4 , numpy , packaging , pytest-astropy @@ -17,18 +20,23 @@ buildPythonPackage rec { pname = "asdf"; - version = "2.8.3"; - disabled = pythonOlder "3.6"; + version = "2.11.1"; format = "pyproject"; + disabled = pythonOlder "3.7"; + src = fetchPypi { inherit pname version; - sha256 = "de0f70ffb2e0d539461940d6f7529c3548541fa098d8edc37af256af61c09b44"; + hash = "sha256-1uDRoS9nyZCLPdbiAQBADoiwqaVBzj1NMpZXdJQYoxQ="; }; - nativeBuildInputs = [ setuptools-scm ]; + nativeBuildInputs = [ + setuptools-scm + ]; propagatedBuildInputs = [ + asdf-standard + asdf-transform-schemas jmespath jsonschema numpy @@ -40,8 +48,9 @@ buildPythonPackage rec { ]; checkInputs = [ - pytest-astropy astropy + lz4 + pytest-astropy pytestCheckHook ]; @@ -49,11 +58,13 @@ buildPythonPackage rec { export PY_IGNORE_IMPORTMISMATCH=1 ''; - pythonImportsCheck = [ "asdf" ]; + pythonImportsCheck = [ + "asdf" + ]; meta = with lib; { description = "Python tools to handle ASDF files"; - homepage = "https://github.com/spacetelescope/asdf"; + homepage = "https://github.com/asdf-format/asdf"; license = licenses.bsd3; maintainers = with maintainers; [ costrouc ]; }; diff --git a/pkgs/development/python-modules/asgiref/default.nix b/pkgs/development/python-modules/asgiref/default.nix index 5eea9a5579a19..2ea9f4130f979 100644 --- a/pkgs/development/python-modules/asgiref/default.nix +++ b/pkgs/development/python-modules/asgiref/default.nix @@ -6,21 +6,31 @@ , pytest-asyncio , pytestCheckHook , pythonOlder +, fetchpatch }: buildPythonPackage rec { - version = "3.4.1"; + version = "3.5.0"; pname = "asgiref"; + format = "setuptools"; - disabled = pythonOlder "3.6"; + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "django"; repo = pname; rev = version; - sha256 = "sha256-aXD46qH5sTTmp0rlzQGLAN+MfIz1u6obCwtfqoIYgBA="; + sha256 = "sha256-eWDsd8iWK1C/X3t/fKAM1i4hyTM/daGTd8CDSgDTL/U="; }; + patches = [ + (fetchpatch { + name = "remove-sock-nonblock-in-tests.patch"; + url = "https://github.com/django/asgiref/commit/d451a724c93043b623e83e7f86743bbcd9a05c45.patch"; + sha256 = "0whdsn5isln4dqbqqngvsy4yxgaqgpnziz0cndj1zdxim8cdicj7"; + }) + ]; + propagatedBuildInputs = [ async-timeout ]; @@ -40,6 +50,6 @@ buildPythonPackage rec { description = "Reference ASGI adapters and channel layers"; homepage = "https://github.com/django/asgiref"; license = licenses.bsd3; - maintainers = with maintainers; [ ]; + maintainers = with maintainers; [ SuperSandro2000 ]; }; } diff --git a/pkgs/development/python-modules/asn1crypto/default.nix b/pkgs/development/python-modules/asn1crypto/default.nix index 989b974c64a64..0c071c4206b06 100644 --- a/pkgs/development/python-modules/asn1crypto/default.nix +++ b/pkgs/development/python-modules/asn1crypto/default.nix @@ -1,19 +1,25 @@ { lib , buildPythonPackage -, fetchPypi +, fetchFromGitHub +, pytestCheckHook }: buildPythonPackage rec { pname = "asn1crypto"; - version = "1.4.0"; + version = "1.5.1"; + format = "setuptools"; - src = fetchPypi { - inherit pname version; - sha256 = "f4f6e119474e58e04a2b1af817eb585b4fd72bdd89b998624712b5c99be7641c"; + # Pulling from Github to run tests + src = fetchFromGitHub { + owner = "wbond"; + repo = "asn1crypto"; + rev = version; + sha256 = "sha256-M8vASxhaJPgkiTrAckxz7gk/QHkrFlNz7fFbnLEBT+M="; }; - # No tests included - doCheck = false; + checkInputs = [ + pytestCheckHook + ]; meta = { description = "Fast ASN.1 parser and serializer with definitions for private keys, public keys, certificates, CRL, OCSP, CMS, PKCS#3, PKCS#7, PKCS#8, PKCS#12, PKCS#5, X.509 and TSP"; diff --git a/pkgs/development/python-modules/astroid/default.nix b/pkgs/development/python-modules/astroid/default.nix index ab62a565ce678..539787403c6ef 100644 --- a/pkgs/development/python-modules/astroid/default.nix +++ b/pkgs/development/python-modules/astroid/default.nix @@ -1,6 +1,7 @@ { lib , buildPythonPackage , fetchFromGitHub +, pythonAtLeast , pythonOlder , isPyPy , lazy-object-proxy @@ -14,7 +15,7 @@ buildPythonPackage rec { pname = "astroid"; - version = "2.9.3"; # Check whether the version is compatible with pylint + version = "2.11.2"; # Check whether the version is compatible with pylint disabled = pythonOlder "3.6.2"; @@ -22,7 +23,7 @@ buildPythonPackage rec { owner = "PyCQA"; repo = pname; rev = "v${version}"; - sha256 = "1x77faggk1dgxy48ng31xj9h6p51w312kvk5zqgvd5f19nvznxyi"; + sha256 = "sha256-adnvJCchsMWQxsIlenndUb6Mw1MgCNAanZcTmssmsEc="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; @@ -45,6 +46,9 @@ buildPythonPackage rec { disabledTests = [ # assert (1, 1) == (1, 16) "test_end_lineno_string" + ] ++ lib.optionals (pythonAtLeast "3.10") [ + # AssertionError: Lists differ: ['ABC[16 chars]yBase', 'Final', 'Generic', 'MyProtocol', 'Protocol', 'object'] != ['ABC[16 chars]yBase', 'Final', 'Generic', 'MyProtocol', 'object'] + "test_mro_typing_extensions" ]; passthru.tests = { diff --git a/pkgs/development/python-modules/astropy-extension-helpers/default.nix b/pkgs/development/python-modules/astropy-extension-helpers/default.nix index 8e5a2fda3301a..cb15acf883997 100644 --- a/pkgs/development/python-modules/astropy-extension-helpers/default.nix +++ b/pkgs/development/python-modules/astropy-extension-helpers/default.nix @@ -3,17 +3,20 @@ , fetchPypi , findutils , pytestCheckHook +, pythonOlder , setuptools-scm }: buildPythonPackage rec { pname = "extension-helpers"; - version = "0.1"; + version = "1.0.0"; format = "pyproject"; + disabled = pythonOlder "3.6"; + src = fetchPypi { inherit pname version; - sha256 = "10iqjzmya2h4sk765dlm1pbqypwlqyh8rw59a5m9i63d3klnz2mc"; + sha256 = "ca1bfac67c79cf4a7a0c09286ce2a24eec31bf17715818d0726318dd0e5050e6"; }; nativeBuildInputs = [ @@ -22,13 +25,21 @@ buildPythonPackage rec { patches = [ ./permissions.patch ]; - checkInputs = [ findutils pytestCheckHook ]; + checkInputs = [ + findutils + pytestCheckHook + ]; # avoid import mismatch errors, as conftest.py is copied to build dir pytestFlagsArray = [ "extension_helpers" ]; + disabledTests = [ + # https://github.com/astropy/extension-helpers/issues/43 + "test_write_if_different" + ]; + pythonImportsCheck = [ "extension_helpers" ]; @@ -37,6 +48,6 @@ buildPythonPackage rec { description = "Utilities for building and installing packages in the Astropy ecosystem"; homepage = "https://github.com/astropy/extension-helpers"; license = licenses.bsd3; - maintainers = [ maintainers.rmcgibbo ]; + maintainers = with maintainers; [ rmcgibbo ]; }; } diff --git a/pkgs/development/python-modules/astropy/default.nix b/pkgs/development/python-modules/astropy/default.nix index 78f02e2870ce8..56d0cc766ad01 100644 --- a/pkgs/development/python-modules/astropy/default.nix +++ b/pkgs/development/python-modules/astropy/default.nix @@ -19,7 +19,7 @@ let pname = "astropy"; - version = "5.0"; + version = "5.0.3"; in buildPythonPackage { inherit pname version; @@ -29,7 +29,7 @@ buildPythonPackage { src = fetchPypi { inherit pname version; - sha256 = "70203e151e13292586a817b4069ce1aad4643567aff38b1d191c173bc54f3927"; + sha256 = "sha256-GxZOxV63HH8Pil8zVDOcWkLWEpg1ayFOT7n/JWqGgUc="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; diff --git a/pkgs/development/python-modules/astroquery/default.nix b/pkgs/development/python-modules/astroquery/default.nix index 8853b1e9e08d9..6c1d39a82b018 100644 --- a/pkgs/development/python-modules/astroquery/default.nix +++ b/pkgs/development/python-modules/astroquery/default.nix @@ -6,39 +6,61 @@ , keyring , beautifulsoup4 , html5lib +, matplotlib +, pillow , pytest , pytest-astropy +, pytestCheckHook +, pyvo , astropy-helpers , isPy3k }: buildPythonPackage rec { pname = "astroquery"; - version = "0.4.5"; + version = "0.4.6"; format = "pyproject"; src = fetchPypi { inherit pname version; - sha256 = "20002f84b61fb11ceeae408a4cd23b379490e174054ec777f946df8a3f06be1b"; + sha256 = "sha256-MHylVMtzSgypoi+G9e/+fkE6+ROuZeFXiXLYR7H+E+4="; }; disabled = !isPy3k; - propagatedBuildInputs = [ astropy requests keyring beautifulsoup4 html5lib ]; + propagatedBuildInputs = [ + astropy + requests + keyring + beautifulsoup4 + html5lib + pyvo + ]; nativeBuildInputs = [ astropy-helpers ]; - # Tests disabled until pytest-astropy has been updated to include pytest-astropy-header - doCheck = false; - checkInputs = [ pytest pytest-astropy ]; + # Disable automatic update of the astropy-helper module + postPatch = '' + substituteInPlace setup.cfg --replace "auto_use = True" "auto_use = False" + ''; + + checkInputs = [ + matplotlib + pillow + pytest + pytest-astropy + pytestCheckHook + ]; # Tests must be run in the build directory. The tests create files # in $HOME/.astropy so we need to set HOME to $TMPDIR. - checkPhase = '' + preCheck = '' + export HOME=$TMPDIR cd build/lib - HOME=$TMPDIR pytest ''; + pythonImportsCheck = [ "astroquery" ]; + meta = with pkgs.lib; { description = "Functions and classes to access online data resources"; homepage = "https://astroquery.readthedocs.io/"; diff --git a/pkgs/development/python-modules/asttokens/default.nix b/pkgs/development/python-modules/asttokens/default.nix index 1e44ee8fa0e16..3d78ae7690b3e 100644 --- a/pkgs/development/python-modules/asttokens/default.nix +++ b/pkgs/development/python-modules/asttokens/default.nix @@ -22,10 +22,10 @@ buildPythonPackage rec { propagatedBuildInputs = [ six - astroid ]; checkInputs = [ + astroid pytestCheckHook ]; @@ -34,6 +34,11 @@ buildPythonPackage rec { "test_slices" ]; + disabledTestPaths = [ + # incompatible with astroid 2.11.0, pins <= 2.5.3 + "tests/test_astroid.py" + ]; + pythonImportsCheck = [ "asttokens" ]; meta = with lib; { diff --git a/pkgs/development/python-modules/async-lru/default.nix b/pkgs/development/python-modules/async-lru/default.nix index 9dc412ccde86d..69e6519b32c3d 100644 --- a/pkgs/development/python-modules/async-lru/default.nix +++ b/pkgs/development/python-modules/async-lru/default.nix @@ -28,6 +28,10 @@ buildPythonPackage rec { pytest-asyncio ]; + pytestFlagsArray = [ + "--asyncio-mode=strict" + ]; + disabledTests = [ # https://github.com/aio-libs/async-lru/issues/341 "test_alru_cache_deco" diff --git a/pkgs/development/python-modules/async-upnp-client/default.nix b/pkgs/development/python-modules/async-upnp-client/default.nix index 1c818d2724ea0..f2fc5b855c109 100644 --- a/pkgs/development/python-modules/async-upnp-client/default.nix +++ b/pkgs/development/python-modules/async-upnp-client/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "async-upnp-client"; - version = "0.23.5"; + version = "0.28.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "StevenLooman"; repo = "async_upnp_client"; rev = version; - sha256 = "sha256-fMlP8LX+OFiw6o1rpz8J0sEsACk5x9dQko1oGEaZFuc="; + sha256 = "sha256-ZyYIZLIlLQV3Yj4a+M5vZVaTe9lEsrWhBe/g9wzM1TY="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/async_generator/default.nix b/pkgs/development/python-modules/async_generator/default.nix index 6f6da10a87f9c..277616849e15d 100644 --- a/pkgs/development/python-modules/async_generator/default.nix +++ b/pkgs/development/python-modules/async_generator/default.nix @@ -2,7 +2,6 @@ , buildPythonPackage , fetchPypi , pythonOlder -, pytest-asyncio , pytestCheckHook }: @@ -19,7 +18,6 @@ buildPythonPackage rec { }; checkInputs = [ - pytest-asyncio pytestCheckHook ]; diff --git a/pkgs/development/python-modules/asyncssh/default.nix b/pkgs/development/python-modules/asyncssh/default.nix index 3d00805537fe4..bb6ce96ea5886 100644 --- a/pkgs/development/python-modules/asyncssh/default.nix +++ b/pkgs/development/python-modules/asyncssh/default.nix @@ -19,14 +19,14 @@ buildPythonPackage rec { pname = "asyncssh"; - version = "2.10.0"; + version = "2.10.1"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "sha256-WF5JmDzHlXFB4D7p9IvRU2pepXFdCqHOnM4Ecobmaws="; + sha256 = "sha256-SZuDbPWKnxknrStaQMPL0N042+CNLfj6is1TjCj8j6k="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/atlassian-python-api/default.nix b/pkgs/development/python-modules/atlassian-python-api/default.nix index 468dac5566144..4ecf893c1b941 100755 --- a/pkgs/development/python-modules/atlassian-python-api/default.nix +++ b/pkgs/development/python-modules/atlassian-python-api/default.nix @@ -4,7 +4,7 @@ , deprecated , oauthlib , requests -, requests_oauthlib +, requests-oauthlib , six , pytestCheckHook , pythonOlder @@ -28,7 +28,7 @@ buildPythonPackage rec { deprecated oauthlib requests - requests_oauthlib + requests-oauthlib six ]; diff --git a/pkgs/development/python-modules/atom/default.nix b/pkgs/development/python-modules/atom/default.nix index 80e29932ee2d7..88cfc818e3b98 100644 --- a/pkgs/development/python-modules/atom/default.nix +++ b/pkgs/development/python-modules/atom/default.nix @@ -1,19 +1,45 @@ -{ lib, buildPythonPackage, fetchPypi, future, cppy }: +{ lib +, buildPythonPackage +, fetchFromGitHub +, setuptools-scm +, future +, cppy +, pytestCheckHook +}: buildPythonPackage rec { pname = "atom"; - version = "0.7.0"; + version = "0.8.0"; + format = "pyproject"; - src = fetchPypi { - inherit pname version; - sha256 = "4055fbdeeb692d3d52c6e3c628d7513fc71f147920cac7d0da05b6dbb5ec8c8d"; + src = fetchFromGitHub { + owner = "nucleic"; + repo = pname; + rev = version; + hash = "sha256-Xby3QopKw7teShMi80RMG8YdhOOvfQb5vwOuFEUTxHQ="; }; - buildInputs = [ cppy ]; - propagatedBuildInputs = [ future ]; + SETUPTOOLS_SCM_PRETEND_VERSION = version; - # Tests not released to pypi - doCheck = true; + nativeBuildInputs = [ + setuptools-scm + ]; + + buildInputs = [ + cppy + ]; + + preCheck = '' + rm -rf atom + ''; + + checkInputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ + "atom.api" + ]; meta = with lib; { description = "Memory efficient Python objects"; diff --git a/pkgs/development/python-modules/aurorapy/default.nix b/pkgs/development/python-modules/aurorapy/default.nix index 17abcf0e9c476..7e59d9c8bc958 100644 --- a/pkgs/development/python-modules/aurorapy/default.nix +++ b/pkgs/development/python-modules/aurorapy/default.nix @@ -5,6 +5,7 @@ , pyserial , pytestCheckHook , pythonOlder +, six }: buildPythonPackage rec { @@ -28,6 +29,7 @@ buildPythonPackage rec { checkInputs = [ pytestCheckHook + six ]; pythonImportsCheck = [ diff --git a/pkgs/development/python-modules/authcaptureproxy/default.nix b/pkgs/development/python-modules/authcaptureproxy/default.nix index 73422a0624c8c..11e1f444cb0bb 100644 --- a/pkgs/development/python-modules/authcaptureproxy/default.nix +++ b/pkgs/development/python-modules/authcaptureproxy/default.nix @@ -15,14 +15,14 @@ buildPythonPackage rec { pname = "authcaptureproxy"; - version = "1.1.1"; + version = "1.1.3"; format = "pyproject"; src = fetchFromGitHub { owner = "alandtse"; repo = "auth_capture_proxy"; rev = "v${version}"; - sha256 = "08zpaclg5f9g1pix0jaq42i2ph12xc8djjrmhxz0yygw5rsilgl4"; + sha256 = "sha256-RD/8v3IQb50iGkU6zj5QfHXakjHdcCBWWAkXhCIF6qo="; }; postPatch = '' diff --git a/pkgs/development/python-modules/authheaders/default.nix b/pkgs/development/python-modules/authheaders/default.nix index 8593f7f4d742e..0d9c1a4093dae 100644 --- a/pkgs/development/python-modules/authheaders/default.nix +++ b/pkgs/development/python-modules/authheaders/default.nix @@ -4,11 +4,11 @@ buildPythonPackage rec { pname = "authheaders"; - version = "0.14.1"; + version = "0.15.1"; src = fetchPypi { inherit pname version; - sha256 = "4e601b5b54080019a2f548fadf80ddf9c5538615607c7fb602936404aafe67e2"; + sha256 = "sha256-90rOvu+CbHtammrMDZpPx7rIboIT2X/jL1GtfjpmuOk="; }; propagatedBuildInputs = [ authres dnspython dkimpy publicsuffix2 ] diff --git a/pkgs/development/python-modules/autobahn/default.nix b/pkgs/development/python-modules/autobahn/default.nix index a088a0120103a..49f18ebca4982 100644 --- a/pkgs/development/python-modules/autobahn/default.nix +++ b/pkgs/development/python-modules/autobahn/default.nix @@ -23,14 +23,14 @@ buildPythonPackage rec { pname = "autobahn"; - version = "21.11.1"; + version = "22.3.2"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "sha256-vW9GMVQZygpb5BCfc3QQIIrV8ZcY9nympKZ0zGbKmxg="; + sha256 = "sha256-WKiHx6GWuwjYtmJMs2lfSTqeXJ8A/TUNjW+Cm0f/kDY="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/autograd/default.nix b/pkgs/development/python-modules/autograd/default.nix index 0bdee21b69c21..93e89a2800d40 100644 --- a/pkgs/development/python-modules/autograd/default.nix +++ b/pkgs/development/python-modules/autograd/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "autograd"; - version = "1.3"; + version = "1.4"; src = fetchPypi { inherit pname version; - sha256 = "1i1ylf03b7220n8znk63zg6sgdd3py9wlh1pvqvy03g1fxsi8pd1"; + sha256 = "sha256-OD3g9TfvLji4X/lpJZOwz66JWMmzvUUbUsJV/ZFx/84="; }; propagatedBuildInputs = [ numpy future ]; diff --git a/pkgs/development/python-modules/av/default.nix b/pkgs/development/python-modules/av/default.nix index c79dc8b3fcb14..3ebc44d1c4d63 100644 --- a/pkgs/development/python-modules/av/default.nix +++ b/pkgs/development/python-modules/av/default.nix @@ -1,33 +1,141 @@ { lib , buildPythonPackage -, fetchPypi -, isPy27 -, numpy -, ffmpeg +, fetchFromGitHub +, pythonOlder + +# build +, cython , pkg-config + +# runtime +, ffmpeg + +# tests +, numpy +, pillow +, pytestCheckHook }: buildPythonPackage rec { pname = "av"; - version = "8.1.0"; - disabled = isPy27; # setup.py no longer compatible + version = "9.1.1"; + format = "pyproject"; + disabled = pythonOlder "3.7"; - src = fetchPypi { - inherit pname version; - sha256 = "0402169bc27e38e0f44e0e0e1854cf488337e86206b6d25d6dae2bfd7a1a0230"; + src = fetchFromGitHub { + owner = "mikeboers"; + repo = "PyAV"; + rev = "v${version}"; + hash = "sha256-/6C5GE9zANPy0xaptu/+pIupOLDra/R7TJ41YLGszUs="; }; - checkInputs = [ numpy ]; + nativeBuildInputs = [ + cython + pkg-config + ]; + + buildInputs = [ + ffmpeg + ]; + + preCheck = '' + # ensure we import the built version + rm -r av + ''; + + checkInputs = [ + numpy + pillow + pytestCheckHook + ]; + + pytestFlagsArray = [ + # Tests that want to download FATE data + # https://github.com/PyAV-Org/PyAV/issues/955 + "--deselect=tests/test_audiofifo.py::TestAudioFifo::test_data" + "--deselect=tests/test_codec_context.py::TestCodecContext::test_codec_tag" + "--deselect=tests/test_codec_context.py::TestCodecContext::test_parse" + "--deselect=tests/test_codec_context.py::TestEncoding::test_encoding_aac" + "--deselect=tests/test_codec_context.py::TestEncoding::test_encoding_dnxhd" + "--deselect=tests/test_codec_context.py::TestEncoding::test_encoding_dvvideo" + "--deselect=tests/test_codec_context.py::TestEncoding::test_encoding_h264" + "--deselect=tests/test_codec_context.py::TestEncoding::test_encoding_mjpeg" + "--deselect=tests/test_codec_context.py::TestEncoding::test_encoding_mp2" + "--deselect=tests/test_codec_context.py::TestEncoding::test_encoding_mpeg1video" + "--deselect=tests/test_codec_context.py::TestEncoding::test_encoding_mpeg4" + "--deselect=tests/test_codec_context.py::TestEncoding::test_encoding_pcm_s24le" + "--deselect=tests/test_codec_context.py::TestEncoding::test_encoding_png" + "--deselect=tests/test_codec_context.py::TestEncoding::test_encoding_tiff" + "--deselect=tests/test_codec_context.py::TestEncoding::test_encoding_xvid" + "--deselect=tests/test_decode.py::TestDecode::test_decode_audio_sample_count" + "--deselect=tests/test_decode.py::TestDecode::test_decoded_motion_vectors" + "--deselect=tests/test_decode.py::TestDecode::test_decoded_motion_vectors_no_flag" + "--deselect=tests/test_decode.py::TestDecode::test_decoded_time_base" + "--deselect=tests/test_decode.py::TestDecode::test_decoded_video_frame_count" + "--deselect=tests/test_encode.py::TestBasicAudioEncoding::test_transcode" + "--deselect=tests/test_file_probing.py::TestAudioProbe::test_container_probing" + "--deselect=tests/test_file_probing.py::TestAudioProbe::test_stream_probing" + "--deselect=tests/test_file_probing.py::TestDataProbe::test_container_probing" + "--deselect=tests/test_file_probing.py::TestDataProbe::test_stream_probing" + "--deselect=tests/test_file_probing.py::TestSubtitleProbe::test_container_probing" + "--deselect=tests/test_file_probing.py::TestSubtitleProbe::test_stream_probing" + "--deselect=tests/test_file_probing.py::TestVideoProbe::test_container_probing" + "--deselect=tests/test_file_probing.py::TestVideoProbe::test_stream_probing" + "--deselect=tests/test_python_io.py::TestPythonIO::test_reading_from_buffer" + "--deselect=tests/test_python_io.py::TestPythonIO::test_reading_from_buffer_no_see" + "--deselect=tests/test_python_io.py::TestPythonIO::test_reading_from_file" + "--deselect=tests/test_python_io.py::TestPythonIO::test_reading_from_pipe_readonly" + "--deselect=tests/test_python_io.py::TestPythonIO::test_reading_from_write_readonl" + "--deselect=tests/test_seek.py::TestSeek::test_decode_half" + "--deselect=tests/test_seek.py::TestSeek::test_seek_end" + "--deselect=tests/test_seek.py::TestSeek::test_seek_float" + "--deselect=tests/test_seek.py::TestSeek::test_seek_int64" + "--deselect=tests/test_seek.py::TestSeek::test_seek_middle" + "--deselect=tests/test_seek.py::TestSeek::test_seek_start" + "--deselect=tests/test_seek.py::TestSeek::test_stream_seek" + "--deselect=tests/test_streams.py::TestStreams::test_selection" + "--deselect=tests/test_streams.py::TestStreams::test_stream_tuples" + "--deselect=tests/test_subtitles.py::TestSubtitle::test_movtext" + "--deselect=tests/test_subtitles.py::TestSubtitle::test_vobsub" + "--deselect=tests/test_videoframe.py::TestVideoFrameImage::test_roundtrip" + ]; - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ ffmpeg ]; + disabledTestPaths = [ + # urlopen fails during DNS resolution + "tests/test_doctests.py" + "tests/test_timeout.py" + ]; - # Tests require downloading files from internet - doCheck = false; + pythonImportsCheck = [ + "av" + "av.audio" + "av.buffer" + "av.bytesource" + "av.codec" + "av.container" + "av._core" + "av.datasets" + "av.descriptor" + "av.dictionary" + "av.enum" + "av.error" + "av.filter" + "av.format" + "av.frame" + "av.logging" + "av.option" + "av.packet" + "av.plane" + "av.stream" + "av.subtitles" + "av.utils" + "av.video" + ]; - meta = { + meta = with lib; { description = "Pythonic bindings for FFmpeg/Libav"; homepage = "https://github.com/mikeboers/PyAV/"; - license = lib.licenses.bsd2; + license = licenses.bsd2; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/development/python-modules/awesomeversion/default.nix b/pkgs/development/python-modules/awesomeversion/default.nix index f74a6af84757c..c1fca79f81c6d 100644 --- a/pkgs/development/python-modules/awesomeversion/default.nix +++ b/pkgs/development/python-modules/awesomeversion/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "awesomeversion"; - version = "22.2.0"; + version = "22.4.0"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "ludeeus"; repo = pname; rev = version; - sha256 = "sha256-FlJrk/PH3nBLakQfS+ruDwAPH/oo16JcfrtVRFgbUXY="; + sha256 = "sha256-bloBP5cKZtvu96HSQ4AmZ5+VeSXGkmN/m4fuyHLrBws="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/aws-adfs/default.nix b/pkgs/development/python-modules/aws-adfs/default.nix index 461ce9d90d9d6..845032ddcb926 100644 --- a/pkgs/development/python-modules/aws-adfs/default.nix +++ b/pkgs/development/python-modules/aws-adfs/default.nix @@ -1,31 +1,42 @@ { lib +, boto3 , botocore , buildPythonPackage , click , configparser -, fetchPypi +, fetchFromGitHub +, fetchpatch , fido2 -, glibcLocales -, isPy27 , lxml -, mock +, poetry-core , pyopenssl , pytestCheckHook +, pythonOlder , requests , requests-kerberos +, toml }: buildPythonPackage rec { pname = "aws-adfs"; - version = "1.24.5"; - disabled = isPy27; + version = "2.0.1"; + format = "pyproject"; - src = fetchPypi { - inherit pname version; - sha256 = "6a78bd31477ea9988166215ae86abcbfe1413bee20373ecdf0dd170b7290db55"; + disabled = pythonOlder "3.6"; + + src = fetchFromGitHub { + owner = "venth"; + repo = pname; + rev = version; + hash = "sha256-0BURXbEOZvb8kszuajLtR+V7HjJycCBAQrm3WqpVB1w="; }; + nativeBuildInputs = [ + poetry-core + ]; + propagatedBuildInputs = [ + boto3 botocore click configparser @@ -36,31 +47,38 @@ buildPythonPackage rec { requests-kerberos ]; - checkInputs = [ - glibcLocales - mock - pytestCheckHook + patches = [ + # Switch to poetry-core, https://github.com/venth/aws-adfs/pull/230 + (fetchpatch { + name = "switch-to-poetry-core.patch"; + url = "https://github.com/venth/aws-adfs/commit/da095ccf64629d36a6045ffec2684038378ee690.patch"; + sha256 = "sha256-xg4c7iIonkUmNN74q/UeGSuYP3to7q4cLW6+TMW9nh4="; + }) ]; - # Relax version constraint postPatch = '' - substituteInPlace setup.py \ - --replace 'coverage < 4' 'coverage' \ - --replace 'fido2>=0.8.1,<0.9.0' 'fido2>=0.8.1,<1.0.0' + substituteInPlace pyproject.toml \ + --replace 'boto3 = "^1.20.50"' 'boto3 = "*"' \ + --replace 'botocore = ">=1.12.6"' 'botocore = "*"' ''; - # Test suite writes files to $HOME/.aws/, or /homeless-shelter if unset - HOME = "."; + checkInputs = [ + pytestCheckHook + toml + ]; - # Required for python3 tests, along with glibcLocales - LC_ALL = "en_US.UTF-8"; + preCheck = '' + export HOME=$(mktemp -d); + ''; - pythonImportsCheck = [ "aws_adfs" ]; + pythonImportsCheck = [ + "aws_adfs" + ]; meta = with lib; { - description = "Command line tool to ease aws cli authentication against ADFS"; + description = "Command line tool to ease AWS CLI authentication against ADFS"; homepage = "https://github.com/venth/aws-adfs"; license = licenses.psfl; - maintainers = [ maintainers.bhipple ]; + maintainers = with maintainers; [ bhipple ]; }; } diff --git a/pkgs/development/python-modules/awscrt/default.nix b/pkgs/development/python-modules/awscrt/default.nix index 6197914f435be..cc43d411039f2 100644 --- a/pkgs/development/python-modules/awscrt/default.nix +++ b/pkgs/development/python-modules/awscrt/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "awscrt"; - version = "0.13.7"; + version = "0.13.9"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-FCmdYuXh8+nWfeGbJ9IhfwASFsZoxOp7jL+5/TrtG5Q="; + hash = "sha256-9XUzHfezr+bhQt6OKYiVEaCHqqWE6J7Y4Rj3MmaMAXA="; }; buildInputs = lib.optionals stdenv.isDarwin [ diff --git a/pkgs/development/python-modules/awsiotpythonsdk/default.nix b/pkgs/development/python-modules/awsiotpythonsdk/default.nix index fc188ae683c6a..7ec8b9008fd4a 100644 --- a/pkgs/development/python-modules/awsiotpythonsdk/default.nix +++ b/pkgs/development/python-modules/awsiotpythonsdk/default.nix @@ -6,7 +6,7 @@ buildPythonPackage rec { pname = "AWSIoTPythonSDK"; - version = "1.5.1"; + version = "1.5.2"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -14,8 +14,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "aws"; repo = "aws-iot-device-sdk-python"; - rev = "v${version}"; - sha256 = "sha256-UpfgoCVbweOpWbgaqNebAAkWmhjkZu3txVoTZ/qhl3g="; + rev = "refs/tags/v${version}"; + sha256 = "sha256-GHMnDRxXkaKDTaawwPtMqa7EZJ8Y35+ScgtfEP9PJGs="; }; # Module has no tests diff --git a/pkgs/development/python-modules/azure-common/default.nix b/pkgs/development/python-modules/azure-common/default.nix index 2312df1cafaf0..a540ebf0beadd 100644 --- a/pkgs/development/python-modules/azure-common/default.nix +++ b/pkgs/development/python-modules/azure-common/default.nix @@ -9,14 +9,14 @@ }: buildPythonPackage rec { - version = "1.1.27"; + version = "1.1.28"; pname = "azure-common"; disabled = isPyPy; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "9f3f5d991023acbd93050cf53c4e863c6973ded7e236c69e99c8ff5c7bad41ef"; + sha256 = "sha256-SsDNMhTja2obakQmhnIqXYzESWA6qDPz8PQL2oNnBKM="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/azure-core/default.nix b/pkgs/development/python-modules/azure-core/default.nix index b7d330e6eff90..260a40e9de806 100644 --- a/pkgs/development/python-modules/azure-core/default.nix +++ b/pkgs/development/python-modules/azure-core/default.nix @@ -15,19 +15,20 @@ }: buildPythonPackage rec { - version = "1.21.1"; + version = "1.23.1"; pname = "azure-core"; disabled = isPy27; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "88d2db5cf9a135a7287dc45fdde6b96f9ca62c9567512a3bb3e20e322ce7deb2"; + sha256 = "sha256-KKAd+68KaBLE4qgtFkLqMJVqlznyW8d8myO5H06mjw8="; }; propagatedBuildInputs = [ requests six + typing-extensions ]; checkInputs = [ @@ -41,7 +42,6 @@ buildPythonPackage rec { pytest-asyncio pytestCheckHook trio - typing-extensions ]; # test server needs to be available @@ -57,6 +57,8 @@ buildPythonPackage rec { "response" "request" "timeout" + "test_sync_transport_short_read_download_stream" + "test_aio_transport_short_read_download_stream" # disable 8 tests failing on some darwin machines with errors: # azure.core.polling.base_polling.BadStatus: Invalid return status 403 for 'GET' operation # azure.core.exceptions.HttpResponseError: Operation returned an invalid status 'Forbidden' diff --git a/pkgs/development/python-modules/azure-eventgrid/default.nix b/pkgs/development/python-modules/azure-eventgrid/default.nix index a5e06a4f54f28..861f9ccd0f9b0 100644 --- a/pkgs/development/python-modules/azure-eventgrid/default.nix +++ b/pkgs/development/python-modules/azure-eventgrid/default.nix @@ -5,16 +5,20 @@ , azure-common , azure-core , msrestazure +, pythonOlder }: buildPythonPackage rec { pname = "azure-eventgrid"; - version = "4.7.1"; + version = "4.8.0"; + format = "setuptools"; + + disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "b96afc0317c764c2c428512485305ec5748698081cb6bc70dcaa903b0ac04754"; + hash = "sha256-8jEtTQTUJLSa2iuA/Sgirgcm8kbwWOT11O1n46CLouw="; }; propagatedBuildInputs = [ @@ -26,7 +30,10 @@ buildPythonPackage rec { # has no tests doCheck = false; - pythonImportsCheck = [ "azure.eventgrid" ]; + + pythonImportsCheck = [ + "azure.eventgrid" + ]; meta = with lib; { description = "A fully-managed intelligent event routing service that allows for uniform event consumption using a publish-subscribe model"; diff --git a/pkgs/development/python-modules/azure-identity/default.nix b/pkgs/development/python-modules/azure-identity/default.nix index ea0696e294a07..c4897fb306f9b 100644 --- a/pkgs/development/python-modules/azure-identity/default.nix +++ b/pkgs/development/python-modules/azure-identity/default.nix @@ -16,14 +16,19 @@ buildPythonPackage rec { pname = "azure-identity"; - version = "1.8.0"; + version = "1.9.0"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "sha256-Ag/w5HFXhS5KrIo62waEGCcUfyepTL50qQRCXY5i2Tw="; + sha256 = "sha256-CFTRnaTFZEZBgU3E+VHELgFAC1eS8J37a/+nJti5Fg0="; }; + postPatch = '' + substituteInPlace setup.py \ + --replace "msal-extensions~=0.3.0" "msal-extensions" + ''; + propagatedBuildInputs = [ azure-common azure-core diff --git a/pkgs/development/python-modules/azure-keyvault-keys/default.nix b/pkgs/development/python-modules/azure-keyvault-keys/default.nix index 8ce81bc3d6169..d9e37f1b8826d 100644 --- a/pkgs/development/python-modules/azure-keyvault-keys/default.nix +++ b/pkgs/development/python-modules/azure-keyvault-keys/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "azure-keyvault-keys"; - version = "4.5.0"; + version = "4.5.1"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -20,7 +20,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; extension = "zip"; - hash = "sha256-x1AhiARXZXcky3A+DJXoCrvkqsonlkgdrdr6es/VY3s="; + hash = "sha256-2ojnH+ySoU+1jOyIaKv366BAGI3Nzjac4QUK3RllhvY="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/azure-mgmt-containerservice/default.nix b/pkgs/development/python-modules/azure-mgmt-containerservice/default.nix index 00e24a2d9f181..4a502ac65dbfb 100644 --- a/pkgs/development/python-modules/azure-mgmt-containerservice/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-containerservice/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "azure-mgmt-containerservice"; - version = "18.0.0"; + version = "19.0.0"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -19,7 +19,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "sha256-b4AwcnSp6JOtG8VaBbUN7d/NIhHN2TPnyjzCUVhMOzg="; + sha256 = "sha256-UHkSUoNzXWomr4vczGRRXVJplVRfqDjwFczkOP2Jwsc="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/azure-mgmt-core/default.nix b/pkgs/development/python-modules/azure-mgmt-core/default.nix index 6adca4c02c7a5..0a65dbfb7ec82 100644 --- a/pkgs/development/python-modules/azure-mgmt-core/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-core/default.nix @@ -2,6 +2,7 @@ , buildPythonPackage , fetchPypi , azure-core +, typing-extensions }: buildPythonPackage rec { @@ -16,6 +17,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ azure-core + typing-extensions ]; pythonNamespaces = "azure.mgmt"; diff --git a/pkgs/development/python-modules/azure-mgmt-datafactory/default.nix b/pkgs/development/python-modules/azure-mgmt-datafactory/default.nix index eed367c2206da..d26033c414f1f 100644 --- a/pkgs/development/python-modules/azure-mgmt-datafactory/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-datafactory/default.nix @@ -5,18 +5,20 @@ , msrestazure , azure-common , azure-mgmt-core -, azure-mgmt-nspkg -, isPy3k +, pythonOlder }: buildPythonPackage rec { pname = "azure-mgmt-datafactory"; - version = "2.3.0"; + version = "2.4.0"; + format = "setuptools"; + + disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "sha256-pjBjFPkKhKd8XI6wmzX/rAssHINMzDAZa+XRqG/pLYo="; + hash = "sha256-oCDh7tWsBA6z/auQm3AtkRzT9IUrq8HJ+R//HDJ+1nw="; }; propagatedBuildInputs = [ @@ -24,8 +26,6 @@ buildPythonPackage rec { msrestazure azure-common azure-mgmt-core - ] ++ lib.optionals (!isPy3k) [ - azure-mgmt-nspkg ]; # has no tests diff --git a/pkgs/development/python-modules/azure-mgmt-kusto/azure-mgmt-apimanagement/default.nix b/pkgs/development/python-modules/azure-mgmt-kusto/azure-mgmt-apimanagement/default.nix index 4c7233203bb92..4c61b55b666c9 100644 --- a/pkgs/development/python-modules/azure-mgmt-kusto/azure-mgmt-apimanagement/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-kusto/azure-mgmt-apimanagement/default.nix @@ -5,13 +5,13 @@ }: buildPythonPackage rec { - version = "2.1.0"; + version = "3.0.0"; pname = "azure-mgmt-apimanagement"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "58296bd45e876df33f93f3a41c866c36476f5f3bd46818e8891308794f041c94"; + sha256 = "sha256-kmL1TtOH6wg9ja5m0yqN81ZHMZuQK9SYzcN29QoS0VQ="; extension = "zip"; }; diff --git a/pkgs/development/python-modules/azure-mgmt-loganalytics/default.nix b/pkgs/development/python-modules/azure-mgmt-loganalytics/default.nix index 947bb4a28ba97..9629c6e7bba06 100644 --- a/pkgs/development/python-modules/azure-mgmt-loganalytics/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-loganalytics/default.nix @@ -4,7 +4,6 @@ , msrest , msrestazure , azure-common -, azure-mgmt-nspkg , azure-mgmt-core }: @@ -22,7 +21,6 @@ buildPythonPackage rec { msrest msrestazure azure-common - azure-mgmt-nspkg azure-mgmt-core ]; diff --git a/pkgs/development/python-modules/azure-mgmt-msi/default.nix b/pkgs/development/python-modules/azure-mgmt-msi/default.nix index bf81b5e67c72d..1f1a2dde37627 100644 --- a/pkgs/development/python-modules/azure-mgmt-msi/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-msi/default.nix @@ -9,12 +9,12 @@ buildPythonPackage rec { pname = "azure-mgmt-msi"; - version = "1.0.0"; + version = "6.0.0"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "0n4gbwk843z66hhpcp1kcrnwqkzygbbc2ma01r9asgfv4nmklvyl"; + sha256 = "sha256-RpmYeF6LRKqu0KrjNAFAaOGxyfPuK+TImOumP+FPX2w="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/azure-mgmt-reservations/default.nix b/pkgs/development/python-modules/azure-mgmt-reservations/default.nix index 7e08b16166d7a..0be05eb390f14 100644 --- a/pkgs/development/python-modules/azure-mgmt-reservations/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-reservations/default.nix @@ -5,18 +5,20 @@ , msrestazure , azure-common , azure-mgmt-core -, azure-mgmt-nspkg -, isPy3k +, pythonOlder }: buildPythonPackage rec { pname = "azure-mgmt-reservations"; - version = "1.0.0"; + version = "2.0.0"; + format = "setuptools"; + + disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "880df54fdf3869ee6b142d4fc7a3fce518c850523c42cc895b7fb8359956554e"; + hash = "sha256-5vXdXiRubnzPk4uTFeNHR6rwiHSGbeUREX9eW1pqC3E="; }; propagatedBuildInputs = [ @@ -24,8 +26,6 @@ buildPythonPackage rec { msrestazure azure-common azure-mgmt-core - ] ++ lib.optionals (!isPy3k) [ - azure-mgmt-nspkg ]; # has no tests diff --git a/pkgs/development/python-modules/azure-mgmt-servicelinker/default.nix b/pkgs/development/python-modules/azure-mgmt-servicelinker/default.nix index 58d32853194bd..55f4d9284923d 100644 --- a/pkgs/development/python-modules/azure-mgmt-servicelinker/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-servicelinker/default.nix @@ -8,11 +8,11 @@ buildPythonPackage rec { pname = "azure-mgmt-servicelinker"; - version = "1.0.0b1"; + version = "1.0.0"; src = fetchPypi { inherit pname version; - sha256 = "4f70d3bcd98ba539bfef870e3c497ebdc5efed3200c2627a61718baa9ab21a61"; + sha256 = "sha256-lAjgwEa2TJDEUU8pwfwkU8EyA1bhLkcAv++I6WHb7Xs="; extension = "zip"; }; diff --git a/pkgs/development/python-modules/azure-mgmt-storage/default.nix b/pkgs/development/python-modules/azure-mgmt-storage/default.nix index cd7e96049d1fc..8bc69d0c9b72b 100644 --- a/pkgs/development/python-modules/azure-mgmt-storage/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-storage/default.nix @@ -3,18 +3,20 @@ , fetchPypi , azure-mgmt-common , azure-mgmt-core -, isPy3k +, pythonOlder }: buildPythonPackage rec { - version = "19.1.0"; + version = "20.0.0"; pname = "azure-mgmt-storage"; - disabled = !isPy3k; + format = "setuptools"; + + disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "sha256-Seoi8A4JZaNVCvNKQcGh06SBaQ9lAMeOhUCIAvVtdBY="; + hash = "sha256-buR2tWIv9vWVTt7m6w2N1CezIXAihVrfHshjPKBM3uI="; }; propagatedBuildInputs = [ @@ -22,9 +24,13 @@ buildPythonPackage rec { azure-mgmt-core ]; - pythonNamespaces = [ "azure.mgmt" ]; + pythonNamespaces = [ + "azure.mgmt" + ]; - pythonImportsCheck = [ "azure.mgmt.storage" ]; + pythonImportsCheck = [ + "azure.mgmt.storage" + ]; # has no tests doCheck = false; diff --git a/pkgs/development/python-modules/azure-mgmt-trafficmanager/default.nix b/pkgs/development/python-modules/azure-mgmt-trafficmanager/default.nix index dd7ed3b19b213..68d14c49ef6a8 100644 --- a/pkgs/development/python-modules/azure-mgmt-trafficmanager/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-trafficmanager/default.nix @@ -4,24 +4,26 @@ , msrest , msrestazure , azure-common +, azure-mgmt-core , azure-mgmt-nspkg , isPy3k }: buildPythonPackage rec { pname = "azure-mgmt-trafficmanager"; - version = "0.51.0"; + version = "1.0.0"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "fc8ae77022cfe52fda4379a2f31e0b857574d536e41291a7b569b5c0f4104186"; + sha256 = "sha256-R0F2HoA0bE7dTLPycTaOqYBj+ATQFeJFwv4EjtK1lqg="; }; propagatedBuildInputs = [ msrest msrestazure azure-common + azure-mgmt-core ] ++ lib.optionals (!isPy3k) [ azure-mgmt-nspkg ]; diff --git a/pkgs/development/python-modules/azure-servicebus/default.nix b/pkgs/development/python-modules/azure-servicebus/default.nix index b4e37c33fef9f..a0864529177fc 100644 --- a/pkgs/development/python-modules/azure-servicebus/default.nix +++ b/pkgs/development/python-modules/azure-servicebus/default.nix @@ -12,13 +12,13 @@ buildPythonPackage rec { pname = "azure-servicebus"; - version = "7.5.0"; + version = "7.6.0"; format = "setuptools"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "e97a069c6a73fce3042a5ef0d438cc564152cfbcc2e7db6f7a19fbd51bb3555b"; + sha256 = "sha256-uZGxQ1Vl6wpBCMW1+80/CBuqelLV02yXf1sNlNtCpHU="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/azure-synapse-artifacts/default.nix b/pkgs/development/python-modules/azure-synapse-artifacts/default.nix index 5a83385b75410..de0909fa0c02f 100644 --- a/pkgs/development/python-modules/azure-synapse-artifacts/default.nix +++ b/pkgs/development/python-modules/azure-synapse-artifacts/default.nix @@ -6,12 +6,12 @@ buildPythonPackage rec { pname = "azure-synapse-artifacts"; - version = "0.12.0"; + version = "0.13.0"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "sha256-IfQWsITuThzh+TRgv99JTtcDFY3gMq5PjALkN4mJEZo="; + sha256 = "sha256-WJZtE7efs1xwalyb0Sr2J+pmPIt9gn2o01/prncb2uM="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/backports-zoneinfo/default.nix b/pkgs/development/python-modules/backports-zoneinfo/default.nix index 0b4703e265161..d2b6d06c4cdbb 100644 --- a/pkgs/development/python-modules/backports-zoneinfo/default.nix +++ b/pkgs/development/python-modules/backports-zoneinfo/default.nix @@ -1,4 +1,5 @@ { lib, buildPythonPackage, fetchFromGitHub +, pythonAtLeast , pythonOlder , python , substituteAll @@ -12,6 +13,8 @@ buildPythonPackage rec { pname = "backports-zoneinfo"; version = "0.2.1"; + disabled = pythonAtLeast "3.9"; + src = fetchFromGitHub { owner = "pganssle"; repo = "zoneinfo"; diff --git a/pkgs/development/python-modules/basemap/default.nix b/pkgs/development/python-modules/basemap/default.nix index 30ca58fed319e..6d8dd8a3943b0 100644 --- a/pkgs/development/python-modules/basemap/default.nix +++ b/pkgs/development/python-modules/basemap/default.nix @@ -14,13 +14,13 @@ buildPythonPackage rec { pname = "basemap"; - version = "1.3.0"; + version = "1.3.2"; src = fetchFromGitHub { owner = "matplotlib"; repo = "basemap"; rev = "v${version}"; - sha256 = "0nwpd6zx2q2fc556ppz71ra6ad9z0d5bz8hcld64i91dcy0f0zs3"; + sha256 = "sha256-onNdOQL4i6GTcuCRel5yanJ2EQ5iYClp+imuBObXF2I="; }; propagatedBuildInputs = [ numpy matplotlib pillow pyproj pyshp six ]; diff --git a/pkgs/development/python-modules/bc-python-hcl2/default.nix b/pkgs/development/python-modules/bc-python-hcl2/default.nix index 78529e288ca26..8d5c2d7d4c265 100644 --- a/pkgs/development/python-modules/bc-python-hcl2/default.nix +++ b/pkgs/development/python-modules/bc-python-hcl2/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "bc-python-hcl2"; - version = "0.3.33"; + version = "0.3.39"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-tdsw9gf64VGH9tRWgYZZq3FNa5B5JNhN3k6wUHrU5zY="; + hash = "sha256-JMQ2sLgAnMJ1/0nR8LgKbpPB43gVKtCtrZKr/T4p0O8="; }; # Nose is required during build process, so can not use `checkInputs`. diff --git a/pkgs/development/python-modules/bcrypt/default.nix b/pkgs/development/python-modules/bcrypt/default.nix index d6347b1790465..13fb25d037146 100644 --- a/pkgs/development/python-modules/bcrypt/default.nix +++ b/pkgs/development/python-modules/bcrypt/default.nix @@ -1,9 +1,19 @@ -{ lib, buildPythonPackage, isPyPy, fetchPypi, pythonOlder -, cffi, pycparser, mock, pytest, py, six }: +{ lib +, buildPythonPackage +, setuptools +, isPyPy +, fetchPypi +, pythonOlder +, cffi +, pytestCheckHook +, six +}: buildPythonPackage rec { - version = "3.2.0"; pname = "bcrypt"; + version = "3.2.0"; + format = "pyproject"; + disabled = pythonOlder "3.6"; src = fetchPypi { @@ -11,16 +21,31 @@ buildPythonPackage rec { sha256 = "5b93c1726e50a93a033c36e5ca7fdcd29a5c7395af50a6892f5d9e7c6cfbfb29"; }; - buildInputs = [ pycparser mock pytest py ]; + nativeBuildInputs = [ + setuptools + ]; + + propagatedBuildInputs = [ + six + cffi + ]; + + propagatedNativeBuildInputs = [ + cffi + ]; - propagatedBuildInputs = [ six ] ++ lib.optional (!isPyPy) cffi; + checkInputs = [ + pytestCheckHook + ]; - propagatedNativeBuildInputs = lib.optional (!isPyPy) cffi; + pythonImportsCheck = [ + "bcrypt" + ]; meta = with lib; { - maintainers = with maintainers; [ domenkozar ]; description = "Modern password hashing for your software and your servers"; - license = licenses.asl20; homepage = "https://github.com/pyca/bcrypt/"; + license = licenses.asl20; + maintainers = with maintainers; [ domenkozar ]; }; } diff --git a/pkgs/development/python-modules/beautifultable/default.nix b/pkgs/development/python-modules/beautifultable/default.nix index def8f207ee808..646cfe8af9a2c 100644 --- a/pkgs/development/python-modules/beautifultable/default.nix +++ b/pkgs/development/python-modules/beautifultable/default.nix @@ -1,6 +1,7 @@ { lib , buildPythonPackage , fetchFromGitHub +, wcwidth , pytestCheckHook }: @@ -15,6 +16,10 @@ buildPythonPackage rec { sha256 = "12ci6jy8qmbphsvzvj98466nlhclfzs0a0pmbsv3mf5bfcdwvbh7"; }; + propagatedBuildInputs = [ + wcwidth + ]; + checkInputs = [ pytestCheckHook ]; @@ -25,7 +30,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python package for printing visually appealing tables"; - homepage = "https://github.com/CERT-Polska/mwdblib"; + homepage = "https://github.com/pri22296/beautifultable"; license = with licenses; [ mit ]; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/behave/default.nix b/pkgs/development/python-modules/behave/default.nix index 1198f034d00ab..5254f79c4b2fd 100644 --- a/pkgs/development/python-modules/behave/default.nix +++ b/pkgs/development/python-modules/behave/default.nix @@ -1,22 +1,22 @@ { lib, stdenv, fetchFromGitHub , buildPythonApplication, python -, pytestCheckHook, mock, pathpy, pyhamcrest, pytest-html +, pytestCheckHook, mock, path, pyhamcrest, pytest-html , glibcLocales , colorama, cucumber-tag-expressions, parse, parse-type, six }: buildPythonApplication rec { pname = "behave"; - version = "1.2.7.dev1"; + version = "1.2.7.dev2"; src = fetchFromGitHub { owner = "behave"; repo = pname; rev = "v${version}"; - sha256 = "1ssgixmqlg8sxsyalr83a1970njc2wg3zl8idsmxnsljwacv7qwv"; + hash = "sha256-B8PUN1Q4UAsDWrHjPZDlpaPjCKjI/pAogCSI+BQnaWs="; }; - checkInputs = [ pytestCheckHook mock pathpy pyhamcrest pytest-html ]; + checkInputs = [ pytestCheckHook mock path pyhamcrest pytest-html ]; # upstream tests are failing, so instead we only check if we can import it doCheck = false; diff --git a/pkgs/development/python-modules/bimmer-connected/default.nix b/pkgs/development/python-modules/bimmer-connected/default.nix index 8f754b213e819..3e8ba28c717ea 100644 --- a/pkgs/development/python-modules/bimmer-connected/default.nix +++ b/pkgs/development/python-modules/bimmer-connected/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "bimmer-connected"; - version = "0.8.11"; + version = "0.8.12"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "bimmerconnected"; repo = "bimmer_connected"; rev = version; - hash = "sha256-Ufx9Tl0PmV3AEig3UvejJBVxhewzPN6IRsji5MzVxG8="; + hash = "sha256-0yXEm8cjzw1ClSP8a5TB9RrugzgHSu40tTtyNQU4dfY="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/bip_utils/default.nix b/pkgs/development/python-modules/bip_utils/default.nix index a4430b655ce17..932d887754ec4 100644 --- a/pkgs/development/python-modules/bip_utils/default.nix +++ b/pkgs/development/python-modules/bip_utils/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "bip_utils"; - version = "2.1.0"; + version = "2.2.1"; disabled = pythonOlder "3.6"; @@ -16,7 +16,7 @@ buildPythonPackage rec { owner = "ebellocchia"; repo = pname; rev = "v${version}"; - sha256 = "1n677z6rvcny1vyfzwnvcmzbqp9m4kfpdjfvkf1q6310zr2ybp7m"; + sha256 = "sha256-p2JOZAJxQ/nPZ7vjnB24hA3kz3Io4D3HTP/8mqS/XCc="; }; propagatedBuildInputs = [ ecdsa pysha3 ]; diff --git a/pkgs/development/python-modules/bitarray/default.nix b/pkgs/development/python-modules/bitarray/default.nix index be7f69fbd8dcc..d5806d77112d5 100644 --- a/pkgs/development/python-modules/bitarray/default.nix +++ b/pkgs/development/python-modules/bitarray/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "bitarray"; - version = "2.4.0"; + version = "2.4.1"; src = fetchPypi { inherit pname version; - sha256 = "sha256-8SA+kC1R3zGRfXfuupw/540DKHOirXjHN+JkIPAIDlg="; + sha256 = "sha256-+uygP5eemSzHb3QGr365eVyxEbjYlpyJGgMr10l8h9o="; }; checkPhase = '' diff --git a/pkgs/development/python-modules/bitbox02/default.nix b/pkgs/development/python-modules/bitbox02/default.nix index d57d4a6585bd4..358a4d163f3e2 100644 --- a/pkgs/development/python-modules/bitbox02/default.nix +++ b/pkgs/development/python-modules/bitbox02/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "bitbox02"; - version = "5.3.0"; + version = "6.0.0"; src = fetchPypi { inherit pname version; - sha256 = "fe0e8aeb9b32fd7d76bb3e9838895973a74dfd532a8fb8ac174a1a60214aee26"; + sha256 = "sha256-wTateh3dJycFNozLaQbAzXF0avr2ofBdjlqqcOBLr/0="; }; propagatedBuildInputs = [ base58 ecdsa hidapi noiseprotocol protobuf semver typing-extensions ]; diff --git a/pkgs/development/python-modules/bitcoin-price-api/default.nix b/pkgs/development/python-modules/bitcoin-price-api/default.nix deleted file mode 100644 index c9d317a81c3c3..0000000000000 --- a/pkgs/development/python-modules/bitcoin-price-api/default.nix +++ /dev/null @@ -1,24 +0,0 @@ -{ lib, buildPythonPackage, fetchPypi -, python-dateutil, requests }: - -buildPythonPackage rec { - pname = "bitcoin-price-api"; - version = "0.0.4"; - - src = fetchPypi { - inherit pname version; - sha256 = "bc68076f9632aaa9a8009d916d67a709c1e045dd904cfc7a3e8be33960d32029"; - }; - - propagatedBuildInputs = [ python-dateutil requests ]; - - # No tests in archive - doCheck = false; - - meta = { - homepage = "https://github.com/dursk/bitcoin-price-api"; - description = "Price APIs for bitcoin exchanges"; - license = with lib.licenses; [ mit ]; - maintainers = with lib.maintainers; [ bhipple ]; - }; -} diff --git a/pkgs/development/python-modules/bitstruct/default.nix b/pkgs/development/python-modules/bitstruct/default.nix index 78b34dfbf17c1..5867e695b816e 100644 --- a/pkgs/development/python-modules/bitstruct/default.nix +++ b/pkgs/development/python-modules/bitstruct/default.nix @@ -1,17 +1,28 @@ -{ lib, buildPythonPackage, fetchPypi }: +{ lib +, buildPythonPackage +, fetchPypi +, pythonOlder +}: buildPythonPackage rec { pname = "bitstruct"; - version = "8.12.1"; + version = "8.14.1"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "45b2b932ce6681f5c6ce8cba39abdd423b579b0568c76fa48b1e09c88368ede7"; + hash = "sha256-04ExvUR7avW49GTEh4eXyHpdnaHJW5NX4HHEJP3l8FU="; }; + pythonImportsCheck = [ + "bitstruct" + ]; + meta = with lib; { - homepage = "https://github.com/eerimoq/bitstruct"; description = "Python bit pack/unpack package"; + homepage = "https://github.com/eerimoq/bitstruct"; license = licenses.mit; maintainers = with maintainers; [ jakewaksbaum ]; }; diff --git a/pkgs/development/python-modules/bjoern/default.nix b/pkgs/development/python-modules/bjoern/default.nix index ef599d89be2bc..e8b11a6311a4e 100644 --- a/pkgs/development/python-modules/bjoern/default.nix +++ b/pkgs/development/python-modules/bjoern/default.nix @@ -1,12 +1,17 @@ -{ lib, buildPythonPackage, fetchPypi, libev, python }: +{ lib, buildPythonPackage, fetchFromGitHub, libev, python }: buildPythonPackage rec { pname = "bjoern"; - version = "3.1.0"; + version = "3.2.1"; + format = "setuptools"; - src = fetchPypi { - inherit pname version; - sha256 = "01f3b601cf0ab0a9c7cb9c8f944ab7c738baaa6043ca82db20e9bd7a9be5767b"; + # tests are not published to pypi anymore + src = fetchFromGitHub { + owner = "jonashaag"; + repo = pname; + rev = version; + hash = "sha256-d7u/lEh2Zr5NYWYu4Zr7kgyeOIQuHQLYrZeiZMHbpio="; + fetchSubmodules = true; # fetch http-parser and statsd-c-client submodules }; buildInputs = [ libev ]; diff --git a/pkgs/development/python-modules/black/default.nix b/pkgs/development/python-modules/black/default.nix index 064fe8187edcc..884629da0ffe5 100644 --- a/pkgs/development/python-modules/black/default.nix +++ b/pkgs/development/python-modules/black/default.nix @@ -23,13 +23,13 @@ buildPythonPackage rec { pname = "black"; - version = "22.1.0"; + version = "22.3.0"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-p8AZLTVjX2/BF0vldct5FekuXdYp7nn9rw3PpBqAr7U="; + hash = "sha256-NQILiIbAIs7ZKCtRtah1ttGrDDh7MaBluE23wzCFynk="; }; nativeBuildInputs = [ setuptools-scm ]; diff --git a/pkgs/development/python-modules/blessed/default.nix b/pkgs/development/python-modules/blessed/default.nix index c2b03d35a21c3..592c36692d0fd 100644 --- a/pkgs/development/python-modules/blessed/default.nix +++ b/pkgs/development/python-modules/blessed/default.nix @@ -4,11 +4,11 @@ buildPythonPackage rec { pname = "blessed"; - version = "1.19.0"; + version = "1.19.1"; src = fetchPypi { inherit pname version; - sha256 = "4db0f94e5761aea330b528e84a250027ffe996b5a94bf03e502600c9a5ad7a61"; + sha256 = "sha256-mg0JlpW/Yh1GgN1sc/atVH9qNEL72+gMSx2qHtvEkvw="; }; checkInputs = [ pytest mock glibcLocales ]; diff --git a/pkgs/development/python-modules/blinker/default.nix b/pkgs/development/python-modules/blinker/default.nix index ca59a0d710aba..53aaacbdf820a 100644 --- a/pkgs/development/python-modules/blinker/default.nix +++ b/pkgs/development/python-modules/blinker/default.nix @@ -1,4 +1,4 @@ -{ lib, buildPythonPackage, fetchPypi, nose, pytestCheckHook }: +{ lib, buildPythonPackage, fetchPypi, nose }: buildPythonPackage rec { pname = "blinker"; @@ -9,13 +9,18 @@ buildPythonPackage rec { sha256 = "1dpq0vb01p36jjwbhhd08ylvrnyvcc82yxx3mwjx6awrycjyw6j7"; }; - checkInputs = [ nose pytestCheckHook ]; + checkInputs = [ nose ]; + + checkPhase = '' + nosetests + ''; + pythonImportsCheck = [ "blinker" ]; meta = with lib; { homepage = "https://pythonhosted.org/blinker/"; description = "Fast, simple object-to-object and broadcast signaling"; license = licenses.mit; - maintainers = with maintainers; [ ]; + maintainers = with maintainers; [ SuperSandro2000 ]; }; } diff --git a/pkgs/development/python-modules/blspy/default.nix b/pkgs/development/python-modules/blspy/default.nix index aac2c2b973918..9f07fa764f9d7 100644 --- a/pkgs/development/python-modules/blspy/default.nix +++ b/pkgs/development/python-modules/blspy/default.nix @@ -27,10 +27,10 @@ buildPythonPackage rec { src = ./dont_fetch_dependencies.patch; pybind11_src = pybind11.src; relic_src = fetchFromGitHub { - owner = "relic-toolkit"; + owner = "Chia-Network"; repo = "relic"; - rev = "1885ae3b681c423c72b65ce1fe70910142cf941c"; # pinned by blspy - hash = "sha256-tsSZTcssl8t7Nqdex4BesgQ+ACPgTdtHnJFvS9josN0="; + rev = "1d98e5abf3ca5b14fd729bd5bcced88ea70ecfd7"; # pinned by blspy + hash = "sha256-IfTD8DvTEXeLUoKe4Ejafb+PEJW5DV/VXRYuutwGQHU="; }; sodium_src = fetchFromGitHub { owner = "AmineKhaldi"; diff --git a/pkgs/development/python-modules/boltztrap2/default.nix b/pkgs/development/python-modules/boltztrap2/default.nix index e697d97fea781..ad28d461faffa 100644 --- a/pkgs/development/python-modules/boltztrap2/default.nix +++ b/pkgs/development/python-modules/boltztrap2/default.nix @@ -14,32 +14,45 @@ }: buildPythonPackage rec { - version = "22.3.2"; - pname = "BoltzTraP2"; + pname = "boltztrap2"; + version = "22.4.1"; + format = "setuptools"; + disabled = pythonOlder "3.5"; src = fetchPypi { - inherit pname version; - sha256 = "sha256-Yo37xdXxCQKkA+lrFEZp1DxjJy216Q6aYYT68PEx9JU="; + pname = "BoltzTraP2"; + inherit version; + hash = "sha256-lGwKHWAslCmb9bVQELHD6kAay+dnieiNsSAfAyNFLPM="; }; dontUseCmakeConfigure = true; - nativeBuildInputs = [ cmake cython ]; - checkInputs = [ pytest ]; - propagatedBuildInputs = [ spglib numpy scipy matplotlib ase netcdf4 ]; + nativeBuildInputs = [ + cmake + cython + ]; + + propagatedBuildInputs = [ + spglib + numpy + scipy + matplotlib + ase + netcdf4 + ]; # pypi release does no include files for tests doCheck = false; - checkPhase = '' - py.test - ''; + pythonImportsCheck = [ + "BoltzTraP2" + ]; meta = with lib; { - homepage = "http://www.boltztrap.org/"; description = "Band-structure interpolator and transport coefficient calculator"; - license = licenses.gpl3; - maintainers = [ maintainers.costrouc ]; + homepage = "http://www.boltztrap.org/"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ costrouc ]; }; } diff --git a/pkgs/development/python-modules/boschshcpy/default.nix b/pkgs/development/python-modules/boschshcpy/default.nix index 518a2d8b69e0d..277a55637f733 100644 --- a/pkgs/development/python-modules/boschshcpy/default.nix +++ b/pkgs/development/python-modules/boschshcpy/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "boschshcpy"; - version = "0.2.30"; + version = "0.2.32"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "tschamm"; repo = pname; rev = version; - sha256 = "sha256-qq01hnNiJ6BUGhi5owYvxM+Kj7/KYp0vBpILmwPuZaw="; + sha256 = "sha256-tJlgmxa6HppLLTs4ZggnJ5H6NOH3v+C9pUfLBmxr4XY="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/boto3/default.nix b/pkgs/development/python-modules/boto3/default.nix index c6fdc8c9981c5..d849d49b64f85 100644 --- a/pkgs/development/python-modules/boto3/default.nix +++ b/pkgs/development/python-modules/boto3/default.nix @@ -13,11 +13,11 @@ buildPythonPackage rec { pname = "boto3"; - version = "1.20.35"; # N.B: if you change this, change botocore and awscli to a matching version + version = "1.21.30"; # N.B: if you change this, change botocore and awscli to a matching version src = fetchPypi { inherit pname version; - sha256 = "42dd9fcb9e033ab19c9dfaeaba745ef9d2db6efe4e9f1e1f547b3e3e0b1f4a82"; + sha256 = "sha256-8K+PTvX+Y1PHlM08zmJ9Rpphi1is58p1pjz9cZ32Fc4="; }; propagatedBuildInputs = [ botocore jmespath s3transfer ] ++ lib.optionals (!isPy3k) [ futures ]; diff --git a/pkgs/development/python-modules/botocore/default.nix b/pkgs/development/python-modules/botocore/default.nix index 6d5c11665c2cb..52b8d8d37fc14 100644 --- a/pkgs/development/python-modules/botocore/default.nix +++ b/pkgs/development/python-modules/botocore/default.nix @@ -13,11 +13,11 @@ buildPythonPackage rec { pname = "botocore"; - version = "1.23.35"; # N.B: if you change this, change boto3 and awscli to a matching version + version = "1.24.33"; # N.B: if you change this, change boto3 and awscli to a matching version src = fetchPypi { inherit pname version; - sha256 = "5be6ba6c5ea71c256da8a5023bf9c278847c4b90fdb40f2c4c3bdb21ca11ff28"; + sha256 = "sha256-6l/RgAggMKbDP6Gb8BHXKXDz7SPP/xtBQTBp4yV2gQM="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/bottleneck/default.nix b/pkgs/development/python-modules/bottleneck/default.nix index f7e7dc7c390c1..4197920d2b9a4 100644 --- a/pkgs/development/python-modules/bottleneck/default.nix +++ b/pkgs/development/python-modules/bottleneck/default.nix @@ -1,32 +1,47 @@ -{ lib, buildPythonPackage, fetchPypi -, nose +{ lib +, buildPythonPackage +, fetchPypi , numpy -, pytest +, pytestCheckHook , python +, pythonOlder }: buildPythonPackage rec { - pname = "Bottleneck"; - version = "1.3.2"; + pname = "bottleneck"; + version = "1.3.4"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchPypi { - inherit pname version; - sha256 = "20179f0b66359792ea283b69aa16366419132f3b6cf3adadc0c48e2e8118e573"; + pname = "Bottleneck"; + inherit version; + hash = "sha256-F2Sn9K1YxVhyPFQoR+s2erC7ttiApOXV7vMKDs5c7Oo="; }; - propagatedBuildInputs = [ numpy ]; + propagatedBuildInputs = [ + numpy + ]; + + checkInputs = [ + pytestCheckHook + ]; + + pytestFlagsArray = [ + "$out/${python.sitePackages}" + ]; - postPatch = '' - substituteInPlace setup.py --replace "__builtins__.__NUMPY_SETUP__ = False" "" - ''; + disabledTests = [ + "test_make_c_files" + ]; - checkInputs = [ pytest nose ]; - checkPhase = '' - py.test -p no:warnings $out/${python.sitePackages} - ''; + pythonImportsCheck = [ + "bottleneck" + ]; meta = with lib; { - description = "Fast NumPy array functions written in C"; + description = "Fast NumPy array functions"; homepage = "https://github.com/pydata/bottleneck"; license = licenses.bsd2; maintainers = with maintainers; [ ]; diff --git a/pkgs/development/python-modules/boxx/default.nix b/pkgs/development/python-modules/boxx/default.nix index a3f0db80fafe8..10032f0ae58fe 100644 --- a/pkgs/development/python-modules/boxx/default.nix +++ b/pkgs/development/python-modules/boxx/default.nix @@ -13,16 +13,20 @@ , pyopengl , seaborn , pytorch +, pythonOlder , torchvision }: buildPythonPackage rec { pname = "boxx"; - version = "0.9.9"; + version = "0.10.0"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "sha256-Mc6R6ruUVhFs2D0CTJsAiM9aGOusS973hRS5r2kQsy4="; + hash = "sha256-1Q6wCloOCfyDmvC8VbK6GgfnxuliJ6Ze7UEvsNFBVa0="; }; propagatedBuildInputs = [ @@ -37,19 +41,22 @@ buildPythonPackage rec { seaborn ]; - pythonImportsCheck = [ "boxx" ]; checkInputs = [ xvfb-run pytorch torchvision ]; + pythonImportsCheck = [ + "boxx" + ]; + checkPhase = '' xvfb-run ${python.interpreter} -m unittest ''; meta = with lib; { - description = "Tool-box for efficient build and debug in Python. Especially for Scientific Computing and Computer Vision."; + description = "Tool-box for efficient build and debug for Scientific Computing and Computer Vision"; homepage = "https://github.com/DIYer22/boxx"; license = licenses.mit; maintainers = with maintainers; [ lucasew ]; diff --git a/pkgs/development/python-modules/brother/default.nix b/pkgs/development/python-modules/brother/default.nix index 17d46940e254e..db4ef16522e83 100644 --- a/pkgs/development/python-modules/brother/default.nix +++ b/pkgs/development/python-modules/brother/default.nix @@ -1,37 +1,29 @@ { lib , buildPythonPackage , fetchFromGitHub -, pysnmp +, pysnmplib , pytest-asyncio , pytest-error-for-skips -, pytest-runner , pytestCheckHook , pythonOlder }: buildPythonPackage rec { pname = "brother"; - version = "1.1.0"; + version = "1.2.0"; + format = "setuptools"; + disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "bieniu"; repo = pname; rev = version; - sha256 = "sha256-ZDQIpzdr3XkYrSUgrBDZsUwUZRQCdJdvmniMezvJxzU="; + hash = "sha256-hKOZ5pTDwhM0lOXoatXXVvEVxiTfxIpBRe3fFcUfzwE="; }; - nativeBuildInputs = [ - pytest-runner - ]; - - postPatch = '' - substituteInPlace setup.cfg \ - --replace "--cov --cov-report term-missing " "" - ''; - propagatedBuildInputs = [ - pysnmp + pysnmplib ]; checkInputs = [ @@ -40,7 +32,16 @@ buildPythonPackage rec { pytestCheckHook ]; - pythonImportsCheck = [ "brother" ]; + postPatch = '' + substituteInPlace setup.cfg \ + --replace "--cov --cov-report term-missing " "" + substituteInPlace setup.py \ + --replace '"pytest-runner"' "" + ''; + + pythonImportsCheck = [ + "brother" + ]; meta = with lib; { description = "Python wrapper for getting data from Brother laser and inkjet printers via SNMP"; diff --git a/pkgs/development/python-modules/bsblan/default.nix b/pkgs/development/python-modules/bsblan/default.nix index 6db9523477522..ed13a3a3a7ba7 100644 --- a/pkgs/development/python-modules/bsblan/default.nix +++ b/pkgs/development/python-modules/bsblan/default.nix @@ -5,6 +5,8 @@ , aresponses , coverage , mypy +, poetry-core +, pydantic , pytest-asyncio , pytest-cov , pytest-mock @@ -17,22 +19,27 @@ buildPythonPackage rec { pname = "bsblan"; - version = "0.5.0"; - format = "setuptools"; + version = "0.5.5"; + format = "pyproject"; disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "liudger"; repo = "python-bsblan"; - rev = "v.${version}"; - sha256 = "1j41y2njnalcsp1vjqwl508yp3ki82lv8108ijz52hprhrq4fffb"; + rev = "v${version}"; + sha256 = "sha256-kq4cML7D9XC/QRPjGfaWcs0H78OOc2IXGua7qJpWYOQ="; }; + nativeBuildInputs = [ + poetry-core + ]; + propagatedBuildInputs = [ aiohttp attrs cattrs + pydantic yarl ]; diff --git a/pkgs/development/python-modules/build/default.nix b/pkgs/development/python-modules/build/default.nix index f1f7f0e81bd25..d36804649b7e3 100644 --- a/pkgs/development/python-modules/build/default.nix +++ b/pkgs/development/python-modules/build/default.nix @@ -52,8 +52,6 @@ buildPythonPackage rec { ]; pytestFlagsArray = [ - "-n" - "$NIX_BUILD_CORES" "-W" "ignore::DeprecationWarning" ]; diff --git a/pkgs/development/python-modules/buildbot/default.nix b/pkgs/development/python-modules/buildbot/default.nix index 2836ee24c34a4..743c9f2c4b117 100644 --- a/pkgs/development/python-modules/buildbot/default.nix +++ b/pkgs/development/python-modules/buildbot/default.nix @@ -31,11 +31,11 @@ let package = buildPythonPackage rec { pname = "buildbot"; - version = "3.4.1"; + version = "3.5.0"; src = fetchPypi { inherit pname version; - sha256 = "sha256-GmKMqejHjtEiEtlZffze7PGNjVwUKB/ZcvUgJ4DoeDQ="; + sha256 = "sha256-woGHdCan5qTp00toNkWa821EgVQMrPK+OWXoqFcgIDQ="; }; propagatedBuildInputs = [ @@ -92,6 +92,9 @@ let preCheck = '' export LC_ALL="en_US.UTF-8" export PATH="$out/bin:$PATH" + + # remove testfile which is missing configuration file from sdist + rm buildbot/test/integration/test_graphql.py ''; disabled = !isPy3k; diff --git a/pkgs/development/python-modules/buildbot/pkg.nix b/pkgs/development/python-modules/buildbot/pkg.nix index a35506c89b8de..a2cffd739d1a7 100644 --- a/pkgs/development/python-modules/buildbot/pkg.nix +++ b/pkgs/development/python-modules/buildbot/pkg.nix @@ -6,7 +6,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-A2a5rEL5MN9jlu5vVnUIKx9ma2H6wuJAWjkqLpQgcfc="; + sha256 = "sha256-CYbMixfZZ1xypV0J7TW54n/fja9RGMlWiF7StJYFnqM="; }; postPatch = '' diff --git a/pkgs/development/python-modules/buildbot/plugins.nix b/pkgs/development/python-modules/buildbot/plugins.nix index 5b64f4c51ab99..62aa51e053dcb 100644 --- a/pkgs/development/python-modules/buildbot/plugins.nix +++ b/pkgs/development/python-modules/buildbot/plugins.nix @@ -7,7 +7,7 @@ src = fetchPypi { inherit pname version; - sha256 = "sha256-Hly1dwUbWblHoP+ufjxyz4boXby8kxeFSHLMHcCpc1o="; + sha256 = "sha256-boa/MWi/HAhNU3/n96i0fuoQ+jT5I+dWoe1Zd7f/Yvs="; }; # Remove unneccessary circular dependency on buildbot @@ -34,7 +34,7 @@ src = fetchPypi { inherit pname version; - sha256 = "sha256-QuV808Wg9epCgjehuUaMKCLLTLfFJVWBdKPy8sZfBYg="; + sha256 = "sha256-NUDTwgkQuasOlJxNTlvfIm99LNVCrRIdBmgeJnwkSU8="; }; buildInputs = [ buildbot-pkg ]; @@ -56,7 +56,7 @@ src = fetchPypi { inherit pname version; - sha256 = "sha256-p8PRQaWrPb63RrF4FtTX65qM3HdzI4Gl4tR0zTOBFEI="; + sha256 = "sha256-EmiIDCG4iFIwFnwii8fjII7C7wsBifzeZeW7HyY04dE="; }; buildInputs = [ buildbot-pkg ]; @@ -78,7 +78,7 @@ src = fetchPypi { inherit pname version; - sha256 = "sha256-cNYptEp98padbyoY1DmZbpaED7O5pfck9oMjst4RHnI="; + sha256 = "sha256-QcS8QJ17uzDvkynTczj05LojuIT6feGiQNCwCESbVLw="; }; buildInputs = [ buildbot-pkg ]; @@ -100,7 +100,7 @@ src = fetchPypi { inherit pname version; - sha256 = "sha256-o747SIyqJom4ucZ7hmODcP0VC7i+ydgvi+oMxn/vupc="; + sha256 = "sha256-U9ecRxpDowzjD4GsrW4FUHcbNaWeAFGKDlqMrbIoTrQ="; }; buildInputs = [ buildbot-pkg ]; diff --git a/pkgs/development/python-modules/buildbot/worker.nix b/pkgs/development/python-modules/buildbot/worker.nix index 97a3eec770bd8..8c5319868ce5b 100644 --- a/pkgs/development/python-modules/buildbot/worker.nix +++ b/pkgs/development/python-modules/buildbot/worker.nix @@ -1,5 +1,26 @@ -{ lib, buildPythonPackage, fetchPypi, buildbot, setuptoolsTrial, mock, twisted, - future, coreutils, nixosTests }: +{ lib +, buildPythonPackage +, fetchPypi +, buildbot + +# patch +, coreutils + +# propagates +, autobahn +, future +, msgpack +, twisted + +# tests +, mock +, parameterized +, psutil +, setuptoolsTrial + +# passthru +, nixosTests +}: buildPythonPackage (rec { pname = "buildbot-worker"; @@ -7,18 +28,31 @@ buildPythonPackage (rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-9wdUvp00vuP7peJ+Oo4guHLfIz0YWHwp6q/zlKOOoXg="; + sha256 = "sha256-HZH3TdH5dhr3f6ev25O3SgPPNbiFGMmAp9DHwcb/2MA="; }; - propagatedBuildInputs = [ twisted future ]; - - checkInputs = [ setuptoolsTrial mock ]; - postPatch = '' substituteInPlace buildbot_worker/scripts/logwatcher.py \ --replace /usr/bin/tail "${coreutils}/bin/tail" ''; + nativeBuildInputs = [ + setuptoolsTrial + ]; + + propagatedBuildInputs = [ + autobahn + future + msgpack + twisted + ]; + + checkInputs = [ + mock + parameterized + psutil + ]; + passthru.tests = { smoke-test = nixosTests.buildbot; }; diff --git a/pkgs/development/python-modules/caldav/default.nix b/pkgs/development/python-modules/caldav/default.nix index 27b59cfc07e10..c2ffe1786c488 100644 --- a/pkgs/development/python-modules/caldav/default.nix +++ b/pkgs/development/python-modules/caldav/default.nix @@ -14,13 +14,13 @@ buildPythonPackage rec { pname = "caldav"; - version = "0.8.2"; + version = "0.9.0"; src = fetchFromGitHub { owner = "python-caldav"; repo = pname; - rev = "v${version}"; - hash = "sha256-2mpE1aLipps4X/3EF0oKHXDcrgUh78/fxY6y1B1V2IU="; + rev = "refs/tags/v${version}"; + hash = "sha256-1pYbL9k2cfjIw9AFiItlDCidxZIuOAoUcgFmSibkphA="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/can/default.nix b/pkgs/development/python-modules/can/default.nix index a68d73e1242c5..8e7a8b7ea0e81 100644 --- a/pkgs/development/python-modules/can/default.nix +++ b/pkgs/development/python-modules/can/default.nix @@ -3,6 +3,7 @@ , fetchFromGitHub , future , hypothesis +, packaging , parameterized , msgpack , pyserial @@ -15,7 +16,7 @@ buildPythonPackage rec { pname = "python-can"; - version = "unstable-2022-01-11"; + version = "4.0.0"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -23,12 +24,13 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "hardbyte"; repo = pname; - rev = "2e24af08326ecd69fba9f02fed7b9c26f233c92b"; - hash = "sha256-ZP5qtbjDtBZ2uT9DOSvSnfHyTlirr0oCEXhiLO1ydz0="; + rev = version; + hash = "sha256-/z7zBfVbO7x4UtzWOXolH2YrtYWgsvRLObWwz8sqOEc="; }; propagatedBuildInputs = [ msgpack + packaging pyserial typing-extensions wrapt @@ -56,6 +58,9 @@ buildPythonPackage rec { # Tests require access socket "BasicTestUdpMulticastBusIPv4" "BasicTestUdpMulticastBusIPv6" + # pytest.approx is not supported in a boolean context (since pytest7) + "test_pack_unpack" + "test_receive" ]; preCheck = '' diff --git a/pkgs/development/python-modules/casbin/default.nix b/pkgs/development/python-modules/casbin/default.nix index 12ea06a5c4f7d..433b7644e7a80 100644 --- a/pkgs/development/python-modules/casbin/default.nix +++ b/pkgs/development/python-modules/casbin/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "casbin"; - version = "1.15.4"; + version = "1.15.5"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -17,8 +17,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = pname; repo = "pycasbin"; - rev = "v${version}"; - sha256 = "0vczml14dvvrj401r08d6b0rfn5p5kfm1wr0vrfi8rqk2z5x1w0g"; + rev = "refs/tags/v${version}"; + sha256 = "sha256-7q9zTuqdIUAiipA5kh8CwQa/TeiXGsKuGGvYYwTjObw="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/cattrs/default.nix b/pkgs/development/python-modules/cattrs/default.nix index e3d694d28e3b3..69a351e3c341c 100644 --- a/pkgs/development/python-modules/cattrs/default.nix +++ b/pkgs/development/python-modules/cattrs/default.nix @@ -7,6 +7,7 @@ , motor , msgpack , poetry-core +, pytest-xdist , pytestCheckHook , pythonOlder , pyyaml @@ -44,12 +45,14 @@ buildPythonPackage rec { immutables motor msgpack + pytest-xdist pytestCheckHook pyyaml tomlkit ujson ]; + postPatch = '' substituteInPlace pyproject.toml \ --replace "-l --benchmark-sort=fullname --benchmark-warmup=true --benchmark-warmup-iterations=5 --benchmark-group-by=fullname" "" \ @@ -75,6 +78,8 @@ buildPythonPackage rec { disabledTests = [ # orjson is not available as it requires Rust nightly features to compile its requirements "test_orjson" + # tomlkit is pinned to an older version and newer versions raise InvalidControlChar exception + "test_tomlkit" ]; pythonImportsCheck = [ diff --git a/pkgs/development/python-modules/cbor2/default.nix b/pkgs/development/python-modules/cbor2/default.nix index cf4813a9d9085..5039872b336f2 100644 --- a/pkgs/development/python-modules/cbor2/default.nix +++ b/pkgs/development/python-modules/cbor2/default.nix @@ -9,13 +9,13 @@ buildPythonPackage rec { pname = "cbor2"; - version = "5.4.2"; + version = "5.4.2.post1"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "sha256-4oPnC1WgSf82TMXmSP3lh+TZsOh+SyZkxp5jkTXms7g="; + sha256 = "sha256-nPIdWWBLlSnXh3yOA0Ki66rhoH/o/1aD3HX+wVhHx5c="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/celery/default.nix b/pkgs/development/python-modules/celery/default.nix index 247d25bf420ab..4c7e2d8d62f5b 100644 --- a/pkgs/development/python-modules/celery/default.nix +++ b/pkgs/development/python-modules/celery/default.nix @@ -24,14 +24,14 @@ buildPythonPackage rec { pname = "celery"; - version = "5.2.3"; + version = "5.2.6"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-4s1BZnrZfU9qL0Zy0cam662hlMYZJTBYtfI3BKqtqoI="; + hash = "sha256-0TmMrfMPV2Jms0Nw4o6IAwbsVfektjB1SbCunBVmNIE="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/certbot/default.nix b/pkgs/development/python-modules/certbot/default.nix index e65e6f0d808ed..72a5d8db39d75 100644 --- a/pkgs/development/python-modules/certbot/default.nix +++ b/pkgs/development/python-modules/certbot/default.nix @@ -9,13 +9,13 @@ buildPythonPackage rec { pname = "certbot"; - version = "1.22.0"; + version = "1.24.0"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "1wrk5rhds6a69vbs1bda0zhwpvjhd8i20did6j3kydbas3zbr516"; + sha256 = "sha256-XIKFEPQKIV5s6sZ7LRnlTvsb3cF4KIaiVZ36cAN1AwA="; }; sourceRoot = "source/${pname}"; diff --git a/pkgs/development/python-modules/certomancer/default.nix b/pkgs/development/python-modules/certomancer/default.nix new file mode 100644 index 0000000000000..3d863165f2966 --- /dev/null +++ b/pkgs/development/python-modules/certomancer/default.nix @@ -0,0 +1,71 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, pythonOlder +, asn1crypto +, click +, oscrypto +, pyyaml +, python-dateutil +, tzlocal +, pytest-aiohttp +, pytz +, freezegun +, jinja2 +, pyhanko-certvalidator +, requests +, requests-mock +, werkzeug +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "certomancer"; + version = "0.8.2"; + format = "setuptools"; + disabled = pythonOlder "3.7"; + + # Tests are only available on GitHub + src = fetchFromGitHub { + owner = "MatthiasValvekens"; + repo = "certomancer"; + rev = version; + sha256 = "sha256-H43NlFNTwZtedHsB7c62MocwQVOi5JjVJxRcZY+Wn7Y="; + }; + + propagatedBuildInputs = [ + asn1crypto + click + oscrypto + pyyaml + python-dateutil + tzlocal + ]; + + postPatch = '' + substituteInPlace setup.py \ + --replace ", 'pytest-runner'" "" \ + --replace "pyhanko-certvalidator==0.19.2" "pyhanko-certvalidator==0.19.5" + ''; + + checkInputs = [ + freezegun + jinja2 + pyhanko-certvalidator + pytest-aiohttp + pytz + requests + requests-mock + werkzeug + pytestCheckHook + ]; + + pythonImportsCheck = [ "certomancer" ]; + + meta = with lib; { + description = "Quickly construct, mock & deploy PKI test configurations using simple declarative configuration"; + homepage = "https://github.com/MatthiasValvekens/certomancer"; + license = licenses.mit; + maintainers = with maintainers; [ wolfangaukang ]; + }; +} diff --git a/pkgs/development/python-modules/cffi/default.nix b/pkgs/development/python-modules/cffi/default.nix index a65cd297f43f5..22d2e87cd276c 100644 --- a/pkgs/development/python-modules/cffi/default.nix +++ b/pkgs/development/python-modules/cffi/default.nix @@ -19,11 +19,12 @@ if isPyPy then null else buildPythonPackage rec { propagatedBuildInputs = [ pycparser ]; - prePatch = lib.optionalString stdenv.isDarwin '' + postPatch = lib.optionalString stdenv.isDarwin '' # Remove setup.py impurities - substituteInPlace setup.py --replace "'-iwithsysroot/usr/include/ffi'" "" - substituteInPlace setup.py --replace "'/usr/include/ffi'," "" - substituteInPlace setup.py --replace '/usr/include/libffi' '${lib.getDev libffi}/include' + substituteInPlace setup.py \ + --replace "'-iwithsysroot/usr/include/ffi'" "" \ + --replace "'/usr/include/ffi'," "" \ + --replace '/usr/include/libffi' '${lib.getDev libffi}/include' ''; # The tests use -Werror but with python3.6 clang detects some unreachable code. diff --git a/pkgs/development/python-modules/chainer/default.nix b/pkgs/development/python-modules/chainer/default.nix index b7dbfca70e8a8..1b40d506abc1d 100644 --- a/pkgs/development/python-modules/chainer/default.nix +++ b/pkgs/development/python-modules/chainer/default.nix @@ -1,6 +1,6 @@ -{ lib, buildPythonPackage, fetchFromGitHub, isPy3k +{ config, lib, buildPythonPackage, fetchFromGitHub, isPy3k , filelock, protobuf, numpy, pytestCheckHook, mock, typing-extensions -, cupy, cudaSupport ? false +, cupy, cudaSupport ? config.cudaSupport or false }: buildPythonPackage rec { @@ -39,6 +39,8 @@ buildPythonPackage rec { meta = with lib; { description = "A flexible framework of neural networks for deep learning"; homepage = "https://chainer.org/"; + # Un-break me when updating chainer next time! + broken = cudaSupport && (lib.versionAtLeast cupy.version "8.0.0"); license = licenses.mit; maintainers = with maintainers; [ hyphon81 ]; }; diff --git a/pkgs/development/python-modules/chalice/default.nix b/pkgs/development/python-modules/chalice/default.nix index 762846ab34c2d..d309bc71731bc 100644 --- a/pkgs/development/python-modules/chalice/default.nix +++ b/pkgs/development/python-modules/chalice/default.nix @@ -24,13 +24,13 @@ buildPythonPackage rec { pname = "chalice"; - version = "1.26.4"; + version = "1.26.6"; src = fetchFromGitHub { owner = "aws"; repo = pname; rev = version; - sha256 = "sha256-Xn8OqeEihLxZS9QZtrhzau2zLg9SzQrrigK70PoImhU="; + sha256 = "sha256-6Y5pJg6N/F97zvkyo4r6MoThi79kI53AvlHNOmOCpFA="; }; propagatedBuildInputs = [ @@ -62,7 +62,7 @@ buildPythonPackage rec { sed -i setup.py -e "/pip>=/c\'pip'," substituteInPlace setup.py \ --replace "typing==3.6.4" "typing" \ - --replace "attrs>=19.3.0,<21.3.0" "attrs" + --replace "jmespath>=0.9.3,<1.0.0" "jmespath>=0.9.3,<2.0.0" ''; disabledTestPaths = [ diff --git a/pkgs/development/python-modules/cherrypy/default.nix b/pkgs/development/python-modules/cherrypy/default.nix index 01bbfe8841b7a..f4272f90d6298 100644 --- a/pkgs/development/python-modules/cherrypy/default.nix +++ b/pkgs/development/python-modules/cherrypy/default.nix @@ -6,7 +6,7 @@ , jaraco_collections , more-itertools , objgraph -, pathpy +, path , portend , pytest-forked , pytest-services @@ -51,7 +51,7 @@ buildPythonPackage rec { checkInputs = [ objgraph - pathpy + path pytest-forked pytest-services pytestCheckHook diff --git a/pkgs/development/python-modules/chex/default.nix b/pkgs/development/python-modules/chex/default.nix index bb873f2c3bfd0..a06cb4ec84bba 100644 --- a/pkgs/development/python-modules/chex/default.nix +++ b/pkgs/development/python-modules/chex/default.nix @@ -12,16 +12,14 @@ buildPythonPackage rec { pname = "chex"; - # As of 2021-12-29, the latest official version has broken tests with jax 0.2.26: - # `AttributeError: module 'jax.interpreters.xla' has no attribute 'xb'` - version = "unstable-2021-12-16"; + version = "0.1.2"; format = "setuptools"; src = fetchFromGitHub { owner = "deepmind"; repo = pname; - rev = "5adc10e0b4218f8ec775567fca38b68bbad42a3a"; - sha256 = "00xib6zv9pwid2q7wcr109qj3fa3g3b852skz8444kw7r0qxy7z3"; + rev = "v${version}"; + hash = "sha256-NtZYOHByKBcKmhRaNULwaQqxfoPRmgbtJ3cFHNfy4E8="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/chiavdf/default.nix b/pkgs/development/python-modules/chiavdf/default.nix index 1525c5ac90587..a4bd20f9cd6a8 100644 --- a/pkgs/development/python-modules/chiavdf/default.nix +++ b/pkgs/development/python-modules/chiavdf/default.nix @@ -14,12 +14,12 @@ buildPythonPackage rec { pname = "chiavdf"; - version = "1.0.5"; + version = "1.0.6"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-2pC6sFRwgAwIEanZXe99848XMxK/lyLGxiA+UA+q3H0="; + hash = "sha256-Ri7j/T0nnZFml4kC0qIQkyYRJBPZMhTYxolW/A25030="; }; patches = [ diff --git a/pkgs/development/python-modules/ciscoconfparse/default.nix b/pkgs/development/python-modules/ciscoconfparse/default.nix index e6db689a45c5f..49b36a5c6582c 100644 --- a/pkgs/development/python-modules/ciscoconfparse/default.nix +++ b/pkgs/development/python-modules/ciscoconfparse/default.nix @@ -33,6 +33,7 @@ buildPythonPackage rec { passlib dnspython loguru + toml ]; checkInputs = [ diff --git a/pkgs/development/python-modules/ckcc-protocol/default.nix b/pkgs/development/python-modules/ckcc-protocol/default.nix index 670e4a3c92375..e2a8ebd977688 100644 --- a/pkgs/development/python-modules/ckcc-protocol/default.nix +++ b/pkgs/development/python-modules/ckcc-protocol/default.nix @@ -10,12 +10,12 @@ buildPythonPackage rec { pname = "ckcc-protocol"; - version = "1.3.0"; + version = "1.3.1"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "sha256-UVLKJHDPxi9ivY3JyIySmce0NUhxIIlIxVTdPoXMaKM="; + sha256 = "sha256-5wsVg7GX/9UygzpGI6DwrkAvexgcOmJyuv8GXiPPWvk="; }; propagatedBuildInputs = [ click ecdsa hidapi pyaes ]; diff --git a/pkgs/development/python-modules/claripy/default.nix b/pkgs/development/python-modules/claripy/default.nix index 9816ff3782b35..8f66e8551edf5 100644 --- a/pkgs/development/python-modules/claripy/default.nix +++ b/pkgs/development/python-modules/claripy/default.nix @@ -8,13 +8,14 @@ , pysmt , pythonOlder , pytestCheckHook +, six , z3 }: buildPythonPackage rec { pname = "claripy"; - version = "9.1.12332"; - format = "setuptools"; + version = "9.2.1"; + format = "pyproject"; disabled = pythonOlder "3.6"; @@ -22,7 +23,7 @@ buildPythonPackage rec { owner = "angr"; repo = pname; rev = "v${version}"; - sha256 = "sha256-YrR8OkDoop6kHAuk4cM4STYYOjjaMLZCQuE07/5IXqs="; + hash = "sha256-pCqhSpZfX3u9vJ8Oy1yyicagBQYK5+jBVCEab0TnGA4="; }; propagatedBuildInputs = [ @@ -36,12 +37,13 @@ buildPythonPackage rec { checkInputs = [ nose pytestCheckHook + six ]; postPatch = '' # Use upstream z3 implementation - substituteInPlace setup.py \ - --replace "z3-solver>=4.8.5.0" "" + substituteInPlace setup.cfg \ + --replace "z3-solver >= 4.8.5.0" "" ''; pythonImportsCheck = [ diff --git a/pkgs/development/python-modules/cle/default.nix b/pkgs/development/python-modules/cle/default.nix index 6c8126172c056..8ee898b445e72 100644 --- a/pkgs/development/python-modules/cle/default.nix +++ b/pkgs/development/python-modules/cle/default.nix @@ -15,7 +15,7 @@ let # The binaries are following the argr projects release cycle - version = "9.1.12332"; + version = "9.2.1"; # Binary files from https://github.com/angr/binaries (only used for testing and only here) binaries = fetchFromGitHub { @@ -29,7 +29,7 @@ in buildPythonPackage rec { pname = "cle"; inherit version; - format = "setuptools"; + format = "pyproject"; disabled = pythonOlder "3.6"; @@ -37,7 +37,7 @@ buildPythonPackage rec { owner = "angr"; repo = pname; rev = "v${version}"; - hash = "sha256-xcj6Skzzmw5g+0KsBMLNOhRyXQA7nbgnc9YyfJLteCM="; + hash = "sha256-OGdnrRFfx2LMMsw6giPC+4izWX603cYbpKHuslj4Gng="; }; propagatedBuildInputs = [ @@ -70,6 +70,8 @@ buildPythonPackage rec { "test_plt_full_relro" # Test fails "test_tls_pe_incorrect_tls_data_start" + # The required parts is not present on Nix + "test_remote_file_map" ]; pythonImportsCheck = [ diff --git a/pkgs/development/python-modules/click-log/default.nix b/pkgs/development/python-modules/click-log/default.nix index 3145d4775e397..c0b8c89ea648b 100644 --- a/pkgs/development/python-modules/click-log/default.nix +++ b/pkgs/development/python-modules/click-log/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "click-log"; - version = "0.3.2"; + version = "0.4.0"; src = fetchPypi { inherit pname version; - sha256 = "16fd1ca3fc6b16c98cea63acf1ab474ea8e676849dc669d86afafb0ed7003124"; + sha256 = "sha256-OXD4VwrFRJEje82z2KtePu9sBX3yn4w9EVGlGpwjuXU="; }; propagatedBuildInputs = [ click ]; diff --git a/pkgs/development/python-modules/click/default.nix b/pkgs/development/python-modules/click/default.nix index 6d865307f9be4..a75f563862a37 100644 --- a/pkgs/development/python-modules/click/default.nix +++ b/pkgs/development/python-modules/click/default.nix @@ -3,7 +3,6 @@ , pythonOlder , fetchPypi , importlib-metadata -, locale , pytestCheckHook # large-rebuild downstream dependencies @@ -17,18 +16,14 @@ buildPythonPackage rec { pname = "click"; - version = "8.0.3"; + version = "8.1.2"; + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "sha256-QQ6TKwUPXu13PEzalN51lxyJzbMVWnKggxE5p55ey1s="; + sha256 = "sha256-R5cH/hTZ7JoHV2GLehAKCuTE4jb6xbf4DKaAKBQaGnI="; }; - postPatch = '' - substituteInPlace src/click/_unicodefun.py \ - --replace '"locale"' "'${locale}/bin/locale'" - ''; - propagatedBuildInputs = lib.optionals (pythonOlder "3.8") [ importlib-metadata ]; diff --git a/pkgs/development/python-modules/clickhouse-driver/default.nix b/pkgs/development/python-modules/clickhouse-driver/default.nix index dd1698f9a3ae4..826ce08c1e06d 100644 --- a/pkgs/development/python-modules/clickhouse-driver/default.nix +++ b/pkgs/development/python-modules/clickhouse-driver/default.nix @@ -57,8 +57,6 @@ buildPythonPackage rec { # some test in test_buffered_reader.py doesn't seem to return disabledTestPaths = [ "tests/test_buffered_reader.py" ]; - pytestFlagsArray = [ "-n" "$NIX_BUILD_CORES" ]; - # most tests require `clickhouse` # TODO: enable tests after `clickhouse` unbroken doCheck = false; diff --git a/pkgs/development/python-modules/clize/default.nix b/pkgs/development/python-modules/clize/default.nix index 75c4513d1e3a3..10b4c8f68c69a 100644 --- a/pkgs/development/python-modules/clize/default.nix +++ b/pkgs/development/python-modules/clize/default.nix @@ -1,12 +1,18 @@ { lib , buildPythonPackage , fetchPypi -, python-dateutil + +# propagtes , sigtools , six , attrs , od , docutils + +# extras: datetime +, python-dateutil + +# tests , pygments , unittest2 , pytestCheckHook @@ -21,6 +27,25 @@ buildPythonPackage rec { sha256 = "3177a028e4169d8865c79af82bdd441b24311d4bd9c0ae8803641882d340a51d"; }; + postPatch = '' + substituteInPlace setup.py \ + --replace "docutils ~= 0.17.0" "docutils" + ''; + + propagatedBuildInputs = [ + attrs + docutils + od + sigtools + six + ]; + + passthru.extras-require = { + datetime = [ + python-dateutil + ]; + }; + # repeated_test no longer exists in nixpkgs # also see: https://github.com/epsy/clize/issues/74 doCheck = false; @@ -31,14 +56,6 @@ buildPythonPackage rec { unittest2 ]; - propagatedBuildInputs = [ - attrs - docutils - od - sigtools - six - ]; - pythonImportsCheck = [ "clize" ]; meta = with lib; { diff --git a/pkgs/development/python-modules/clldutils/default.nix b/pkgs/development/python-modules/clldutils/default.nix index 563ad08381c4e..697296d9a200b 100644 --- a/pkgs/development/python-modules/clldutils/default.nix +++ b/pkgs/development/python-modules/clldutils/default.nix @@ -44,9 +44,15 @@ buildPythonPackage rec { pytest-mock ]; + disabledTests = [ + # uses pytest.approx which is not supported in a boolean context in pytest7 + "test_to_dec" + "test_roundtrip" + ]; + meta = with lib; { - description = "CSV on the Web"; - homepage = "https://github.com/cldf/csvw"; + description = "Utilities for clld apps without the overhead of requiring pyramid, rdflib et al"; + homepage = "https://github.com/clld/clldutils"; license = licenses.asl20; maintainers = with maintainers; [ ]; }; diff --git a/pkgs/development/python-modules/cloudflare/default.nix b/pkgs/development/python-modules/cloudflare/default.nix index 4c4a6bccfcd93..e6498216aa03c 100644 --- a/pkgs/development/python-modules/cloudflare/default.nix +++ b/pkgs/development/python-modules/cloudflare/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "cloudflare"; - version = "2.9.9"; + version = "2.9.10"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-wou62Xro/hOU3pjGdJpe2kzY15+bcd14UOn4vsw9RcI="; + hash = "sha256-LsUMB0zqlelHqWsgdmJ8v+Qn/reYuxCTKTODBT9K0bg="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/cma/default.nix b/pkgs/development/python-modules/cma/default.nix index 473f060769833..c0480f2fa714c 100644 --- a/pkgs/development/python-modules/cma/default.nix +++ b/pkgs/development/python-modules/cma/default.nix @@ -7,13 +7,13 @@ buildPythonPackage rec { pname = "cma"; - version = "3.1.0"; + version = "3.2.1"; src = fetchFromGitHub { owner = "CMA-ES"; repo = "pycma"; rev = "r${version}"; - sha256 = "1bal4kljxrdm6x5ppyi6i109714h0czdxfsna906dlfplrmq52bf"; + sha256 = "sha256-wLUD8HMJusUeCwwp37D/W7yJuJQcDfRwVGVKwBS6sR8="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/cmd2/default.nix b/pkgs/development/python-modules/cmd2/default.nix index 5f262438fe954..8a7f9a5e1c8ac 100644 --- a/pkgs/development/python-modules/cmd2/default.nix +++ b/pkgs/development/python-modules/cmd2/default.nix @@ -18,13 +18,13 @@ buildPythonPackage rec { pname = "cmd2"; - version = "2.3.3"; + version = "2.4.0"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "750d7eb04d55c3bc2a413e191bc177856f388102de47d11f2210a35266543640"; + sha256 = "sha256-CQkJq2yOzuQIE87HWeYd1ucMgiehqOlggvXysNOUvHc="; }; LC_ALL = "en_US.UTF-8"; diff --git a/pkgs/development/python-modules/collections-extended/default.nix b/pkgs/development/python-modules/collections-extended/default.nix index 52f73a5554a59..867226c327b43 100644 --- a/pkgs/development/python-modules/collections-extended/default.nix +++ b/pkgs/development/python-modules/collections-extended/default.nix @@ -1,13 +1,15 @@ { lib , buildPythonPackage , fetchFromGitHub -, pythonOlder +, hypothesis , poetry-core , pytestCheckHook +, pythonOlder }: + buildPythonPackage rec { pname = "collections-extended"; - version = "2.0.0"; + version = "2.0.2"; format = "pyproject"; disabled = pythonOlder "3.6"; @@ -16,7 +18,7 @@ buildPythonPackage rec { owner = "mlenzen"; repo = pname; rev = "v${version}"; - sha256 = "sha256:1qcr1q49a134b122rpldjiim1fsl32gxs5fpj3232nyb05r68haz"; + hash = "sha256-cK13+CQUELKSiLpG747+C+RB5b6luu0mWLLXTT+uGH4="; }; nativeBuildInputs = [ @@ -24,14 +26,17 @@ buildPythonPackage rec { ]; checkInputs = [ + hypothesis pytestCheckHook ]; - pythonImportsCheck = [ "collections_extended" ]; + pythonImportsCheck = [ + "collections_extended" + ]; meta = with lib; { + description = "Extra Python Collections - bags (multisets), setlists (unique list/indexed set), RangeMap and IndexedDict"; homepage = "https://github.com/mlenzen/collections-extended"; - description = "Extra Python Collections - bags (multisets), setlists (unique list / indexed set), RangeMap and IndexedDict"; license = licenses.asl20; maintainers = with maintainers; [ exarkun ]; }; diff --git a/pkgs/development/python-modules/commoncode/default.nix b/pkgs/development/python-modules/commoncode/default.nix index 7a2416728c8e1..b6c5f02fb8e13 100644 --- a/pkgs/development/python-modules/commoncode/default.nix +++ b/pkgs/development/python-modules/commoncode/default.nix @@ -19,16 +19,21 @@ buildPythonPackage rec { pname = "commoncode"; - version = "30.0.0"; - format = "setuptools"; + version = "30.1.1"; + format = "pyproject"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "sha256-6SeU4u6pfDuGCgCYAO5fdbWBxW9XN3WvM8j6DwUlFwM="; + sha256 = "sha256-KymdX+5CAYSRpOwpqQ1DMCFWqkeMAmOHjVnBZTji76I="; }; + postPatch = '' + substituteInPlace setup.cfg \ + --replace "intbitset >= 2.3.0, < 3.0" "intbitset >= 2.3.0" + ''; + dontConfigure = true; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/construct/default.nix b/pkgs/development/python-modules/construct/default.nix index 8ae44476eff40..ce6e0a65b3429 100644 --- a/pkgs/development/python-modules/construct/default.nix +++ b/pkgs/development/python-modules/construct/default.nix @@ -5,7 +5,7 @@ buildPythonPackage rec { pname = "construct"; - version = "2.10.67"; + version = "2.10.68"; disabled = pythonOlder "3.6"; @@ -14,7 +14,7 @@ buildPythonPackage rec { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "1nciwim745qk41l1ck4chx3vxpfr6cq4k3a4i7vfnnrd3s6szzsw"; + sha256 = "sha256-bp/YyRFP0rrBHPyhiqnn6o1iC5l61oedShZ2phGeqaw="; }; # not an explicit dependency, but it's imported by an entrypoint diff --git a/pkgs/development/python-modules/convertdate/default.nix b/pkgs/development/python-modules/convertdate/default.nix index cc26142d362b1..b20066c51d8b1 100644 --- a/pkgs/development/python-modules/convertdate/default.nix +++ b/pkgs/development/python-modules/convertdate/default.nix @@ -1,23 +1,24 @@ { lib , buildPythonPackage -, isPy27 , fetchFromGitHub , pymeeus , pytz , pytestCheckHook +, pythonOlder }: buildPythonPackage rec { pname = "convertdate"; - version = "2.3.2"; - disabled = isPy27; + version = "2.4.0"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; - # Tests are not available in the PyPI tarball so use GitHub instead. src = fetchFromGitHub { owner = "fitnr"; repo = pname; rev = "v${version}"; - sha256 = "0k7j59sbqwyi72vcjx5vsh3qb6hxfnkfjkd2i6f6lckdr1bkh7fz"; + hash = "sha256-iOHK3UJulXJJR50nhiVgfk3bt+CAtG3BRySJ8DkBuJE="; }; propagatedBuildInputs = [ @@ -29,11 +30,13 @@ buildPythonPackage rec { pytestCheckHook ]; - pythonImportsCheck = [ "convertdate" ]; + pythonImportsCheck = [ + "convertdate" + ]; meta = with lib; { - homepage = "https://github.com/fitnr/convertdate"; description = "Utils for converting between date formats and calculating holidays"; + homepage = "https://github.com/fitnr/convertdate"; license = licenses.mit; maintainers = with maintainers; [ jluttine ]; }; diff --git a/pkgs/development/python-modules/coqpit/default.nix b/pkgs/development/python-modules/coqpit/default.nix index e19255c4479df..12e1a46025a9f 100644 --- a/pkgs/development/python-modules/coqpit/default.nix +++ b/pkgs/development/python-modules/coqpit/default.nix @@ -6,14 +6,14 @@ buildPythonPackage rec { pname = "coqpit"; - version = "0.0.15"; + version = "0.0.16"; format = "setuptools"; src = fetchFromGitHub { owner = "coqui-ai"; repo = pname; - rev = "v${version}"; - sha256 = "sha256-i2Lf7YQ9Ht4AlmfIBvJTWNPgEk8Kv92rs5VxuPgvR5U="; + rev = "refs/tags/v${version}"; + sha256 = "sha256-f1FLjR4VzSOA/VaeseVA4F1NWVJIvokIZIDW1k7fNqU="; }; checkInputs = [ diff --git a/pkgs/development/python-modules/coverage/default.nix b/pkgs/development/python-modules/coverage/default.nix index f1930b88fb8c4..8019fc9496655 100644 --- a/pkgs/development/python-modules/coverage/default.nix +++ b/pkgs/development/python-modules/coverage/default.nix @@ -7,13 +7,13 @@ buildPythonPackage rec { pname = "coverage"; - version = "6.2"; + version = "6.3.2"; # uses f strings disabled = pythonOlder "3.5"; src = fetchPypi { inherit pname version; - sha256 = "e2cad8093172b7d1595b4ad66f24270808658e11acf43a8f95b41276162eb5b8"; + sha256 = "sha256-A+KngmCGuR7zRf8YdC7p/Eemg5zNUXBh74+hl25lLOk="; }; # No tests in archive diff --git a/pkgs/development/python-modules/cppy/default.nix b/pkgs/development/python-modules/cppy/default.nix index fffa91744248e..5b7e092c42a57 100644 --- a/pkgs/development/python-modules/cppy/default.nix +++ b/pkgs/development/python-modules/cppy/default.nix @@ -1,23 +1,28 @@ { lib , buildPythonPackage , fetchPypi -, isPy3k +, pythonOlder +, pytestCheckHook +, setuptools-scm }: buildPythonPackage rec { pname = "cppy"; - version = "1.1.0"; + version = "1.2.1"; + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "4eda6f1952054a270f32dc11df7c5e24b259a09fddf7bfaa5f33df9fb4a29642"; + sha256 = "sha256-g7Q78XsQhawVxd69tCFU8Ti5KCNLIURzWJgfadDW/hs="; }; - # Headers-only library, no tests - doCheck = false; + nativeBuildInputs = [ + setuptools-scm + ]; - # Not supported - disabled = !isPy3k; + checkInputs = [ pytestCheckHook ]; + + pythonImportsCheck = [ "cppy" ]; meta = { description = "C++ headers for C extension development"; diff --git a/pkgs/development/python-modules/cryptography/default.nix b/pkgs/development/python-modules/cryptography/default.nix index b4a79137d59bf..b4048366ed544 100644 --- a/pkgs/development/python-modules/cryptography/default.nix +++ b/pkgs/development/python-modules/cryptography/default.nix @@ -1,16 +1,17 @@ -{ lib, stdenv +{ lib +, stdenv +, callPackage , buildPythonPackage , fetchPypi , rustPlatform , setuptools-rust , openssl -, cryptography_vectors -, darwin +, Security , packaging , six , isPyPy , cffi -, pytest +, pytestCheckHook , pytest-subtests , pretend , libiconv @@ -19,20 +20,23 @@ , hypothesis }: +let + cryptography-vectors = callPackage ./vectors.nix { }; +in buildPythonPackage rec { pname = "cryptography"; - version = "36.0.0"; # Also update the hash in vectors.nix + version = "36.0.2"; # Also update the hash in vectors.nix src = fetchPypi { inherit pname version; - sha256 = "0zshc1jaavykdnic5ns8zax6gqganys6gp5f35bqcfggnkn6kxsj"; + sha256 = "sha256-cPj097sqyfNAZVy6yJ1oxSevW7Q4dSKoQT6EHj5mKMk="; }; cargoDeps = rustPlatform.fetchCargoTarball { inherit src; sourceRoot = "${pname}-${version}/${cargoRoot}"; name = "${pname}-${version}"; - sha256 = "1nbw4cfshyc125jwdivg9gxy52qcd1iz31lypl95ij9bn1dyx933"; + sha256 = "sha256-6C4N445h4Xf2nCc9rJWpSZaNPilR9GfgbmKvNlSIFqg="; }; cargoRoot = "src/rust"; @@ -47,37 +51,31 @@ buildPythonPackage rec { ] ++ (with rustPlatform; [ rust.cargo rust.rustc ]); buildInputs = [ openssl ] - ++ lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Security libiconv ]; - propagatedBuildInputs = [ - packaging - six - ] ++ lib.optionals (!isPyPy) [ + ++ lib.optionals stdenv.isDarwin [ Security libiconv ]; + + propagatedBuildInputs = lib.optionals (!isPyPy) [ cffi ]; checkInputs = [ - cryptography_vectors + cryptography-vectors hypothesis iso8601 pretend - pytest + pytestCheckHook pytest-subtests pytz ]; - pytestFlags = lib.concatStringsSep " " ([ + pytestFlagsArray = [ "--disable-pytest-warnings" - ] ++ - lib.optionals (stdenv.isDarwin && stdenv.isAarch64) [ - # aarch64-darwin forbids W+X memory, but this tests depends on it: - # * https://cffi.readthedocs.io/en/latest/using.html#callbacks - "--ignore=tests/hazmat/backends/test_openssl_memleak.py" - ] - ); + ]; - checkPhase = '' - py.test ${pytestFlags} tests - ''; + disabledTestPaths = lib.optionals (stdenv.isDarwin && stdenv.isAarch64) [ + # aarch64-darwin forbids W+X memory, but this tests depends on it: + # * https://cffi.readthedocs.io/en/latest/using.html#callbacks + "tests/hazmat/backends/test_openssl_memleak.py" + ]; meta = with lib; { description = "A package which provides cryptographic recipes and primitives"; @@ -92,6 +90,6 @@ buildPythonPackage rec { changelog = "https://cryptography.io/en/latest/changelog/#v" + replaceStrings [ "." ] [ "-" ] version; license = with licenses; [ asl20 bsd3 psfl ]; - maintainers = with maintainers; [ primeos ]; + maintainers = with maintainers; [ SuperSandro2000 ]; }; } diff --git a/pkgs/development/python-modules/cryptography/vectors.nix b/pkgs/development/python-modules/cryptography/vectors.nix index 577c2c870910b..9937209072653 100644 --- a/pkgs/development/python-modules/cryptography/vectors.nix +++ b/pkgs/development/python-modules/cryptography/vectors.nix @@ -1,23 +1,26 @@ { buildPythonPackage, fetchPypi, lib, cryptography }: buildPythonPackage rec { - pname = "cryptography_vectors"; - # The test vectors must have the same version as the cryptography package: - version = cryptography.version; + pname = "cryptography-vectors"; + # The test vectors must have the same version as the cryptography package + inherit (cryptography) version; src = fetchPypi { - inherit pname version; - sha256 = "19gs051jbsixxwhlfs4xdxpzg8w1vypzpz3w56bp9x01qwzfbdy6"; + pname = "cryptography_vectors"; + inherit version; + sha256 = "sha256-KnkkRJoDAl+vf4dUpvQgAAHKshBzSmzmrB9r2s06aOQ="; }; # No tests included doCheck = false; + pythonImportsCheck = [ "cryptography_vectors" ]; + meta = with lib; { description = "Test vectors for the cryptography package"; homepage = "https://cryptography.io/en/latest/development/test-vectors/"; # Source: https://github.com/pyca/cryptography/tree/master/vectors; license = with licenses; [ asl20 bsd3 ]; - maintainers = with maintainers; [ primeos ]; + maintainers = with maintainers; [ SuperSandro2000 ]; }; } diff --git a/pkgs/development/python-modules/crytic-compile/default.nix b/pkgs/development/python-modules/crytic-compile/default.nix index 7260310ea03e9..393dcd5e9d83f 100644 --- a/pkgs/development/python-modules/crytic-compile/default.nix +++ b/pkgs/development/python-modules/crytic-compile/default.nix @@ -2,15 +2,15 @@ buildPythonPackage rec { pname = "crytic-compile"; - version = "0.2.2"; + version = "0.2.3"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "crytic"; repo = "crytic-compile"; - rev = version; - sha256 = "sha256-4Lz+jJdKURp+K5XJJb7ksiFbnQwzS71gZWOufBvqz/k="; + rev = "refs/tags/${version}"; + sha256 = "sha256-l8a9QXERpkVrx7zHluMlb3zBvJSODsviNtJPzvL3hDo="; }; propagatedBuildInputs = [ pysha3 setuptools ]; diff --git a/pkgs/development/python-modules/cssselect2/default.nix b/pkgs/development/python-modules/cssselect2/default.nix index 52c1bc4067fbc..987e84ffcee2f 100644 --- a/pkgs/development/python-modules/cssselect2/default.nix +++ b/pkgs/development/python-modules/cssselect2/default.nix @@ -1,5 +1,6 @@ { lib , buildPythonPackage +, flit-core , pythonOlder , fetchPypi , tinycss2 @@ -8,18 +9,23 @@ buildPythonPackage rec { pname = "cssselect2"; - version = "0.4.1"; + version = "0.5.0"; + format = "pyproject"; disabled = pythonOlder "3.5"; src = fetchPypi { inherit pname version; - sha256 = "93fbb9af860e95dd40bf18c3b2b6ed99189a07c0f29ba76f9c5be71344664ec8"; + sha256 = "sha256-2Yp7vdjrxGCTJ5GV1mmjNZvVoj+QwZ6CwZ2e7vMz5hc="; }; postPatch = '' sed -i '/^addopts/d' pyproject.toml ''; + nativeBuildInputs = [ + flit-core + ]; + propagatedBuildInputs = [ tinycss2 ]; checkInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/cupy/default.nix b/pkgs/development/python-modules/cupy/default.nix index a798920ef7a87..cdd11e5010be4 100644 --- a/pkgs/development/python-modules/cupy/default.nix +++ b/pkgs/development/python-modules/cupy/default.nix @@ -1,22 +1,20 @@ { lib, buildPythonPackage , fetchPypi, isPy3k, cython , fastrlock, numpy, six, wheel, pytestCheckHook, mock, setuptools -, cudatoolkit, cudnn, cutensor, nccl +, cudaPackages , addOpenGLRunpath }: -assert cudnn.cudatoolkit == cudatoolkit; -assert cutensor.cudatoolkit == cudatoolkit; -assert nccl.cudatoolkit == cudatoolkit; - -buildPythonPackage rec { +let + inherit (cudaPackages) cudatoolkit cudnn cutensor nccl; +in buildPythonPackage rec { pname = "cupy"; - version = "10.2.0"; + version = "10.3.1"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "sha256-5ovvA76QGOsOnVztMfDgLerks5nJrKR08rLc+ArmWA8="; + sha256 = "sha256-c8BOKI1AWU+zN8lhliRus55PUAgvFm+TlxKToYn7jWc="; }; # See https://docs.cupy.dev/en/v10.2.0/reference/environment.html. Seting both diff --git a/pkgs/development/python-modules/cx_freeze/default.nix b/pkgs/development/python-modules/cx_freeze/default.nix index 90e2608069c40..fb02b0d1ef144 100644 --- a/pkgs/development/python-modules/cx_freeze/default.nix +++ b/pkgs/development/python-modules/cx_freeze/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "cx_Freeze"; - version = "6.9"; + version = "6.10"; src = fetchPypi { inherit pname version; - sha256 = "673aa3199af2ef87fc03a43a30e5d78b27ced2cedde925da89c55b5657da267b"; + sha256 = "sha256-5bcb9XuYgawUL76+riyLDTKUtW9uSKtkAyMh47Giuic="; }; disabled = pythonOlder "3.5"; diff --git a/pkgs/development/python-modules/cyclonedx-python-lib/default.nix b/pkgs/development/python-modules/cyclonedx-python-lib/default.nix index 26546c3f7cb01..c8a2eefed246d 100644 --- a/pkgs/development/python-modules/cyclonedx-python-lib/default.nix +++ b/pkgs/development/python-modules/cyclonedx-python-lib/default.nix @@ -6,27 +6,28 @@ , lxml , packageurl-python , poetry-core -, pytestCheckHook +, python , pythonOlder , requirements-parser , setuptools , toml , types-setuptools , types-toml +, xmldiff }: buildPythonPackage rec { pname = "cyclonedx-python-lib"; - version = "1.3.0"; + version = "2.3.0"; format = "pyproject"; - disabled = pythonOlder "3.6"; + disabled = pythonOlder "3.9"; src = fetchFromGitHub { owner = "CycloneDX"; repo = pname; - rev = "v${version}"; - hash = "sha256-/1kWvhTUS0JT0RwodiivJSUiWIDwQyXxdjF/KUlCNds="; + rev = "refs/tags/v${version}"; + hash = "sha256-eZy+m6AkSlZM/i64FyFL+ZgeW86MOSM6sDYPT4ckaHE="; }; nativeBuildInputs = [ @@ -46,13 +47,21 @@ buildPythonPackage rec { checkInputs = [ jsonschema lxml - pytestCheckHook + xmldiff ]; pythonImportsCheck = [ "cyclonedx" ]; + checkPhase = '' + runHook preCheck + # Tests require network access + rm tests/test_output_json.py + ${python.interpreter} -m unittest discover -s tests -v + runHook postCheck + ''; + meta = with lib; { description = "Python library for generating CycloneDX SBOMs"; homepage = "https://github.com/CycloneDX/cyclonedx-python-lib"; diff --git a/pkgs/development/python-modules/cypherpunkpay/default.nix b/pkgs/development/python-modules/cypherpunkpay/default.nix new file mode 100644 index 0000000000000..3c72f2e073ed8 --- /dev/null +++ b/pkgs/development/python-modules/cypherpunkpay/default.nix @@ -0,0 +1,97 @@ +{ stdenv +, lib +, buildPythonPackage +, fetchFromGitHub +, poetry-core +, APScheduler +, bitstring +, cffi +, ecdsa +, monero +, pypng +, pyqrcode +, pyramid +, pyramid_jinja2 +, pysocks +, requests +, tzlocal +, waitress +, yoyo-migrations +, pytestCheckHook +, pytest-cov +, webtest +}: + +buildPythonPackage rec { + pname = "cypherpunkpay"; + version = "1.0.15"; + format = "pyproject"; + + src = fetchFromGitHub { + owner = "CypherpunkPay"; + repo = "CypherpunkPay"; + rev = "v${version}"; + sha256 = "sha256-W2f4jtEqopDXiXx0pklZrjOmVhpx2kDdTJRPm2Ka0Cg="; + }; + + postPatch = '' + substituteInPlace pyproject.toml \ + --replace 'monero = "^0.99"' 'monero = ">=0.99"' \ + --replace 'pypng = "^0.0.20"' 'pypng = ">=0.0.20"' \ + --replace 'tzlocal = "2.1"' 'tzlocal = ">=2.1"' + ''; + + nativeBuildInputs = [ + poetry-core + ]; + + propagatedBuildInputs = [ + APScheduler + bitstring + cffi + ecdsa + monero + pypng + pyqrcode + pyramid + pyramid_jinja2 + pysocks + requests + tzlocal + waitress + yoyo-migrations + ]; + + checkInputs = [ + pytestCheckHook + pytest-cov + webtest + ]; + + disabledTestPaths = [ + # performance test + "test/unit/tools/pbkdf2_test.py" + # tests require network connection + "test/network/explorers/bitcoin" + "test/network/net/http_client" + "test/network/prices" + # tests require bitcoind running + "test/network/full_node_clients" + # tests require lnd running + "test/network/ln" + # tests require tor running + "test/network/net/tor_client" + # tests require the full environment running + "test/acceptance/views" + "test/acceptance/views_admin" + "test/acceptance/views_donations" + "test/acceptance/views_dummystore" + ]; + + meta = with lib; { + description = "Modern self-hosted software for accepting Bitcoin"; + homepage = "https://cypherpunkpay.org"; + license = with licenses; [ mit /* or */ unlicense ]; + maintainers = with maintainers; [ prusnak ]; + }; +} diff --git a/pkgs/development/python-modules/dask-mpi/default.nix b/pkgs/development/python-modules/dask-mpi/default.nix index cc44a6e97eb7b..15f0b315e9f0f 100644 --- a/pkgs/development/python-modules/dask-mpi/default.nix +++ b/pkgs/development/python-modules/dask-mpi/default.nix @@ -7,12 +7,12 @@ }: buildPythonPackage rec { - version = "2021.11.0"; + version = "2022.4.0"; pname = "dask-mpi"; src = fetchPypi { inherit pname version; - sha256 = "602d2e2d7816a4abc1eb17998e1acc93a43b6f82bf94a6accca169a42de21898"; + sha256 = "sha256-CgTx19NaBs3/UGWTMw1EFOokLJFySYzhkfV0LqxJnhc="; }; propagatedBuildInputs = [ dask distributed mpi4py ]; diff --git a/pkgs/development/python-modules/dask/default.nix b/pkgs/development/python-modules/dask/default.nix index 7af0eca747e81..79f07c6e88f22 100644 --- a/pkgs/development/python-modules/dask/default.nix +++ b/pkgs/development/python-modules/dask/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { pname = "dask"; - version = "2022.02.0"; + version = "2022.02.1"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -31,7 +31,7 @@ buildPythonPackage rec { owner = "dask"; repo = pname; rev = version; - hash = "sha256-tDqpIS8j6a16YbJak+P1GkCEZvJyheWV5vkUrkhScRY="; + hash = "sha256-A8ktvfpow/QKAEEt9SUnkTqYFJCrV1mgnuDIP3gdyrE="; }; propagatedBuildInputs = [ @@ -67,8 +67,6 @@ buildPythonPackage rec { ''; pytestFlagsArray = [ - # parallelize - "--numprocesses $NIX_BUILD_CORES" # rerun failed tests up to three times "--reruns 3" # don't run tests that require network access diff --git a/pkgs/development/python-modules/databricks-connect/default.nix b/pkgs/development/python-modules/databricks-connect/default.nix index d242c59acdbdb..3475001a58b7d 100644 --- a/pkgs/development/python-modules/databricks-connect/default.nix +++ b/pkgs/development/python-modules/databricks-connect/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "databricks-connect"; - version = "9.1.10"; + version = "9.1.14"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "sha256-OR3TXO6IzqwqbBbfFf+FGIUbwTa0DoKry84e1hL0I3Q="; + sha256 = "sha256-l+mTqiQPuPJfGbEVSILpCTlxAka0GeCgIXjMG4Vs82o="; }; sourceRoot = "."; diff --git a/pkgs/development/python-modules/datadog/default.nix b/pkgs/development/python-modules/datadog/default.nix index c15e673fa3ed7..7d32650302f4d 100644 --- a/pkgs/development/python-modules/datadog/default.nix +++ b/pkgs/development/python-modules/datadog/default.nix @@ -2,6 +2,7 @@ , buildPythonPackage , fetchPypi , pythonOlder +, hatchling , decorator , requests , typing ? null @@ -17,17 +18,22 @@ buildPythonPackage rec { pname = "datadog"; - version = "0.43.0"; + version = "0.44.0"; + format = "pyproject"; src = fetchPypi { inherit pname version; - sha256 = "1f2123083d9e1add6f238c62714b76ac2fc134d7d1c435cd82b976487b191b96"; + sha256 = "sha256-BxFw8MfvIlEdv3+b12xL5QDuLT1SBykApch7VJXSxzM="; }; postPatch = '' find . -name '*.pyc' -exec rm {} \; ''; + nativeBuildInputs = [ + hatchling + ]; + propagatedBuildInputs = [ decorator requests ] ++ lib.optional (pythonOlder "3.5") typing ++ lib.optional (pythonOlder "3.0") configparser; diff --git a/pkgs/development/python-modules/dataset/default.nix b/pkgs/development/python-modules/dataset/default.nix index 38de0218dec07..514876761ebfe 100644 --- a/pkgs/development/python-modules/dataset/default.nix +++ b/pkgs/development/python-modules/dataset/default.nix @@ -1,22 +1,28 @@ { lib +, alembic +, banal , buildPythonPackage , fetchPypi +, pythonOlder , sqlalchemy -, alembic -, banal }: buildPythonPackage rec { pname = "dataset"; version = "1.5.2"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "sha256-TDZ6fAqFxOdI79o07uMAw/zD8HbHXDKQt0mnoFM1yEc="; + hash = "sha256-TDZ6fAqFxOdI79o07uMAw/zD8HbHXDKQt0mnoFM1yEc="; }; propagatedBuildInputs = [ - sqlalchemy alembic banal + alembic + banal + sqlalchemy ]; # checks attempt to import nonexistent module 'test.test' and fail @@ -30,6 +36,6 @@ buildPythonPackage rec { description = "Toolkit for Python-based database access"; homepage = "https://dataset.readthedocs.io"; license = licenses.mit; - maintainers = [ maintainers.xfnw ]; + maintainers = with maintainers; [ xfnw ]; }; } diff --git a/pkgs/development/python-modules/datasets/default.nix b/pkgs/development/python-modules/datasets/default.nix index ab5e929818c6e..aa3cd42e50867 100644 --- a/pkgs/development/python-modules/datasets/default.nix +++ b/pkgs/development/python-modules/datasets/default.nix @@ -1,42 +1,53 @@ { lib +, aiohttp , buildPythonPackage -, fetchFromGitHub , dill -, filelock +, fetchFromGitHub , fsspec , huggingface-hub +, importlib-metadata , multiprocess , numpy +, packaging , pandas , pyarrow +, pythonOlder , requests +, responses , tqdm , xxhash }: buildPythonPackage rec { pname = "datasets"; - version = "1.17.0"; + version = "1.18.3"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "huggingface"; repo = pname; rev = version; - sha256 = "0bsk3jldvcxak64dhlxkqax7mf83z6qpwfgfk32rni1gpnz5pqbd"; + hash = "sha256-2x6DpsDcVF2O5iJKeMEGw/aJwZPc7gSGaK2947c3B6s="; }; propagatedBuildInputs = [ + aiohttp dill - filelock fsspec huggingface-hub multiprocess numpy + packaging pandas pyarrow requests + responses tqdm xxhash + ] ++ lib.optionals (pythonOlder "3.8") [ + importlib-metadata ]; # Tests require pervasive internet access. @@ -45,11 +56,13 @@ buildPythonPackage rec { # Module import will attempt to create a cache directory. postFixup = "export HF_MODULES_CACHE=$TMPDIR"; - pythonImportsCheck = [ "datasets" ]; + pythonImportsCheck = [ + "datasets" + ]; meta = with lib; { + description = "Open-access datasets and evaluation metrics for natural language processing"; homepage = "https://github.com/huggingface/datasets"; - description = "Fast, efficient, open-access datasets and evaluation metrics for natural language processing"; changelog = "https://github.com/huggingface/datasets/releases/tag/${version}"; license = licenses.asl20; platforms = platforms.unix; diff --git a/pkgs/development/python-modules/datasette/default.nix b/pkgs/development/python-modules/datasette/default.nix index f2a0d531a0a77..18c6943d1e677 100644 --- a/pkgs/development/python-modules/datasette/default.nix +++ b/pkgs/development/python-modules/datasette/default.nix @@ -32,7 +32,7 @@ buildPythonPackage rec { pname = "datasette"; version = "0.61.1"; - disabled = pythonOlder "3.6"; + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "simonw"; @@ -41,6 +41,17 @@ buildPythonPackage rec { sha256 = "sha256-HVzMyF4ujYK12UQ25il/XROPo+iBldsMxOTx+duoc5o="; }; + postPatch = '' + substituteInPlace setup.py \ + --replace '"pytest-runner"' "" \ + --replace "click>=7.1.1,<8.1.0" "click>=7.1.1,<8.2.0" \ + --replace "click-default-group~=1.2.2" "click-default-group" \ + --replace "hupper~=1.9" "hupper" \ + --replace "Jinja2>=2.10.3,<3.1.0" "Jinja2" \ + --replace "pint~=0.9" "pint" \ + --replace "uvicorn~=0.11" "uvicorn" + ''; + propagatedBuildInputs = [ aiofiles asgi-csrf @@ -70,17 +81,6 @@ buildPythonPackage rec { trustme ]; - postConfigure = '' - substituteInPlace setup.py \ - --replace '"pytest-runner"' "" - substituteInPlace setup.py \ - --replace "click-default-group~=1.2.2" "click-default-group" \ - --replace "hupper~=1.9" "hupper" \ - --replace "pint~=0.9" "pint" \ - --replace "pluggy~=0.13.0" "pluggy" \ - --replace "uvicorn~=0.11" "uvicorn" \ - ''; - # takes 30-180 mins to run entire test suite, not worth the CPU resources, slows down reviews # with pytest-xdist, it still takes around 10 mins with 32 cores # just run the csv tests, as this should give some indictation of correctness diff --git a/pkgs/development/python-modules/datashader/default.nix b/pkgs/development/python-modules/datashader/default.nix index 152582f6716f2..b9630aa07fd4d 100644 --- a/pkgs/development/python-modules/datashader/default.nix +++ b/pkgs/development/python-modules/datashader/default.nix @@ -70,7 +70,6 @@ buildPythonPackage rec { ''; pytestFlagsArray = [ - "-n $NIX_BUILD_CORES" "datashader" ]; diff --git a/pkgs/development/python-modules/datatable/default.nix b/pkgs/development/python-modules/datatable/default.nix index 9008270fc79e3..004e47a60b5cc 100644 --- a/pkgs/development/python-modules/datatable/default.nix +++ b/pkgs/development/python-modules/datatable/default.nix @@ -44,15 +44,9 @@ buildPythonPackage rec { LLVM = llvm; NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isDarwin "-isystem ${lib.getDev libcxx}/include/c++/v1"; - pytestFlagsArray = let - # ini file (not included in tarball) required to change python_files setting, - pytestIni = writeText "pytest.ini" '' - [pytest] - python_files = test_*.py test-*.py - ''; - in [ - "-c ${pytestIni}" - ]; + # test suite is very cpu intensive, only run small subset to ensure package is working as expected + pytestFlagsArray = [ "tests/test-sets.py" ]; + disabledTests = [ # skip tests which are irrelevant to our installation or use way too much memory "test_xfunction_paths" diff --git a/pkgs/development/python-modules/dateparser/default.nix b/pkgs/development/python-modules/dateparser/default.nix index 467ed5184c114..7f92077c0c73f 100644 --- a/pkgs/development/python-modules/dateparser/default.nix +++ b/pkgs/development/python-modules/dateparser/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { pname = "dateparser"; - version = "1.1.0"; + version = "1.1.1"; disabled = !isPy3k; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = "scrapinghub"; repo = "dateparser"; rev = "v${version}"; - sha256 = "sha256-RpQWDsj7vGtfu6wf4yETdswfXDfoTkburTl6aOA03Ww="; + sha256 = "sha256-bDup3q93Zq+pvwsy/lQy2byOMjG6C/+7813hWQMbZRU="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/db-dtypes/default.nix b/pkgs/development/python-modules/db-dtypes/default.nix new file mode 100644 index 0000000000000..883439aba4621 --- /dev/null +++ b/pkgs/development/python-modules/db-dtypes/default.nix @@ -0,0 +1,39 @@ +{ lib +, buildPythonPackage +, fetchPypi +, numpy +, packaging +, pandas +, pyarrow +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "db-dtypes"; + version = "1.0.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "3070d1a8d86ff0b5d9b16f15c5fab9c18893c6b3d5723cd95ee397b169049454"; + }; + + propagatedBuildInputs = [ + numpy + packaging + pandas + pyarrow + ]; + + checkInputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ "db_dtypes" ]; + + meta = with lib; { + description = "Pandas Data Types for SQL systems (BigQuery, Spanner)"; + homepage = "https://github.com/googleapis/python-db-dtypes-pandas"; + license = licenses.asl20; + maintainers = with maintainers; [ SuperSandro2000 ]; + }; +} diff --git a/pkgs/development/python-modules/debtcollector/default.nix b/pkgs/development/python-modules/debtcollector/default.nix index 1915b64aca801..ced1929bcd7a6 100644 --- a/pkgs/development/python-modules/debtcollector/default.nix +++ b/pkgs/development/python-modules/debtcollector/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "debtcollector"; - version = "2.4.0"; + version = "2.5.0"; src = fetchPypi { inherit pname version; - sha256 = "sha256-G8A+LZAX3kgMQc8+Wg2MyV8bDI8TOSgbTsqKIqz3aiM="; + sha256 = "sha256-3J0a0/dFxD9LvtvKMPn/6JBajAKMmSbmEHeEfV6iV6s="; }; nativeBuildInputs = [ pbr ]; diff --git a/pkgs/development/python-modules/debugpy/default.nix b/pkgs/development/python-modules/debugpy/default.nix index 9f6026ce7360c..04b78d6c80232 100644 --- a/pkgs/development/python-modules/debugpy/default.nix +++ b/pkgs/development/python-modules/debugpy/default.nix @@ -84,7 +84,6 @@ buildPythonPackage rec { # Override default arguments in pytest.ini pytestFlagsArray = [ "--timeout=0" - "-n=$NIX_BUILD_CORES" ]; disabledTests = lib.optionals (pythonAtLeast "3.10") [ diff --git a/pkgs/development/python-modules/deepdiff/default.nix b/pkgs/development/python-modules/deepdiff/default.nix index 67f5347e1e7e2..2601eedc2fa27 100644 --- a/pkgs/development/python-modules/deepdiff/default.nix +++ b/pkgs/development/python-modules/deepdiff/default.nix @@ -12,18 +12,21 @@ buildPythonPackage rec { pname = "deepdiff"; - version = "5.6.0"; + version = "5.7.0"; format = "setuptools"; # pypi source does not contain all fixtures required for tests src = fetchFromGitHub { owner = "seperman"; repo = "deepdiff"; - rev = version; - sha256 = "sha256-ysaIeVefsTX7ZubOXaEzeS1kMyBp4/w3SHNFxsGVhzY="; + # 5.7.0 release not tagged https://github.com/seperman/deepdiff/issues/300 + rev = "f2ffdb83b2993f4f0bb7e854620f0acd0bf6339e"; + hash = "sha256-0UBx7sH2iMrLVl5FtHNTwoecLHi8GbInn75G3FSg4gk="; }; postPatch = '' + substituteInPlace requirements.txt \ + --replace "ordered-set==4.0.2" "ordered-set" substituteInPlace tests/test_command.py \ --replace '/tmp/' "$TMPDIR/" ''; diff --git a/pkgs/development/python-modules/deezer-python/default.nix b/pkgs/development/python-modules/deezer-python/default.nix index 0f01ebab4a55e..b8ad686120acd 100644 --- a/pkgs/development/python-modules/deezer-python/default.nix +++ b/pkgs/development/python-modules/deezer-python/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "deezer-python"; - version = "5.2.0"; + version = "5.3.1"; format = "pyproject"; disabled = pythonOlder "3.6"; @@ -21,8 +21,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "browniebroke"; repo = pname; - rev = "v${version}"; - sha256 = "sha256-jaF5vQx8/qP9pGLfilx86v1GxHbjxaRghjjI5Me0pU0="; + rev = "refs/tags/v${version}"; + sha256 = "sha256-x1iZP+dGHeWwIr/AwQr1rYSFECtM6iDXEq9DrGH5J+s="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/detect-secrets/default.nix b/pkgs/development/python-modules/detect-secrets/default.nix index ef19b9a913b01..e9227891e0457 100644 --- a/pkgs/development/python-modules/detect-secrets/default.nix +++ b/pkgs/development/python-modules/detect-secrets/default.nix @@ -15,14 +15,14 @@ buildPythonPackage rec { pname = "detect-secrets"; - version = "1.1.0"; + version = "1.2.0"; disabled = isPy27; src = fetchFromGitHub { owner = "Yelp"; repo = pname; rev = "v${version}"; - sha256 = "sha256-dG2YaWXAMINxBGKNMlVfGTR9QHdnepiZmN+G88X4Wak="; + hash = "sha256-4VcV06iaL3NAj7qF8RyfWV1zgrt928AQfjGeuO2Pbjk="; leaveDotGit = true; }; diff --git a/pkgs/development/python-modules/devolo-home-control-api/default.nix b/pkgs/development/python-modules/devolo-home-control-api/default.nix index badbd3afbdb6f..31e9da795d3a7 100644 --- a/pkgs/development/python-modules/devolo-home-control-api/default.nix +++ b/pkgs/development/python-modules/devolo-home-control-api/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "devolo-home-control-api"; - version = "0.17.4"; + version = "0.18.1"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "2Fake"; repo = "devolo_home_control_api"; rev = "v${version}"; - sha256 = "sha256-N/48Q2IEL194vCzrPPuy+mRNejXfkoXy2t2oe0Y6ug4="; + sha256 = "sha256-Xj5k09uEVxZgG0oLbiPOBx/dALsRjqkZbLKit4X4q9Q="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; diff --git a/pkgs/development/python-modules/devtools/default.nix b/pkgs/development/python-modules/devtools/default.nix index 5d4f0871bf78f..34004769b1fdf 100644 --- a/pkgs/development/python-modules/devtools/default.nix +++ b/pkgs/development/python-modules/devtools/default.nix @@ -34,11 +34,18 @@ buildPythonPackage rec { pytest-mock ]; + pytestFlagsArray = [ + # pytest.PytestRemovedIn8Warning: Passing None has been deprecated. + "-W ignore::pytest.PytestRemovedIn8Warning" + ]; + disabledTests = [ # Test for Windows32 "test_print_subprocess" # sensitive to timing "test_multiple_not_verbose" + # sensitive to interpreter output + "test_simple_vars" ]; pythonImportsCheck = [ diff --git a/pkgs/development/python-modules/dictpath/default.nix b/pkgs/development/python-modules/dictpath/default.nix index 2809d859589ec..5a648f7898f5e 100644 --- a/pkgs/development/python-modules/dictpath/default.nix +++ b/pkgs/development/python-modules/dictpath/default.nix @@ -2,6 +2,7 @@ , buildPythonPackage , fetchFromGitHub , pytestCheckHook +, six }: buildPythonPackage rec { @@ -21,6 +22,7 @@ buildPythonPackage rec { checkInputs = [ pytestCheckHook + six ]; pythonImportsCheck = [ "dictpath" ]; diff --git a/pkgs/development/python-modules/diff-cover/default.nix b/pkgs/development/python-modules/diff-cover/default.nix index cbb44fb7ca4fe..1fc50c5ef232f 100644 --- a/pkgs/development/python-modules/diff-cover/default.nix +++ b/pkgs/development/python-modules/diff-cover/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { pname = "diff-cover"; - version = "6.4.5"; + version = "6.5.0"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -26,7 +26,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "diff_cover"; inherit version; - sha256 = "sha256-qUuMHBfcJEmJF/con+ODtFfYrU7yo//KgKiSpByLWKY="; + sha256 = "sha256-N2O0/C75EGO6crUCFGUiJLLQqfMVRNVQRZb1xKhHzXs="; }; propagatedBuildInputs = [ @@ -52,6 +52,8 @@ buildPythonPackage rec { "file_does_not_exist" # AssertionError: assert '.c { color:... "test_style_defs" + # uses pytest.approx in a boolean context, which is unsupported since pytest7 + "test_percent_covered" ]; pythonImportsCheck = [ diff --git a/pkgs/development/python-modules/diskcache/default.nix b/pkgs/development/python-modules/diskcache/default.nix index 26cb0e438f01c..cf3f7b514b1fa 100644 --- a/pkgs/development/python-modules/diskcache/default.nix +++ b/pkgs/development/python-modules/diskcache/default.nix @@ -45,10 +45,6 @@ buildPythonPackage rec { "test_get_many" ]; - pytestFlagsArray = [ - "-n $NIX_BUILD_CORES" - ]; - pythonImportsCheck = [ "diskcache" ]; diff --git a/pkgs/development/python-modules/distributed/default.nix b/pkgs/development/python-modules/distributed/default.nix index ee86418a66514..2055c9de13e39 100644 --- a/pkgs/development/python-modules/distributed/default.nix +++ b/pkgs/development/python-modules/distributed/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { pname = "distributed"; - version = "2022.2.0"; + version = "2022.2.1"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -27,7 +27,7 @@ buildPythonPackage rec { # get full repository need conftest.py to run tests src = fetchPypi { inherit pname version; - hash = "sha256-Gi9u7JczpnAEg53E7N5tXBfAeWZaLBVzRU3SpbU3bZU="; + hash = "sha256-+2KnWvjvM7vhqoCmjAGjOpPBzVozLdAXq0SVW/fs9ls="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/distro/default.nix b/pkgs/development/python-modules/distro/default.nix index bf8675af941d3..deee452ae1b4a 100644 --- a/pkgs/development/python-modules/distro/default.nix +++ b/pkgs/development/python-modules/distro/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "distro"; - version = "1.6.0"; + version = "1.7.0"; src = fetchPypi { inherit pname version; - sha256 = "83f5e5a09f9c5f68f60173de572930effbcc0287bb84fdc4426cb4168c088424"; + sha256 = "sha256-FRrsz2DCFkApMrUuQO5HepOfjViJiSc3igKrvoUsHDk="; }; # tests are very targeted at individual linux distributions diff --git a/pkgs/development/python-modules/django-allauth/default.nix b/pkgs/development/python-modules/django-allauth/default.nix index a68cfd6d9cdfe..591d41a960ccd 100644 --- a/pkgs/development/python-modules/django-allauth/default.nix +++ b/pkgs/development/python-modules/django-allauth/default.nix @@ -1,31 +1,45 @@ -{ lib, buildPythonPackage, fetchFromGitHub, requests, requests_oauthlib -, django, python3-openid, mock, coverage }: +{ lib +, buildPythonPackage +, django +, fetchFromGitHub +, python3-openid +, pythonOlder +, requests +, requests-oauthlib +}: buildPythonPackage rec { pname = "django-allauth"; version = "0.47.0"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; - # no tests on PyPI src = fetchFromGitHub { owner = "pennersr"; repo = pname; rev = version; - sha256 = "sha256-wKrsute6TCl331UrxNEBf/zTtGnyGHsOZQwdiicbg2o="; + hash = "sha256-wKrsute6TCl331UrxNEBf/zTtGnyGHsOZQwdiicbg2o="; }; - propagatedBuildInputs = [ requests requests_oauthlib django python3-openid ]; - - checkInputs = [ coverage mock ]; + propagatedBuildInputs = [ + requests + requests-oauthlib + django + python3-openid + ]; + # Tests requires a Django instance doCheck = false; - checkPhase = '' - cd $NIX_BUILD_TOP/$sourceRoot - coverage run manage.py test allauth - ''; + + pythonImportsCheck = [ + "allauth" + ]; meta = with lib; { description = "Integrated set of Django applications addressing authentication, registration, account management as well as 3rd party (social) account authentication"; homepage = "https://www.intenct.nl/projects/django-allauth"; license = licenses.mit; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/development/python-modules/django-appconf/default.nix b/pkgs/development/python-modules/django-appconf/default.nix new file mode 100644 index 0000000000000..66eef9d472886 --- /dev/null +++ b/pkgs/development/python-modules/django-appconf/default.nix @@ -0,0 +1,45 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, pythonOlder +, django +, six +, python +}: + +buildPythonPackage rec { + pname = "django-appconf"; + version = "1.0.5"; + format = "setuptools"; + + disabled = pythonOlder "3.6"; + + src = fetchFromGitHub { + owner = "django-compressor"; + repo = "django-appconf"; + rev = "v${version}"; + hash = "sha256-nS4Hwp/NYg1XGvZO1tiE9mzJA7WFifyvgAjyp3YpqS4="; + }; + + propagatedBuildInputs = [ + django + ]; + + preCheck = '' + # prove we're running tests against installed package, not build dir + rm -r appconf + ''; + + checkPhase = '' + runHook preCheck + ${python.interpreter} -m django test --settings=tests.test_settings + runHook postCheck + ''; + + meta = with lib; { + description = "A helper class for handling configuration defaults of packaged apps gracefully"; + homepage = "https://django-appconf.readthedocs.org/"; + license = licenses.bsd2; + maintainers = with maintainers; [ desiderius ]; + }; +} diff --git a/pkgs/development/python-modules/django-hijack-admin/default.nix b/pkgs/development/python-modules/django-hijack-admin/default.nix index ee5a47d3787cb..ccd285757cbdd 100644 --- a/pkgs/development/python-modules/django-hijack-admin/default.nix +++ b/pkgs/development/python-modules/django-hijack-admin/default.nix @@ -34,5 +34,8 @@ buildPythonPackage rec { homepage = "https://github.com/arteria/django-hijack-admin"; license = licenses.mit; maintainers = with maintainers; [ lsix ]; + # may be unmaintained, doesn't work with recent django-hijack: + # https://github.com/django-hijack/django-hijack-admin/issues/46 + broken = true; }; } diff --git a/pkgs/development/python-modules/django-hijack/default.nix b/pkgs/development/python-modules/django-hijack/default.nix index fd9c30a4bc7cc..78cce76ca5b0d 100644 --- a/pkgs/development/python-modules/django-hijack/default.nix +++ b/pkgs/development/python-modules/django-hijack/default.nix @@ -1,34 +1,34 @@ -{ lib, buildPythonPackage, fetchFromGitHub, python, - django, django_compat, django_nose +{ lib +, fetchPypi +, buildPythonPackage +, django +, django_compat +, pytest-django +, pytestCheckHook }: + buildPythonPackage rec { pname = "django-hijack"; - version = "2.1.10"; + version = "3.2.0"; - # the pypi packages don't include everything required for the tests - src = fetchFromGitHub { - owner = "arteria"; - repo = "django-hijack"; - rev = "v${version}"; - sha256 = "01fwkjdzvw0yx2spwi7zc1yy64ndq1y72bfmk7kxnq5x803m2ak6"; + # the wheel comes with pre-built assets, allowing us to avoid fighting + # with npm/webpack/gettext to build them ourselves. + format = "wheel"; + src = fetchPypi { + inherit version format; + pname = "django_hijack"; + dist = "py3"; + python = "py3"; + sha256 = "1ixn7ppmbq1bgqahwv3z57hk80ql7sxpwl8jms7y8w5z1h91cn86"; }; - checkInputs = [ django_nose ]; propagatedBuildInputs = [ django django_compat ]; - checkPhase = '' - runHook preCheck - - # we have to do a little bit of tinkering to convince the tests to run against the installed package, not the - # source directory - mkdir testbase - pushd testbase - mv ../runtests.py . - ${python.interpreter} runtests.py hijack - popd - - runHook postCheck + checkInputs = [ pytestCheckHook pytest-django ]; + preCheck = '' + export DJANGO_SETTINGS_MODULE='hijack.tests.test_app.settings' ''; + pytestFlagsArray = [ "--pyargs" "hijack" ]; meta = with lib; { description = "Allows superusers to hijack (=login as) and work on behalf of another user"; diff --git a/pkgs/development/python-modules/django-raster/default.nix b/pkgs/development/python-modules/django-raster/default.nix index 713e7214cfbc6..f590aca527f4f 100644 --- a/pkgs/development/python-modules/django-raster/default.nix +++ b/pkgs/development/python-modules/django-raster/default.nix @@ -2,9 +2,7 @@ numpy, django_colorful, pillow, psycopg2, pyparsing, django, celery, boto3, importlib-metadata }: -if lib.versionOlder django.version "2.0" -then throw "django-raster requires Django >= 2.0. Consider overiding the python package set to use django_2." -else + buildPythonPackage rec { version = "0.8.1"; pname = "django-raster"; diff --git a/pkgs/development/python-modules/django-statici18n/default.nix b/pkgs/development/python-modules/django-statici18n/default.nix index 78c807903c4ef..db7d36c899339 100644 --- a/pkgs/development/python-modules/django-statici18n/default.nix +++ b/pkgs/development/python-modules/django-statici18n/default.nix @@ -1,4 +1,4 @@ -{ lib, buildPythonPackage, fetchPypi, django, django_appconf }: +{ lib, buildPythonPackage, fetchPypi, django, django-appconf }: buildPythonPackage rec { pname = "django-statici18n"; @@ -9,7 +9,7 @@ buildPythonPackage rec { sha256 = "dbcdac190d93e0b4eabcab8875c8eb68795eceb442f926843ec5cbe1432fe628"; }; - propagatedBuildInputs = [ django django_appconf ]; + propagatedBuildInputs = [ django django-appconf ]; # pypi package does not contains test harness # source tarball requires setting up a config diff --git a/pkgs/development/python-modules/django-widget-tweaks/default.nix b/pkgs/development/python-modules/django-widget-tweaks/default.nix index 63e575b634549..5fd29de16107d 100644 --- a/pkgs/development/python-modules/django-widget-tweaks/default.nix +++ b/pkgs/development/python-modules/django-widget-tweaks/default.nix @@ -1,4 +1,16 @@ -{ buildPythonPackage, fetchFromGitHub, python, lib, django }: +{ lib +, buildPythonPackage +, fetchFromGitHub + +# native +, setuptools-scm + +# propagated +, django + +# tests +, python +}: buildPythonPackage rec { pname = "django-widget-tweaks"; @@ -11,15 +23,26 @@ buildPythonPackage rec { sha256 = "1rhn2skx287k6nnkxlwvl9snbia6w6z4c2rqg22hwzbz5w05b24h"; }; - checkPhase = "${python.interpreter} runtests.py"; - propagatedBuildInputs = [ django ]; + SETUPTOOLS_SCM_PRETEND_VERSION = version; + + nativeBuildInputs = [ + setuptools-scm + ]; + + propagatedBuildInputs = [ + django + ]; + + checkPhase = '' + ${python.interpreter} -m django test --settings=tests.settings + ''; meta = with lib; { - description = "Tweak the form field rendering in templates, not in python-level form definitions."; - homepage = "https://github.com/jazzband/django-widget-tweaks"; - license = licenses.mit; - maintainers = with maintainers; [ - maxxk - ]; + description = "Tweak the form field rendering in templates, not in python-level form definitions."; + homepage = "https://github.com/jazzband/django-widget-tweaks"; + license = licenses.mit; + maintainers = with maintainers; [ + maxxk + ]; }; } diff --git a/pkgs/development/python-modules/django/1.10-gis-libs.template.patch b/pkgs/development/python-modules/django/1.10-gis-libs.template.patch deleted file mode 100644 index da154554d1b37..0000000000000 --- a/pkgs/development/python-modules/django/1.10-gis-libs.template.patch +++ /dev/null @@ -1,24 +0,0 @@ -diff --git a/django/contrib/gis/gdal/libgdal.py b/django/contrib/gis/gdal/libgdal.py ---- a/django/contrib/gis/gdal/libgdal.py -+++ b/django/contrib/gis/gdal/libgdal.py -@@ -17,7 +17,7 @@ try: - lib_path = settings.GDAL_LIBRARY_PATH - except (AttributeError, EnvironmentError, - ImportError, ImproperlyConfigured): -- lib_path = None -+ lib_path = "@gdal@/lib/libgdal@extension@" - - if lib_path: - lib_names = None -diff --git a/django/contrib/gis/geos/libgeos.py b/django/contrib/gis/geos/libgeos.py ---- a/django/contrib/gis/geos/libgeos.py -+++ b/django/contrib/gis/geos/libgeos.py -@@ -26,7 +26,7 @@ try: - lib_path = settings.GEOS_LIBRARY_PATH - except (AttributeError, EnvironmentError, - ImportError, ImproperlyConfigured): -- lib_path = None -+ lib_path = "@geos@/lib/libgeos_c@extension@" - - # Setting the appropriate names for the GEOS-C library. - if lib_path: diff --git a/pkgs/development/python-modules/django/2.nix b/pkgs/development/python-modules/django/2.nix deleted file mode 100644 index 727bf304fdb2b..0000000000000 --- a/pkgs/development/python-modules/django/2.nix +++ /dev/null @@ -1,39 +0,0 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, substituteAll, - isPy3k, - geos, gdal, pytz, sqlparse, - withGdal ? false -}: - -buildPythonPackage rec { - pname = "django"; - version = "2.2.27"; - - disabled = !isPy3k; - - src = fetchPypi { - pname = "Django"; - inherit version; - sha256 = "sha256-HuNwRrC/K2HoOzoB0GcyNRbsO28rF81JsTJt1LqdyRM="; - }; - - patches = lib.optional withGdal - (substituteAll { - src = ./1.10-gis-libs.template.patch; - geos = geos; - gdal = gdal; - extension = stdenv.hostPlatform.extensions.sharedLibrary; - }) - ; - - propagatedBuildInputs = [ pytz sqlparse ]; - - # too complicated to setup - doCheck = false; - - meta = with lib; { - description = "A high-level Python Web framework"; - homepage = "https://www.djangoproject.com/"; - license = licenses.bsd3; - maintainers = with maintainers; [ georgewhewell ]; - }; -} diff --git a/pkgs/development/python-modules/django/3.nix b/pkgs/development/python-modules/django/3.nix index 1538b8a82b470..f1cee8c5ffa08 100644 --- a/pkgs/development/python-modules/django/3.nix +++ b/pkgs/development/python-modules/django/3.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "django"; - version = "3.2.12"; + version = "3.2.13"; disabled = pythonOlder "3.7"; src = fetchPypi { pname = "Django"; inherit version; - sha256 = "sha256-l3Lmk1cD5Z6ZOWCDLWamFM8CM6HFEjvGIk7MataeQeI="; + sha256 = "sha256-bZNJegqb9roOCxopzM3EDvv8dilyVbEwmzqISmiOxLY="; }; patches = lib.optional withGdal diff --git a/pkgs/development/python-modules/django/4.nix b/pkgs/development/python-modules/django/4.nix index 57c752725d587..db00506798115 100644 --- a/pkgs/development/python-modules/django/4.nix +++ b/pkgs/development/python-modules/django/4.nix @@ -39,14 +39,14 @@ buildPythonPackage rec { pname = "Django"; - version = "4.0.3"; + version = "4.0.4"; format = "pyproject"; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-d/8ucFDjMkybZ+KbZwd1RWb1hRQRKprHMxD2DNUmGTA="; + hash = "sha256-ToF3hYUkQXVjzAQw8p6iSZRtgx6ssAaKFFVoZYffQLU="; }; patches = lib.optional withGdal diff --git a/pkgs/development/python-modules/django_appconf/default.nix b/pkgs/development/python-modules/django_appconf/default.nix deleted file mode 100644 index 5da9ed0ca26da..0000000000000 --- a/pkgs/development/python-modules/django_appconf/default.nix +++ /dev/null @@ -1,35 +0,0 @@ -{ lib, buildPythonPackage, fetchFromGitHub, six, django, fetchpatch }: -buildPythonPackage rec { - pname = "django-appconf"; - version = "1.0.3"; - - src = fetchFromGitHub { - owner = "django-compressor"; - repo = "django-appconf"; - rev = version; - sha256 = "06hwbz7362y0la9np3df25mms235fcqgpd2vn0mnf8dri9spzy1h"; - }; - - propagatedBuildInputs = [ six django ]; - - patches = [ - (fetchpatch { - name = "backport_django_2_2.patch"; - url = "https://github.com/django-compressor/django-appconf/commit/1526a842ee084b791aa66c931b3822091a442853.patch"; - sha256 = "1vl2s6vlf15089s8p4c3g4d5iqm8jva66bdw683r8440f80ixgmw"; - }) - ]; - - checkPhase = '' - # prove we're running tests against installed package, not build dir - rm -r appconf - python -m django test --settings="tests.test_settings" - ''; - - meta = with lib; { - description = "A helper class for handling configuration defaults of packaged apps gracefully"; - homepage = "https://django-appconf.readthedocs.org/"; - license = licenses.bsd2; - maintainers = with maintainers; [ desiderius ]; - }; -} diff --git a/pkgs/development/python-modules/django_compressor/default.nix b/pkgs/development/python-modules/django_compressor/default.nix index a8204eab5fad2..82684b52374ac 100644 --- a/pkgs/development/python-modules/django_compressor/default.nix +++ b/pkgs/development/python-modules/django_compressor/default.nix @@ -1,5 +1,5 @@ { lib, buildPythonPackage, fetchPypi, - rcssmin, rjsmin, django_appconf }: + rcssmin, rjsmin, django-appconf }: buildPythonPackage rec { pname = "django_compressor"; @@ -18,7 +18,7 @@ buildPythonPackage rec { # requires django-sekizai, which we don't have packaged yet doCheck = false; - propagatedBuildInputs = [ rcssmin rjsmin django_appconf ]; + propagatedBuildInputs = [ rcssmin rjsmin django-appconf ]; meta = with lib; { description = "Compresses linked and inline JavaScript or CSS into single cached files"; diff --git a/pkgs/development/python-modules/django_contrib_comments/default.nix b/pkgs/development/python-modules/django_contrib_comments/default.nix index 3f717b0fb5ce1..88bbdfdeddb99 100644 --- a/pkgs/development/python-modules/django_contrib_comments/default.nix +++ b/pkgs/development/python-modules/django_contrib_comments/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "django-contrib-comments"; - version = "2.1.0"; + version = "2.2.0"; src = fetchPypi { inherit pname version; - sha256 = "d82f1d04690550df026553053903deec0c52dc54212e1b79241b08f0355cff2c"; + sha256 = "sha256-SN4A8VZ34BaiFq7/IF1uAOQ5HJpXAhNsZBGcRytzVto="; }; propagatedBuildInputs = [ django ]; diff --git a/pkgs/development/python-modules/django_modelcluster/default.nix b/pkgs/development/python-modules/django_modelcluster/default.nix index fc0d0e0921b48..02995c1570b9f 100644 --- a/pkgs/development/python-modules/django_modelcluster/default.nix +++ b/pkgs/development/python-modules/django_modelcluster/default.nix @@ -1,25 +1,43 @@ { lib , buildPythonPackage -, fetchPypi +, fetchFromGitHub +, django +, django-taggit , pytz , pythonOlder -, six +, python }: buildPythonPackage rec { pname = "django-modelcluster"; - version = "5.2"; + version = "6.0"; + format = "setuptools"; - src = fetchPypi { - inherit pname version; - sha256 = "e541a46a0a899ef4778a4708be22e71cac3efacc09a6ff44bc065c5c9194c054"; + disabled = pythonOlder "3.5"; + + src = fetchFromGitHub { + owner = "wagtail"; + repo = pname; + rev = "v${version}"; + hash = "sha256-p6hvOkPWRVJYLHvwyn9nS05wblikRFmlSYZuLiCcuqc="; }; - disabled = pythonOlder "3.5"; + propagatedBuildInputs = [ + django + pytz + ]; + + passthru.extras-require.taggit = [ + django-taggit + ]; - doCheck = false; + checkInputs = passthru.extras-require.taggit; - propagatedBuildInputs = [ pytz six ]; + checkPhase = '' + runHook preCheck + ${python.interpreter} ./runtests.py --noinput + runHook postCheck + ''; meta = with lib; { description = "Django extension to allow working with 'clusters' of models as a single unit, independently of the database"; diff --git a/pkgs/development/python-modules/django_reversion/default.nix b/pkgs/development/python-modules/django_reversion/default.nix index 1bf4d6b4dab55..f6bc72dc226a5 100644 --- a/pkgs/development/python-modules/django_reversion/default.nix +++ b/pkgs/development/python-modules/django_reversion/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "django-reversion"; - version = "4.0.2"; + version = "5.0.0"; src = fetchPypi { inherit pname version; - sha256 = "sha256-XTO6lE2/GccDDJ5w43MSSK40Nozyr+3hDg0I+/ieb4w="; + sha256 = "sha256-C63jw5k4dFEIfwxng14NPRhtdn3mpcW6U6iOr8Pyccg="; }; # tests assume the availability of a mysql/postgresql database diff --git a/pkgs/development/python-modules/dm-haiku/default.nix b/pkgs/development/python-modules/dm-haiku/default.nix index 55a91006b06a8..2c4c24b93670b 100644 --- a/pkgs/development/python-modules/dm-haiku/default.nix +++ b/pkgs/development/python-modules/dm-haiku/default.nix @@ -15,13 +15,13 @@ buildPythonPackage rec { pname = "dm-haiku"; - version = "0.0.5"; + version = "0.0.6"; src = fetchFromGitHub { owner = "deepmind"; repo = pname; rev = "v${version}"; - sha256 = "1mdqjcka0m1div63ngba8w8z94id4c1h8xqmnq1xpmgkc79224wa"; + hash = "sha256-qvKMeGPiWXvvyV+GZdTWdsC6Wp08AmP8nDtWk7sZtqM="; }; propagatedBuildInputs = [ @@ -32,13 +32,13 @@ buildPythonPackage rec { checkInputs = [ chex cloudpickle + dill dm-tree jaxlib pytest-xdist pytestCheckHook tensorflow ]; - pytestFlagsArray = [ "-n $NIX_BUILD_CORES" ]; pythonImportsCheck = [ "haiku" @@ -53,6 +53,13 @@ buildPythonPackage rec { # likely that's the reason the upstream uses TF-nightly for tests? # `nixpkgs` doesn't have the corresponding TF version packaged. "haiku/_src/integration/jax2tf_test.py" + # `TypeError: lax.conv_general_dilated requires arguments to have the same dtypes, got float32, float16`. + "haiku/_src/integration/numpy_inputs_test.py" + ]; + + disabledTests = [ + # See https://github.com/deepmind/dm-haiku/issues/366. + "test_jit_Recurrent" ]; meta = with lib; { diff --git a/pkgs/development/python-modules/dm-sonnet/default.nix b/pkgs/development/python-modules/dm-sonnet/default.nix deleted file mode 100644 index 3820fdd1e36cb..0000000000000 --- a/pkgs/development/python-modules/dm-sonnet/default.nix +++ /dev/null @@ -1,91 +0,0 @@ -{ lib -, fetchFromGitHub -, bazel_0_26 -, buildBazelPackage -, buildPythonPackage -, git -, python -, six -, absl-py -, semantic-version -, contextlib2 -, wrapt -, tensorflow -, tensorflow-probability -, tensorflow-estimator -}: - -let - version = "1.33"; - - # first build all binaries and generate setup.py using bazel - bazel-build = buildBazelPackage { - bazel = bazel_0_26; - - name = "dm-sonnet-bazel-${version}"; - - src = fetchFromGitHub { - owner = "deepmind"; - repo = "sonnet"; - rev = "v${version}"; - sha256 = "1nqsja1s8jrkq6v1whgh7smk17313mjr9vs3k5c1m8px4yblzhqc"; - }; - - nativeBuildInputs = [ - git # needed to fetch the bazel deps (protobuf in particular) - ]; - - # see https://github.com/deepmind/sonnet/blob/master/docs/INSTALL.md - bazelTarget = ":install"; - - fetchAttrs = { - sha256 = "09dzxs2v5wpiaxrz7qj257q1fbx0gxwbk0jyx58n81m5kys7yj9k"; - }; - - buildAttrs = { - preBuild = '' - patchShebangs . - ''; - - installPhase = '' - # do not generate a wheel, instead just copy the generated files to $out to be installed by buildPythonPackage - sed -i 's,.*bdist_wheel.*,cp -rL . "$out"; exit 0,' bazel-bin/install - - # the target directory "dist" does not actually matter since we're not generating a wheel - bazel-bin/install dist - ''; - }; - }; - -# now use pip to install the package prepared by bazel -in buildPythonPackage { - pname = "dm-sonnet"; - inherit version; - - src = bazel-build; - - propagatedBuildInputs = [ - six - absl-py - semantic-version - contextlib2 - wrapt - tensorflow - tensorflow-probability - tensorflow-estimator - ]; - - # not sure how to properly run the real test suite -- through bazel? - checkPhase = '' - ${python.interpreter} -c "import sonnet" - ''; - - meta = with lib; { - description = "TensorFlow-based neural network library"; - homepage = "https://sonnet.dev"; - license = licenses.asl20; - maintainers = with maintainers; [ timokau ]; - platforms = platforms.linux; - broken = true; # depends on older TensorFlow version than is currently packaged - }; -} diff --git a/pkgs/development/python-modules/dnspython/default.nix b/pkgs/development/python-modules/dnspython/default.nix index 59730bff71ecf..1dbbba48b1048 100644 --- a/pkgs/development/python-modules/dnspython/default.nix +++ b/pkgs/development/python-modules/dnspython/default.nix @@ -5,31 +5,39 @@ , pythonOlder , setuptools-scm , pytestCheckHook +, cacert }: buildPythonPackage rec { pname = "dnspython"; - version = "2.2.0"; + version = "2.2.1"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; extension = "tar.gz"; - sha256 = "1mi6l2n766y1gic3x1swp2jk2nr7wbkb191qinwhddnh6bh534z7"; + sha256 = "0gk00m8zxjghxnzafhars51k5ahd6wfhf123nrc1j5gzlsj6jx8g"; }; checkInputs = [ pytestCheckHook + ] ++ lib.optional stdenv.isDarwin [ + cacert ]; disabledTests = [ # dns.exception.SyntaxError: protocol not found "test_misc_good_WKS_text" - ] ++ lib.optionals stdenv.isDarwin [ - # unable to get local issuer certificate - "test_async" - "test_query" + # fails if IPv6 isn't available "test_resolver_override" + + # Tests that run inconsistently on darwin systems + ] ++ lib.optionals stdenv.isDarwin [ + # 9 tests fail with: BlockingIOError: [Errno 35] Resource temporarily unavailable + "testQueryUDP" + # 6 tests fail with: dns.resolver.LifetimeTimeout: The resolution lifetime expired after ... + "testResolveCacheHit" + "testResolveTCP" ]; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/doc8/default.nix b/pkgs/development/python-modules/doc8/default.nix index 61c4ca6890a15..c02100e379ec5 100644 --- a/pkgs/development/python-modules/doc8/default.nix +++ b/pkgs/development/python-modules/doc8/default.nix @@ -14,14 +14,14 @@ buildPythonPackage rec { pname = "doc8"; - version = "0.10.1"; + version = "0.11.1"; format = "pyproject"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "376e50f4e70a1ae935416ddfcf93db35dd5d4cc0e557f2ec72f0667d0ace4548"; + sha256 = "sha256-bby1Ry79Mydj/7KGK0/e7EDIpv3Gu2fmhxOtdJylgIw="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/docutils/default.nix b/pkgs/development/python-modules/docutils/default.nix index 529a09d3f0468..3cd680e062f0e 100644 --- a/pkgs/development/python-modules/docutils/default.nix +++ b/pkgs/development/python-modules/docutils/default.nix @@ -8,11 +8,11 @@ buildPythonPackage rec { pname = "docutils"; - version = "0.17.1"; + version = "0.18.1"; src = fetchPypi { inherit pname version; - sha256 = "686577d2e4c32380bb50cbb22f575ed742d58168cee37e99117a854bcd88f125"; + sha256 = "sha256-Z5mHyvNhp1OdduWEy+3cMR467pN4d8hzRvMd68Y+nQY="; }; # Only Darwin needs LANG, but we could set it in general. diff --git a/pkgs/development/python-modules/doit/default.nix b/pkgs/development/python-modules/doit/default.nix index c7c66fceaa7cd..71cc9f69654c7 100644 --- a/pkgs/development/python-modules/doit/default.nix +++ b/pkgs/development/python-modules/doit/default.nix @@ -8,21 +8,24 @@ , cloudpickle , pyinotify , macfsevents +, toml }: buildPythonPackage rec { pname = "doit"; - version = "0.34.2"; + version = "0.35.0"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "sha256-OIER+Kals7RGIM7rKH0FhZJ8hdDW0/h5DTT7tFwM9sM="; + sha256 = "sha256-cVoyLIdMTLhiOU46DWn/MlcrUln1cDb7/cEFPEwB00g="; }; - propagatedBuildInputs = [ cloudpickle ] - ++ lib.optional stdenv.isLinux pyinotify + propagatedBuildInputs = [ + cloudpickle + toml + ] ++ lib.optional stdenv.isLinux pyinotify ++ lib.optional stdenv.isDarwin macfsevents; # hangs on darwin diff --git a/pkgs/development/python-modules/dotmap/default.nix b/pkgs/development/python-modules/dotmap/default.nix index 1378569f3a9c1..5c4cfbf952406 100644 --- a/pkgs/development/python-modules/dotmap/default.nix +++ b/pkgs/development/python-modules/dotmap/default.nix @@ -7,14 +7,14 @@ buildPythonPackage rec { pname = "dotmap"; - version = "1.3.28"; + version = "1.3.30"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-riqDYqtjstyx681zz80aZ6hBizNw4V3NOusInHGlXoI="; + hash = "sha256-WCGnkz8HX7R1Y0F8DpLgt8AxFYtMmmp+VhY0ebZYs2g="; }; checkInputs = [ diff --git a/pkgs/development/python-modules/dragonfly/default.nix b/pkgs/development/python-modules/dragonfly/default.nix index 82e1a645c853f..74740aeffb7ee 100644 --- a/pkgs/development/python-modules/dragonfly/default.nix +++ b/pkgs/development/python-modules/dragonfly/default.nix @@ -24,13 +24,13 @@ buildPythonPackage rec { pname = "dragonfly"; - version = "0.32.0"; + version = "0.35.0"; src = fetchFromGitHub { owner = "dictation-toolbox"; repo = pname; rev = version; - sha256 = "BUbIhc8as/DVx8/4VeQS9emOLGcWFujNCxesSEEBqKQ="; + sha256 = "sha256-sqEEEr5/KG3cn4rmOGJt9zMNAjeLO6h3NJgg0EyewrM="; }; postPatch = '' diff --git a/pkgs/development/python-modules/dropbox/default.nix b/pkgs/development/python-modules/dropbox/default.nix index f18f6203d1e09..efce258451ffd 100644 --- a/pkgs/development/python-modules/dropbox/default.nix +++ b/pkgs/development/python-modules/dropbox/default.nix @@ -1,17 +1,18 @@ { lib , buildPythonPackage +, pythonOlder , fetchFromGitHub , requests -, urllib3 -, mock -, setuptools +, six , stone -, pythonOlder +, mock +, pytest-mock +, pytestCheckHook }: buildPythonPackage rec { pname = "dropbox"; - version = "11.29.0"; + version = "11.30.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -20,33 +21,58 @@ buildPythonPackage rec { owner = "dropbox"; repo = "dropbox-sdk-python"; rev = "v${version}"; - sha256 = "sha256-TKJb34hJYzZtQcqgopLpN8c1utWCNjmev9epY+hYU7M="; + hash = "sha256-w07r95MBAClf0F3SICiZsHLdslzf+JuxC+BVdTACCog="; }; propagatedBuildInputs = [ requests - urllib3 - mock - setuptools + six stone ]; + checkInputs = [ + mock + pytest-mock + pytestCheckHook + ]; + postPatch = '' substituteInPlace setup.py \ --replace "'pytest-runner == 5.2.0'," "" ''; - # Set DROPBOX_TOKEN environment variable to a valid token. - doCheck = false; + doCheck = true; pythonImportsCheck = [ "dropbox" ]; + # Set SCOPED_USER_DROPBOX_TOKEN environment variable to a valid value. + disabledTests = [ + "test_default_oauth2_urls" + "test_bad_auth" + "test_multi_auth" + "test_refresh" + "test_app_auth" + "test_downscope" + "test_rpc" + "test_upload_download" + "test_bad_upload_types" + "test_clone_when_user_linked" + "test_with_path_root_constructor" + "test_path_root" + "test_path_root_err" + "test_versioned_route" + "test_team" + "test_as_user" + "test_as_admin" + "test_clone_when_team_linked" + ]; + meta = with lib; { description = "Python library for Dropbox's HTTP-based Core and Datastore APIs"; homepage = "https://github.com/dropbox/dropbox-sdk-python"; license = licenses.mit; - maintainers = with maintainers; [ ]; + maintainers = with maintainers; [ sfrijters ]; }; } diff --git a/pkgs/development/python-modules/dugong/default.nix b/pkgs/development/python-modules/dugong/default.nix index 5130ea3b0043e..190411b5333c5 100644 --- a/pkgs/development/python-modules/dugong/default.nix +++ b/pkgs/development/python-modules/dugong/default.nix @@ -2,6 +2,7 @@ , buildPythonPackage , fetchFromGitHub , pythonOlder +, pythonAtLeast , pytestCheckHook }: @@ -21,6 +22,10 @@ buildPythonPackage rec { pytestCheckHook ]; + # Lots of tests hang during teardown with: + # ssl.SSLEOFError: EOF occurred in violation of protocol (_ssl.c:2396) + doCheck = pythonOlder "3.10"; + pythonImportsCheck = [ "dugong" ]; meta = with lib; { diff --git a/pkgs/development/python-modules/dunamai/default.nix b/pkgs/development/python-modules/dunamai/default.nix index f4a24a7a7f8a7..8b51d829c8df1 100644 --- a/pkgs/development/python-modules/dunamai/default.nix +++ b/pkgs/development/python-modules/dunamai/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "dunamai"; - version = "1.10.0"; + version = "1.11.1"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "mtkennerly"; repo = "dunamai"; rev = "v${version}"; - sha256 = "sha256-Sp0yfNkFwNc2qR9aSPteBqZcqRokM9whOVmduXVK3CI="; + sha256 = "sha256-nkE9QBziCQA/aN+Z0OuqJlf5FJ4fidE7u5Gt25zjX0c="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/dynalite-devices/default.nix b/pkgs/development/python-modules/dynalite-devices/default.nix index dafbcfc2f5cd0..3ee79ae448049 100644 --- a/pkgs/development/python-modules/dynalite-devices/default.nix +++ b/pkgs/development/python-modules/dynalite-devices/default.nix @@ -8,12 +8,12 @@ buildPythonPackage rec { pname = "dynalite-devices"; - version = "0.1.46"; + version = "0.46"; src = fetchFromGitHub { owner = "ziv1234"; repo = "python-dynalite-devices"; - rev = "v0.46"; # https://github.com/ziv1234/python-dynalite-devices/issues/2 + rev = "v${version}"; # https://github.com/ziv1234/python-dynalite-devices/issues/2 hash = "sha256-Fju2JpFkQBCbOln7r3L+crv82TI2SkdPJ1oaK7PEifo="; }; diff --git a/pkgs/development/python-modules/eagle100/default.nix b/pkgs/development/python-modules/eagle100/default.nix new file mode 100644 index 0000000000000..9d5e5d795028f --- /dev/null +++ b/pkgs/development/python-modules/eagle100/default.nix @@ -0,0 +1,37 @@ +{ lib +, buildPythonPackage +, fetchPypi +, pythonOlder +, requests +}: + +buildPythonPackage rec { + pname = "eagle100"; + version = "0.1.1"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; + + src = fetchPypi { + inherit pname version; + hash = "sha256-eyYY1x8IjIfUx5OiaOomiWunsO1++seFwXlI/iKDDLw="; + }; + + propagatedBuildInputs = [ + requests + ]; + + # Project has no tests + doCheck = false; + + pythonImportsCheck = [ + "eagle100" + ]; + + meta = with lib; { + description = "Python library for interacting with Rainforest EAGLE devices"; + homepage = "https://github.com/hastarin/eagle100"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/easyprocess/default.nix b/pkgs/development/python-modules/easyprocess/default.nix index c98a8b572d454..97707e0e9fd43 100644 --- a/pkgs/development/python-modules/easyprocess/default.nix +++ b/pkgs/development/python-modules/easyprocess/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "EasyProcess"; - version = "0.3"; + version = "1.1"; src = fetchPypi { inherit pname version; - sha256 = "115rzzr0hx4af4m6krf7dxn8851n4l8jfxahjzjc2r0zq2m8v57v"; + sha256 = "sha256-iFiYMCpXqrlIlz6LXTKkIpOSufstmGqx1P/VkOW6kOw="; }; # No tests diff --git a/pkgs/development/python-modules/editables/default.nix b/pkgs/development/python-modules/editables/default.nix index ee902d772c99f..e5deb02af52f4 100644 --- a/pkgs/development/python-modules/editables/default.nix +++ b/pkgs/development/python-modules/editables/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "editables"; - version = "0.2"; + version = "0.3"; src = fetchPypi { inherit pname version; - sha256 = "6918f16225258f24ef9800c2327e14eded42ddac344e77982380749464024f35"; + sha256 = "sha256-FnUk43c1jtHxN05hwmjw16S/fb0EbGVve0EM3hYWGxo="; }; checkInputs = [ diff --git a/pkgs/development/python-modules/elkm1-lib/default.nix b/pkgs/development/python-modules/elkm1-lib/default.nix index 6b877a58dd0ba..12f9a667fef8a 100644 --- a/pkgs/development/python-modules/elkm1-lib/default.nix +++ b/pkgs/development/python-modules/elkm1-lib/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "elkm1-lib"; - version = "1.2.1"; + version = "1.3.4"; format = "pyproject"; disabled = pythonOlder "3.6"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "gwww"; repo = "elkm1"; rev = version; - hash = "sha256-Jr9f+essHB1FkzD6zM0G6jgE9C9lfDJuFIPrKRhVt+g="; + hash = "sha256-g8tMVH1MZihEEHGQjxX/Mcn5Mu3N9VA3AGdk2avlOoE="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/enaml/default.nix b/pkgs/development/python-modules/enaml/default.nix index 9e6a910b2ba94..ccd8bb497d100 100644 --- a/pkgs/development/python-modules/enaml/default.nix +++ b/pkgs/development/python-modules/enaml/default.nix @@ -1,6 +1,7 @@ { lib , buildPythonPackage , fetchFromGitHub +, setuptools-scm , atom , ply , kiwisolver @@ -12,13 +13,13 @@ buildPythonPackage rec { pname = "enaml"; - version = "0.14.1"; + version = "0.15.0"; src = fetchFromGitHub { owner = "nucleic"; repo = pname; - rev = version; - sha256 = "sha256-QfI7cwl2c5HOlFNNdG+oOv48X9jJZnZNU/kWgutWe6k="; + rev = "refs/tags/${version}"; + sha256 = "sha256-xSMgT8VooDS5kvf4BCcVbv/MNfRDTVnPKU3Ou+/Gq7I="; }; # qt bindings cannot be found during tests @@ -39,6 +40,7 @@ buildPythonPackage rec { "enaml.workbench" ]; + nativeBuildInputs = [ setuptools-scm ]; propagatedBuildInputs = [ atom ply @@ -48,6 +50,7 @@ buildPythonPackage rec { cppy bytecode ]; + SETUPTOOLS_SCM_PRETEND_VERSION = version; meta = with lib; { homepage = "https://github.com/nucleic/enaml"; diff --git a/pkgs/development/python-modules/entrypoint2/default.nix b/pkgs/development/python-modules/entrypoint2/default.nix index 73ede85fb886e..4fd464d483f39 100644 --- a/pkgs/development/python-modules/entrypoint2/default.nix +++ b/pkgs/development/python-modules/entrypoint2/default.nix @@ -1,4 +1,4 @@ -{ lib, buildPythonPackage, fetchPypi, EasyProcess, pathpy, pytestCheckHook }: +{ lib, buildPythonPackage, fetchPypi, EasyProcess, path, pytestCheckHook }: buildPythonPackage rec { pname = "entrypoint2"; @@ -11,7 +11,7 @@ buildPythonPackage rec { pythonImportsCheck = [ "entrypoint2" ]; - checkInputs = [ EasyProcess pathpy pytestCheckHook ]; + checkInputs = [ EasyProcess path pytestCheckHook ]; meta = with lib; { description = "Easy to use command-line interface for python modules"; diff --git a/pkgs/development/python-modules/entrypoints/default.nix b/pkgs/development/python-modules/entrypoints/default.nix index a26d6ede8904f..1223f3f911dec 100644 --- a/pkgs/development/python-modules/entrypoints/default.nix +++ b/pkgs/development/python-modules/entrypoints/default.nix @@ -1,31 +1,36 @@ { lib , buildPythonPackage +, pythonOlder , fetchPypi +, flit-core , configparser -, pytest -, isPy3k +, pytestCheckHook }: buildPythonPackage rec { pname = "entrypoints"; - version = "0.3"; + version = "0.4"; + format = "pyproject"; + + disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "c70dd71abe5a8c85e55e12c19bd91ccfeec11a6e99044204511f9ed547d48451"; + sha256 = "sha256-twbt2qkhihnrzWe1aBjwW7J1ibHKno15e3Sv+tTMrNQ="; }; - checkInputs = [ pytest ]; - - propagatedBuildInputs = lib.optional (!isPy3k) configparser; + nativeBuildInputs = [ + flit-core + ]; - checkPhase = '' - py.test tests - ''; + checkInputs = [ + pytestCheckHook + ]; - meta = { + meta = with lib; { description = "Discover and load entry points from installed packages"; homepage = "https://github.com/takluyver/entrypoints"; - license = lib.licenses.mit; + license = licenses.mit; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/development/python-modules/env-canada/default.nix b/pkgs/development/python-modules/env-canada/default.nix index 9ec0dda4bc515..216168b51131b 100644 --- a/pkgs/development/python-modules/env-canada/default.nix +++ b/pkgs/development/python-modules/env-canada/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "env-canada"; - version = "0.5.22"; + version = "0.5.23"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -22,8 +22,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "michaeldavie"; repo = "env_canada"; - rev = "v${version}"; - sha256 = "sha256-3dqG3wlFlGCI3Ymq5rpoNpmeU36WCQ4Iya5m5mCAVFI="; + rev = "refs/tags/v${version}"; + sha256 = "sha256-ksQQ3jujfu2XR0ZaR5fc8GNYDL8Tos+8U4OHS1mMyRY="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/ephemeral-port-reserve/default.nix b/pkgs/development/python-modules/ephemeral-port-reserve/default.nix new file mode 100644 index 0000000000000..0af57945073fe --- /dev/null +++ b/pkgs/development/python-modules/ephemeral-port-reserve/default.nix @@ -0,0 +1,42 @@ +{ lib +, stdenv +, buildPythonPackage +, fetchFromGitHub +, pytestCheckHook +}: + +let + pname = "ephemeral-port-reserve"; + version = "1.1.4"; +in +buildPythonPackage { + inherit pname version; + format = "setuptools"; + + src = fetchFromGitHub { + owner = "Yelp"; + repo = "ephemeral-port-reserve"; + rev = "v${version}"; + hash = "sha256-R6NRpfaT05PO/cTWgCakiGfCuCyucjVOXbAezn5x1cU="; + }; + + checkInputs = [ + pytestCheckHook + ]; + + disabledTests = lib.optionals stdenv.isDarwin [ + # can't find hostname in our darwin build environment + "test_fqdn" + ]; + + pythonImportsCheck = [ + "ephemeral_port_reserve" + ]; + + meta = with lib; { + description = "Find an unused port, reliably"; + homepage = "https://github.com/Yelp/ephemeral-port-reserve/"; + license = licenses.mit; + maintainers = with maintainers; [ hexa ]; + }; +} diff --git a/pkgs/development/python-modules/exchangelib/default.nix b/pkgs/development/python-modules/exchangelib/default.nix index 3550f1e17361c..2f3f5fe16abbc 100644 --- a/pkgs/development/python-modules/exchangelib/default.nix +++ b/pkgs/development/python-modules/exchangelib/default.nix @@ -17,7 +17,7 @@ , pyyaml , requests , requests_ntlm -, requests_oauthlib +, requests-oauthlib , requests-kerberos , requests-mock , tzdata @@ -35,7 +35,7 @@ buildPythonPackage rec { owner = "ecederstrand"; repo = pname; rev = "v${version}"; - sha256 = "sha256-fdYc+fJEePgCzAkUWz7pmL/CI/O9zm5G9xh1f4bhrH4="; + hash = "sha256-fdYc+fJEePgCzAkUWz7pmL/CI/O9zm5G9xh1f4bhrH4="; }; propagatedBuildInputs = [ @@ -48,7 +48,7 @@ buildPythonPackage rec { pygments requests requests_ntlm - requests_oauthlib + requests-oauthlib requests-kerberos tzdata tzlocal diff --git a/pkgs/development/python-modules/faker/default.nix b/pkgs/development/python-modules/faker/default.nix index 048edf64d38f8..7ca49a4843429 100644 --- a/pkgs/development/python-modules/faker/default.nix +++ b/pkgs/development/python-modules/faker/default.nix @@ -12,12 +12,12 @@ buildPythonPackage rec { pname = "faker"; - version = "11.3.0"; + version = "13.3.4"; src = fetchPypi { pname = "Faker"; inherit version; - hash = "sha256-rb5WfmTaahCX/qyraZAA4a0W4Xplkqjwrh7gt/vxmIc="; + hash = "sha256-GIlhBl+1x46mOfQhdvVRAPcskMOjF5rGyVXEvXErBRE="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/fakeredis/default.nix b/pkgs/development/python-modules/fakeredis/default.nix index 5860a959afcd8..5d45c4dc5ce38 100644 --- a/pkgs/development/python-modules/fakeredis/default.nix +++ b/pkgs/development/python-modules/fakeredis/default.nix @@ -26,6 +26,11 @@ buildPythonPackage rec { hash = "sha256-fCxLobQuCnUzfFS3d78GcQVrRWllDj/5J+S5s4WvyOw="; }; + postPatch = '' + substituteInPlace setup.cfg \ + --replace "redis<4.2.0" "redis" + ''; + propagatedBuildInputs = [ aioredis lupa diff --git a/pkgs/development/python-modules/falcon/default.nix b/pkgs/development/python-modules/falcon/default.nix index 5dba22d839124..58bbae872832e 100644 --- a/pkgs/development/python-modules/falcon/default.nix +++ b/pkgs/development/python-modules/falcon/default.nix @@ -1,22 +1,21 @@ { lib , buildPythonPackage , pythonOlder -, fetchPypi -, pytestCheckHook +, isPyPy +, fetchFromGitHub + +# build +, cython + +# tests , aiofiles , cbor2 -, ddt -, gunicorn , httpx -, hypercorn -, jsonschema , msgpack , mujson -, nose , orjson -, pecan , pytest-asyncio -, python-mimeparse +, pytestCheckHook , pyyaml , rapidjson , requests @@ -28,43 +27,57 @@ buildPythonPackage rec { pname = "falcon"; - version = "3.0.1"; + version = "3.1.0"; format = "pyproject"; disabled = pythonOlder "3.5"; - src = fetchPypi { - inherit pname version; - sha256 = "sha256-xB2E2zJYgahw6LcSnV7P2XL6QyPPd7cRmh0qIZZu5oE="; + src = fetchFromGitHub { + owner = "falconry"; + repo = pname; + rev = version; + hash = "sha256-Y6bD0GCXhqpvMV+/i1v59p2qWZ91f2ey7sPQrVALY54="; }; + nativeBuildInputs = lib.optionals (!isPyPy) [ + cython + ]; + + preCheck = '' + export HOME=$TMPDIR + cp -R tests examples $TMPDIR + pushd $TMPDIR + ''; + + postCheck = '' + popd + ''; + checkInputs = [ - aiofiles - cbor2 - ddt - gunicorn - httpx - hypercorn - jsonschema - msgpack - mujson - nose - orjson - pecan - pytest-asyncio + # https://github.com/falconry/falcon/blob/master/requirements/tests pytestCheckHook - python-mimeparse pyyaml - rapidjson requests - testtools - ujson + rapidjson + orjson + + # ASGI specific + pytest-asyncio + aiofiles + httpx uvicorn websockets + + # handler specific + cbor2 + msgpack + mujson + ujson + ] ++ lib.optionals (pythonOlder "3.10") [ + testtools ]; - disabledTestPaths = [ - # missing optional nuts package - "falcon/bench/nuts/nuts/tests/test_functional.py" + pytestFlagsArray = [ + "tests" ]; meta = with lib; { diff --git a/pkgs/development/python-modules/faraday-plugins/default.nix b/pkgs/development/python-modules/faraday-plugins/default.nix index 42f8a4860509a..fb26c1621fe35 100644 --- a/pkgs/development/python-modules/faraday-plugins/default.nix +++ b/pkgs/development/python-modules/faraday-plugins/default.nix @@ -16,14 +16,14 @@ buildPythonPackage rec { pname = "faraday-plugins"; - version = "1.6.1"; + version = "1.6.4"; format = "setuptools"; src = fetchFromGitHub { owner = "infobyte"; repo = "faraday_plugins"; - rev = "v${version}"; - sha256 = "sha256-NpPVA+fruI/xX0KMjRuRuMK8HYc/0ErbDhJOCNXKhyY="; + rev = "refs/tags/v${version}"; + sha256 = "sha256-0IAr91ql4ShjGQol3uc/erIHW6E1Vzj724JJ3NaLZUo="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/fastapi/default.nix b/pkgs/development/python-modules/fastapi/default.nix index cf55a56bdd173..c3abc2163be76 100644 --- a/pkgs/development/python-modules/fastapi/default.nix +++ b/pkgs/development/python-modules/fastapi/default.nix @@ -7,6 +7,7 @@ , pytest-asyncio , aiosqlite , databases +, fetchpatch , flask , httpx , passlib @@ -19,7 +20,7 @@ buildPythonPackage rec { pname = "fastapi"; - version = "0.75.1"; + version = "0.75.2"; format = "flit"; disabled = pythonOlder "3.6"; @@ -28,7 +29,7 @@ buildPythonPackage rec { owner = "tiangolo"; repo = pname; rev = version; - sha256 = "sha256-tSZ5isMzDhDsuVNQdoYXG0IYkgCvdVdARtFXELNjTtk="; + hash = "sha256-B4q3Q256Sj4jTQt1TDm3fiEaQKdVxddCF9+KsxkkTWo="; }; propagatedBuildInputs = [ @@ -50,6 +51,16 @@ buildPythonPackage rec { trio ]; + patches = [ + # Bump starlette, https://github.com/tiangolo/fastapi/pull/4483 + (fetchpatch { + name = "support-later-starlette.patch"; + # PR contains multiple commits + url = "https://patch-diff.githubusercontent.com/raw/tiangolo/fastapi/pull/4483.patch"; + sha256 = "sha256-ZWaqAd/QYEYRL1hSQdXdFPgWgdmOill2GtmEn33vz2U="; + }) + ]; + postPatch = '' substituteInPlace pyproject.toml \ --replace "starlette ==" "starlette >=" @@ -70,10 +81,13 @@ buildPythonPackage rec { disabledTests = [ "test_get_custom_response" - # Failed: DID NOT RAISE <class 'starlette.websockets.WebSocketDisconnect'> "test_websocket_invalid_data" "test_websocket_no_credentials" + # TypeError: __init__() missing 1...starlette-releated + "test_head" + "test_options" + "test_trace" ]; pythonImportsCheck = [ diff --git a/pkgs/development/python-modules/fastcore/default.nix b/pkgs/development/python-modules/fastcore/default.nix index b7fc364958dd2..e86013605e7b1 100644 --- a/pkgs/development/python-modules/fastcore/default.nix +++ b/pkgs/development/python-modules/fastcore/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "fastcore"; - version = "1.4.1"; + version = "1.4.2"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -16,8 +16,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "fastai"; repo = pname; - rev = version; - sha256 = "sha256-qZsCsMwZxJsnznQ/C1SUPexkquv0tIyCkNYL5f2k0FU="; + rev = "refs/tags/${version}"; + sha256 = "sha256-0q+qFrfMsXkwgu08igt2kHZ9c3/aqz/inCpJXkPZsdg="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/fasteners/default.nix b/pkgs/development/python-modules/fasteners/default.nix index 0364022fa2864..ef8a62bc8e8e4 100644 --- a/pkgs/development/python-modules/fasteners/default.nix +++ b/pkgs/development/python-modules/fasteners/default.nix @@ -1,47 +1,34 @@ { lib , buildPythonPackage -, fetchPypi -, six -, monotonic +, fetchFromGitHub , diskcache , more-itertools -, testtools -, isPy3k -, nose -, futures ? null +, pytestCheckHook }: buildPythonPackage rec { pname = "fasteners"; - version = "0.16.3"; + version = "0.17.3"; + format = "pyproject"; - src = fetchPypi { - inherit pname version; - sha256 = "b1ab4e5adfbc28681ce44b3024421c4f567e705cc3963c732bf1cba3348307de"; + src = fetchFromGitHub { + owner = "harlowja"; + repo = pname; + rev = version; + hash = "sha256-FVhHp8BZ/wQQyr5AcuDo94LlflixhjZ0SnheSdHuDVQ="; }; - propagatedBuildInputs = [ - six - monotonic - ]; - checkInputs = [ diskcache more-itertools - testtools - nose - ] ++ lib.optionals (!isPy3k) [ - futures + pytestCheckHook ]; - checkPhase = '' - nosetests - ''; - meta = with lib; { description = "A python package that provides useful locks"; homepage = "https://github.com/harlowja/fasteners"; license = licenses.asl20; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/development/python-modules/fastparquet/default.nix b/pkgs/development/python-modules/fastparquet/default.nix index 56fb6a53e14a2..30aa6a2ab7640 100644 --- a/pkgs/development/python-modules/fastparquet/default.nix +++ b/pkgs/development/python-modules/fastparquet/default.nix @@ -13,13 +13,13 @@ buildPythonPackage rec { pname = "fastparquet"; - version = "0.7.1"; + version = "0.8.1"; src = fetchFromGitHub { owner = "dask"; repo = pname; rev = version; - hash = "sha256-xV0AXNZSy4LSrHf11OP/+KDbeDQu8yF1ugX+W4mie1E="; + sha256 = "05qb4nz87p9vnrdsyl25hdp5sj35lki64gjza5dahc89fwfdnsmd"; }; postPatch = '' diff --git a/pkgs/development/python-modules/fenics/default.nix b/pkgs/development/python-modules/fenics/default.nix new file mode 100644 index 0000000000000..f1ccc5efc84b4 --- /dev/null +++ b/pkgs/development/python-modules/fenics/default.nix @@ -0,0 +1,264 @@ +{ lib, stdenv +, fetchurl +, fetchpatch +, blas +, boost +, cmake +, doxygen +, eigen +, gtest +, hdf5 +, lapack +, mpi +, mpi4py +, numpy +, pkg-config +, ply +, pybind11 +, pytest +, python +, pythonPackages +, scotch +, setuptools +, six +, sphinx +, suitesparse +, swig +, sympy +, zlib +, nixosTests +}: + +let + version = "2019.1.0"; + + dijitso = pythonPackages.buildPythonPackage { + pname = "dijitso"; + inherit version; + src = fetchurl { + url = "https://bitbucket.org/fenics-project/dijitso/downloads/dijitso-${version}.tar.gz"; + sha256 = "1ncgbr0bn5cvv16f13g722a0ipw6p9y6p4iasxjziwsp8kn5x97a"; + }; + propagatedBuildInputs = [ numpy six ]; + checkInputs = [ pytest ]; + preCheck = '' + export HOME=$PWD + ''; + checkPhase = '' + runHook preCheck + py.test test/ + runHook postCheck + ''; + meta = { + description = "Distributed just-in-time shared library building"; + homepage = "https://fenicsproject.org/"; + platforms = lib.platforms.all; + license = lib.licenses.lgpl3; + }; + }; + + fiat = pythonPackages.buildPythonPackage { + pname = "fiat"; + inherit version; + src = fetchurl { + url = "https://bitbucket.org/fenics-project/fiat/downloads/fiat-${version}.tar.gz"; + sha256 = "1sbi0fbr7w9g9ajr565g3njxrc3qydqjy3334vmz5xg0rd3106il"; + }; + propagatedBuildInputs = [ numpy six sympy ]; + checkInputs = [ pytest ]; + + preCheck = '' + # Workaround pytest 4.6.3 issue. + # See: https://bitbucket.org/fenics-project/fiat/pull-requests/59 + rm test/unit/test_quadrature.py + rm test/unit/test_reference_element.py + rm test/unit/test_fiat.py + ''; + checkPhase = '' + runHook preCheck + py.test test/unit/ + runHook postCheck + ''; + meta = { + description = "Automatic generation of finite element basis functions"; + homepage = "https://fenicsproject.org/"; + platforms = lib.platforms.all; + license = lib.licenses.lgpl3; + }; + }; + + ufl = pythonPackages.buildPythonPackage { + pname = "ufl"; + inherit version; + src = fetchurl { + url = "https://bitbucket.org/fenics-project/ufl/downloads/ufl-${version}.tar.gz"; + sha256 = "04daxwg4y9c51sdgvwgmlc82nn0fjw7i2vzs15ckdc7dlazmcfi1"; + }; + propagatedBuildInputs = [ numpy six ]; + checkInputs = [ pytest ]; + checkPhase = '' + runHook preCheck + py.test test/ + runHook postCheck + ''; + meta = { + description = "A domain-specific language for finite element variational forms"; + homepage = "https://fenicsproject.org/"; + platforms = lib.platforms.all; + license = lib.licenses.lgpl3; + }; + }; + + ffc = pythonPackages.buildPythonPackage { + pname = "ffc"; + inherit version; + src = fetchurl { + url = "https://bitbucket.org/fenics-project/ffc/downloads/ffc-${version}.tar.gz"; + sha256 = "1zdg6pziss4va74pd7jjl8sc3ya2gmhpypccmyd8p7c66ji23y2g"; + }; + nativeBuildInputs = [ + pybind11 + ]; + propagatedBuildInputs = [ + dijitso + fiat + numpy + six + sympy + ufl + setuptools + ]; + checkInputs = [ pytest ]; + preCheck = '' + export HOME=$PWD + rm test/unit/ufc/finite_element/test_evaluate.py + ''; + checkPhase = '' + runHook preCheck + py.test test/unit/ + runHook postCheck + ''; + meta = { + description = "A compiler for finite element variational forms"; + homepage = "https://fenicsproject.org/"; + platforms = lib.platforms.all; + license = lib.licenses.lgpl3; + }; + }; + dolfin = stdenv.mkDerivation { + pname = "dolfin"; + inherit version; + src = fetchurl { + url = "https://bitbucket.org/fenics-project/dolfin/downloads/dolfin-${version}.tar.gz"; + sha256 = "0kbyi4x5f6j4zpasch0swh0ch81w2h92rqm1nfp3ydi4a93vky33"; + }; + patches = [ + (fetchpatch { + name = "fix-double-prefix.patch"; + url = "https://bitbucket.org/josef_kemetmueller/dolfin/commits/328e94acd426ebaf2243c072b806be3379fd4340/raw"; + sha256 = "1zj7k3y7vsx0hz3gwwlxhq6gdqamqpcw90d4ishwx5ps5ckcsb9r"; + }) + ]; + propagatedBuildInputs = [ + dijitso + fiat + numpy + six + ufl + ]; + nativeBuildInputs = [ + cmake + doxygen + pkg-config + ]; + buildInputs = [ + boost + dijitso + eigen + ffc + fiat + hdf5 + mpi + numpy + blas + lapack + ply + python + scotch + six + sphinx + suitesparse + swig + sympy + ufl + zlib + ]; + cmakeFlags = [ + "-DDOLFIN_CXX_FLAGS=-std=c++11" + "-DDOLFIN_AUTO_DETECT_MPI=ON" + "-DDOLFIN_ENABLE_CHOLMOD=ON" + "-DDOLFIN_ENABLE_DOCS=ON" + "-DDOLFIN_ENABLE_HDF5=ON" + "-DDOLFIN_ENABLE_MPI=ON" + "-DDOLFIN_ENABLE_SCOTCH=ON" + "-DDOLFIN_ENABLE_UMFPACK=ON" + "-DDOLFIN_ENABLE_ZLIB=ON" + "-DDOLFIN_SKIP_BUILD_TESTS=ON" # Otherwise SCOTCH is not found + # TODO: Enable the following features + "-DDOLFIN_ENABLE_PARMETIS=OFF" + "-DDOLFIN_ENABLE_PETSC=OFF" + "-DDOLFIN_ENABLE_SLEPC=OFF" + "-DDOLFIN_ENABLE_TRILINOS=OFF" + ]; + installCheckPhase = '' + source $out/share/dolfin/dolfin.conf + make runtests + ''; + meta = { + description = "The FEniCS Problem Solving Environment in Python and C++"; + homepage = "https://fenicsproject.org/"; + license = lib.licenses.lgpl3; + }; + }; + python-dolfin = pythonPackages.buildPythonPackage rec { + pname = "dolfin"; + inherit version; + disabled = pythonPackages.isPy27; + src = dolfin.src; + sourceRoot = "${pname}-${version}/python"; + nativeBuildInputs = [ + pybind11 + cmake + ]; + dontUseCmakeConfigure = true; + preConfigure = '' + export CMAKE_PREFIX_PATH=${pybind11}/share/cmake/pybind11:$CMAKE_PREFIX_PATH + substituteInPlace setup.py --replace "pybind11==2.2.4" "pybind11" + substituteInPlace dolfin/jit/jit.py \ + --replace 'pkgconfig.exists("dolfin")' 'pkgconfig.exists("${dolfin}/lib/pkgconfig/dolfin.pc")' \ + --replace 'pkgconfig.parse("dolfin")' 'pkgconfig.parse("${dolfin}/lib/pkgconfig/dolfin.pc")' + ''; + buildInputs = [ + dolfin + boost + ]; + + propagatedBuildInputs = [ + dijitso + ffc + mpi4py + numpy + ufl + pythonPackages.pkgconfig + pythonPackages.pybind11 + ]; + doCheck = false; # Tries to orte_ess_init and call ssh to localhost + passthru.tests = { inherit (nixosTests) fenics; }; + meta = { + description = "Python bindings for the DOLFIN FEM compiler"; + homepage = "https://fenicsproject.org/"; + platforms = lib.platforms.all; + license = lib.licenses.lgpl3; + }; + }; +in python-dolfin diff --git a/pkgs/development/python-modules/ffcv/default.nix b/pkgs/development/python-modules/ffcv/default.nix index 2aee132e294fc..08f80d198e4e2 100644 --- a/pkgs/development/python-modules/ffcv/default.nix +++ b/pkgs/development/python-modules/ffcv/default.nix @@ -5,7 +5,7 @@ , numba , opencv4 , pandas -, pkgconfig +, pkg-config , pytorch-pfn-extras , terminaltables , tqdm @@ -35,7 +35,8 @@ buildPythonPackage rec { --replace "'webdataset'," "" ''; - buildInputs = [ libjpeg pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ libjpeg ]; propagatedBuildInputs = [ opencv4 numba pandas pytorch-pfn-extras terminaltables tqdm ]; # `ffcv._libffcv*.so` cannot be loaded in the nix build environment for some diff --git a/pkgs/development/python-modules/filelock/default.nix b/pkgs/development/python-modules/filelock/default.nix index 8eaed65ca73c2..16379ef85e1ef 100644 --- a/pkgs/development/python-modules/filelock/default.nix +++ b/pkgs/development/python-modules/filelock/default.nix @@ -8,13 +8,13 @@ buildPythonPackage rec { pname = "filelock"; - version = "3.4.2"; + version = "3.6.0"; format = "pyproject"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "38b4f4c989f9d06d44524df1b24bd19e167d851f19b50bf3e3559952dddc5b80"; + sha256 = "sha256-nNVAqTUuQyxyRqSP5OhxKxCssd8q0fMOjAcLgq4f7YU="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/findpython/default.nix b/pkgs/development/python-modules/findpython/default.nix new file mode 100644 index 0000000000000..6c4f5daf64860 --- /dev/null +++ b/pkgs/development/python-modules/findpython/default.nix @@ -0,0 +1,53 @@ +{ lib +, buildPythonPackage +, fetchPypi +, pythonOlder + +# build time +, pdm-pep517 + +# runtime +, packaging + +# tests +, pytestCheckHook +}: + +let + pname = "findpython"; + version = "0.1.6"; +in +buildPythonPackage { + inherit pname version; + format = "pyproject"; + + disabled = pythonOlder "3.7"; + + src = fetchPypi { + inherit pname version; + hash = "sha256-n9YYXNy5a6pxCTCER++0k7LH8aj1aeEorxTXJrKmnhg="; + }; + + nativeBuildInputs = [ + pdm-pep517 + ]; + + propagatedBuildInputs = [ + packaging + ]; + + checkInputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ + "findpython" + ]; + + meta = with lib; { + description = "A utility to find python versions on your system"; + homepage = "https://github.com/frostming/findpython"; + license = licenses.mit; + maintainers = with maintainers; [ hexa ]; + }; +} diff --git a/pkgs/development/python-modules/fints/default.nix b/pkgs/development/python-modules/fints/default.nix index 7972a9374c785..13f20fbd49d69 100644 --- a/pkgs/development/python-modules/fints/default.nix +++ b/pkgs/development/python-modules/fints/default.nix @@ -8,7 +8,7 @@ }: buildPythonPackage rec { - version = "3.0.1"; + version = "3.1.0"; pname = "fints"; disabled = isPy27; @@ -16,7 +16,7 @@ buildPythonPackage rec { owner = "raphaelm"; repo = "python-fints"; rev = "v${version}"; - sha256 = "sha256-P9+3QuB5c7WMjic2fSp8pwXrOUHIrLThvfodtbBXLMY="; + hash = "sha256-3frJIEZgVnZD2spWYIuEtUt7MVsU/Zj82HOB9fKYQWE="; }; propagatedBuildInputs = [ requests mt-940 sepaxml bleach ]; diff --git a/pkgs/development/python-modules/fipy/default.nix b/pkgs/development/python-modules/fipy/default.nix index ab670e557da4b..57835019d5def 100644 --- a/pkgs/development/python-modules/fipy/default.nix +++ b/pkgs/development/python-modules/fipy/default.nix @@ -39,6 +39,14 @@ buildPythonPackage rec { ] ++ lib.optionals isPy27 [ pysparse ] ++ lib.optionals (!stdenv.isDarwin) [ gmsh ]; + # Reading version string from Gmsh is broken in latest release of FiPy + # This issue is repaired on master branch of FiPy + # Fixed with: https://github.com/usnistgov/fipy/pull/848/files + # Remove patch with next release. + patches = [ ./gmsh.patch ]; + + checkInputs = lib.optionals (!stdenv.isDarwin) [ gmsh ]; + checkPhase = '' export OMPI_MCA_plm_rsh_agent=${openssh}/bin/ssh ${python.interpreter} setup.py test --modules diff --git a/pkgs/development/python-modules/fipy/gmsh.patch b/pkgs/development/python-modules/fipy/gmsh.patch new file mode 100644 index 0000000000000..7e7b687ac8c6a --- /dev/null +++ b/pkgs/development/python-modules/fipy/gmsh.patch @@ -0,0 +1,182 @@ +diff --git a/fipy/meshes/gmshMesh.py b/fipy/meshes/gmshMesh.py +index fc3ff6c8..d529d532 100755 +--- a/fipy/meshes/gmshMesh.py ++++ b/fipy/meshes/gmshMesh.py +@@ -13,11 +13,11 @@ import sys + import tempfile + from textwrap import dedent + import warnings +-from distutils.version import StrictVersion + + from fipy.tools import numerix as nx + from fipy.tools import parallelComm + from fipy.tools import serialComm ++from fipy.tools.version import Version, parse_version + from fipy.tests.doctestPlus import register_skipper + + from fipy.meshes.mesh import Mesh +@@ -38,7 +38,7 @@ def _checkForGmsh(): + hasGmsh = True + try: + version = _gmshVersion(communicator=parallelComm) +- hasGmsh = version >= StrictVersion("2.0") ++ hasGmsh = version >= Version("2.0") + except Exception: + hasGmsh = False + return hasGmsh +@@ -68,6 +68,7 @@ def gmshVersion(communicator=parallelComm): + while True: + try: + # gmsh returns version in stderr (Why?!?) ++ # (newer versions of gmsh return the version in stdout) + # spyder on Windows throws + # OSError: [WinError 6] The handle is invalid + # if we don't PIPE stdout, too +@@ -77,8 +78,11 @@ def gmshVersion(communicator=parallelComm): + break + + try: +- out, verStr = p.communicate() +- verStr = verStr.decode('ascii').strip() ++ out, err = p.communicate() ++ verStr = err.decode('ascii').strip() ++ if not verStr: ++ # newer versions of gmsh return the version in stdout ++ verStr = out.decode('ascii').strip() + break + except IOError: + # some weird conflict with things like PyQT can cause +@@ -93,12 +97,12 @@ def gmshVersion(communicator=parallelComm): + def _gmshVersion(communicator=parallelComm): + version = gmshVersion(communicator) or "0.0" + try: +- version = StrictVersion(version) ++ version = parse_version(version) + except ValueError: + # gmsh returns the version string in stderr, + # which means it's often unparsable due to irrelevant warnings + # assume it's OK and move on +- version = StrictVersion("3.0") ++ version = Version("3.0") + + return version + +@@ -133,7 +137,7 @@ def openMSHFile(name, dimensions=None, coordDimensions=None, communicator=parall + + # Enforce gmsh version to be either >= 2 or 2.5, based on Nproc. + version = _gmshVersion(communicator=communicator) +- if version < StrictVersion("2.0"): ++ if version < Version("2.0"): + raise EnvironmentError("Gmsh version must be >= 2.0.") + + # If we're being passed a .msh file, leave it be. Otherwise, +@@ -176,9 +180,11 @@ def openMSHFile(name, dimensions=None, coordDimensions=None, communicator=parall + gmshFlags = ["-%d" % dimensions, "-nopopup"] + + if communicator.Nproc > 1: +- if not (StrictVersion("2.5") < version <= StrictVersion("4.0")): +- warnstr = "Cannot partition with Gmsh version < 2.5 or >= 4.0. " \ +- + "Reverting to serial." ++ if ((version < Version("2.5")) ++ or (Version("4.0") <= version < Version("4.5.2"))): ++ warnstr = ("Cannot partition with Gmsh version < 2.5 " ++ "or 4.0 <= version < 4.5.2. " ++ "Reverting to serial.") + warnings.warn(warnstr, RuntimeWarning, stacklevel=2) + communicator = serialComm + +@@ -188,13 +194,13 @@ def openMSHFile(name, dimensions=None, coordDimensions=None, communicator=parall + raise ValueError("'dimensions' must be specified to generate a mesh from a geometry script") + else: # gmsh version is adequate for partitioning + gmshFlags += ["-part", "%d" % communicator.Nproc] +- if version >= StrictVersion("4.0"): ++ if version >= Version("4.0"): + # Gmsh 4.x needs to be told to generate ghost cells +- # Unfortunately, the ghosts are broken ++ # Unfortunately, the ghosts are broken in Gmsh 4.0--4.5.1 + # https://gitlab.onelab.info/gmsh/gmsh/issues/733 + gmshFlags += ["-part_ghosts"] + +- gmshFlags += ["-format", "msh2"] ++ gmshFlags += ["-format", "msh2", "-smooth", "8"] + + if background is not None: + if communicator.procID == 0: +@@ -1387,6 +1393,11 @@ class _GmshTopology(_MeshTopology): + class Gmsh2D(Mesh2D): + """Construct a 2D Mesh using Gmsh + ++ If called in parallel, the mesh will be partitioned based on the value ++ of `parallelComm.Nproc`. If an `MSH` file is supplied, it must have ++ been previously partitioned with the number of partitions matching ++ `parallelComm.Nproc`. ++ + >>> radius = 5. + >>> side = 4. + >>> squaredCircle = Gmsh2D(''' +@@ -1875,6 +1886,11 @@ class Gmsh2D(Mesh2D): + class Gmsh2DIn3DSpace(Gmsh2D): + """Create a topologically 2D Mesh in 3D coordinates using Gmsh + ++ If called in parallel, the mesh will be partitioned based on the value ++ of `parallelComm.Nproc`. If an `MSH` file is supplied, it must have ++ been previously partitioned with the number of partitions matching ++ `parallelComm.Nproc`. ++ + Parameters + ---------- + arg : str +@@ -1959,6 +1975,11 @@ class Gmsh2DIn3DSpace(Gmsh2D): + class Gmsh3D(Mesh): + """Create a 3D Mesh using Gmsh + ++ If called in parallel, the mesh will be partitioned based on the value ++ of `parallelComm.Nproc`. If an `MSH` file is supplied, it must have ++ been previously partitioned with the number of partitions matching ++ `parallelComm.Nproc`. ++ + Parameters + ---------- + arg : str +@@ -2225,7 +2246,7 @@ class GmshGrid2D(Gmsh2D): + width = nx * dx + numLayers = int(ny / float(dy)) + +- if _gmshVersion() < StrictVersion("2.7"): ++ if _gmshVersion() < Version("2.7"): + # kludge: must offset cellSize by `eps` to work properly + eps = float(dx)/(nx * 10) + else: +@@ -2299,7 +2320,7 @@ class GmshGrid3D(Gmsh3D): + width = nx * dx + depth = nz * dz + +- if _gmshVersion() < StrictVersion("2.7"): ++ if _gmshVersion() < Version("2.7"): + # kludge: must offset cellSize by `eps` to work properly + eps = float(dx)/(nx * 10) + else: +diff --git a/fipy/tools/version.py b/fipy/tools/version.py +new file mode 100644 +index 00000000..93d89c18 +--- /dev/null ++++ b/fipy/tools/version.py +@@ -0,0 +1,18 @@ ++"""Shim for version checking ++ ++`distutils.version` is deprecated, but `packaging.version` is unavailable ++in Python 2.7 ++""" ++from __future__ import unicode_literals ++ ++__docformat__ = 'restructuredtext' ++ ++ ++__all__ = ["Version", "parse_version"] ++from future.utils import text_to_native_str ++__all__ = [text_to_native_str(n) for n in __all__] ++ ++try: ++ from packaging.version import Version, parse as parse_version ++except ImportError: ++ from distutils.version import StrictVersion as Version, StrictVersion as parse_version diff --git a/pkgs/development/python-modules/fitbit/default.nix b/pkgs/development/python-modules/fitbit/default.nix index b41ac0a4983a1..3a1c76776774a 100644 --- a/pkgs/development/python-modules/fitbit/default.nix +++ b/pkgs/development/python-modules/fitbit/default.nix @@ -1,41 +1,49 @@ { lib , buildPythonPackage , fetchFromGitHub -, coverage -, python-dateutil , freezegun , mock +, pytestCheckHook +, python-dateutil +, pythonOlder , requests-mock -, requests_oauthlib -, sphinx +, requests-oauthlib }: buildPythonPackage rec { pname = "fitbit"; version = "0.3.1"; + format = "setuptools"; - checkInputs = [ coverage freezegun mock requests-mock sphinx ]; - propagatedBuildInputs = [ python-dateutil requests_oauthlib ]; + disabled = pythonOlder "3.7"; - # The source package on PyPi is missing files required for unit testing. - # https://github.com/orcasgit/python-fitbit/issues/148 src = fetchFromGitHub { - rev = version; owner = "orcasgit"; repo = "python-fitbit"; - sha256 = "1w2lpgf6bs5nbnmslppaf4lbhr9cj6grg0a525xv41jip7iy3vfn"; + rev = version; + hash = "sha256-1u3h47lRBrJ7EUWBl5+RLGW4KHHqXqqrXbboZdy7VPA="; }; - postPatch = '' - substituteInPlace requirements/test.txt \ - --replace 'Sphinx>=1.2,<1.4' 'Sphinx' \ - --replace 'coverage>=3.7,<4.0' 'coverage' - ''; + propagatedBuildInputs = [ + python-dateutil + requests-oauthlib + ]; + + checkInputs = [ + freezegun + mock + pytestCheckHook + requests-mock + ]; + + pythonImportsCheck = [ + "fitbit" + ]; meta = with lib; { description = "Fitbit API Python Client Implementation"; - license = licenses.asl20; homepage = "https://github.com/orcasgit/python-fitbit"; + license = licenses.asl20; maintainers = with maintainers; [ delroth ]; }; } diff --git a/pkgs/development/python-modules/fivem-api/default.nix b/pkgs/development/python-modules/fivem-api/default.nix new file mode 100644 index 0000000000000..aef6fc342129f --- /dev/null +++ b/pkgs/development/python-modules/fivem-api/default.nix @@ -0,0 +1,42 @@ +{ lib +, aiohttp +, buildPythonPackage +, fetchPypi +, pythonOlder +, setuptools-scm +}: + +buildPythonPackage rec { + pname = "fivem-api"; + version = "0.1.2"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; + + src = fetchPypi { + inherit pname version; + hash = "sha256-6llrMGWbDRmysEw+B6B115hLS5xlktQEXiSHzPLbV5s="; + }; + + nativeBuildInputs = [ + setuptools-scm + ]; + + propagatedBuildInputs = [ + aiohttp + ]; + + # Module has no tests + doCheck = false; + + pythonImportsCheck = [ + "fivem" + ]; + + meta = with lib; { + description = "Module for interacting with FiveM servers"; + homepage = "https://github.com/Sander0542/fivem-api"; + license = licenses.mit; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/flake8-blind-except/default.nix b/pkgs/development/python-modules/flake8-blind-except/default.nix index ee3f46d078ca2..c25985e16819d 100644 --- a/pkgs/development/python-modules/flake8-blind-except/default.nix +++ b/pkgs/development/python-modules/flake8-blind-except/default.nix @@ -1,6 +1,7 @@ { lib , fetchPypi , buildPythonPackage +, pycodestyle , pythonOlder }: @@ -16,6 +17,10 @@ buildPythonPackage rec { hash = "sha256-8lpXWp3LPus8dgv5wi22C4taIxICJO0fqppD913X3RY="; }; + propagatedBuildInputs = [ + pycodestyle + ]; + # Module has no tests doCheck = false; diff --git a/pkgs/development/python-modules/flake8-bugbear/default.nix b/pkgs/development/python-modules/flake8-bugbear/default.nix index ef014011bdff0..a2fb820c1e5fe 100644 --- a/pkgs/development/python-modules/flake8-bugbear/default.nix +++ b/pkgs/development/python-modules/flake8-bugbear/default.nix @@ -4,19 +4,23 @@ , attrs , flake8 , pytestCheckHook +, pythonOlder , hypothesis , hypothesmith }: buildPythonPackage rec { pname = "flake8-bugbear"; - version = "22.3.23"; + version = "22.4.25"; + format = "setuptools"; + + disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "PyCQA"; repo = pname; - rev = version; - sha256 = "sha256-s1EnPM2He+R+vafu14XI1Xuft8Rg6W3vPH2Atc6N7I0="; + rev = "refs/tags/${version}"; + hash = "sha256-y/hpBlIQ3aJj3Y1snpArOCIv2w1ncQNMSYJ+G0CeM84="; }; propagatedBuildInputs = [ @@ -32,9 +36,10 @@ buildPythonPackage rec { ]; meta = with lib; { + description = "Plugin for Flake8 to find bugs and design problems"; homepage = "https://github.com/PyCQA/flake8-bugbear"; changelog = "https://github.com/PyCQA/flake8-bugbear/blob/${version}/README.rst#change-log"; - description = '' + longDescription = '' A plugin for flake8 finding likely bugs and design problems in your program. ''; diff --git a/pkgs/development/python-modules/flake8/default.nix b/pkgs/development/python-modules/flake8/default.nix index c707cb3caaa1b..73dc7403b25f4 100644 --- a/pkgs/development/python-modules/flake8/default.nix +++ b/pkgs/development/python-modules/flake8/default.nix @@ -25,7 +25,7 @@ buildPythonPackage rec { postPatch = '' substituteInPlace setup.cfg \ - --replace "pyflakes >= 2.3.0, < 2.4.0" "pyflakes >= 2.3.0, < 2.5.0" + --replace "mccabe>=0.6.0,<0.7.0" "mccabe>=0.7.0,<0.8.0" ''; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/flask-admin/default.nix b/pkgs/development/python-modules/flask-admin/default.nix index 7187e8790529c..6a1ea3991cfa3 100644 --- a/pkgs/development/python-modules/flask-admin/default.nix +++ b/pkgs/development/python-modules/flask-admin/default.nix @@ -62,6 +62,11 @@ buildPythonPackage rec { wtf-peewee ]; + disabledTests = [ + # Incompatible with werkzeug 2.1 + "test_mockview" + ]; + disabledTestPaths = [ # Tests have additional requirements "flask_admin/tests/geoa/test_basic.py" diff --git a/pkgs/development/python-modules/flask-appbuilder/default.nix b/pkgs/development/python-modules/flask-appbuilder/default.nix index 0129c98772307..1d84fb88ed7c4 100644 --- a/pkgs/development/python-modules/flask-appbuilder/default.nix +++ b/pkgs/development/python-modules/flask-appbuilder/default.nix @@ -27,7 +27,7 @@ buildPythonPackage rec { pname = "flask-appbuilder"; - version = "3.4.4"; + version = "4.0.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -35,14 +35,10 @@ buildPythonPackage rec { src = fetchPypi { pname = "Flask-AppBuilder"; inherit version; - sha256 = "sha256-uZzuvNusqMzAS/vmg3CuZ+D442J4LbFwsBboVIx/srE="; + hash = "sha256-g+iHUL83PokXPGu7HJ8ffLocQr0uGpMqS5MbfIlZZ2E="; }; - # See here: https://github.com/dpgaspar/Flask-AppBuilder/commit/7097a7b133f27c78d2b54d2a46e4a4c24478a066.patch - # https://github.com/dpgaspar/Flask-AppBuilder/pull/1610 - # The patch from the PR doesn't apply cleanly so I edited it manually. patches = [ - ./upgrade-to-flask_jwt_extended-4.patch (fetchpatch { # https://github.com/dpgaspar/Flask-AppBuilder/pull/1734 name = "flask-appbuilder-wtf3.patch"; @@ -82,16 +78,11 @@ buildPythonPackage rec { postPatch = '' substituteInPlace setup.py \ --replace "apispec[yaml]>=3.3, <4" "apispec[yaml] >=3.3" \ - --replace "Flask>=0.12, <2" "Flask" \ - --replace "Flask-Login>=0.3, <0.5" "Flask-Login >=0.3, <0.6" \ - --replace "Flask-Babel>=1, <2" "Flask-Babel >=1, <3" \ + --replace "Flask-Login>=0.3, <0.5" "Flask-Login >=0.3" \ --replace "Flask-WTF>=0.14.2, <0.15.0" "Flask-WTF" \ --replace "WTForms<3.0.0" "WTForms" \ --replace "marshmallow-sqlalchemy>=0.22.0, <0.27.0" "marshmallow-sqlalchemy" \ - --replace "Flask-JWT-Extended>=3.18, <4" "Flask-JWT-Extended>=4.1.0" \ - --replace "PyJWT>=1.7.1, <2.0.0" "PyJWT>=2.0.1" \ - --replace "prison>=0.2.1, <1.0.0" "prison" \ - --replace "SQLAlchemy<1.4.0" "SQLAlchemy" + --replace "prison>=0.2.1, <1.0.0" "prison" ''; # Majority of tests require network access or mongo diff --git a/pkgs/development/python-modules/flask-bcrypt/default.nix b/pkgs/development/python-modules/flask-bcrypt/default.nix index fd0e63d26f301..1c09b6d809c4a 100644 --- a/pkgs/development/python-modules/flask-bcrypt/default.nix +++ b/pkgs/development/python-modules/flask-bcrypt/default.nix @@ -8,13 +8,13 @@ buildPythonPackage rec { pname = "flask-bcrypt"; - version = "0.7.1"; + version = "1.0.1"; src = fetchFromGitHub { owner = "maxcountryman"; repo = pname; rev = version; - sha256 = "0036gag3nj7fzib23lbbpwhlrn1s0kkrfwk5pd90y4cjcfqh8z9x"; + sha256 = "sha256-WlIholi/nzq6Ikc0LS6FhG0Q5Kz0kvvAlA2YJ7EksZ4="; }; propagatedBuildInputs = [ @@ -23,9 +23,15 @@ buildPythonPackage rec { ]; checkPhase = '' - ${python.interpreter} test_bcrypt.py + runHook preCheck + ${python.interpreter} -m unittest discover + runHook postCheck ''; + pythonImportsCheck = [ + "flask_bcrypt" + ]; + meta = with lib; { description = "Brcrypt hashing for Flask"; homepage = "https://github.com/maxcountryman/flask-bcrypt"; diff --git a/pkgs/development/python-modules/flask-compress/default.nix b/pkgs/development/python-modules/flask-compress/default.nix index fff330946d168..26e5feca03e39 100644 --- a/pkgs/development/python-modules/flask-compress/default.nix +++ b/pkgs/development/python-modules/flask-compress/default.nix @@ -1,25 +1,43 @@ -{ lib, fetchPypi, buildPythonPackage, flask +{ lib +, fetchPypi +, buildPythonPackage +, setuptools-scm +, flask , brotli +, pytestCheckHook }: buildPythonPackage rec { - version = "1.10.1"; + version = "1.11"; pname = "Flask-Compress"; + format = "pyproject"; src = fetchPypi { inherit pname version; - sha256 = "28352387efbbe772cfb307570019f81957a13ff718d994a9125fa705efb73680"; + sha256 = "sha256-9WnzLERtayXKjjR9UAOgUxgR73MmeABbADb8HJ6xwhw="; }; - postPatch = '' - sed -i -e 's/use_scm_version=.*/version="${version}",/' setup.py - ''; + nativeBuildInputs = [ + setuptools-scm + ]; - propagatedBuildInputs = [ flask brotli ]; + propagatedBuildInputs = [ + flask + brotli + ]; + + checkInputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ + "flask_compress" + ]; meta = with lib; { description = "Compress responses in your Flask app with gzip"; - homepage = "https://libwilliam.github.io/flask-compress/"; + homepage = "https://github.com/colour-science/flask-compress"; + changelog = "https://github.com/colour-science/flask-compress/blob/v${version}/CHANGELOG.md"; license = licenses.mit; }; } diff --git a/pkgs/development/python-modules/flask-httpauth/default.nix b/pkgs/development/python-modules/flask-httpauth/default.nix index e667e08b144ac..fb313faff2396 100644 --- a/pkgs/development/python-modules/flask-httpauth/default.nix +++ b/pkgs/development/python-modules/flask-httpauth/default.nix @@ -2,14 +2,14 @@ buildPythonPackage rec { pname = "flask-httpauth"; - version = "4.5.0"; + version = "4.6.0"; disabled = python.pythonOlder "3"; src = fetchPypi { pname = "Flask-HTTPAuth"; version = version; - sha256 = "0ada63rkcvwkakjyx4ay98fjzwx5h55br12ys40ghkc5lbyl0l1r"; + sha256 = "sha256-IHbPhuhMaqRC7gM0S/91Hq4TPTWhpIkx5vmfFHFhtVs="; }; checkInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/flask-login/default.nix b/pkgs/development/python-modules/flask-login/default.nix index 3c7058c1212d8..62eb3287f8c75 100644 --- a/pkgs/development/python-modules/flask-login/default.nix +++ b/pkgs/development/python-modules/flask-login/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "flask-login"; - version = "0.5.0"; + version = "0.6.0"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -20,7 +20,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "Flask-Login"; inherit version; - sha256 = "6d33aef15b5bcead780acc339464aae8a6e28f13c90d8b1cf9de8b549d1c0b4b"; + sha256 = "sha256-qoT8+0w88JyljAjoFre85z8TSboc8T0A2N/8WHLV/PY="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/flask-paranoid/default.nix b/pkgs/development/python-modules/flask-paranoid/default.nix index 787b34a93b37f..8de346593efbe 100644 --- a/pkgs/development/python-modules/flask-paranoid/default.nix +++ b/pkgs/development/python-modules/flask-paranoid/default.nix @@ -7,13 +7,13 @@ buildPythonPackage rec { pname = "flask-paranoid"; - version = "0.2"; + version = "0.3.0"; src = fetchFromGitHub { owner = "miguelgrinberg"; repo = pname; rev = "v${version}"; - sha256 = "0WWc/ktAOuTk4A75xI1jCj/aef2+1TjLKBA9+PRfJO0="; + sha256 = "sha256-tikD8efc3Q3xIQnaC3SSBaCRQxMI1HzXxeupvYeNnE4="; }; postPatch = '' diff --git a/pkgs/development/python-modules/flask-restful/default.nix b/pkgs/development/python-modules/flask-restful/default.nix index db7a63c5ed4a2..1af875d4bbc59 100644 --- a/pkgs/development/python-modules/flask-restful/default.nix +++ b/pkgs/development/python-modules/flask-restful/default.nix @@ -20,6 +20,10 @@ buildPythonPackage rec { sha256 = "0gm5dz088v3d2k1dkcp9b3nnqpkk0fp2jly870hijj2xhc5nbv6c"; }; + patches = [ + ./werkzeug-2.1.0-compat.patch + ]; + propagatedBuildInputs = [ aniso8601 flask diff --git a/pkgs/development/python-modules/flask-restful/werkzeug-2.1.0-compat.patch b/pkgs/development/python-modules/flask-restful/werkzeug-2.1.0-compat.patch new file mode 100644 index 0000000000000..c8707b2394354 --- /dev/null +++ b/pkgs/development/python-modules/flask-restful/werkzeug-2.1.0-compat.patch @@ -0,0 +1,114 @@ +Fixes compatibility with Werkzeug 2.1.0 ported over from flask-restx#423. + +https://github.com/python-restx/flask-restx/pull/423 + +diff --git a/flask_restful/reqparse.py b/flask_restful/reqparse.py +index 9bb3099..5c59594 100644 +--- a/flask_restful/reqparse.py ++++ b/flask_restful/reqparse.py +@@ -114,7 +114,10 @@ class Argument(object): + :param request: The flask request object to parse arguments from + """ + if isinstance(self.location, six.string_types): +- value = getattr(request, self.location, MultiDict()) ++ if self.location in {"json", "get_json"}: ++ value = request.get_json(silent=True) ++ else: ++ value = getattr(request, self.location, MultiDict()) + if callable(value): + value = value() + if value is not None: +@@ -122,7 +125,10 @@ class Argument(object): + else: + values = MultiDict() + for l in self.location: +- value = getattr(request, l, None) ++ if l in {"json", "get_json"}: ++ value = request.get_json(silent=True) ++ else: ++ value = getattr(request, l, None) + if callable(value): + value = value() + if value is not None: +diff --git a/tests/test_api.py b/tests/test_api.py +index 15f12eb..9a9cceb 100644 +--- a/tests/test_api.py ++++ b/tests/test_api.py +@@ -936,7 +936,7 @@ class APITestCase(unittest.TestCase): + app = app.test_client() + resp = app.get('/api') + self.assertEqual(resp.status_code, 302) +- self.assertEqual(resp.headers['Location'], 'http://localhost/') ++ self.assertEqual(resp.headers['Location'], '/') + + def test_json_float_marshalled(self): + app = Flask(__name__) +diff --git a/tests/test_reqparse.py b/tests/test_reqparse.py +index 1d75e40..e5c586b 100644 +--- a/tests/test_reqparse.py ++++ b/tests/test_reqparse.py +@@ -23,8 +23,9 @@ class ReqParseTestCase(unittest.TestCase): + with app.app_context(): + parser = RequestParser() + parser.add_argument('foo', choices=('one', 'two'), help='Bad choice: {error_msg}') +- req = Mock(['values']) ++ req = Mock(["values", "get_json"]) + req.values = MultiDict([('foo', 'three')]) ++ req.get_json.return_value = None + parser.parse_args(req) + expected = {'foo': 'Bad choice: three is not a valid choice'} + abort.assert_called_with(400, message=expected) +@@ -35,8 +36,9 @@ class ReqParseTestCase(unittest.TestCase): + with app.app_context(): + parser = RequestParser() + parser.add_argument('foo', choices=('one', 'two'), help=u'Bad choice: {error_msg}') +- req = Mock(['values']) ++ req = Mock(["values", "get_json"]) + req.values = MultiDict([('foo', u'\xf0\x9f\x8d\x95')]) ++ req.get_json.return_value = None + parser.parse_args(req) + expected = {'foo': u'Bad choice: \xf0\x9f\x8d\x95 is not a valid choice'} + abort.assert_called_with(400, message=expected) +@@ -47,8 +49,9 @@ class ReqParseTestCase(unittest.TestCase): + with app.app_context(): + parser = RequestParser() + parser.add_argument('foo', choices=['one', 'two'], help='Please select a valid choice') +- req = Mock(['values']) ++ req = Mock(["values", "get_json"]) + req.values = MultiDict([('foo', 'three')]) ++ req.get_json.return_value = None + parser.parse_args(req) + expected = {'foo': 'Please select a valid choice'} + abort.assert_called_with(400, message=expected) +@@ -58,8 +61,9 @@ class ReqParseTestCase(unittest.TestCase): + def bad_choice(): + parser = RequestParser() + parser.add_argument('foo', choices=['one', 'two']) +- req = Mock(['values']) ++ req = Mock(["values", "get_json"]) + req.values = MultiDict([('foo', 'three')]) ++ req.get_json.return_value = None + parser.parse_args(req) + abort.assert_called_with(400, message='three is not a valid choice') + app = Flask(__name__) +@@ -190,7 +194,8 @@ class ReqParseTestCase(unittest.TestCase): + self.assertTrue(len(arg.source(req)) == 0) # yes, basically you don't find it + + def test_source_default_location(self): +- req = Mock(['values']) ++ req = Mock(['values', 'get_json']) ++ req.get_json.return_value = None + req._get_child_mock = lambda **kwargs: MultiDict() + arg = Argument('foo') + self.assertEqual(arg.source(req), req.values) +@@ -215,8 +220,9 @@ class ReqParseTestCase(unittest.TestCase): + args = parser.parse_args(req) + self.assertEqual(args['foo'], "bar") + +- req = Mock() ++ req = Mock(['get_json']) + req.values = () ++ req.get_json.return_value = None + req.json = None + req.view_args = {"foo": "bar"} + parser = RequestParser() diff --git a/pkgs/development/python-modules/flask-restx/default.nix b/pkgs/development/python-modules/flask-restx/default.nix index 42e3eabec74eb..4b88ab5645075 100644 --- a/pkgs/development/python-modules/flask-restx/default.nix +++ b/pkgs/development/python-modules/flask-restx/default.nix @@ -1,6 +1,7 @@ { lib , buildPythonPackage , fetchFromGitHub +, fetchpatch , aniso8601 , jsonschema , flask @@ -28,6 +29,20 @@ buildPythonPackage rec { sha256 = "18vrmknyxw6adn62pz3kr9kvazfgjgl4pgimdf8527fyyiwcqy15"; }; + patches = [ + # Fixes werkzeug 2.1 compatibility + (fetchpatch { + # https://github.com/python-restx/flask-restx/pull/427 + url = "https://github.com/python-restx/flask-restx/commit/bb72a51860ea8a42c928f69bdd44ad20b1f9ee7e.patch"; + hash = "sha256-DRH3lI6TV1m0Dq1VyscL7GQS26OOra9g88dXZNrNpmQ="; + }) + (fetchpatch { + # https://github.com/python-restx/flask-restx/pull/427 + url = "https://github.com/python-restx/flask-restx/commit/bb3e9dd83b9d4c0d0fa0de7d7ff713fae71eccee.patch"; + hash = "sha256-HJpjG4aQWzEPCMfbXfkw4mz5TH9d89BCvGH2dE6Jfv0="; + }) + ]; + propagatedBuildInputs = [ aniso8601 flask diff --git a/pkgs/development/python-modules/flask-seasurf/default.nix b/pkgs/development/python-modules/flask-seasurf/default.nix index ff1f97c42184a..6d09d7ec45c69 100644 --- a/pkgs/development/python-modules/flask-seasurf/default.nix +++ b/pkgs/development/python-modules/flask-seasurf/default.nix @@ -1,19 +1,29 @@ -{ lib, fetchFromGitHub, buildPythonPackage, isPy3k, flask }: +{ lib, fetchFromGitHub, buildPythonPackage, isPy3k, flask, mock, python }: buildPythonPackage rec { pname = "Flask-SeaSurf"; - version = "0.3.0"; + version = "1.1.1"; disabled = !isPy3k; src = fetchFromGitHub { owner = "maxcountryman"; repo = "flask-seasurf"; rev = version; - sha256 = "02hsvppsz1d93v641f14fdnd22gbc12ilc9k9kn7wl119n5s3pd8"; + sha256 = "sha256-L/ZUEqqHmsyXG5eShcITII36ttwQlZN5GBngo+GcCdw="; }; propagatedBuildInputs = [ flask ]; + checkInputs = [ + mock + ]; + + checkPhase = '' + runHook preCheck + ${python.interpreter} -m unittest discover + runHook postCheck + ''; + pythonImportsCheck = [ "flask_seasurf" ]; meta = with lib; { diff --git a/pkgs/development/python-modules/flask-security-too/default.nix b/pkgs/development/python-modules/flask-security-too/default.nix index ddf5aa05c493b..8379ec7bcfe4b 100644 --- a/pkgs/development/python-modules/flask-security-too/default.nix +++ b/pkgs/development/python-modules/flask-security-too/default.nix @@ -1,69 +1,103 @@ { lib , buildPythonPackage , fetchPypi -, flask + +# extras: babel +, Babel +, flask-babel + +# extras: common +, bcrypt +, bleach +, flask_mail + +# extras: fsqla +, flask_sqlalchemy +, sqlalchemy +, sqlalchemy-utils + +# extras: mfa +, cryptography +, phonenumbers +, pyqrcode + +# propagates , blinker -, setuptools -, itsdangerous -, flask_principal -, passlib , email_validator -, flask_wtf +, flask , flask_login -, pytestCheckHook -, flask_mail -, sqlalchemy -, flask_sqlalchemy +, flask_principal +, flask_wtf +, itsdangerous +, passlib + +# tests , flask-mongoengine +, mongoengine +, mongomock , peewee , pony +, pytestCheckHook , zxcvbn -, mongoengine -, cryptography -, pyqrcode -, phonenumbers -, bleach -, mongomock }: buildPythonPackage rec { pname = "flask-security-too"; - version = "4.1.2"; + version = "4.1.4"; src = fetchPypi { pname = "Flask-Security-Too"; inherit version; - sha256 = "16ws5n08vm7wsa2f7lrkxvc7jl3ah1xfylhhyzb4vvqmlk7x9hw8"; + sha256 = "sha256-j6My1CD+GY2InHlN0IXPcNqfq+ytdoDD3y+5s2o3WRI="; }; propagatedBuildInputs = [ + blinker + email_validator flask flask_login flask_principal flask_wtf - email_validator itsdangerous passlib - blinker - setuptools ]; + passthru.extras-require = { + babel = [ + Babel + flask-babel + ]; + common = [ + bcrypt + bleach + flask_mail + ]; + fsqla = [ + flask_sqlalchemy + sqlalchemy + sqlalchemy-utils + ]; + mfa = [ + cryptography + phonenumbers + pyqrcode + ]; + }; + checkInputs = [ - pytestCheckHook - flask_mail - sqlalchemy - flask_sqlalchemy flask-mongoengine + mongoengine + mongomock peewee pony + pytestCheckHook zxcvbn - mongoengine - cryptography - pyqrcode - phonenumbers - bleach - mongomock - ]; + ] + ++ passthru.extras-require.babel + ++ passthru.extras-require.common + ++ passthru.extras-require.fsqla + ++ passthru.extras-require.mfa; + pythonImportsCheck = [ "flask_security" ]; diff --git a/pkgs/development/python-modules/flask-socketio/default.nix b/pkgs/development/python-modules/flask-socketio/default.nix index 496676600fc9d..a429e81ce0fb4 100644 --- a/pkgs/development/python-modules/flask-socketio/default.nix +++ b/pkgs/development/python-modules/flask-socketio/default.nix @@ -9,13 +9,13 @@ buildPythonPackage rec { pname = "Flask-SocketIO"; - version = "5.0.1"; + version = "5.1.1"; src = fetchFromGitHub { owner = "miguelgrinberg"; repo = "Flask-SocketIO"; rev = "v${version}"; - sha256 = "01zf6cy95pgc4flgn0740z2my90l7rxwliahp6rb2xbp7rh32cng"; + sha256 = "sha256-PnNJEtcWaisOlt6OmYUl97TlZb9cK2ORvtEcmGPxSB0="; }; propagatedBuildInputs = [ @@ -28,6 +28,10 @@ buildPythonPackage rec { pytestCheckHook ]; + pytestFlagsArray = [ + "test_socketio.py" + ]; + pythonImportsCheck = [ "flask_socketio" ]; meta = with lib; { diff --git a/pkgs/development/python-modules/flask-talisman/default.nix b/pkgs/development/python-modules/flask-talisman/default.nix index b57d588247056..82f3e09b47944 100644 --- a/pkgs/development/python-modules/flask-talisman/default.nix +++ b/pkgs/development/python-modules/flask-talisman/default.nix @@ -8,11 +8,11 @@ buildPythonPackage rec { pname = "flask-talisman"; - version = "0.8.1"; + version = "1.0.0"; src = fetchPypi { inherit pname version; - sha256 = "11gjgqkpj2yqydb0pfhjyx56iy4l9szgz33vg5d7bw8vqp02wl2x"; + sha256 = "sha256-IF0958Xs+tZnyEEj9fvlgLH2jNmhsFjXNTzANI4Vsb8="; }; buildInputs = [ diff --git a/pkgs/development/python-modules/flask/default.nix b/pkgs/development/python-modules/flask/default.nix index 6c05367b3d477..997a28de1e9c0 100644 --- a/pkgs/development/python-modules/flask/default.nix +++ b/pkgs/development/python-modules/flask/default.nix @@ -3,21 +3,22 @@ , fetchPypi , asgiref , click +, importlib-metadata , itsdangerous , jinja2 , python-dotenv , werkzeug -, setuptools , pytestCheckHook +, pythonOlder }: buildPythonPackage rec { - version = "2.0.2"; + version = "2.1.1"; pname = "Flask"; src = fetchPypi { inherit pname version; - sha256 = "7b2fb8e934ddd50731893bdcdb00fc8c0315916f9fcd50d22c7cc1a95ab634e2"; + sha256 = "sha256-qMm9PlWOyZZG0Xepc5xB3x3tBilIC0yNKXVBLzyVGcg="; }; propagatedBuildInputs = [ @@ -27,11 +28,7 @@ buildPythonPackage rec { itsdangerous jinja2 werkzeug - - # required for CLI subcommand autodiscovery - # see: https://github.com/pallets/flask/blob/fdac8a5404e3e3a316568107a293f134707c75bb/src/flask/cli.py#L498 - setuptools - ]; + ] ++ lib.optional (pythonOlder "3.10") importlib-metadata; checkInputs = [ pytestCheckHook @@ -48,5 +45,6 @@ buildPythonPackage rec { Python web application frameworks. ''; license = licenses.bsd3; + maintainers = with maintainers; [ SuperSandro2000 ]; }; } diff --git a/pkgs/development/python-modules/flatbuffers/default.nix b/pkgs/development/python-modules/flatbuffers/default.nix index f697f7b8ae099..3575f1c361372 100644 --- a/pkgs/development/python-modules/flatbuffers/default.nix +++ b/pkgs/development/python-modules/flatbuffers/default.nix @@ -17,5 +17,6 @@ buildPythonPackage rec { meta = flatbuffers.meta // { description = "Python runtime library for use with the Flatbuffers serialization format"; maintainers = with lib.maintainers; [ wulfsta ]; + mainProgram = "flatc"; }; } diff --git a/pkgs/development/python-modules/flax/default.nix b/pkgs/development/python-modules/flax/default.nix index 1f1622dc1aead..1cd68790479f2 100644 --- a/pkgs/development/python-modules/flax/default.nix +++ b/pkgs/development/python-modules/flax/default.nix @@ -14,13 +14,13 @@ buildPythonPackage rec { pname = "flax"; - version = "0.4.0"; + version = "0.4.1"; src = fetchFromGitHub { owner = "google"; repo = pname; rev = "v${version}"; - sha256 = "0rvdaxyf68qmm5d77gbizpcibyz2ic2pb2x7rgf7p8qwijyc39ws"; + sha256 = "0j5ngdndm9nm49gcda7m36qzwk5lcbi4jnij9fi96vld54ip6f6v"; }; buildInputs = [ jaxlib ]; @@ -42,7 +42,11 @@ buildPythonPackage rec { pytestCheckHook tensorflow ]; - pytestFlagsArray = [ "-n $NIX_BUILD_CORES" ]; + + pytestFlagsArray = [ + "-W ignore::FutureWarning" + "-W ignore::DeprecationWarning" + ]; disabledTestPaths = [ # Docs test, needs extra deps + we're not interested in it. diff --git a/pkgs/development/python-modules/flickrapi/default.nix b/pkgs/development/python-modules/flickrapi/default.nix index d7d20f19ea7be..8ad1071cd241a 100644 --- a/pkgs/development/python-modules/flickrapi/default.nix +++ b/pkgs/development/python-modules/flickrapi/default.nix @@ -1,35 +1,66 @@ { lib , buildPythonPackage -, fetchPypi +, fetchFromGitHub , requests , requests-toolbelt -, requests_oauthlib -, pytest -, pytest-runner -, pytest-cov +, requests-oauthlib +, pytestCheckHook , responses +, pythonOlder }: buildPythonPackage rec { - pname = "flickrapi"; - version = "2.4.0"; + pname = "flickrapi"; + version = "2.4"; + format = "setuptools"; - src = fetchPypi { - inherit pname version; - sha256 = "03g2z21k6nhxgwysjrgnxj9m1yg25mnnkr10gpyfhfkd9w77pcpz"; + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "sybrenstuvel"; + repo = pname; + rev = "version-${version}"; + hash = "sha256-vRZrlXKI0UDdmDevh3XUngH4X8G3VlOCSP0z/rxhIgw="; }; - propagatedBuildInputs = [ requests requests-toolbelt requests_oauthlib ]; + propagatedBuildInputs = [ + requests + requests-toolbelt + requests-oauthlib + ]; + + checkInputs = [ + pytestCheckHook + responses + ]; + + preCheck = '' + export HOME=$(mktemp -d); + ''; + + disabledTests = [ + # Tests require network access + "test_default_format" + "test_etree_default_format" + "test_etree_format_error" + "test_etree_format_happy" + "test_explicit_format" + "test_json_callback_format" + "test_json_format" + "test_parsed_json_format" + "test_walk" + "test_xmlnode_format" + "test_xmlnode_format_error" + ]; - checkInputs = [ pytest pytest-runner pytest-cov responses ]; - doCheck = false; # Otherwise: - # ========================= no tests ran in 0.01 seconds ========================= - # builder for '/nix/store/c8a58v6aa18zci08q2l53s12ywn8jqhq-python3.6-flickrapi-2.4.0.drv' failed with exit code 5 + pythonImportsCheck = [ + "flickrapi" + ]; - meta = { + meta = with lib; { description = "A Python interface to the Flickr API"; - homepage = "https://stuvel.eu/flickrapi"; - license = lib.licenses.psfl; - maintainers = with lib.maintainers; [ obadz ]; + homepage = "https://stuvel.eu/flickrapi"; + license = licenses.psfl; + maintainers = with maintainers; [ obadz ]; }; } diff --git a/pkgs/development/python-modules/flit-core/default.nix b/pkgs/development/python-modules/flit-core/default.nix index 35bba06f1f36e..d0b83d30ea270 100644 --- a/pkgs/development/python-modules/flit-core/default.nix +++ b/pkgs/development/python-modules/flit-core/default.nix @@ -6,7 +6,7 @@ buildPythonPackage rec { pname = "flit-core"; - version = "3.6.0"; + inherit (flit) version; format = "pyproject"; outputs = [ @@ -35,7 +35,7 @@ buildPythonPackage rec { meta = with lib; { description = "Distribution-building parts of Flit. See flit package for more information"; - homepage = "https://github.com/takluyver/flit"; + homepage = "https://github.com/pypa/flit"; license = licenses.bsd3; maintainers = with maintainers; [ fridh SuperSandro2000 ]; }; diff --git a/pkgs/development/python-modules/flit/default.nix b/pkgs/development/python-modules/flit/default.nix index 830ed2702b898..598905d97ffaf 100644 --- a/pkgs/development/python-modules/flit/default.nix +++ b/pkgs/development/python-modules/flit/default.nix @@ -3,7 +3,7 @@ , fetchFromGitHub , docutils , requests -, pytest +, pytestCheckHook , testpath , responses , flit-core @@ -18,14 +18,14 @@ buildPythonPackage rec { pname = "flit"; - version = "3.6.0"; + version = "3.7.1"; format = "pyproject"; src = fetchFromGitHub { owner = "takluyver"; repo = "flit"; rev = version; - sha256 = "sha256-D3q/1g6njrrmizooGmzNd9g2nKs00dMGj9jrrv3Y6HQ="; + sha256 = "sha256-zKgaeK3fskz2TuHvIWlxBrdZIWfIJHhaqopZ3+V36wY="; }; nativeBuildInputs = [ @@ -40,18 +40,17 @@ buildPythonPackage rec { tomli-w ]; - checkInputs = [ pytest testpath responses ]; + checkInputs = [ pytestCheckHook testpath responses ]; - # Disable test that needs some ini file. - # Disable test that wants hg - checkPhase = '' - HOME=$(mktemp -d) pytest -k "not test_invalid_classifier and not test_build_sdist" - ''; + disabledTests = [ + # needs some ini file. + "test_invalid_classifier" + ]; meta = with lib; { description = "A simple packaging tool for simple packages"; - homepage = "https://github.com/takluyver/flit"; + homepage = "https://github.com/pypa/flit"; license = licenses.bsd3; - maintainers = [ maintainers.fridh ]; + maintainers = with maintainers; [ fridh SuperSandro2000 ]; }; } diff --git a/pkgs/development/python-modules/flux-led/default.nix b/pkgs/development/python-modules/flux-led/default.nix index f07efbee7f300..9e1c881805e8c 100644 --- a/pkgs/development/python-modules/flux-led/default.nix +++ b/pkgs/development/python-modules/flux-led/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "flux-led"; - version = "0.28.27"; + version = "0.28.28"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "Danielhiversen"; repo = "flux_led"; rev = version; - sha256 = "sha256-Z1NgQo4BrfdPAwoELzyjZphmuvPK/c09j/BvDOWaD9I="; + sha256 = "sha256-FtZHZ48XGo+0aP4ARSfzI9xzFVptYhG6CDVGTT4oDBQ="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/fn/default.nix b/pkgs/development/python-modules/fn/default.nix index f64d1a3d122d7..0acdf24d9542f 100644 --- a/pkgs/development/python-modules/fn/default.nix +++ b/pkgs/development/python-modules/fn/default.nix @@ -1,20 +1,34 @@ -{ lib, buildPythonPackage, fetchPypi }: +{ lib +, buildPythonPackage +, fetchpatch +, fetchPypi +}: buildPythonPackage rec { pname = "fn"; version = "0.4.3"; - meta = { + src = fetchPypi { + inherit pname version; + sha256 = "1nmsjmn8jb4gp22ksx0j0hhdf4y0zm8rjykyy2i6flzimg6q1kgq"; + }; + + patches = [ + (fetchpatch { + url = "https://github.com/kachayev/fn.py/commit/a54fc0bd8aeae277de2db726131d249ce607c0c2.patch"; + hash = "sha256-I0ZISOgVibsc1k7gwSfeW6qV9PspQqdaHlRLr/IusQ8="; + excludes = [ + "fn/monad.py" + ]; + }) + ]; + + meta = with lib; { description = '' Functional programming in Python: implementation of missing features to enjoy FP ''; homepage = "https://github.com/kachayev/fn.py"; - license = lib.licenses.asl20; - }; - - src = fetchPypi { - inherit pname version; - sha256 = "1nmsjmn8jb4gp22ksx0j0hhdf4y0zm8rjykyy2i6flzimg6q1kgq"; + license = licenses.asl20; }; } diff --git a/pkgs/development/python-modules/fontparts/default.nix b/pkgs/development/python-modules/fontparts/default.nix index 7830cb1171285..16d594eab04f6 100644 --- a/pkgs/development/python-modules/fontparts/default.nix +++ b/pkgs/development/python-modules/fontparts/default.nix @@ -1,4 +1,4 @@ -{ lib, buildPythonPackage, fetchPypi, python +{ lib, buildPythonPackage, fetchPypi, python, pythonOlder , fonttools, lxml, fs, unicodedata2 , defcon, fontpens, fontmath, booleanoperations , pytest, setuptools-scm @@ -6,11 +6,13 @@ buildPythonPackage rec { pname = "fontParts"; - version = "0.10.3"; + version = "0.10.4"; + + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "sha256-aHtjLHdc2/s3ppF8fz8qFAqxwEKMZJJAFNlBaZ7FAb4="; + sha256 = "1ic453q86s5hsw8mxnclk1vr4qp69fd67gywhv23zqwz9a7kb7lh"; extension = "zip"; }; diff --git a/pkgs/development/python-modules/fonttools/default.nix b/pkgs/development/python-modules/fonttools/default.nix index 50f5e87a29f49..a70dfef00541b 100644 --- a/pkgs/development/python-modules/fonttools/default.nix +++ b/pkgs/development/python-modules/fonttools/default.nix @@ -17,16 +17,15 @@ buildPythonPackage rec { pname = "fonttools"; - version = "4.29.0"; + version = "4.30.0"; - # Bump to 3.7 when https://github.com/fonttools/fonttools/pull/2417 is merged - disabled = pythonOlder "3.6"; + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = pname; repo = pname; rev = version; - sha256 = "LnkpTEpZbbRAyqGPJXdfpHjh4t7n6LkjZGLhirVNl7E="; + sha256 = "1y9f071bdl66rsx42j16j5v53h85xra5qlg860rz3m054s2rmin9"; }; # all dependencies are optional, but diff --git a/pkgs/development/python-modules/freezegun/default.nix b/pkgs/development/python-modules/freezegun/default.nix index 2ffefa1a4e095..171d2b0556aba 100644 --- a/pkgs/development/python-modules/freezegun/default.nix +++ b/pkgs/development/python-modules/freezegun/default.nix @@ -1,21 +1,23 @@ { lib , buildPythonPackage -, pythonOlder -, pythonAtLeast , fetchpatch , fetchPypi -, python-dateutil , pytestCheckHook +, python-dateutil +, pythonAtLeast +, pythonOlder }: buildPythonPackage rec { pname = "freezegun"; - version = "1.1.0"; - disabled = pythonOlder "3.5"; + version = "1.2.1"; + format = "setuptools"; + + disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "177f9dd59861d871e27a484c3332f35a6e3f5d14626f2bf91be37891f18927f3"; + hash = "sha256-tMZO+ydea8aNxudxsX/+D/D5C4GipRiQQ1ULZRmSa6Q="; }; patches = lib.optionals (pythonAtLeast "3.10") [ @@ -26,13 +28,22 @@ buildPythonPackage rec { }) ]; - propagatedBuildInputs = [ python-dateutil ]; - checkInputs = [ pytestCheckHook ]; + propagatedBuildInputs = [ + python-dateutil + ]; + + checkInputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ + "freezegun" + ]; meta = with lib; { - description = "FreezeGun: Let your Python tests travel through time"; + description = "Library that allows your Python tests to travel through time"; homepage = "https://github.com/spulec/freezegun"; license = licenses.asl20; + maintainers = with maintainers; [ fab ]; }; - } diff --git a/pkgs/development/python-modules/fs/default.nix b/pkgs/development/python-modules/fs/default.nix index 0ab3778f55cf4..6915ba8d050c9 100644 --- a/pkgs/development/python-modules/fs/default.nix +++ b/pkgs/development/python-modules/fs/default.nix @@ -20,11 +20,11 @@ buildPythonPackage rec { pname = "fs"; - version = "2.4.14"; + version = "2.4.15"; src = fetchPypi { inherit pname version; - sha256 = "9555dc2bc58c58cac03478ac7e9f622d29fe2d20a4384c24c90ab50de2c7b36c"; + sha256 = "sha256-sJ0CwxH0rdHm4rdXJMRQ6vz+7MkXV5IkyorSHazQoYI="; }; buildInputs = [ glibcLocales ]; diff --git a/pkgs/development/python-modules/ftfy/default.nix b/pkgs/development/python-modules/ftfy/default.nix index 5ea93ec179ecb..d214cb4f0a437 100644 --- a/pkgs/development/python-modules/ftfy/default.nix +++ b/pkgs/development/python-modules/ftfy/default.nix @@ -8,13 +8,13 @@ buildPythonPackage rec { pname = "ftfy"; - version = "6.0.3"; + version = "6.1.1"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "ba71121a9c8d7790d3e833c6c1021143f3e5c4118293ec3afb5d43ed9ca8e72b"; + sha256 = "sha256-v8IBn4T82FFBkVIyCmN1YEoPFFnCgbWxmbLNDS5yf48="; }; propagatedBuildInputs = [ @@ -29,6 +29,12 @@ buildPythonPackage rec { export PATH=$out/bin:$PATH ''; + disabledTestPaths = [ + # Calls poetry and fails to match output exactly + "tests/test_cli.py" + ]; + + meta = with lib; { description = "Given Unicode text, make its representation consistent and possibly less broken"; homepage = "https://github.com/LuminosoInsight/python-ftfy"; diff --git a/pkgs/development/python-modules/funcparserlib/default.nix b/pkgs/development/python-modules/funcparserlib/default.nix index 3ace04b108d44..ba535146cf25b 100644 --- a/pkgs/development/python-modules/funcparserlib/default.nix +++ b/pkgs/development/python-modules/funcparserlib/default.nix @@ -6,6 +6,7 @@ , python , pytestCheckHook , pythonOlder +, six }: buildPythonPackage rec { @@ -28,6 +29,7 @@ buildPythonPackage rec { checkInputs = [ pytestCheckHook + six ]; patches = [ diff --git a/pkgs/development/python-modules/furo/default.nix b/pkgs/development/python-modules/furo/default.nix index 615bf3ebe9c02..60fbc917f7d95 100644 --- a/pkgs/development/python-modules/furo/default.nix +++ b/pkgs/development/python-modules/furo/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "furo"; - version = "2022.3.4"; + version = "2022.4.7"; format = "wheel"; disable = pythonOlder "3.6"; @@ -16,7 +16,7 @@ buildPythonPackage rec { inherit pname version format; dist = "py3"; python = "py3"; - sha256 = "sha256-bHGCk+v4d1XwufFIseaXyeOqvXr5VWRNS8ruXOddt4E="; + sha256 = "sha256-fz49L7l3SDWQ+Oyyws1RG9gmYbecGO+yTelVi8nN8tc="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/fuse-python/default.nix b/pkgs/development/python-modules/fuse-python/default.nix index f1bf6e39a069b..46cf6ec53459b 100644 --- a/pkgs/development/python-modules/fuse-python/default.nix +++ b/pkgs/development/python-modules/fuse-python/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "fuse-python"; - version = "1.0.4"; + version = "1.0.5"; src = fetchPypi { inherit pname version; - sha256 = "b9a69c38b3909ffd35d77cb1a73ebfdc3a103a6d4cdd20c86c70ed1141771580"; + sha256 = "sha256-dOX/szaCu6mlrypaBI9Ht+e0ZOv4QpG/WiWL+60Do6o="; }; buildInputs = [ fuse ]; diff --git a/pkgs/development/python-modules/gattlib/default.nix b/pkgs/development/python-modules/gattlib/default.nix new file mode 100644 index 0000000000000..c7450d6b6b5b8 --- /dev/null +++ b/pkgs/development/python-modules/gattlib/default.nix @@ -0,0 +1,68 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, substituteAll + +# build +, pkg-config +, glibc +, python + +# runtime +, bluez +, boost +, glib + +}: + +let + pname = "gattlib"; + version = "unstable-2021-06-16"; +in +buildPythonPackage { + inherit pname version; + format = "setuptools"; + + + src = fetchFromGitHub { + owner = "oscaracena"; + repo = "pygattlib"; + rev = "7bdb229124fe7d9f4a2cc090277b0fdef82e2a56"; + hash = "sha256-PS5DIH1JuH2HweyebLLM+UNFGY/XsjKIrsD9x7g7yMI="; + }; + + patches = [ + (substituteAll { + src = ./setup.patch; + boost_version = let + pythonVersion = with lib.versions; "${major python.version}${minor python.version}"; + in + "boost_python${pythonVersion}"; + }) + ]; + + nativeBuildInputs = [ + pkg-config + glibc + ]; + + buildInputs = [ + bluez + boost + glib + ]; + + # has no tests + doCheck = false; + + pythonImportsCheck = [ + "gattlib" + ]; + + meta = with lib; { + description = "Python library to use the GATT Protocol for Bluetooth LE devices"; + homepage = "https://github.com/oscaracena/pygattlib"; + license = licenses.asl20; + maintainers = with maintainers; [ hexa ]; + }; +} diff --git a/pkgs/development/python-modules/gattlib/setup.patch b/pkgs/development/python-modules/gattlib/setup.patch new file mode 100644 index 0000000000000..32c3b1be496d1 --- /dev/null +++ b/pkgs/development/python-modules/gattlib/setup.patch @@ -0,0 +1,18 @@ +diff --git a/setup.py b/setup.py +index 0825241..389a59e 100755 +--- a/setup.py ++++ b/setup.py +@@ -11,12 +11,7 @@ extension_modules = [] + + + def get_boost_version(out=None): +- if out is None: +- out = subprocess.check_output( +- r"ldconfig -p | grep -E 'libboost_python.*\.so '", shell=True) +- +- ver = os.path.splitext(out.split()[0][3:])[0].decode() +- return ver ++ return "@boost_version@" + + def tests(): + # case: python3-py3x.so diff --git a/pkgs/development/python-modules/gb-io/default.nix b/pkgs/development/python-modules/gb-io/default.nix new file mode 100644 index 0000000000000..e61248cecf93d --- /dev/null +++ b/pkgs/development/python-modules/gb-io/default.nix @@ -0,0 +1,45 @@ +{ lib +, fetchFromGitHub +, buildPythonPackage +, rustPlatform +, setuptools-rust +}: + +buildPythonPackage rec { + pname = "gb-io"; + version = "0.1.1"; + + src = fetchFromGitHub { + owner = "althonos"; + repo = "gb-io.py"; + rev = "v${version}"; + sha256 = "05fpz11rqqjrb8lc8id6ssv7sni9i1h7x1ra5v5flw9ghpf29ncm"; + }; + + cargoDeps = rustPlatform.fetchCargoTarball { + inherit src sourceRoot; + name = "${pname}-${version}"; + sha256 = "1qh31jysg475f2qc70b3bczmzywmg9987kn2vsmk88h8sx4nnwc5"; + }; + + sourceRoot = "source"; + + nativeBuildInputs = [ setuptools-rust ] ++ (with rustPlatform; [ + cargoSetupHook + rust.cargo + rust.rustc + ]); + + checkPhase = '' + python -m unittest discover + ''; + + pythonImportsCheck = [ "gb_io" ]; + + meta = with lib; { + homepage = "https://github.com/althonos/gb-io.py"; + description = "A Python interface to gb-io, a fast GenBank parser written in Rust"; + license = licenses.mit; + maintainers = with lib.maintainers; [ dlesl ]; + }; +} diff --git a/pkgs/development/python-modules/genshi/default.nix b/pkgs/development/python-modules/genshi/default.nix index c476960bbf836..be6abbd836443 100644 --- a/pkgs/development/python-modules/genshi/default.nix +++ b/pkgs/development/python-modules/genshi/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "Genshi"; - version = "0.7.5"; + version = "0.7.6"; src = fetchPypi { inherit pname version; - sha256 = "c12d6c2abf7df0ec661d9ff2e197522eae846e43dc58abd5a36443d05bc41135"; + sha256 = "sha256-NKLOi4DoQ/Ygxbe35ZqqNip2zpdkpvEQMig+2UWMOlk="; }; # FAIL: test_sanitize_remove_script_elem (genshi.filters.tests.html.HTMLSanitizerTestCase) diff --git a/pkgs/development/python-modules/geoalchemy2/default.nix b/pkgs/development/python-modules/geoalchemy2/default.nix index 15ba87400e33e..9260bb6e3c394 100644 --- a/pkgs/development/python-modules/geoalchemy2/default.nix +++ b/pkgs/development/python-modules/geoalchemy2/default.nix @@ -11,12 +11,12 @@ buildPythonPackage rec { pname = "GeoAlchemy2"; - version = "0.10.2"; + version = "0.11.1"; format = "setuptools"; src = fetchPypi { inherit pname version; - sha256 = "3db833746e11bc802b754751ec94eaab81009a9ad8fe647d461fe76d1a47a3fd"; + sha256 = "sha256-+SoPrdtbdDhNu/PHAAQzNYzo4HoYD+HWwoQ+qgQ3/wg="; }; nativeBuildInputs = [ @@ -34,6 +34,12 @@ buildPythonPackage rec { pytestCheckHook ]; + pytestFlagsArray = [ + # tests require live postgis database + "--deselect=tests/test_pickle.py::TestPickle::test_pickle_unpickle" + "--deselect=tests/gallery/test_specific_compilation.py::test_specific_compilation" + ]; + disabledTestPaths = [ # tests require live postgis database "tests/gallery/test_decipher_raster.py" @@ -41,6 +47,11 @@ buildPythonPackage rec { "tests/gallery/test_summarystatsagg.py" "tests/gallery/test_type_decorator.py" "tests/test_functional.py" + "tests/test_functional_postgresql.py" + ]; + + pythonImportsCheck = [ + "geoalchemy2" ]; meta = with lib; { diff --git a/pkgs/development/python-modules/geocachingapi/default.nix b/pkgs/development/python-modules/geocachingapi/default.nix index 952457c5360d9..9d75727317887 100644 --- a/pkgs/development/python-modules/geocachingapi/default.nix +++ b/pkgs/development/python-modules/geocachingapi/default.nix @@ -3,19 +3,23 @@ , backoff , buildPythonPackage , fetchFromGitHub +, pythonOlder , setuptools-scm , yarl }: buildPythonPackage rec { pname = "geocachingapi"; - version = "0.1.0"; + version = "0.2.1"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "Sholofly"; repo = "geocachingapi-python"; - rev = version; - sha256 = "1vdknsxd7rvw6g5lwxlxj97l9ic8cch8rdki3aczs6xzw5adxhcs"; + rev = "refs/tags/${version}"; + sha256 = "sha256-36CkbwRDpMTprsZuPJ9khSrzqLb2Sz7iCvXtJ46uTL0="; }; nativeBuildInputs = [ @@ -33,7 +37,9 @@ buildPythonPackage rec { # Tests require a token and network access doCheck = false; - pythonImportsCheck = [ "geocachingapi" ]; + pythonImportsCheck = [ + "geocachingapi" + ]; meta = with lib; { description = "Python API to control the Geocaching API"; diff --git a/pkgs/development/python-modules/geopandas/default.nix b/pkgs/development/python-modules/geopandas/default.nix index b62b2c67ef781..9bacb9fd818c6 100644 --- a/pkgs/development/python-modules/geopandas/default.nix +++ b/pkgs/development/python-modules/geopandas/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchFromGitHub, pythonOlder +{ lib, stdenv, buildPythonPackage, fetchFromGitHub, fetchpatch, pythonOlder , pandas, shapely, fiona, pyproj , pytestCheckHook, Rtree }: @@ -14,6 +14,19 @@ buildPythonPackage rec { sha256 = "14azl3gppqn90k8h4hpjilsivj92k6p1jh7mdr6p4grbww1b7sdq"; }; + patches = [ + # Fixes a test, will be included in the next release after 0.10.2 + (fetchpatch { + url = "https://github.com/geopandas/geopandas/pull/2219/commits/ac67515c9df745b672cca1669adf05eaf5cb0f3b.patch"; + sha256 = "sha256-XcaoFhD6Rq0nfEpMbOJiAWPbaPDrMwFwoyppayq8NHc="; + }) + # 5 commits from post 0.10.2 that fix the test suite compatibility with pandas >=1.4 + (fetchpatch { + url = "https://github.com/geopandas/geopandas/pull/2289.patch"; + sha256 = "sha256-BcZVdaO/DdpZoVGUWaw9etFvvgwizAgrkaBISEOhV4A="; + }) + ]; + propagatedBuildInputs = [ pandas shapely diff --git a/pkgs/development/python-modules/ghapi/default.nix b/pkgs/development/python-modules/ghapi/default.nix index 428215eeee595..3c648b4a45600 100644 --- a/pkgs/development/python-modules/ghapi/default.nix +++ b/pkgs/development/python-modules/ghapi/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "ghapi"; - version = "0.1.19"; + version = "0.1.20"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "fastai"; repo = "ghapi"; rev = version; - sha256 = "sha256-UV2cfotRad9jg/X3pOysKJyMi4/XKt24kf6F4aw4vcI="; + sha256 = "sha256-Pry+qCHCt+c+uwkLaoTVUY1KblESj6kcNtMfGwK1rfk="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/gidgethub/default.nix b/pkgs/development/python-modules/gidgethub/default.nix index 691af2eda8497..9d1fdc07d9017 100644 --- a/pkgs/development/python-modules/gidgethub/default.nix +++ b/pkgs/development/python-modules/gidgethub/default.nix @@ -16,13 +16,13 @@ buildPythonPackage rec { pname = "gidgethub"; - version = "5.0.1"; + version = "5.1.0"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "3efbd6998600254ec7a2869318bd3ffde38edc3a0d37be0c14bc46b45947b682"; + sha256 = "sha256-kNGTb6mA2XBaljYvpOWaKFEks3NigsiPgmdIgSMKTiU="; }; nativeBuildInputs = [ setuptools pytest-runner ]; diff --git a/pkgs/development/python-modules/gipc/default.nix b/pkgs/development/python-modules/gipc/default.nix index 2bab62fbcb109..85d17ee3ab8a2 100644 --- a/pkgs/development/python-modules/gipc/default.nix +++ b/pkgs/development/python-modules/gipc/default.nix @@ -27,8 +27,6 @@ buildPythonPackage rec { ''; homepage = "http://gehrcke.de/gipc"; license = licenses.mit; - # gipc only has support for older versions of gevent - broken = versionOlder "1.6" gevent.version; }; } diff --git a/pkgs/development/python-modules/git-annex-adapter/default.nix b/pkgs/development/python-modules/git-annex-adapter/default.nix index d41874cff3b52..bcc4148c19537 100644 --- a/pkgs/development/python-modules/git-annex-adapter/default.nix +++ b/pkgs/development/python-modules/git-annex-adapter/default.nix @@ -22,6 +22,10 @@ buildPythonPackage rec { url = "https://github.com/alpernebbi/git-annex-adapter/commit/6c210d828e8a57b12c716339ad1bf15c31cd4a55.patch"; sha256 = "17kp7pnm9svq9av4q7hfic95xa1w3z02dnr8nmg14sjck2rlmqsi"; }) + (fetchpatch { + url = "https://github.com/alpernebbi/git-annex-adapter/commit/b78a8f445f1fb5cf34b28512fc61898ef166b5a1.patch"; + hash = "sha256-BSVoOPWsgY1btvn68bco4yb90FAC7ay2kYZ+q9qDHHw="; + }) (substituteAll { src = ./git-annex-path.patch; gitAnnex = "${git-annex}/bin/git-annex"; diff --git a/pkgs/development/python-modules/github3_py/default.nix b/pkgs/development/python-modules/github3_py/default.nix index 1f5c983e14f38..67e1868fb8b1a 100644 --- a/pkgs/development/python-modules/github3_py/default.nix +++ b/pkgs/development/python-modules/github3_py/default.nix @@ -18,11 +18,11 @@ buildPythonPackage rec { pname = "github3.py"; - version = "3.0.0"; + version = "3.2.0"; src = fetchPypi { inherit pname version; - sha256 = "a9134cb9efd334b1644ad7c5ee3ff3ff488317c4549ffc0e8d82e4d63383a1a4"; + sha256 = "sha256-Cbcr4Ul9NGsJaM3oNgoNavedwgbQFJpjzT7IbGXDd8w="; }; checkInputs = [ betamax pytest betamax-matchers ] diff --git a/pkgs/development/python-modules/glad/default.nix b/pkgs/development/python-modules/glad/default.nix new file mode 100644 index 0000000000000..9d05720d84dfd --- /dev/null +++ b/pkgs/development/python-modules/glad/default.nix @@ -0,0 +1,18 @@ +{ buildPythonPackage, fetchPypi, lib }: + +buildPythonPackage rec { + pname = "glad"; + version = "0.1.36"; + + src = fetchPypi { + inherit pname version; + sha256 = "sha256-P7ANv+x65t2+ugTiFUf2fzzPx5X8NFYkUM8/K7Gf28c="; + }; + + meta = with lib; { + description = "Multi-Language Vulkan/GL/GLES/EGL/GLX/WGL Loader-Generator based on the official specs"; + homepage = "https://github.com/Dav1dde/glad"; + license = licenses.mit; + maintainers = with maintainers; [ superherointj ]; + }; +} diff --git a/pkgs/development/python-modules/glcontext/default.nix b/pkgs/development/python-modules/glcontext/default.nix index fe25277e8cdac..a9306c1818645 100644 --- a/pkgs/development/python-modules/glcontext/default.nix +++ b/pkgs/development/python-modules/glcontext/default.nix @@ -8,13 +8,13 @@ buildPythonPackage rec { pname = "glcontext"; - version = "2.3.5"; + version = "2.3.6"; src = fetchFromGitHub { owner = "moderngl"; repo = pname; - rev = version; - sha256 = "sha256-wvoIfwd0UBooqbJGshADjf96Xqx2k9G1nN3Dy6v3GIY="; + rev = "refs/tags/${version}"; + sha256 = "sha256-fE1fyoKQz1jmTBcAz2CbkLjRfgN5QedpMOLMU8keIZs="; }; disabled = !isPy3k; diff --git a/pkgs/development/python-modules/glean-parser/default.nix b/pkgs/development/python-modules/glean-parser/default.nix index 704c556c00334..3cb8d83b7c8d5 100644 --- a/pkgs/development/python-modules/glean-parser/default.nix +++ b/pkgs/development/python-modules/glean-parser/default.nix @@ -26,6 +26,12 @@ buildPythonPackage rec { hash = "sha256-PjOMNUnrz0kDfYEXv5Ni/9RIHn4Yylle6NJOK1Rb3SY="; }; + postPatch = '' + substituteInPlace setup.py \ + --replace "pytest-runner" "" \ + --replace "MarkupSafe==2.0.1" "MarkupSafe" + ''; + nativeBuildInputs = [ setuptools-scm ]; @@ -44,11 +50,6 @@ buildPythonPackage rec { pytestCheckHook ]; - postPatch = '' - substituteInPlace setup.py \ - --replace "pytest-runner" "" - ''; - disabledTests = [ # https://bugzilla.mozilla.org/show_bug.cgi?id=1741668 "test_validate_ping" diff --git a/pkgs/development/python-modules/glfw/default.nix b/pkgs/development/python-modules/glfw/default.nix index e9587d0b765ca..accd8fcf5b915 100644 --- a/pkgs/development/python-modules/glfw/default.nix +++ b/pkgs/development/python-modules/glfw/default.nix @@ -2,13 +2,13 @@ buildPythonPackage rec { pname = "glfw"; - version = "2.5.1"; + version = "2.5.3"; src = fetchFromGitHub { owner = "FlorianRhiem"; repo = "pyGLFW"; - rev = "v${version}"; - sha256 = "sha256-XR6TqIrbCR93Qe9cRMgJ0aT/6ZZFj+6Mz+9GhiMD8lM="; + rev = "refs/tags/v${version}"; + sha256 = "sha256-LaK/lYCUN7PDy8QsaGCnQPM1nvQNeBRTdEEkKtaMUHA="; }; # Patch path to GLFW shared object diff --git a/pkgs/development/python-modules/globus-sdk/default.nix b/pkgs/development/python-modules/globus-sdk/default.nix index 6895db19abc12..88a2c49e0520b 100644 --- a/pkgs/development/python-modules/globus-sdk/default.nix +++ b/pkgs/development/python-modules/globus-sdk/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "globus-sdk"; - version = "3.6.0"; + version = "3.7.0"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -21,8 +21,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "globus"; repo = "globus-sdk-python"; - rev = version; - hash = "sha256-SBLQ+uSZE8YkT+fQWIKGlfhocJXX5k9kSejAbjazjM8="; + rev = "refs/tags/${version}"; + hash = "sha256-Us3SCkrBPL3v9YCOQ7ceF3neCUZkJTrchYsvCRSX84Y="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/google-api-core/default.nix b/pkgs/development/python-modules/google-api-core/default.nix index 468b2476de9b5..b5a9bfea212f5 100644 --- a/pkgs/development/python-modules/google-api-core/default.nix +++ b/pkgs/development/python-modules/google-api-core/default.nix @@ -16,14 +16,14 @@ buildPythonPackage rec { pname = "google-api-core"; - version = "2.5.0"; + version = "2.7.1"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "sha256-8zhjpnCWUXA7ixi2cJNRSDjHnysE0CqlASAwefJLgBg="; + sha256 = "sha256-sPpXflEvDI4GM4a5dHGLhhRYanmMWJTtNL7fJW2driQ="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/google-api-python-client/default.nix b/pkgs/development/python-modules/google-api-python-client/default.nix index 772f45411d397..bce1897eac565 100644 --- a/pkgs/development/python-modules/google-api-python-client/default.nix +++ b/pkgs/development/python-modules/google-api-python-client/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "google-api-python-client"; - version = "2.35.0"; + version = "2.42.0"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "038b12979ea86ef0e33962bd33f955c337bc28f0471522bd27a801d52bfb4ae2"; + sha256 = "sha256-e/WLZltjXQattHeXqaT3NILnOeAu0DbNlg3HwYM2H2c="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/google-auth-oauthlib/default.nix b/pkgs/development/python-modules/google-auth-oauthlib/default.nix index 6ee0cb0654010..449a07ea40cbd 100644 --- a/pkgs/development/python-modules/google-auth-oauthlib/default.nix +++ b/pkgs/development/python-modules/google-auth-oauthlib/default.nix @@ -6,12 +6,16 @@ , mock , pytestCheckHook , google-auth -, requests_oauthlib +, requests-oauthlib +, pythonOlder }: buildPythonPackage rec { pname = "google-auth-oauthlib"; version = "0.5.1"; + format = "setuptools"; + + disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; @@ -20,7 +24,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ google-auth - requests_oauthlib + requests-oauthlib ]; checkInputs = [ @@ -29,7 +33,13 @@ buildPythonPackage rec { pytestCheckHook ]; - disabledTests = lib.optionals stdenv.isDarwin [ "test_run_local_server" ]; + disabledTests = lib.optionals stdenv.isDarwin [ + "test_run_local_server" + ]; + + pythonImportsCheck = [ + "google_auth_oauthlib" + ]; meta = with lib; { description = "Google Authentication Library: oauthlib integration"; diff --git a/pkgs/development/python-modules/google-cloud-bigquery-storage/default.nix b/pkgs/development/python-modules/google-cloud-bigquery-storage/default.nix new file mode 100644 index 0000000000000..1b59bc8ddbf81 --- /dev/null +++ b/pkgs/development/python-modules/google-cloud-bigquery-storage/default.nix @@ -0,0 +1,48 @@ +{ lib +, buildPythonPackage +, fetchPypi +, google-api-core +, google-auth +, google-cloud-bigquery +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "google-cloud-bigquery-storage"; + version = "2.13.1"; + + src = fetchPypi { + inherit pname version; + sha256 = "7a25148f635a04ca9ff568d47e64be275d3a4a3c90772524879e8f88f270d92d"; + }; + + propagatedBuildInputs = [ + google-api-core + ]; + + checkInputs = [ + google-auth + google-cloud-bigquery + pytestCheckHook + ]; + + # dependency loop with google-cloud-bigquery + doCheck = false; + + preCheck = '' + rm -r google + ''; + + pythonImportsCheck = [ + "google.cloud.bigquery_storage" + "google.cloud.bigquery_storage_v1" + "google.cloud.bigquery_storage_v1beta2" + ]; + + meta = with lib; { + description = "BigQuery Storage API API client library"; + homepage = "https://github.com/googleapis/python-bigquery-storage"; + license = licenses.asl20; + maintainers = with maintainers; [ SuperSandro2000 ]; + }; +} diff --git a/pkgs/development/python-modules/google-cloud-bigquery/default.nix b/pkgs/development/python-modules/google-cloud-bigquery/default.nix index 86ac3048e0ab9..3a5142a9ceffe 100644 --- a/pkgs/development/python-modules/google-cloud-bigquery/default.nix +++ b/pkgs/development/python-modules/google-cloud-bigquery/default.nix @@ -2,7 +2,9 @@ , buildPythonPackage , fetchPypi , pytestCheckHook +, db-dtypes , freezegun +, google-cloud-bigquery-storage , google-cloud-core , google-cloud-datacatalog , google-cloud-storage @@ -18,22 +20,24 @@ buildPythonPackage rec { pname = "google-cloud-bigquery"; - version = "2.34.2"; + version = "3.0.1"; format = "setuptools"; src = fetchPypi { inherit pname version; - sha256 = "sha256-DriC3zCgD1oe89M5ojpnAjCACyqySUWVkafmharWcU8="; + sha256 = "sha256-UmW6BEV44Ucdg/hUGSQk/kyDnB+Hsyx4q3AXTQe89hI="; }; propagatedBuildInputs = [ - google-resumable-media google-cloud-core + google-cloud-bigquery-storage + google-resumable-media proto-plus pyarrow ]; checkInputs = [ + db-dtypes freezegun google-cloud-testutils ipython @@ -54,8 +58,8 @@ buildPythonPackage rec { # requires credentials "test_bigquery_magic" "TestBigQuery" + "test_context_with_no_query_cache_from_context" "test_arrow_extension_types_same_for_storage_and_REST_APIs_894" - "test_query_retry_539" "test_list_rows_empty_table" "test_list_rows_page_size" "test_list_rows_scalars" @@ -75,6 +79,13 @@ buildPythonPackage rec { "test__initiate_resumable_upload_with_retry" ]; + disabledTestPaths = [ + # requires credentials + "tests/system/test_query.py" + "tests/system/test_job_retry.py" + "tests/system/test_pandas.py" + ]; + pythonImportsCheck = [ "google.cloud.bigquery" "google.cloud.bigquery_v2" diff --git a/pkgs/development/python-modules/google-cloud-bigtable/default.nix b/pkgs/development/python-modules/google-cloud-bigtable/default.nix index 9763cd4e0ba32..1fbe806db3c49 100644 --- a/pkgs/development/python-modules/google-cloud-bigtable/default.nix +++ b/pkgs/development/python-modules/google-cloud-bigtable/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "google-cloud-bigtable"; - version = "2.7.1"; + version = "2.8.1"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-TUMgrv1JNt8h6DzCNtk0Fm4LQFC73/FNfpgTs9jhkYs="; + hash = "sha256-Gy/CS06uGQyQoPLjm8ChR6MkO6CYkpC/n5wM/VncDDs="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/google-cloud-dataproc/default.nix b/pkgs/development/python-modules/google-cloud-dataproc/default.nix index d8451ec097ccd..88d4e0bd6620c 100644 --- a/pkgs/development/python-modules/google-cloud-dataproc/default.nix +++ b/pkgs/development/python-modules/google-cloud-dataproc/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "google-cloud-dataproc"; - version = "4.0.1"; + version = "4.0.2"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "sha256-IAnsz7UxMf3GqaPYPltis0WWPM+IIWwpK1iTSV7Kl5c="; + sha256 = "sha256-C2hAkWSb3h+lFC3pUIHlttme44Ugfae8opmFQbVWYTE="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/google-cloud-error-reporting/default.nix b/pkgs/development/python-modules/google-cloud-error-reporting/default.nix index 9c5af01714c5f..7ae7babaebf54 100644 --- a/pkgs/development/python-modules/google-cloud-error-reporting/default.nix +++ b/pkgs/development/python-modules/google-cloud-error-reporting/default.nix @@ -8,22 +8,21 @@ , mock , proto-plus , pytest-asyncio +, pythonOlder }: buildPythonPackage rec { pname = "google-cloud-error-reporting"; - version = "1.5.1"; + version = "1.5.2"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "sha256-7gFpvFxtYneABxW2mOwW1V2E7kobmj0yzV0pxaRhs8c="; + hash = "sha256-wjRUPBZwyGP+2528vZ/x4EqiZwqH+9ZvK5rx4ISklHE="; }; - postPatch = '' - substituteInPlace setup.py \ - --replace 'google-cloud-logging>=1.14.0, <2.4' 'google-cloud-logging>=1.14.0' - ''; - propagatedBuildInputs = [ google-cloud-logging libcst diff --git a/pkgs/development/python-modules/google-cloud-pubsub/default.nix b/pkgs/development/python-modules/google-cloud-pubsub/default.nix index 5f9fdb2833d20..9ba7f9145e30f 100644 --- a/pkgs/development/python-modules/google-cloud-pubsub/default.nix +++ b/pkgs/development/python-modules/google-cloud-pubsub/default.nix @@ -10,16 +10,19 @@ , mock , proto-plus , pytest-asyncio +, pythonOlder }: buildPythonPackage rec { pname = "google-cloud-pubsub"; - version = "2.11.0"; + version = "2.12.0"; format = "setuptools"; + disabled = pythonOlder "3.6"; + src = fetchPypi { inherit pname version; - sha256 = "sha256-btPJ2X+I0f8C3YDB9bZwPv7HWnqsq9koWsT+CyK1AgM="; + hash = "sha256-5RoIpyVm/y2+6pN4mJPWHbVUwxH6yWI/vIuCVNJU2aw="; }; propagatedBuildInputs = [ @@ -47,7 +50,9 @@ buildPythonPackage rec { "tests/unit/pubsub_v1" ]; - pythonImportsCheck = [ "google.cloud.pubsub" ]; + pythonImportsCheck = [ + "google.cloud.pubsub" + ]; meta = with lib; { description = "Google Cloud Pub/Sub API client library"; diff --git a/pkgs/development/python-modules/google-cloud-secret-manager/default.nix b/pkgs/development/python-modules/google-cloud-secret-manager/default.nix index f7c79521b6323..76c686c951ad0 100644 --- a/pkgs/development/python-modules/google-cloud-secret-manager/default.nix +++ b/pkgs/development/python-modules/google-cloud-secret-manager/default.nix @@ -8,15 +8,19 @@ , proto-plus , pytestCheckHook , pytest-asyncio +, pythonOlder }: buildPythonPackage rec { pname = "google-cloud-secret-manager"; - version = "2.9.2"; + version = "2.10.0"; + format = "setuptools"; + + disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "sha256-W93SDJR8bUPQX9KzoZ6YvV9kU+Twd9huH09Smap481g="; + hash = "sha256-nQfdej2SveO0Qxam57ZRAyTQ0NnGoyb4nx2YFnqtAhI="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/google-cloud-testutils/default.nix b/pkgs/development/python-modules/google-cloud-testutils/default.nix index d4551b4954a5e..c5d02926f507f 100644 --- a/pkgs/development/python-modules/google-cloud-testutils/default.nix +++ b/pkgs/development/python-modules/google-cloud-testutils/default.nix @@ -1,4 +1,4 @@ -{ lib, buildPythonPackage, fetchPypi, click, google-auth, six }: +{ lib, buildPythonPackage, fetchPypi, click, google-auth, packaging, six }: buildPythonPackage rec { pname = "google-cloud-testutils"; @@ -9,7 +9,7 @@ buildPythonPackage rec { sha256 = "sha256-X85NRgGZt7+OpL4poOyS+UWec4fuABiTxEYyFpkUpqs="; }; - propagatedBuildInputs = [ click google-auth six ]; + propagatedBuildInputs = [ click google-auth packaging six ]; # does not contain tests doCheck = false; diff --git a/pkgs/development/python-modules/google-nest-sdm/default.nix b/pkgs/development/python-modules/google-nest-sdm/default.nix index b190d7e854e9a..c14598a8ebaee 100644 --- a/pkgs/development/python-modules/google-nest-sdm/default.nix +++ b/pkgs/development/python-modules/google-nest-sdm/default.nix @@ -11,7 +11,7 @@ , pytest-asyncio , pytestCheckHook , pythonOlder -, requests_oauthlib +, requests-oauthlib }: buildPythonPackage rec { @@ -33,7 +33,7 @@ buildPythonPackage rec { google-auth google-auth-oauthlib google-cloud-pubsub - requests_oauthlib + requests-oauthlib ]; checkInputs = [ diff --git a/pkgs/development/python-modules/gradient/default.nix b/pkgs/development/python-modules/gradient/default.nix index 8daa95c53b868..fa70e62a6fd74 100644 --- a/pkgs/development/python-modules/gradient/default.nix +++ b/pkgs/development/python-modules/gradient/default.nix @@ -23,12 +23,12 @@ buildPythonPackage rec { pname = "gradient"; - version = "1.10.0"; + version = "1.11.0"; format = "setuptools"; src = fetchPypi { inherit pname version; - hash = "sha256-wLdxU+PSREmTlX51scazmTC+U/mE95sSpfaUgHb8/Oc="; + hash = "sha256-IfScVoXFq6XPwUQdkcN87zOmuFY7kapbTkthxHqMAFU="; }; postPatch = '' diff --git a/pkgs/development/python-modules/graph_nets/default.nix b/pkgs/development/python-modules/graph_nets/default.nix deleted file mode 100644 index 4f7b8c52e9ee1..0000000000000 --- a/pkgs/development/python-modules/graph_nets/default.nix +++ /dev/null @@ -1,45 +0,0 @@ -{ lib -, buildPythonPackage -, fetchPypi -, tensorflow -, absl-py -, dm-sonnet -, networkx -, numpy -, setuptools -, six -, future -}: - -buildPythonPackage rec { - pname = "graph_nets"; - version = "1.1.0"; - - src = fetchPypi { - inherit pname version; - sha256 = "278a040674bef295aaf8bb5b0d1b3f207144dc68f0bcfe3f14912b9b85eb0927"; - }; - - postPatch = '' - # https://github.com/deepmind/graph_nets/issues/63 - sed -i 's/dm-sonnet==1.23/dm-sonnet/' setup.py - ''; - - propagatedBuildInputs = [ - tensorflow - absl-py - dm-sonnet - networkx - numpy - setuptools - six - future - ]; - - meta = with lib; { - description = "Build Graph Nets in Tensorflow"; - homepage = "https://github.com/deepmind/graph_nets"; - license = licenses.asl20; - maintainers = with maintainers; [ timokau ]; - }; -} diff --git a/pkgs/development/python-modules/graphene-django/default.nix b/pkgs/development/python-modules/graphene-django/default.nix index f736fbe39d85b..404a6779505ba 100644 --- a/pkgs/development/python-modules/graphene-django/default.nix +++ b/pkgs/development/python-modules/graphene-django/default.nix @@ -19,17 +19,21 @@ buildPythonPackage rec { pname = "graphene-django"; - version = "unstable-2021-06-11"; + version = "unstable-2022-03-03"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "graphql-python"; repo = pname; - rev = "e7f7d8da07ba1020f9916153f17e97b0ec037712"; - sha256 = "0b33q1im90ahp3gzy9wx5amfzy6q57ydjpy5rn988gh81hbyqaxv"; + rev = "f6ec0689c18929344c79ae363d2e3d5628fa4a2d"; + hash = "sha256-KTZ5jcoeHYXnlaF47t8jIi6+7NyMyA4hDPv+il3bt+U="; }; + patches = [ + ./graphene-3_2_0.patch + ]; + postPatch = '' substituteInPlace setup.py \ --replace '"pytest-runner"' "" diff --git a/pkgs/development/python-modules/graphene-django/graphene-3_2_0.patch b/pkgs/development/python-modules/graphene-django/graphene-3_2_0.patch new file mode 100644 index 0000000000000..0e8fa63464a36 --- /dev/null +++ b/pkgs/development/python-modules/graphene-django/graphene-3_2_0.patch @@ -0,0 +1,150 @@ +diff --git a/graphene_django/filter/tests/test_fields.py b/graphene_django/filter/tests/test_fields.py +index 7d440f4..0aec6e4 100644 +--- a/graphene_django/filter/tests/test_fields.py ++++ b/graphene_django/filter/tests/test_fields.py +@@ -1005,7 +1005,7 @@ def test_integer_field_filter_type(): + + schema = Schema(query=Query) + +- assert str(schema) == dedent( ++ assert str(schema).rstrip() + "\n" == dedent( + """\ + type Query { + pets(offset: Int = null, before: String = null, after: String = null, first: Int = null, last: Int = null, age: Int = null): PetTypeConnection +@@ -1074,7 +1074,7 @@ def test_other_filter_types(): + + schema = Schema(query=Query) + +- assert str(schema) == dedent( ++ assert str(schema).rstrip() + "\n" == dedent( + """\ + type Query { + pets(offset: Int = null, before: String = null, after: String = null, first: Int = null, last: Int = null, age: Int = null, age_Isnull: Boolean = null, age_Lt: Int = null): PetTypeConnection +diff --git a/graphene_django/tests/test_command.py b/graphene_django/tests/test_command.py +index 70116b8..a4ab4db 100644 +--- a/graphene_django/tests/test_command.py ++++ b/graphene_django/tests/test_command.py +@@ -49,7 +49,7 @@ def test_generate_graphql_file_on_call_graphql_schema(): + assert handle.write.called_once() + + schema_output = handle.write.call_args[0][0] +- assert schema_output == dedent( ++ assert schema_output.rstrip() + "\n" == dedent( + """\ + type Query { + hi: String +diff --git a/graphene_django/tests/test_types.py b/graphene_django/tests/test_types.py +index bde72c7..0b64440 100644 +--- a/graphene_django/tests/test_types.py ++++ b/graphene_django/tests/test_types.py +@@ -247,7 +247,7 @@ def test_schema_representation(): + } + """ + ) +- assert str(schema) == expected ++ assert str(schema).rstrip() + "\n" == expected + + + def with_local_registry(func): +@@ -515,7 +515,7 @@ class TestDjangoObjectType: + + schema = Schema(query=Query) + +- assert str(schema) == dedent( ++ assert str(schema).rstrip() + "\n" == dedent( + """\ + type Query { + pet: Pet +@@ -541,7 +541,7 @@ class TestDjangoObjectType: + + schema = Schema(query=Query) + +- assert str(schema) == dedent( ++ assert str(schema).rstrip() + "\n" == dedent( + """\ + type Query { + pet: Pet +@@ -576,7 +576,7 @@ class TestDjangoObjectType: + + schema = Schema(query=Query) + +- assert str(schema) == dedent( ++ assert str(schema).rstrip() + "\n" == dedent( + """\ + type Query { + pet: Pet +@@ -603,7 +603,7 @@ class TestDjangoObjectType: + + schema = Schema(query=Query) + +- assert str(schema) == dedent( ++ assert str(schema).rstrip() + "\n" == dedent( + """\ + type Query { + pet: PetModelKind +@@ -642,7 +642,7 @@ class TestDjangoObjectType: + + schema = Schema(query=Query) + +- assert str(schema) == dedent( ++ assert str(schema).rstrip() + "\n" == dedent( + """\ + type Query { + pet: PetModelKind +diff --git a/graphene_django/tests/test_views.py b/graphene_django/tests/test_views.py +index 945fa87..e2e8b46 100644 +--- a/graphene_django/tests/test_views.py ++++ b/graphene_django/tests/test_views.py +@@ -109,12 +109,10 @@ def test_reports_validation_errors(client): + { + "message": "Cannot query field 'unknownOne' on type 'QueryRoot'.", + "locations": [{"line": 1, "column": 9}], +- "path": None, + }, + { + "message": "Cannot query field 'unknownTwo' on type 'QueryRoot'.", + "locations": [{"line": 1, "column": 21}], +- "path": None, + }, + ] + } +@@ -135,8 +133,6 @@ def test_errors_when_missing_operation_name(client): + "errors": [ + { + "message": "Must provide operation name if query contains multiple operations.", +- "locations": None, +- "path": None, + } + ] + } +@@ -476,8 +472,7 @@ def test_handles_syntax_errors_caught_by_graphql(client): + "errors": [ + { + "locations": [{"column": 1, "line": 1}], +- "message": "Syntax Error: Unexpected Name 'syntaxerror'.", +- "path": None, ++ "message": "Syntax Error: Unexpected Name 'syntaxerror'." + } + ] + } +diff --git a/graphene_django/views.py b/graphene_django/views.py +index c23b020..f533f70 100644 +--- a/graphene_django/views.py ++++ b/graphene_django/views.py +@@ -11,7 +11,6 @@ from django.views.decorators.csrf import ensure_csrf_cookie + from django.views.generic import View + from graphql import OperationType, get_operation_ast, parse, validate + from graphql.error import GraphQLError +-from graphql.error import format_error as format_graphql_error + from graphql.execution import ExecutionResult + + from graphene import Schema +@@ -387,7 +386,7 @@ class GraphQLView(View): + @staticmethod + def format_error(error): + if isinstance(error, GraphQLError): +- return format_graphql_error(error) ++ return error.formatted + + return {"message": str(error)} + diff --git a/pkgs/development/python-modules/graphene/default.nix b/pkgs/development/python-modules/graphene/default.nix index e975bff8fee48..7d44f4c6a2458 100644 --- a/pkgs/development/python-modules/graphene/default.nix +++ b/pkgs/development/python-modules/graphene/default.nix @@ -1,6 +1,7 @@ { lib , aniso8601 , buildPythonPackage +, fetchpatch , fetchFromGitHub , graphql-core , graphql-relay @@ -29,6 +30,20 @@ buildPythonPackage rec { sha256 = "0qgp3nl6afyz6y27bw175hyqppx75pp1vqwl7nvlpwvgwyyc2mnl"; }; + patches = [ + # Fix graphql-core 3.2.0 support + (fetchpatch { + # https://github.com/graphql-python/graphene/pull/1378 + url = "https://github.com/graphql-python/graphene/commit/989970f89341ebb949962d13dcabca8a6ccddad4.patch"; + hash = "sha256-qRxWTqv5XQN7uFjL2uv9NjTvSLi76/MyFSa4jpkb8to="; + }) + (fetchpatch { + # https://github.com/graphql-python/graphene/pull/1417 + url = "https://github.com/graphql-python/graphene/commit/4e0e18d1682b7759bdf16499c573f675c7fb51cb.patch"; + hash = "sha256-icdTGDabJouQ3hVpcMkkeabNwdoDxdVVAboTOWFbO94="; + }) + ]; + propagatedBuildInputs = [ aniso8601 graphql-core @@ -53,6 +68,8 @@ buildPythonPackage rec { # Expects different Exeception classes, but receives none of them # https://github.com/graphql-python/graphene/issues/1346 "test_unexpected_error" + # https://github.com/graphql-python/graphene/pull/1417#issuecomment-1102492138 + "test_example_end_to_end" ] ++ lib.optionals (pythonAtLeast "3.10") [ "test_objecttype_as_container_extra_args" "test_objecttype_as_container_invalid_kwargs" diff --git a/pkgs/development/python-modules/graphql-relay/default.nix b/pkgs/development/python-modules/graphql-relay/default.nix index 08e27c1948734..435f1f5d8d0f0 100644 --- a/pkgs/development/python-modules/graphql-relay/default.nix +++ b/pkgs/development/python-modules/graphql-relay/default.nix @@ -1,22 +1,36 @@ { lib , buildPythonPackage , fetchPypi + +, pythonOlder + +# build +, poetry-core + +# runtime , graphql-core +, typing-extensions + +# tests , pytest-asyncio +, pytest-describe , pytestCheckHook -, pythonOlder -, typing-extensions }: buildPythonPackage rec { pname = "graphql-relay"; - version = "3.1.0"; + version = "3.2.0"; + format = "pyproject"; src = fetchPypi { inherit pname version; - sha256 = "sha256-cNWn7lmV6nwqmjflEidmOxpGTx9A6Y/d6VC+VBXf4LQ="; + hash = "sha256-H/HFEpg1bkgaC+AJzN/ySYMs5T8wVZwTOPIqDg0XJQw="; }; + nativeBuildInputs = [ + poetry-core + ]; + propagatedBuildInputs = [ graphql-core ] ++ lib.optionals (pythonOlder "3.8") [ @@ -25,6 +39,7 @@ buildPythonPackage rec { checkInputs = [ pytest-asyncio + pytest-describe pytestCheckHook ]; diff --git a/pkgs/development/python-modules/graphql-subscription-manager/default.nix b/pkgs/development/python-modules/graphql-subscription-manager/default.nix index 2ca6a134ee271..40b7b0be6879e 100644 --- a/pkgs/development/python-modules/graphql-subscription-manager/default.nix +++ b/pkgs/development/python-modules/graphql-subscription-manager/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "graphql-subscription-manager"; - version = "0.5.5"; + version = "0.6.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -16,8 +16,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "Danielhiversen"; repo = "PyGraphqlWebsocketManager"; - rev = version; - hash = "sha256-7MqFsttMNnWmmWKj1zaOORBTDGt6Wm8GU7w56DfPl2c="; + rev = "refs/tags/${version}"; + hash = "sha256-5+KHPm/JuazObvuC2ip6hwQxvjJH/lDgukJMH49cuwg="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/graphviz/default.nix b/pkgs/development/python-modules/graphviz/default.nix index 881dec6b932f9..46a541fe50409 100644 --- a/pkgs/development/python-modules/graphviz/default.nix +++ b/pkgs/development/python-modules/graphviz/default.nix @@ -1,4 +1,5 @@ { lib +, stdenv , buildPythonPackage , pythonOlder , fetchFromGitHub @@ -58,6 +59,9 @@ buildPythonPackage rec { runHook postCheck ''; + # Too many failures due to attempting to connect to com.apple.fonts daemon + doCheck = !stdenv.isDarwin; + meta = with lib; { description = "Simple Python interface for Graphviz"; homepage = "https://github.com/xflr6/graphviz"; diff --git a/pkgs/development/python-modules/graspologic/default.nix b/pkgs/development/python-modules/graspologic/default.nix index 10e7190d1fde7..1a246461e5f7d 100644 --- a/pkgs/development/python-modules/graspologic/default.nix +++ b/pkgs/development/python-modules/graspologic/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "graspologic"; - version = "0.3.1"; + version = "1.0.0"; disabled = isPy27; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "microsoft"; repo = "graspologic"; rev = "v${version}"; - sha256 = "07dmfb1aplha01d22b41js7634dac4v28pv1l3bzssqhi4yyds7h"; + sha256 = "sha256-mzJ3eFo77gnOh/Vs9u68yFDZW3ilXtcCCwKahKyRRmc="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/greeclimate/default.nix b/pkgs/development/python-modules/greeclimate/default.nix index 531ead0f19459..a7a2c5594e566 100644 --- a/pkgs/development/python-modules/greeclimate/default.nix +++ b/pkgs/development/python-modules/greeclimate/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "greeclimate"; - version = "1.1.0"; + version = "1.1.1"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -18,8 +18,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "cmroche"; repo = "greeclimate"; - rev = "v${version}"; - hash = "sha256-KVrm99aP2Nq15pDa8zaYIvTTcl6JEYU+7IkcMayHRQw="; + rev = "refs/tags/v${version}"; + hash = "sha256-TFsuzw9twhoGrgOnTNSmYWqsUW4oqY+SGvrvPUT4tZY="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/gremlinpython/default.nix b/pkgs/development/python-modules/gremlinpython/default.nix index c9ab433d98162..3f7ca1011b529 100644 --- a/pkgs/development/python-modules/gremlinpython/default.nix +++ b/pkgs/development/python-modules/gremlinpython/default.nix @@ -15,25 +15,18 @@ buildPythonPackage rec { pname = "gremlinpython"; - version = "3.5.1"; + version = "3.6.0"; # pypi tarball doesn't include tests src = fetchFromGitHub { owner = "apache"; repo = "tinkerpop"; rev = version; - sha256 = "1vlhxq0f2hanhkv6f17dxgbwr7gnbnh1kkkq0lxcwkbm2l0rdrlr"; + sha256 = "0gyf3a0zbh1grc1vr9zzpqm5yfcjvn0f1akw9l1arq36isqwvydn"; }; sourceRoot = "source/gremlin-python/src/main/python"; postPatch = '' substituteInPlace setup.py \ - --replace 'aenum>=1.4.5,<3.0.0' 'aenum' \ - --replace 'aiohttp>=3.7.0,<=3.7.4' 'aiohttp' \ - --replace 'PyHamcrest>=1.9.0,<2.0.0' 'PyHamcrest' \ - --replace 'radish-bdd==0.8.6' 'radish-bdd' \ - --replace 'mock>=3.0.5,<4.0.0' 'mock' \ - --replace 'pytest>=4.6.4,<5.0.0' 'pytest' \ - --replace 'importlib-metadata<3.0.0' 'importlib-metadata' \ --replace 'pytest-runner==5.2' ' ' ''; @@ -59,6 +52,7 @@ buildPythonPackage rec { # disable custom pytest report generation preCheck = '' substituteInPlace setup.cfg --replace 'addopts' '#addopts' + export TEST_TRANSACTIONS='false' ''; # many tests expect a running tinkerpop server diff --git a/pkgs/development/python-modules/grip/default.nix b/pkgs/development/python-modules/grip/default.nix index dafa692493e3d..eab4b45547c16 100644 --- a/pkgs/development/python-modules/grip/default.nix +++ b/pkgs/development/python-modules/grip/default.nix @@ -1,6 +1,5 @@ { lib , fetchFromGitHub -, fetchpatch # Python bits: , buildPythonPackage , pytest @@ -16,23 +15,15 @@ buildPythonPackage rec { pname = "grip"; - version = "4.5.2"; + version = "4.6.1"; src = fetchFromGitHub { owner = "joeyespo"; repo = "grip"; rev = "v${version}"; - sha256 = "0hphplnyi903jx7ghfxplg1qlj2kpcav1frr2js7p45pbh5ib9rm"; + sha256 = "sha256-CHL2dy0H/i0pLo653F7aUHFvZHTeZA6jC/rwn1KrEW4="; }; - patches = [ - # Render "front matter", used in our RFC template and elsewhere - (fetchpatch { - url = "https://github.com/joeyespo/grip/pull/249.patch"; - sha256 = "07za5iymfv647dfrvi6hhj54a96hgjyarys51zbi08c51shqyzpg"; - }) - ]; - checkInputs = [ pytest responses ]; propagatedBuildInputs = [ docopt flask markdown path-and-address pygments requests tabulate ]; diff --git a/pkgs/development/python-modules/grpcio-status/default.nix b/pkgs/development/python-modules/grpcio-status/default.nix index b20426c0288fa..173353fc9f2f3 100644 --- a/pkgs/development/python-modules/grpcio-status/default.nix +++ b/pkgs/development/python-modules/grpcio-status/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "grpcio-status"; - version = "1.43.0"; + version = "1.45.0"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "sha256-IXWQBvNqf/v/GH1BkfQRjActiqn6aCOhGq14QqPGzNA="; + sha256 = "sha256-S6rY6Ow8RHiOA4wk49fccCWeBroJ9ApbgXhThWO6Plo="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/grpcio-tools/default.nix b/pkgs/development/python-modules/grpcio-tools/default.nix index 78d952f4cb973..b3794e8b9d434 100644 --- a/pkgs/development/python-modules/grpcio-tools/default.nix +++ b/pkgs/development/python-modules/grpcio-tools/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "grpcio-tools"; - version = "1.43.0"; + version = "1.45.0"; src = fetchPypi { inherit pname version; - sha256 = "f42f1d713096808b1b0472dd2a3749b712d13f0092dab9442d9c096446e860b2"; + sha256 = "sha256-oBbPwh4NkbOwNtPU+WjR/eqGXfoDUkyx++yoRxn9RaI="; }; outputs = [ "out" "dev" ]; diff --git a/pkgs/development/python-modules/gspread/default.nix b/pkgs/development/python-modules/gspread/default.nix index ec3b134f16b8b..32a27cf544108 100644 --- a/pkgs/development/python-modules/gspread/default.nix +++ b/pkgs/development/python-modules/gspread/default.nix @@ -7,12 +7,12 @@ }: buildPythonPackage rec { - version = "5.3.0"; + version = "5.3.2"; pname = "gspread"; src = fetchPypi { inherit pname version; - sha256 = "sha256-viIg4ZcjVw7ZjouOtqW24Er6DwjsHwi4niF8NUSIoEc="; + sha256 = "sha256-MZdm2Q2wUFYpP37grSs1UDoaQGg6dYl6KSI5jNIBYoM="; }; propagatedBuildInputs = [ requests google-auth google-auth-oauthlib ]; diff --git a/pkgs/development/python-modules/gssapi/default.nix b/pkgs/development/python-modules/gssapi/default.nix index d500c64532133..f703820a4f5c5 100644 --- a/pkgs/development/python-modules/gssapi/default.nix +++ b/pkgs/development/python-modules/gssapi/default.nix @@ -17,14 +17,14 @@ buildPythonPackage rec { pname = "gssapi"; - version = "1.7.2"; + version = "1.7.3"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "pythongssapi"; repo = "python-${pname}"; rev = "v${version}"; - sha256 = "1xdcnm66b07m7chf04pp58p3khvy547hns1fw1xffd4n51kl42pp"; + sha256 = "sha256-/1YOnG6sCP8G8J3K2/RycTC95rXW9M+U3Mjz4GCt13s="; }; # It's used to locate headers diff --git a/pkgs/development/python-modules/h11/default.nix b/pkgs/development/python-modules/h11/default.nix index f3d37dacfa3c7..98dd8eef6cbdc 100644 --- a/pkgs/development/python-modules/h11/default.nix +++ b/pkgs/development/python-modules/h11/default.nix @@ -2,15 +2,17 @@ , buildPythonPackage , fetchPypi , pytestCheckHook +, pythonOlder }: buildPythonPackage rec { pname = "h11"; - version = "0.12.0"; + version = "0.13.0"; + disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "0hk0nll6qazsambp3kl8cxxsbl4gv5y9252qadyk0jky0sv2q8j7"; + sha256 = "sha256-cIE8ETUIeiSKTTjMDhoBgf+rIYgUGpPq9WeUDDlX/wY="; }; checkInputs = [ pytestCheckHook ]; @@ -22,5 +24,6 @@ buildPythonPackage rec { description = "Pure-Python, bring-your-own-I/O implementation of HTTP/1.1"; homepage = "https://github.com/python-hyper/h11"; license = licenses.mit; + maintainers = with maintainers; [ SuperSandro2000 ]; }; } diff --git a/pkgs/development/python-modules/h3/default.nix b/pkgs/development/python-modules/h3/default.nix index 6e5965053f4ab..e638997be79ec 100644 --- a/pkgs/development/python-modules/h3/default.nix +++ b/pkgs/development/python-modules/h3/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "h3"; - version = "3.7.3"; + version = "3.7.4"; # pypi version does not include tests src = fetchFromGitHub { owner = "uber"; repo = "h3-py"; - rev = "v${version}"; - sha256 = "0wc1fz8v59r97wlayr4lnsgwzd4fxm991xbs9690d4vwdkapafll"; + rev = "refs/tags/v${version}"; + sha256 = "sha256-/DtQD2M+5kBn1RxAOobVqtu32+1cxN8lZSuGH613Bwc="; }; dontConfigure = true; diff --git a/pkgs/development/python-modules/ha-av/default.nix b/pkgs/development/python-modules/ha-av/default.nix deleted file mode 100644 index 78735b67d44d9..0000000000000 --- a/pkgs/development/python-modules/ha-av/default.nix +++ /dev/null @@ -1,43 +0,0 @@ -{ lib -, buildPythonPackage -, pythonOlder -, fetchPypi -, pkg-config -, ffmpeg_4 -}: - -buildPythonPackage rec { - pname = "ha-av"; - version = "8.0.4rc1"; - format = "setuptools"; - - disabled = pythonOlder "3.5"; - - src = fetchPypi { - inherit pname version; - sha256 = "sha256-txdi2/X6upqrACeHhHpEh4tGqgPpW/dyWda8y++7c3M="; - }; - - nativeBuildInputs = [ - pkg-config - ]; - - buildInputs = [ - ffmpeg_4 - ]; - - pythonImportsCheck = [ - "av" - "av._core" - ]; - - # tests fail to import av._core - doCheck = false; - - meta = with lib; { - homepage = "https://pypi.org/project/ha-av/"; - description = "Pythonic bindings for FFmpeg's libraries"; - license = licenses.bsd3; - maintainers = with maintainers; [ hexa ]; - }; -} diff --git a/pkgs/development/python-modules/hachoir/default.nix b/pkgs/development/python-modules/hachoir/default.nix index 2c46b14a27445..c7d4178e3bf9a 100644 --- a/pkgs/development/python-modules/hachoir/default.nix +++ b/pkgs/development/python-modules/hachoir/default.nix @@ -3,17 +3,21 @@ , fetchFromGitHub , pytestCheckHook , urwid +, pythonOlder }: buildPythonPackage rec { pname = "hachoir"; - version = "3.1.2"; + version = "3.1.3"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "vstinner"; repo = pname; rev = version; - sha256 = "06544qmmimvaznwcjs8wwfih1frdd7anwcw5z07cf69l8p146p0y"; + hash = "sha256-HlxDwkU0GccO+IUzbtVpLbsAo+Mcacm4/WrXWCsmpBg="; }; propagatedBuildInputs = [ @@ -24,7 +28,9 @@ buildPythonPackage rec { pytestCheckHook ]; - pythonImportsCheck = [ "hachoir" ]; + pythonImportsCheck = [ + "hachoir" + ]; meta = with lib; { description = "Python library to view and edit a binary stream"; diff --git a/pkgs/development/python-modules/hahomematic/default.nix b/pkgs/development/python-modules/hahomematic/default.nix index b70c808197544..cf7acf0f484ec 100644 --- a/pkgs/development/python-modules/hahomematic/default.nix +++ b/pkgs/development/python-modules/hahomematic/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "hahomematic"; - version = "1.0.4"; + version = "1.1.5"; format = "setuptools"; disabled = pythonOlder "3.9"; @@ -22,8 +22,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "danielperna84"; repo = pname; - rev = version; - sha256 = "sha256-YpsZKhuK3IzUZFNmBToBOuUacaDgbMC/N7pZDjuSzbE="; + rev = "refs/tags/${version}"; + sha256 = "sha256-wuoc+A+KoqH/OdZ7/Rj/RZjgRLMU1WrRFqlS3TzJL4I="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/hangups/default.nix b/pkgs/development/python-modules/hangups/default.nix index 3b5e0a218b78a..18dd31f8af565 100644 --- a/pkgs/development/python-modules/hangups/default.nix +++ b/pkgs/development/python-modules/hangups/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { pname = "hangups"; - version = "0.4.17"; + version = "0.4.18"; disabled = pythonOlder "3.6"; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = "tdryer"; repo = "hangups"; rev = "v${version}"; - hash = "sha256-8kNWcRAip9LkmazDUVeDjGWhy/TWzT01c959LA5hb1Q="; + hash = "sha256-vq1OrOUPMQtezBFlisP2f/bvvYprDjhOuwUcT8rmIvw="; }; postPatch = '' diff --git a/pkgs/development/python-modules/hass-nabucasa/default.nix b/pkgs/development/python-modules/hass-nabucasa/default.nix index e7732e1f6a426..edf19d0e190ff 100644 --- a/pkgs/development/python-modules/hass-nabucasa/default.nix +++ b/pkgs/development/python-modules/hass-nabucasa/default.nix @@ -28,7 +28,8 @@ buildPythonPackage rec { sed -i 's/"acme.*"/"acme"/' setup.py substituteInPlace setup.py \ --replace "cryptography>=2.8,<4.0" "cryptography" \ - --replace "snitun==" "snitun>=" + --replace "snitun==" "snitun>=" \ + --replace "pycognito==2022.01.0" "pycognito" ''; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/hatasmota/default.nix b/pkgs/development/python-modules/hatasmota/default.nix index 6a0a3793d87b2..b710e5fb2e263 100644 --- a/pkgs/development/python-modules/hatasmota/default.nix +++ b/pkgs/development/python-modules/hatasmota/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "hatasmota"; - version = "0.3.1"; + version = "0.4.0"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "emontnemery"; repo = pname; rev = version; - sha256 = "sha256-/am6cRhAdiqMq0u7Ed4qhIA+Em2O0gIt7HfP19+2XHw="; + sha256 = "sha256-r9EBuaKxc7Vcdfk8zoDpIi2i6yIGc7soSWx+RjG+SZo="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/hatchling/default.nix b/pkgs/development/python-modules/hatchling/default.nix new file mode 100644 index 0000000000000..045bbafd6360e --- /dev/null +++ b/pkgs/development/python-modules/hatchling/default.nix @@ -0,0 +1,79 @@ +{ lib +, buildPythonPackage +, fetchPypi +, pythonOlder + +# runtime +, editables +, importlib-metadata # < 3.8 +, packaging +, pathspec +, pluggy +, tomli + +# tests +, build +, python +, requests +, toml +, virtualenv +}: + +let + pname = "hatchling"; + version = "0.22.0"; +in +buildPythonPackage { + inherit pname version; + format = "pyproject"; + + src = fetchPypi { + inherit pname version; + hash = "sha256-BUJ24F4oON/9dWpnnDNM5nIOuh3yuwlvDnLA9uQAIXo="; + }; + + # listed in backend/src/hatchling/ouroboros.py + propagatedBuildInputs = [ + editables + packaging + pathspec + pluggy + tomli + ] ++ lib.optionals (pythonOlder "3.8") [ + importlib-metadata + ]; + + pythonImportsCheck = [ + "hatchling" + "hatchling.build" + ]; + + # tries to fetch packages from the internet + doCheck = false; + + # listed in /backend/tests/downstream/requirements.txt + checkInputs = [ + build + packaging + requests + toml + virtualenv + ]; + + preCheck = '' + export HOME=$TMPDIR + ''; + + checkPhase = '' + runHook preCheck + ${python.interpreter} tests/downstream/integrate.py + runHook postCheck + ''; + + meta = with lib; { + description = "Modern, extensible Python build backend"; + homepage = "https://ofek.dev/hatch/latest/"; + license = licenses.mit; + maintainers = with maintainers; [ hexa ofek ]; + }; +} diff --git a/pkgs/development/python-modules/hg-git/default.nix b/pkgs/development/python-modules/hg-git/default.nix index eccdcdaed422a..6ccde29313b73 100644 --- a/pkgs/development/python-modules/hg-git/default.nix +++ b/pkgs/development/python-modules/hg-git/default.nix @@ -3,24 +3,34 @@ , fetchPypi , dulwich , mercurial +, pythonOlder }: buildPythonPackage rec { pname = "hg-git"; - version = "0.10.3"; + version = "1.0.0"; + format = "setuptools"; + + disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "27e6d7686a1548d4632dcc977f2ff3ce2e42d80735339b1f3b389b7481260cc4"; + hash = "sha256-ORGDOWLrnImca+qPtJZmyC8hGxJNCEC+tq2V4jpGIbY="; }; - propagatedBuildInputs = [ dulwich mercurial ]; + propagatedBuildInputs = [ + dulwich + mercurial + ]; + + pythonImportsCheck = [ + "hggit" + ]; meta = with lib; { description = "Push and pull from a Git server using Mercurial"; homepage = "https://hg-git.github.io/"; - maintainers = with maintainers; [ koral ]; license = licenses.gpl2Only; + maintainers = with maintainers; [ koral ]; }; - } diff --git a/pkgs/development/python-modules/hid/default.nix b/pkgs/development/python-modules/hid/default.nix index ce6e1d58def34..5546b71fea0ee 100644 --- a/pkgs/development/python-modules/hid/default.nix +++ b/pkgs/development/python-modules/hid/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "hid"; - version = "1.0.4"; + version = "1.0.5"; src = fetchPypi { inherit pname version; - sha256 = "sha256-9hsDgvN6M0vIuoYEvIS5SHXuT1lPu6+CssOz6CeIP8E="; + sha256 = "sha256-HpVOf3q5t8nfx421lQRpLBfbO3EklJK5drFSW5fbsOg="; }; propagatedBuildInputs = [ hidapi ]; diff --git a/pkgs/development/python-modules/hidapi/default.nix b/pkgs/development/python-modules/hidapi/default.nix index cf54198b18b30..b77dcaaa9d375 100644 --- a/pkgs/development/python-modules/hidapi/default.nix +++ b/pkgs/development/python-modules/hidapi/default.nix @@ -11,11 +11,11 @@ buildPythonPackage rec { pname = "hidapi"; - version = "0.11.0.post2"; + version = "0.11.2"; src = fetchPypi { inherit pname version; - sha256 = "da815e0d1d4b2ef1ebbcc85034572105dca29627eb61881337aa39010f2ef8cb"; + sha256 = "sha256-yYS37C/C6ph81EzwaUflVXJJjtLUPGSJC0q1iymvcrw="; }; nativeBuildInputs = lib.optionals stdenv.isDarwin [ xcbuild ]; diff --git a/pkgs/development/python-modules/hkavr/default.nix b/pkgs/development/python-modules/hkavr/default.nix new file mode 100644 index 0000000000000..851150ea1dd8f --- /dev/null +++ b/pkgs/development/python-modules/hkavr/default.nix @@ -0,0 +1,37 @@ +{ lib +, buildPythonPackage +, fetchPypi +, pythonOlder +, requests +}: + +buildPythonPackage rec { + pname = "hkavr"; + version = "0.0.5"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; + + src = fetchPypi { + inherit pname version; + hash = "sha256-wa0yS0KPdrQUuxxViweESD6Itn2rFlTwwrPQ0COWIPc="; + }; + + propagatedBuildInputs = [ + requests + ]; + + # Module has no tests + doCheck = false; + + pythonImportsCheck = [ + "hkavr" + ]; + + meta = with lib; { + description = "Library for interacting with Harman Kardon AVR controllers"; + homepage = "https://github.com/Devqon/hkavr"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/hmmlearn/default.nix b/pkgs/development/python-modules/hmmlearn/default.nix index 17f5126367bf4..8c699af975261 100644 --- a/pkgs/development/python-modules/hmmlearn/default.nix +++ b/pkgs/development/python-modules/hmmlearn/default.nix @@ -1,21 +1,22 @@ -{ lib, fetchurl, buildPythonPackage, numpy, scikit-learn, setuptools-scm, cython, pytest }: +{ lib, fetchurl, buildPythonPackage +, numpy, scikit-learn, pybind11, setuptools-scm, cython +, pytestCheckHook }: buildPythonPackage rec { pname = "hmmlearn"; - version = "0.2.6"; + version = "0.2.7"; src = fetchurl { url = "mirror://pypi/h/hmmlearn/${pname}-${version}.tar.gz"; - sha256 = "2a289cf28b31be59fa8ba5d3253d4a2a992401d45a8cdc221ae484fbf390c0d7"; + sha256 = "sha256-a0snIPJ6912pNnq02Q3LAPONozFo322Rf57F3mZw9uE="; }; - buildInputs = [ setuptools-scm cython ]; + buildInputs = [ setuptools-scm cython pybind11 ]; propagatedBuildInputs = [ numpy scikit-learn ]; - checkInputs = [ pytest ]; + checkInputs = [ pytestCheckHook ]; - checkPhase = '' - pytest --pyargs hmmlearn - ''; + pythonImportsCheck = [ "hmmlearn" ]; + pytestFlagsArray = [ "--pyargs" "hmmlearn" ]; meta = with lib; { description = "Hidden Markov Models in Python with scikit-learn like API"; diff --git a/pkgs/development/python-modules/homeconnect/default.nix b/pkgs/development/python-modules/homeconnect/default.nix index b6fca4201ad7f..b615274416abc 100644 --- a/pkgs/development/python-modules/homeconnect/default.nix +++ b/pkgs/development/python-modules/homeconnect/default.nix @@ -2,26 +2,33 @@ , buildPythonPackage , fetchPypi , requests -, requests_oauthlib +, requests-oauthlib +, pythonOlder }: buildPythonPackage rec { pname = "homeconnect"; version = "0.7.0"; + format = "pyproject"; + + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "sha256-/h0dEVmP0R9tVt56mvu72Ksrvnuox1FA7BgrZMOhV6Q="; + hash = "sha256-/h0dEVmP0R9tVt56mvu72Ksrvnuox1FA7BgrZMOhV6Q="; }; propagatedBuildInputs = [ requests - requests_oauthlib + requests-oauthlib ]; # Project has no tests doCheck = false; - pythonImportsCheck = [ "homeconnect" ]; + + pythonImportsCheck = [ + "homeconnect" + ]; meta = with lib; { description = "Python client for the BSH Home Connect REST API"; diff --git a/pkgs/development/python-modules/hpack/default.nix b/pkgs/development/python-modules/hpack/default.nix index a5140a216cfd3..842c6d5f8bfcb 100644 --- a/pkgs/development/python-modules/hpack/default.nix +++ b/pkgs/development/python-modules/hpack/default.nix @@ -1,21 +1,34 @@ { lib , buildPythonPackage -, fetchPypi +, fetchFromGitHub +, pythonOlder +, hypothesis +, pytestCheckHook }: buildPythonPackage rec { pname = "hpack"; version = "4.0.0"; + disabled = pythonOlder "3.6"; - src = fetchPypi { - inherit pname version; - sha256 = "fc41de0c63e687ebffde81187a948221294896f6bdc0ae2312708df339430095"; + src = fetchFromGitHub { + owner = "python-hyper"; + repo = "hpack"; + rev = "v${version}"; + sha256 = "sha256-2CehGy3K5fKbkB1J8+8x1D4XvnBn1Mbapx+p8rdXDYc="; }; + checkInputs = [ + hypothesis + pytestCheckHook + ]; + + pythonImportsCheck = [ "hpack" ]; + meta = with lib; { description = "Pure-Python HPACK header compression"; - homepage = "http://hyper.rtfd.org"; + homepage = "https://github.com/python-hyper/hpack"; license = licenses.mit; + maintainers = with maintainers; [ SuperSandro2000 ]; }; - } diff --git a/pkgs/development/python-modules/html-sanitizer/default.nix b/pkgs/development/python-modules/html-sanitizer/default.nix index 111d7e00d1b2c..09539b590cb38 100644 --- a/pkgs/development/python-modules/html-sanitizer/default.nix +++ b/pkgs/development/python-modules/html-sanitizer/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { owner = "matthiask"; repo = pname; rev = version; - sha256 = "sha256-1JSdi1PFM+N+UuEPfgWkOZw8S2PZ4ntadU0wnVJNnjw="; + hash = "sha256-1JSdi1PFM+N+UuEPfgWkOZw8S2PZ4ntadU0wnVJNnjw="; }; propagatedBuildInputs = [ @@ -31,7 +31,9 @@ buildPythonPackage rec { ]; disabledTests = [ + # Tests are sensitive to output "test_billion_laughs" + "test_10_broken_html" ]; pythonImportsCheck = [ diff --git a/pkgs/development/python-modules/httpbin/default.nix b/pkgs/development/python-modules/httpbin/default.nix index 8359fcf0a096d..a5a77a82af29f 100644 --- a/pkgs/development/python-modules/httpbin/default.nix +++ b/pkgs/development/python-modules/httpbin/default.nix @@ -2,6 +2,7 @@ , brotlipy , buildPythonPackage , decorator +, fetchpatch , fetchPypi , flask , flask-limiter @@ -22,6 +23,15 @@ buildPythonPackage rec { hash = "sha256-y7N3kMkVdfTxV1f0KtQdn3KesifV7b6J5OwXVIbbjfo="; }; + patches = [ + (fetchpatch { + # Replaces BaseResponse class with Response class for Werkezug 2.1.0 compatibility + # https://github.com/postmanlabs/httpbin/pull/674 + url = "https://github.com/postmanlabs/httpbin/commit/5cc81ce87a3c447a127e4a1a707faf9f3b1c9b6b.patch"; + hash = "sha256-SbEWjiqayMFYrbgAPZtSsXqSyCDUz3z127XgcKOcrkE="; + }) + ]; + propagatedBuildInputs = [ brotlipy flask diff --git a/pkgs/development/python-modules/httpcore/default.nix b/pkgs/development/python-modules/httpcore/default.nix index 79d979b10a97c..7f028c478fc5c 100644 --- a/pkgs/development/python-modules/httpcore/default.nix +++ b/pkgs/development/python-modules/httpcore/default.nix @@ -12,6 +12,7 @@ , pytest-cov , pytest-httpbin , sniffio +, socksio , trio , trustme , uvicorn @@ -19,22 +20,28 @@ buildPythonPackage rec { pname = "httpcore"; - version = "0.14.4"; + version = "0.14.7"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "encode"; repo = pname; rev = version; - sha256 = "19zsg8ijw0s1722ka67mjxx5z07lx9jq36z97l1fa6z1129wq240"; + sha256 = "sha256-h+3MfP1p/ifN0mF/xxrOKPTjD4Q7WzRh94YO4DYSuXE="; }; + postPatch = '' + substituteInPlace setup.py \ + --replace "h11>=0.11,<0.13" "h11>=0.11,<0.14" + ''; + propagatedBuildInputs = [ anyio certifi h11 h2 sniffio + socksio ]; checkInputs = [ diff --git a/pkgs/development/python-modules/httplib2/default.nix b/pkgs/development/python-modules/httplib2/default.nix index cd2134418a753..7f331c8edad47 100644 --- a/pkgs/development/python-modules/httplib2/default.nix +++ b/pkgs/development/python-modules/httplib2/default.nix @@ -9,21 +9,20 @@ , pytest-forked , pytest-randomly , pytest-timeout -, pytest-xdist , pytestCheckHook , six }: buildPythonPackage rec { pname = "httplib2"; - version = "0.20.3"; + version = "0.20.4"; format = "setuptools"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "sha256-Q5KkhVqyHDoIeKjvvYoHRbZPY7LUXGDwgp4CSuyvQ1g="; + sha256 = "sha256-eLvxmG9PUX+2RB3M6oG442Wmh6c5GI/aKP/Z8Z5Ixq8="; }; propagatedBuildInputs = [ @@ -36,7 +35,6 @@ buildPythonPackage rec { pytest-forked pytest-randomly pytest-timeout - pytest-xdist six pytestCheckHook ]; @@ -52,7 +50,13 @@ buildPythonPackage rec { # ValueError: Unable to load PEM file. # https://github.com/httplib2/httplib2/issues/192#issuecomment-993165140 "test_client_cert_password_verified" - ] ++ lib.optionals (stdenv.isDarwin) [ + + # improper pytest marking + "test_head_301" + "test_303" + ] ++ lib.optionals stdenv.isDarwin [ + # fails with "ConnectionResetError: [Errno 54] Connection reset by peer" + "test_connection_close" # fails with HTTP 408 Request Timeout, instead of expected 200 OK "test_timeout_subsequent" "test_connection_close" diff --git a/pkgs/development/python-modules/httptools/default.nix b/pkgs/development/python-modules/httptools/default.nix index 0a5b510b0ad9c..963a9ff5ebfe2 100644 --- a/pkgs/development/python-modules/httptools/default.nix +++ b/pkgs/development/python-modules/httptools/default.nix @@ -6,12 +6,12 @@ buildPythonPackage rec { pname = "httptools"; - version = "0.3.0"; + version = "0.4.0"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "3f9b4856d46ba1f0c850f4e84b264a9a8b4460acb20e865ec00978ad9fbaa4cf"; + sha256 = "sha256-LJqTDDeLPRXWtpX7levP+BpzlbT5d1xPEKB2vrCywf8="; }; # tests are not included in pypi tarball diff --git a/pkgs/development/python-modules/httpx-ntlm/default.nix b/pkgs/development/python-modules/httpx-ntlm/default.nix index 40ef250401bf5..a014872ad696c 100644 --- a/pkgs/development/python-modules/httpx-ntlm/default.nix +++ b/pkgs/development/python-modules/httpx-ntlm/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "httpx_ntlm"; inherit version; - sha256 = "sha256-pv/OxgcO0JWk2nCZp+bKlOdX7NqV6V5xZRDy5dd13qQ="; + hash = "sha256-pv/OxgcO0JWk2nCZp+bKlOdX7NqV6V5xZRDy5dd13qQ="; }; propagatedBuildInputs = [ @@ -26,6 +26,12 @@ buildPythonPackage rec { pyspnego ]; + postPatch = '' + substituteInPlace setup.py \ + --replace "pyspnego==0.3.*" "pyspnego>=0.3.*" \ + --replace "cryptography==36.0.*" "cryptography>=36.0.*" + ''; + # https://github.com/ulodciv/httpx-ntlm/issues/5 doCheck = false; diff --git a/pkgs/development/python-modules/httpx/default.nix b/pkgs/development/python-modules/httpx/default.nix index d479cc1f13ced..dbf8d1745c0e5 100644 --- a/pkgs/development/python-modules/httpx/default.nix +++ b/pkgs/development/python-modules/httpx/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { pname = "httpx"; - version = "0.21.3"; + version = "0.22.0"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -29,7 +29,7 @@ buildPythonPackage rec { owner = "encode"; repo = pname; rev = version; - sha256 = "01069b0kj6vnb26xazlz06rj4yncy5nkq76pajvzx0pmpjkniiz9"; + sha256 = "sha256-hQmQodGpVG23IZSsWV7rB1iB6QAudDao/8YshIgpmas="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/huggingface-hub/default.nix b/pkgs/development/python-modules/huggingface-hub/default.nix index cf0b27c6c5b3a..3bbc8ad2669e9 100644 --- a/pkgs/development/python-modules/huggingface-hub/default.nix +++ b/pkgs/development/python-modules/huggingface-hub/default.nix @@ -14,13 +14,13 @@ buildPythonPackage rec { pname = "huggingface-hub"; - version = "0.1.2"; + version = "0.4.0"; src = fetchFromGitHub { owner = "huggingface"; repo = "huggingface_hub"; rev = "v${version}"; - sha256 = "1pmi76vinwwn0bcxy5hj8pxhzqxdbzp0y3hsd631yyys01s0n6xd"; + sha256 = "sha256-rrkubNy60e/1VcGacYQang4yWxUzIBGySxZyq6G1arw="; }; nativeBuildInputs = [ packaging ]; diff --git a/pkgs/development/python-modules/humanize/default.nix b/pkgs/development/python-modules/humanize/default.nix index d0b2464608b94..fa13cdab0c23a 100644 --- a/pkgs/development/python-modules/humanize/default.nix +++ b/pkgs/development/python-modules/humanize/default.nix @@ -9,7 +9,7 @@ }: buildPythonPackage rec { - version = "3.13.1"; + version = "4.0.0"; pname = "humanize"; format = "pyproject"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "jmoiron"; repo = pname; rev = version; - sha256 = "sha256-lgGBvYb3ciqETBOR31gxQVD7YyopTtmr++nCwvm63Zs="; + sha256 = "sha256-v4OdZmUI2LCick4qCSGOHJ7jtWybwKTeTeIcly+QQQQ="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; diff --git a/pkgs/development/python-modules/hwi/default.nix b/pkgs/development/python-modules/hwi/default.nix index 332521d070401..873138cddb340 100644 --- a/pkgs/development/python-modules/hwi/default.nix +++ b/pkgs/development/python-modules/hwi/default.nix @@ -2,45 +2,48 @@ , buildPythonPackage , fetchFromGitHub , bitbox02 +, cbor , ecdsa , hidapi , libusb1 , mnemonic , pyaes +, pyserial , typing-extensions , pythonOlder }: buildPythonPackage rec { pname = "hwi"; - version = "2.0.2"; + version = "2.1.0"; format = "setuptools"; - disabled = pythonOlder "3.7"; - src = fetchFromGitHub { owner = "bitcoin-core"; repo = "HWI"; rev = version; - sha256 = "sha256-s0pKYqesZjHE6YndqsMwCuqLK7eE82oRiSXxBdUtEX4="; + sha256 = "sha256-ih4k58OdH5taf/7fvqLeWLrMzR38uPpDSGE4KU8sEAk="; }; propagatedBuildInputs = [ bitbox02 + cbor ecdsa hidapi libusb1 mnemonic pyaes + pyserial typing-extensions ]; - # make compatible with libusb1 2.x + # relax required dependencies: + # libusb1 - https://github.com/bitcoin-core/HWI/issues/579 + # typing-extensions - https://github.com/bitcoin-core/HWI/issues/572 postPatch = '' substituteInPlace setup.py \ - --replace 'libusb1>=1.7,<2.0' 'libusb1>=1.7' \ - --replace "'python_requires': '>=3.6,<3.10'," "'python_requires': '>=3.6,<4'," \ - --replace 'typing-extensions>=3.7,<4.0' 'typing-extensions>=3.7' + --replace 'libusb1>=1.7,<3' 'libusb1>=1.7,<4' \ + --replace 'typing-extensions>=3.7,<4.0' 'typing-extensions>=3.7,<5.0' ''; # tests require to clone quite a few firmwares diff --git a/pkgs/development/python-modules/hydra-check/default.nix b/pkgs/development/python-modules/hydra-check/default.nix index 48833d77e8bfd..8c1fd56b8d3ae 100644 --- a/pkgs/development/python-modules/hydra-check/default.nix +++ b/pkgs/development/python-modules/hydra-check/default.nix @@ -2,46 +2,39 @@ , buildPythonPackage , pythonOlder , fetchFromGitHub -, docopt +, poetry-core , requests , beautifulsoup4 -, mypy -, types-requests +, colorama }: buildPythonPackage rec { pname = "hydra-check"; - version = "1.2.0"; - disabled = pythonOlder "3.5"; + version = "1.3.4"; + format = "pyproject"; + + disabled = pythonOlder "3.10"; src = fetchFromGitHub { owner = "nix-community"; repo = pname; - rev = version; - sha256 = "EegoQ8qTrFGFYbCDsbAOE4Afg9haLjYdC0Cux/yvSk8="; + rev = "v${version}"; + sha256 = "sha256-voSbpOPJUPjwzdMLVt2TC/FIi6LKk01PLd/GczOAUR8="; }; + nativeBuildInputs = [ poetry-core ]; propagatedBuildInputs = [ - docopt + colorama requests beautifulsoup4 ]; - checkInputs = [ - mypy - types-requests - ]; - - checkPhase = '' - echo -e "\x1b[32m## run mypy\x1b[0m" - mypy hydracheck - ''; + pythonImportsCheck = [ "hydra_check" ]; meta = with lib; { description = "check hydra for the build status of a package"; homepage = "https://github.com/nix-community/hydra-check"; license = licenses.mit; - maintainers = with maintainers; [ makefu ]; + maintainers = with maintainers; [ makefu artturin ]; }; } - diff --git a/pkgs/development/python-modules/hyperframe/default.nix b/pkgs/development/python-modules/hyperframe/default.nix index d10ecc6c07522..e22dc0761a785 100644 --- a/pkgs/development/python-modules/hyperframe/default.nix +++ b/pkgs/development/python-modules/hyperframe/default.nix @@ -11,9 +11,12 @@ buildPythonPackage rec { checkInputs = [ pytestCheckHook ]; + pythonImportsCheck = [ "hyperframe" ]; + meta = with lib; { description = "HTTP/2 framing layer for Python"; - homepage = "http://hyper.rtfd.org/"; + homepage = "https://github.com/python-hyper/hyperframe/"; license = licenses.mit; + maintainers = with maintainers; [ SuperSandro2000 ]; }; } diff --git a/pkgs/development/python-modules/hyperion-py/default.nix b/pkgs/development/python-modules/hyperion-py/default.nix index 719efb92d1da7..7837deea6dba5 100644 --- a/pkgs/development/python-modules/hyperion-py/default.nix +++ b/pkgs/development/python-modules/hyperion-py/default.nix @@ -4,6 +4,7 @@ , fetchFromGitHub , pytestCheckHook , pythonOlder +, pythonAtLeast , poetry-core , pytest-aiohttp , pytest-asyncio @@ -11,15 +12,15 @@ buildPythonPackage rec { pname = "hyperion-py"; - version = "0.7.4"; - disabled = pythonOlder "3.8"; + version = "0.7.5"; + disabled = pythonOlder "3.8" || pythonAtLeast "3.10"; format = "pyproject"; src = fetchFromGitHub { owner = "dermotduffy"; repo = pname; rev = "v${version}"; - sha256 = "00x12ppmvlxs3qbdxq06wnzakvwm2m39qhmpp27qfpl137b0qqyj"; + sha256 = "sha256-arcnpCQsRuiWCrAz/t4TCjTe8DRDtRuzYp8k7nnjGDk="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/hypothesis/default.nix b/pkgs/development/python-modules/hypothesis/default.nix index 89aac153172d7..8eaa808563e6d 100644 --- a/pkgs/development/python-modules/hypothesis/default.nix +++ b/pkgs/development/python-modules/hypothesis/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { # If you need these, you can just add them to your environment. pname = "hypothesis"; - version = "6.35.0"; + version = "6.40.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -28,7 +28,7 @@ buildPythonPackage rec { owner = "HypothesisWorks"; repo = "hypothesis-python"; rev = "hypothesis-python-${version}"; - sha256 = "08wph7q3c08480ma2p7m7mamy0g7g7r5jqpwdyhdga4cfg734527"; + hash = "sha256-6BC3CTotkMhguueH4NJM8VjbrYhofHqtZEUytcllMwQ="; }; postUnpack = "sourceRoot=$sourceRoot/hypothesis-python"; diff --git a/pkgs/development/python-modules/hypothesmith/default.nix b/pkgs/development/python-modules/hypothesmith/default.nix index ee8b897154bdb..4bac9c0bb022b 100644 --- a/pkgs/development/python-modules/hypothesmith/default.nix +++ b/pkgs/development/python-modules/hypothesmith/default.nix @@ -1,4 +1,13 @@ -{ lib, buildPythonPackage, fetchPypi, hypothesis, lark, libcst, black, parso, pytestCheckHook, pytest-cov, pytest-xdist }: +{ lib +, buildPythonPackage +, fetchPypi +, hypothesis +, lark +, libcst +, parso +, pytestCheckHook +, pytest-xdist +}: buildPythonPackage rec { pname = "hypothesmith"; @@ -9,15 +18,34 @@ buildPythonPackage rec { sha256 = "0fb7b3fd03d76eddd4474b0561e1c2662457593a74cc300fd27e5409cd4d7922"; }; + patches = [ + ./remove-black.patch + ]; + postPatch = '' - substituteInPlace setup.py --replace "lark-parser" "lark" + substituteInPlace setup.py \ + --replace "lark-parser" "lark" + + substituteInPlace tox.ini \ + --replace "--cov=hypothesmith" "" \ + --replace "--cov-branch" "" \ + --replace "--cov-report=term-missing:skip-covered" "" \ + --replace "--cov-fail-under=100" "" ''; propagatedBuildInputs = [ hypothesis lark libcst ]; - checkInputs = [ black parso pytestCheckHook pytest-cov pytest-xdist ]; + checkInputs = [ parso pytestCheckHook pytest-xdist ]; + + pytestFlagsArray = [ + "-v" + ]; + + disabledTests = [ + # https://github.com/Zac-HD/hypothesmith/issues/21 + "test_source_code_from_libcst_node_type" + ]; - pytestFlagsArray = [ "-v" ]; # tests are fairly slow, prevents timeout due to no stdout printing pythonImportsCheck = [ "hypothesmith" ]; meta = with lib; { diff --git a/pkgs/development/python-modules/hypothesmith/remove-black.patch b/pkgs/development/python-modules/hypothesmith/remove-black.patch new file mode 100644 index 0000000000000..565f350b06b44 --- /dev/null +++ b/pkgs/development/python-modules/hypothesmith/remove-black.patch @@ -0,0 +1,88 @@ +diff --git a/tests/test_cst.py b/tests/test_cst.py +index c436183..bdba2d7 100644 +--- a/tests/test_cst.py ++++ b/tests/test_cst.py +@@ -3,7 +3,6 @@ import ast + from inspect import isabstract + from operator import attrgetter + +-import black + import libcst + import parso + import pytest +@@ -51,27 +50,6 @@ def test_ast_unparse_from_nodes(source_code): + assert ast.dump(first) == ast.dump(second) + + +-@pytest.mark.xfail +-@example("A\u2592", black.FileMode()) +-@given( +- source_code=hypothesmith.from_node(), +- mode=st.builds( +- black.FileMode, +- line_length=st.just(88) | st.integers(0, 200), +- string_normalization=st.booleans(), +- is_pyi=st.booleans(), +- ), +-) +-def test_black_autoformatter_from_nodes(source_code, mode): +- try: +- result = black.format_file_contents(source_code, fast=False, mode=mode) +- except black.NothingChanged: +- pass +- else: +- with pytest.raises(black.NothingChanged): +- black.format_file_contents(result, fast=False, mode=mode) +- +- + @given(source_code=hypothesmith.from_node()) + def test_from_node_always_compilable(source_code): + compile(source_code, "<string>", "exec") +diff --git a/tests/test_syntactic.py b/tests/test_syntactic.py +index 7ea42e9..a77ac39 100644 +--- a/tests/test_syntactic.py ++++ b/tests/test_syntactic.py +@@ -3,8 +3,6 @@ import ast + import io + import tokenize + +-import black +-import blib2to3 + import parso + import pytest + from hypothesis import example, given, reject, strategies as st +@@ -58,34 +56,6 @@ def test_ast_unparse_from_grammar(source_code): + assert ast.dump(first) == ast.dump(second) + + +-@example("\\", black.FileMode()) +-@example("A#\r#", black.FileMode()) +-@given( +- source_code=hypothesmith.from_grammar(), +- mode=st.builds( +- black.FileMode, +- line_length=st.just(88) | st.integers(0, 200), +- string_normalization=st.booleans(), +- is_pyi=st.booleans(), +- ), +-) +-def test_black_autoformatter_from_grammar(source_code, mode): +- try: +- result = black.format_file_contents(source_code, fast=False, mode=mode) +- except black.NothingChanged: +- pass +- except blib2to3.pgen2.tokenize.TokenError: +- # Fails to tokenise e.g. "\\", though compile("\\", "<string>", "exec") works. +- # See https://github.com/psf/black/issues/1012 +- reject() +- except black.InvalidInput: +- # e.g. "A#\r#", see https://github.com/psf/black/issues/970 +- reject() +- else: +- with pytest.raises(black.NothingChanged): +- black.format_file_contents(result, fast=False, mode=mode) +- +- + @given(source_code=hypothesmith.from_grammar("eval_input")) + def test_eval_input_generation(source_code): + compile(source_code, filename="<string>", mode="eval") diff --git a/pkgs/development/python-modules/hyppo/default.nix b/pkgs/development/python-modules/hyppo/default.nix index 61966bc7de76b..de089ba39d2d4 100644 --- a/pkgs/development/python-modules/hyppo/default.nix +++ b/pkgs/development/python-modules/hyppo/default.nix @@ -3,6 +3,7 @@ , pythonOlder , fetchFromGitHub , pytestCheckHook +, autograd , numba , numpy , scikit-learn @@ -13,7 +14,7 @@ buildPythonPackage rec { pname = "hyppo"; - version = "0.2.2"; + version = "0.3.2"; disabled = pythonOlder "3.6"; @@ -21,10 +22,11 @@ buildPythonPackage rec { owner = "neurodata"; repo = pname; rev = "v${version}"; - sha256 = "1wrzrppyjq0pc03bn6qcslxzcnwn7fr2z5lm71gfpli5k05i26nr"; + sha256 = "sha256-DQ5DrQrFBJ3dnGAjD1c/7GCJeR3g+aL2poR4hwOvmPA="; }; propagatedBuildInputs = [ + autograd numba numpy scikit-learn @@ -40,8 +42,8 @@ buildPythonPackage rec { meta = with lib; { homepage = "https://github.com/neurodata/hyppo"; - description = "Indepedence testing in Python"; - license = licenses.asl20; + description = "Python package for multivariate hypothesis testing"; + license = licenses.mit; maintainers = with maintainers; [ bcdarwin ]; }; } diff --git a/pkgs/development/python-modules/ibis-framework/default.nix b/pkgs/development/python-modules/ibis-framework/default.nix index 61b944b488369..39d226bb95644 100644 --- a/pkgs/development/python-modules/ibis-framework/default.nix +++ b/pkgs/development/python-modules/ibis-framework/default.nix @@ -58,7 +58,7 @@ buildPythonPackage rec { repo = "ibis"; owner = "ibis-project"; rev = version; - sha256 = "sha256-n3fR6wvcSfIo7760seB+5SxtoYSqQmqkzZ9VlNQF200="; + hash = "sha256-n3fR6wvcSfIo7760seB+5SxtoYSqQmqkzZ9VlNQF200="; }; nativeBuildInputs = [ poetry-core ]; @@ -94,7 +94,8 @@ buildPythonPackage rec { postPatch = '' substituteInPlace pyproject.toml \ - --replace 'atpublic = ">=2.3,<3"' 'atpublic = ">=2.3"' + --replace 'atpublic = ">=2.3,<3"' 'atpublic = ">=2.3"' \ + --replace 'regex = "^2021.7.6"' 'regex = "*"' ''; preBuild = '' @@ -119,7 +120,6 @@ buildPythonPackage rec { ]; pytestFlagsArray = [ - "--numprocesses $NIX_BUILD_CORES" "ibis/tests" "ibis/backends/tests" "ibis/backends/{${lib.concatStringsSep "," backends}}/tests" diff --git a/pkgs/development/python-modules/igraph/default.nix b/pkgs/development/python-modules/igraph/default.nix index f7409dc082361..32b471a83ce29 100644 --- a/pkgs/development/python-modules/igraph/default.nix +++ b/pkgs/development/python-modules/igraph/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "igraph"; - version = "0.9.9"; + version = "0.9.10"; disabled = pythonOlder "3.6"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "igraph"; repo = "python-igraph"; rev = version; - hash = "sha256-jHK8whCg+WitRSL5LmkqfdqiAdi9vZPicygzKThnW2U="; + hash = "sha256-c20N8BtbQGxAK7ykQvyfqWYu7wVOlYfeGpNOwWPlGxs="; }; nativeBuildInputs = [ @@ -48,6 +48,7 @@ buildPythonPackage rec { meta = with lib; { description = "High performance graph data structures and algorithms"; homepage = "https://igraph.org/python/"; + changelog = "https://github.com/igraph/python-igraph/blob/${src.rev}/CHANGELOG.md"; license = licenses.gpl2Plus; maintainers = with maintainers; [ MostAwesomeDude dotlambda ]; }; diff --git a/pkgs/development/python-modules/ihatemoney/default.nix b/pkgs/development/python-modules/ihatemoney/default.nix index d351f1ca7d44e..ff30196630a9f 100644 --- a/pkgs/development/python-modules/ihatemoney/default.nix +++ b/pkgs/development/python-modules/ihatemoney/default.nix @@ -99,7 +99,8 @@ buildPythonPackage rec { --replace "cachetools>=4.1,<5" "cachetools>=4.1" \ --replace "Flask-WTF>=0.14.3,<1" "Flask-WTF>=0.14.3,<2" \ --replace "SQLAlchemy>=1.3.0,<1.4" "SQLAlchemy>=1.3.0,<1.5" \ - --replace "WTForms>=2.3.1,<2.4" "WTForms" + --replace "WTForms>=2.3.1,<2.4" "WTForms" \ + --replace "Flask-Talisman>=0.8,<1" "Flask-Talisman>=0.8,<2" # https://github.com/spiral-project/ihatemoney/pull/1006 ''; checkInputs = [ diff --git a/pkgs/development/python-modules/imageio/default.nix b/pkgs/development/python-modules/imageio/default.nix index 98495932fdaf1..9c449c69b7700 100644 --- a/pkgs/development/python-modules/imageio/default.nix +++ b/pkgs/development/python-modules/imageio/default.nix @@ -1,26 +1,36 @@ { lib +, stdenv , buildPythonPackage , isPy27 , fetchPypi -, fetchpatch +, substituteAll , imageio-ffmpeg , numpy , pillow , psutil , pytestCheckHook , tifffile +, fsspec +, libGL }: buildPythonPackage rec { pname = "imageio"; - version = "2.14.1"; + version = "2.16.1"; disabled = isPy27; src = fetchPypi { - sha256 = "sha256-cJwY+ACYHkKGq+S9hrbJtbtuKFtrkztboJYu+OeZQFg="; + sha256 = "sha256-fxI8sjp3rFq+jtTnrWpggxqC3ixdEjRj3PHUJ4xHedI="; inherit pname version; }; + patches = [ + (substituteAll { + src = ./libgl-path.patch; + libgl = "${libGL.out}/lib/libGL${stdenv.hostPlatform.extensions.sharedLibrary}"; + }) + ]; + propagatedBuildInputs = [ imageio-ffmpeg numpy @@ -28,34 +38,33 @@ buildPythonPackage rec { ]; checkInputs = [ + fsspec psutil pytestCheckHook tifffile ]; + pytestFlagsArray = [ + "-m 'not needs_internet'" + ]; + preCheck = '' export IMAGEIO_USERDIR="$TMP" - export IMAGEIO_NO_INTERNET="true" - export HOME="$(mktemp -d)" + export HOME=$TMPDIR ''; - disabledTests = [ - # tries to pull remote resources, even with IMAGEIO_NO_INTERNET - "test_png_remote" - # needs git history - "test_mvolread_out_of_bytes" - "test_imiter" - "test_memory_size" - "test_legacy_write_empty" - ]; - disabledTestPaths = [ + # tries to fetch fixtures over the network + "tests/test_freeimage.py" "tests/test_pillow.py" + "tests/test_spe.py" + "tests/test_swf.py" ]; meta = with lib; { description = "Library for reading and writing a wide range of image, video, scientific, and volumetric data formats"; homepage = "http://imageio.github.io/"; license = licenses.bsd2; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/development/python-modules/imageio/libgl-path.patch b/pkgs/development/python-modules/imageio/libgl-path.patch new file mode 100644 index 0000000000000..f2a2bbfa093d2 --- /dev/null +++ b/pkgs/development/python-modules/imageio/libgl-path.patch @@ -0,0 +1,13 @@ +diff --git a/tests/test_core.py b/tests/test_core.py +index 2cdbb3a..032974c 100644 +--- a/tests/test_core.py ++++ b/tests/test_core.py +@@ -129,7 +129,7 @@ def test_findlib2(): + open(os.path.join(fi_dir, "notalib.test.so"), "wb") + + # Loading libs +- gllib = ctypes.util.find_library("GL") ++ gllib = "@libgl@" + core.load_lib([gllib], []) + # Fail + raises(ValueError, core.load_lib, [], []) # Nothing given diff --git a/pkgs/development/python-modules/imap-tools/default.nix b/pkgs/development/python-modules/imap-tools/default.nix index 9d017b2422350..a63754f0c09e3 100644 --- a/pkgs/development/python-modules/imap-tools/default.nix +++ b/pkgs/development/python-modules/imap-tools/default.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { pname = "imap-tools"; - version = "0.52.0"; + version = "0.54.0"; disabled = isPy27; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "ikvk"; repo = "imap_tools"; rev = "v${version}"; - hash = "sha256-la2+cpTnHZQn/FXtySp+3zDCBTONiLC16Tm+hDiIERc="; + hash = "sha256-RiKGxyCPYlAJ5YbxvEKxCYgUg1D9s29YSCT4tY3FIEE="; }; checkInputs = [ @@ -39,6 +39,7 @@ buildPythonPackage rec { meta = with lib; { description = "Work with email and mailbox by IMAP"; homepage = "https://github.com/ikvk/imap_tools"; + changelog = "https://github.com/ikvk/imap_tools/blob/v${version}/docs/release_notes.rst"; license = licenses.asl20; maintainers = with maintainers; [ dotlambda ]; }; diff --git a/pkgs/development/python-modules/img2pdf/default.nix b/pkgs/development/python-modules/img2pdf/default.nix index 58e3db524a82a..791edcb2fb20e 100644 --- a/pkgs/development/python-modules/img2pdf/default.nix +++ b/pkgs/development/python-modules/img2pdf/default.nix @@ -2,7 +2,6 @@ , buildPythonPackage , isPy27 , fetchPypi -, fetchpatch , pikepdf , pillow , stdenv @@ -19,23 +18,14 @@ buildPythonPackage rec { pname = "img2pdf"; - version = "0.4.3"; + version = "0.4.4"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "sha256-jlHFBD76lddRSBtRYHGgBvh8KkBZlhqaxD7COJFd4J8="; + sha256 = "8ec898a9646523fd3862b154f3f47cd52609c24cc3e2dc1fb5f0168f0cbe793c"; }; - patches = [ - # Disable tests broken by Pillow 9.0.0 - # https://gitlab.mister-muffin.de/josch/img2pdf/issues/130#issuecomment-586 - (fetchpatch { - url = "https://salsa.debian.org/debian/img2pdf/-/raw/f77fefc81e7c4b235c47ae6777d222d391c59536/debian/patches/pillow9"; - sha256 = "sha256-8giZCuv5PzSbrBQqslNqiLOhgxbg3LsdBVwt+DWnvh4="; - }) - ]; - propagatedBuildInputs = [ pikepdf pillow diff --git a/pkgs/development/python-modules/impacket/default.nix b/pkgs/development/python-modules/impacket/default.nix index 82c49cae8bfc5..6b6f7e452b279 100644 --- a/pkgs/development/python-modules/impacket/default.nix +++ b/pkgs/development/python-modules/impacket/default.nix @@ -1,20 +1,46 @@ -{ lib, buildPythonPackage, fetchPypi, flask, ldapdomaindump, pycryptodomex, pyasn1, pyopenssl, chardet, setuptools }: +{ lib +, buildPythonPackage +, chardet +, fetchPypi +, flask +, ldapdomaindump +, pyasn1 +, pycryptodomex +, pyopenssl +, pythonOlder +, setuptools +, six +}: buildPythonPackage rec { pname = "impacket"; version = "0.9.24"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "18d557d387f4914fafa739813b9172bc3f8bd9c036e93bf589a8e0ebb7304bba"; + hash = "sha256-GNVX04f0kU+vpzmBO5FyvD+L2cA26Tv1iajg67cwS7o="; }; - propagatedBuildInputs = [ flask ldapdomaindump pycryptodomex pyasn1 pyopenssl chardet setuptools ]; + propagatedBuildInputs = [ + chardet + flask + ldapdomaindump + pyasn1 + pycryptodomex + pyopenssl + setuptools + six + ]; - # fail with: # RecursionError: maximum recursion depth exceeded doCheck = false; - pythonImportsCheck = [ "impacket" ]; + + pythonImportsCheck = [ + "impacket" + ]; meta = with lib; { description = "Network protocols Constructors and Dissectors"; diff --git a/pkgs/development/python-modules/importlib-metadata/default.nix b/pkgs/development/python-modules/importlib-metadata/default.nix index 3917742a55a90..26612ff924e6d 100644 --- a/pkgs/development/python-modules/importlib-metadata/default.nix +++ b/pkgs/development/python-modules/importlib-metadata/default.nix @@ -2,6 +2,7 @@ , buildPythonPackage , fetchPypi , pythonOlder +, setuptools , setuptools-scm , typing-extensions , toml @@ -10,7 +11,7 @@ buildPythonPackage rec { pname = "importlib-metadata"; - version = "4.11.0"; + version = "4.11.3"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -18,10 +19,11 @@ buildPythonPackage rec { src = fetchPypi { pname = "importlib_metadata"; inherit version; - hash = "sha256-nl5VO7uhhDy0oAgjAUuQdha+Ru5QPSuboAHSFKjaIY8="; + hash = "sha256-6kxZfr83FC+Ce485KZV54xaFwx06Q4tZ9GlAav0PJTk="; }; nativeBuildInputs = [ + setuptools # otherwise cross build fails setuptools-scm ]; diff --git a/pkgs/development/python-modules/importlib-resources/default.nix b/pkgs/development/python-modules/importlib-resources/default.nix index b28932a74f057..61fb5be068d38 100644 --- a/pkgs/development/python-modules/importlib-resources/default.nix +++ b/pkgs/development/python-modules/importlib-resources/default.nix @@ -11,13 +11,14 @@ buildPythonPackage rec { pname = "importlib-resources"; - version = "5.4.0"; + version = "5.6.0"; + format = "pyproject"; disabled = isPy27; src = fetchPypi { pname = "importlib_resources"; inherit version; - sha256 = "sha256-11bi+F3U3iuom+CyHboqO77C6HGkKjoWcZJYoR+HUGs="; + sha256 = "sha256-G5MjjL8jtM3jQkDdgyHZnpvy60vJHAyZsohig+e6rYU="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/inquirer/default.nix b/pkgs/development/python-modules/inquirer/default.nix index dd2db106aceab..0fb7a24512104 100644 --- a/pkgs/development/python-modules/inquirer/default.nix +++ b/pkgs/development/python-modules/inquirer/default.nix @@ -18,14 +18,14 @@ buildPythonPackage rec { pname = "inquirer"; - version = "2.9.1"; + version = "2.9.2"; format = "pyproject"; src = fetchFromGitHub rec { owner = "magmax"; repo = "python-inquirer"; rev = "v${version}"; - sha256 = "sha256:0vdly2k4i7bfcqc8zh2miv9dbpmqvayxk72qn9d4hr7z15wph233"; + sha256 = "sha256-TQEZeZDl4N78dE7CXy5OwquUoHuxxjmDAC3wdxqydaQ="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/installer/default.nix b/pkgs/development/python-modules/installer/default.nix index a19f27a0a7534..8749ea16132d8 100644 --- a/pkgs/development/python-modules/installer/default.nix +++ b/pkgs/development/python-modules/installer/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "installer"; - version = "0.3.0"; + version = "0.5.1"; format = "pyproject"; src = fetchFromGitHub { owner = "pradyunsg"; repo = pname; rev = version; - sha256 = "sha256-AxAQgDhRFkb0HB7ttDb+pHuHzwnNDX6UOm9rswzIwmI="; + sha256 = "sha256-vhZYUhUcD5fnjkyEqFMvggVGH9Ri8iNgqRgSBQTOCtM="; }; nativeBuildInputs = [ flit-core ]; diff --git a/pkgs/development/python-modules/intbitset/default.nix b/pkgs/development/python-modules/intbitset/default.nix index db98be8276c59..9cedf7c4d284c 100644 --- a/pkgs/development/python-modules/intbitset/default.nix +++ b/pkgs/development/python-modules/intbitset/default.nix @@ -1,36 +1,23 @@ { lib , fetchPypi , buildPythonPackage -, six -, nose +, pytestCheckHook }: + buildPythonPackage rec { pname = "intbitset"; - version = "2.4.1"; + version = "3.0.1"; + format = "setuptools"; src = fetchPypi { inherit pname version; - sha256 = "44bca80b8cc702d5a56f0686f2bb5e028ab4d0c2c1761941589d46b7fa2c701c"; + sha256 = "sha256-8ebQPGcpkioiPFGEnfZbnpFuYlrvuRF4Tn+azUwgfVM="; }; - patches = [ - # fixes compilation on aarch64 and determinism (uses -march=core2 and - # -mtune=native) - ./remove-impure-tuning.patch - ]; - - propagatedBuildInputs = [ - six - ]; - checkInputs = [ - nose + pytestCheckHook ]; - checkPhase = '' - nosetests - ''; - pythonImportsCheck = [ "intbitset" ]; diff --git a/pkgs/development/python-modules/intbitset/remove-impure-tuning.patch b/pkgs/development/python-modules/intbitset/remove-impure-tuning.patch deleted file mode 100644 index 4747b87b806c9..0000000000000 --- a/pkgs/development/python-modules/intbitset/remove-impure-tuning.patch +++ /dev/null @@ -1,24 +0,0 @@ -From 2ea60bdf4d7b0344fc6ff5c97c675842fedccfa8 Mon Sep 17 00:00:00 2001 -From: Cole Helbling <cole.e.helbling@outlook.com> -Date: Fri, 23 Apr 2021 09:02:22 -0700 -Subject: [PATCH] setup.py: remove impure tuning - ---- - setup.py | 1 - - 1 file changed, 1 deletion(-) - -diff --git a/setup.py b/setup.py -index 7840022..3922aa5 100644 ---- a/setup.py -+++ b/setup.py -@@ -48,7 +48,6 @@ setup( - ext_modules=[ - Extension("intbitset", - ["intbitset/intbitset.c", "intbitset/intbitset_impl.c"], -- extra_compile_args=['-O3', '-march=core2', '-mtune=native'] - # For debug -> '-ftree-vectorizer-verbose=2' - ) - ], --- -2.30.1 - diff --git a/pkgs/development/python-modules/intellifire4py/default.nix b/pkgs/development/python-modules/intellifire4py/default.nix index b93b9b9c957b4..f8cbd93bb35be 100644 --- a/pkgs/development/python-modules/intellifire4py/default.nix +++ b/pkgs/development/python-modules/intellifire4py/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "intellifire4py"; - version = "1.0.2"; + version = "1.0.5"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "jeeftor"; repo = pname; rev = version; - hash = "sha256-t3wJQ7dXX65yqxMYsFggViqqGvLCdASw1QLc5DJBn+4="; + hash = "sha256-wBk9tCVXDxHBnhofFQfMbsrYF4UYRZ2oXEBCldvJTnM="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/intensity-normalization/default.nix b/pkgs/development/python-modules/intensity-normalization/default.nix index 48260398f4907..94d6252e3c06d 100644 --- a/pkgs/development/python-modules/intensity-normalization/default.nix +++ b/pkgs/development/python-modules/intensity-normalization/default.nix @@ -15,14 +15,15 @@ buildPythonPackage rec { pname = "intensity-normalization"; - version = "2.1.4"; + version = "2.2.3"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { - inherit pname version; - sha256 = "e7b46039311bcbba40224d85eb07eefe1488bd8a6faa893a180e15e65c48b7f5"; + pname = "intensity_normalization"; + inherit version; + sha256 = "sha256-Yjd4hXmbT87xNKSqc6zkKNisOVhQzQAUZI5wBiI/UBk="; }; propagatedBuildInputs = [ @@ -57,5 +58,7 @@ buildPythonPackage rec { description = "MRI intensity normalization tools"; maintainers = with maintainers; [ bcdarwin ]; license = licenses.asl20; + # depends on simpleitk python wrapper which is not packaged yet + broken = true; }; } diff --git a/pkgs/development/python-modules/invocations/default.nix b/pkgs/development/python-modules/invocations/default.nix index 78ace76b762e9..fef497739cbf6 100644 --- a/pkgs/development/python-modules/invocations/default.nix +++ b/pkgs/development/python-modules/invocations/default.nix @@ -1,11 +1,12 @@ -{ buildPythonPackage +{ lib +, buildPythonPackage , blessings , fetchFromGitHub , invoke -, lib , releases , semantic-version , tabulate +, tqdm , twine }: @@ -27,12 +28,22 @@ buildPythonPackage rec { --replace "tabulate==0.7.5" "tabulate" ''; - propagatedBuildInputs = [ blessings invoke releases semantic-version tabulate twine ]; + propagatedBuildInputs = [ + blessings + invoke + releases + semantic-version + tabulate + tqdm + twine + ]; # There's an error loading the test suite. See https://github.com/pyinvoke/invocations/issues/29. doCheck = false; - pythonImportsCheck = [ "invocations" ]; + pythonImportsCheck = [ + "invocations" + ]; meta = with lib; { description = "Common/best-practice Invoke tasks and collections"; diff --git a/pkgs/development/python-modules/ipykernel/default.nix b/pkgs/development/python-modules/ipykernel/default.nix index e888fdcd32093..d7302eaaecb2c 100644 --- a/pkgs/development/python-modules/ipykernel/default.nix +++ b/pkgs/development/python-modules/ipykernel/default.nix @@ -3,35 +3,37 @@ , callPackage , fetchPypi , pythonOlder -, argcomplete , ipython , jupyter-client +, packaging +, psutil , tornado , traitlets }: buildPythonPackage rec { pname = "ipykernel"; - version = "6.7.0"; + version = "6.12.1"; + + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "d82b904fdc2fd8c7b1fbe0fa481c68a11b4cd4c8ef07e6517da1f10cc3114d24"; + sha256 = "sha256-CGj1VhcpreREAR+Mp9NQLcnyf39E4g8dX+5+Hytxg6E="; }; # debugpy is optional, see https://github.com/ipython/ipykernel/pull/767 postPatch = '' - substituteInPlace setup.py \ - --replace "'debugpy>=1.0.0,<2.0'," "" + sed -i "/debugpy/d" setup.py ''; propagatedBuildInputs = [ ipython jupyter-client + packaging + psutil tornado traitlets - ] ++ lib.optionals (pythonOlder "3.8") [ - argcomplete ]; # check in passthru.tests.pytest to escape infinite recursion with ipyparallel diff --git a/pkgs/development/python-modules/ipympl/default.nix b/pkgs/development/python-modules/ipympl/default.nix index 3644442f7adaa..226fea5b621dc 100644 --- a/pkgs/development/python-modules/ipympl/default.nix +++ b/pkgs/development/python-modules/ipympl/default.nix @@ -3,20 +3,21 @@ , fetchPypi , ipykernel , ipywidgets +, matplotlib }: buildPythonPackage rec { pname = "ipympl"; - version = "0.8.7"; + version = "0.9.0"; format = "wheel"; src = fetchPypi { inherit pname version format; - sha256 = "11c3d01f0555f855c51a960964e3ab4dff38e6ccd1a4695205fe250341a9eb99"; + sha256 = "sha256-HpO3T/zRbimxd1+nUkbSmclj7nPsMYuSUK0VJItZQs4="; }; - propagatedBuildInputs = [ ipykernel ipywidgets ]; + propagatedBuildInputs = [ ipykernel ipywidgets matplotlib ]; # There are no unit tests in repository doCheck = false; diff --git a/pkgs/development/python-modules/ipython/default.nix b/pkgs/development/python-modules/ipython/default.nix index c1c0b049dc8c8..0a39950689dfd 100644 --- a/pkgs/development/python-modules/ipython/default.nix +++ b/pkgs/development/python-modules/ipython/default.nix @@ -10,7 +10,6 @@ # Runtime dependencies , appnope , backcall -, black , decorator , jedi , matplotlib-inline @@ -28,13 +27,13 @@ buildPythonPackage rec { pname = "ipython"; - version = "8.0.1"; + version = "8.2.0"; format = "pyproject"; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - sha256 = "0x19sj4dlq7r4p1mqnpx9245r8dwvpjwd8n34snfm37a452lsmmb"; + sha256 = "sha256-cOXrEyysWUo0tfeZvSUliQCZBfBRBHKK6mpAPsJRncE="; }; buildInputs = [ @@ -43,7 +42,6 @@ buildPythonPackage rec { propagatedBuildInputs = [ backcall - black decorator jedi matplotlib-inline @@ -83,7 +81,7 @@ buildPythonPackage rec { meta = with lib; { description = "IPython: Productive Interactive Computing"; - homepage = "http://ipython.org/"; + homepage = "https://ipython.org/"; license = licenses.bsd3; maintainers = with maintainers; [ bjornfor fridh ]; }; diff --git a/pkgs/development/python-modules/ipywidgets/default.nix b/pkgs/development/python-modules/ipywidgets/default.nix index c324eea947dae..b33ec2759b561 100644 --- a/pkgs/development/python-modules/ipywidgets/default.nix +++ b/pkgs/development/python-modules/ipywidgets/default.nix @@ -15,11 +15,11 @@ buildPythonPackage rec { pname = "ipywidgets"; - version = "7.6.5"; + version = "7.7.0"; src = fetchPypi { inherit pname version; - sha256 = "00974f7cb4d5f8d494c19810fedb9fa9b64bffd3cda7c2be23c133a1ad3c99c5"; + sha256 = "sha256-q0pVloVaiLg3YZIcdocH1l5YRwaBObwXKd3+g0cDVCo="; }; # Tests are not distributed diff --git a/pkgs/development/python-modules/islpy/default.nix b/pkgs/development/python-modules/islpy/default.nix index 67b547b724ea8..b37a2b55b2dce 100644 --- a/pkgs/development/python-modules/islpy/default.nix +++ b/pkgs/development/python-modules/islpy/default.nix @@ -10,12 +10,12 @@ buildPythonPackage rec { pname = "islpy"; - version = "2022.1.1"; + version = "2022.1.2"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "sha256-eWNc1xxOqEmPdSC1Ha6tfM8ofgkudfOGjvp3ZyM4pxE="; + sha256 = "sha256-Z0LXmbQeCyBPP0mtnt+UFyi08tcfP9XLZUS8jzkrADo="; }; postConfigure = '' diff --git a/pkgs/development/python-modules/iso4217/default.nix b/pkgs/development/python-modules/iso4217/default.nix index 12cf40a6764e0..8df5f962ce584 100644 --- a/pkgs/development/python-modules/iso4217/default.nix +++ b/pkgs/development/python-modules/iso4217/default.nix @@ -16,7 +16,7 @@ let in buildPythonPackage rec { pname = "iso4217"; - version = "1.8"; + version = "1.9"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "dahlia"; repo = pname; rev = version; - hash = "sha256-L0vx6Aan6D1lusgBh/pcT373ZTxbtWpQnFKB2V0dxlA="; + hash = "sha256-7VrXAP/Qyzy2BDTmFwDlxHvF7HhndJsDMt/qHcsmhzs="; }; propagatedBuildInputs = lib.optionals (pythonOlder "3.9") [ diff --git a/pkgs/development/python-modules/iso8601/default.nix b/pkgs/development/python-modules/iso8601/default.nix index a5eb03dc8eb6e..14cef7c62a8c0 100644 --- a/pkgs/development/python-modules/iso8601/default.nix +++ b/pkgs/development/python-modules/iso8601/default.nix @@ -2,6 +2,7 @@ , buildPythonPackage , fetchPypi , hypothesis +, poetry-core , pytestCheckHook , pytz , pythonOlder @@ -10,7 +11,7 @@ buildPythonPackage rec { pname = "iso8601"; version = "1.0.2"; - format = "setuptools"; + format = "pyproject"; disabled = pythonOlder "3.6"; @@ -19,6 +20,10 @@ buildPythonPackage rec { sha256 = "sha256-J/UDIg5oRdnblU+yErlbA2LYt+bBsjJqhwYcPek1lLE="; }; + nativeBuildInputs = [ + poetry-core + ]; + checkInputs = [ hypothesis pytestCheckHook diff --git a/pkgs/development/python-modules/iterm2/default.nix b/pkgs/development/python-modules/iterm2/default.nix index 1cba03531b5be..1742fc08e1e49 100644 --- a/pkgs/development/python-modules/iterm2/default.nix +++ b/pkgs/development/python-modules/iterm2/default.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { pname = "iterm2"; - version = "1.30"; + version = "2.1"; src = fetchPypi { inherit pname version; - sha256 = "148b32a593f3d932a33daad01fdaa4639918eca74a6e153d9729dd8b3cba3345"; + sha256 = "sha256-oEXDW+ar3S0gJn2DdaOyq6GDE9dJaghQEpPBCfTL2Kw="; }; propagatedBuildInputs = [ protobuf websockets ]; diff --git a/pkgs/development/python-modules/itsdangerous/default.nix b/pkgs/development/python-modules/itsdangerous/default.nix index 35cdf8836a89e..99bdb965235c1 100644 --- a/pkgs/development/python-modules/itsdangerous/default.nix +++ b/pkgs/development/python-modules/itsdangerous/default.nix @@ -8,12 +8,12 @@ buildPythonPackage rec { pname = "itsdangerous"; - version = "2.0.1"; + version = "2.1.2"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "1w6gfb2zhbcmrfj6digwzw1z68w6zg1q87rm6la2m412zil4swly"; + sha256 = "sha256-XbvGizF+XkLzJ/kCF2NUXcP8O/4i5t65aq8fw4h0FWo="; }; checkInputs = [ diff --git a/pkgs/development/python-modules/jaraco_itertools/default.nix b/pkgs/development/python-modules/jaraco_itertools/default.nix index 80b0349ed58d3..95d20fd7e6be7 100644 --- a/pkgs/development/python-modules/jaraco_itertools/default.nix +++ b/pkgs/development/python-modules/jaraco_itertools/default.nix @@ -4,11 +4,12 @@ buildPythonPackage rec { pname = "jaraco.itertools"; - version = "6.0.3"; + version = "6.2.1"; + format = "pyproject"; src = fetchPypi { inherit pname version; - sha256 = "1775bfcad5de275a540a36720c5ab34594ea1dbe7ffefa32099b0129c5604608"; + sha256 = "sha256-YJjts3xrgCPzeU1CWIoTv3WyygK0D/l5XIRry+DBtGw="; }; pythonNamespaces = [ "jaraco" ]; diff --git a/pkgs/development/python-modules/jaraco_text/default.nix b/pkgs/development/python-modules/jaraco_text/default.nix index 054f68ba2f244..e1e82df89ea32 100644 --- a/pkgs/development/python-modules/jaraco_text/default.nix +++ b/pkgs/development/python-modules/jaraco_text/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "jaraco.text"; - version = "3.6.0"; + version = "3.7.0"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "901d3468eaaa04f1d8a8f141f54b8887bfd943ccba311fc1c1de62c66604dfe0"; + sha256 = "sha256-p/nMG0Sl8wlqIWy9EwtlDHprLJ+ABbAArpfzKSOafAA="; }; pythonNamespaces = [ diff --git a/pkgs/development/python-modules/jarowinkler/default.nix b/pkgs/development/python-modules/jarowinkler/default.nix new file mode 100644 index 0000000000000..3985a22d5bcb6 --- /dev/null +++ b/pkgs/development/python-modules/jarowinkler/default.nix @@ -0,0 +1,54 @@ +{ lib +, buildPythonPackage +, pythonOlder +, fetchFromGitHub +, cmake +, cython +, rapidfuzz-capi +, scikit-build +, hypothesis +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "jarowinkler"; + version = "1.0.2"; + + disabled = pythonOlder "3.6"; + + src = fetchFromGitHub { + owner = "maxbachmann"; + repo = "JaroWinkler"; + rev = "v${version}"; + fetchSubmodules = true; + hash = "sha256-zVAcV6xxqyfXRUcyWo9PcOdagcexJc/D5k4g5ag3hbY="; + }; + + nativeBuildInputs = [ + cmake + cython + rapidfuzz-capi + scikit-build + ]; + + dontUseCmakeConfigure = true; + + checkInputs = [ + hypothesis + pytestCheckHook + ]; + + preCheck = '' + # import from $out + rm -r jarowinkler + ''; + + pythonImportsCheck = [ "jarowinkler" ]; + + meta = with lib; { + description = "Library for fast approximate string matching using Jaro and Jaro-Winkler similarity"; + homepage = "https://github.com/maxbachmann/JaroWinkler"; + license = licenses.mit; + maintainers = with maintainers; [ dotlambda ]; + }; +} diff --git a/pkgs/development/python-modules/jax/default.nix b/pkgs/development/python-modules/jax/default.nix index 332cac3133cc2..e4e9139216e17 100644 --- a/pkgs/development/python-modules/jax/default.nix +++ b/pkgs/development/python-modules/jax/default.nix @@ -3,6 +3,7 @@ , blas , buildPythonPackage , fetchFromGitHub +, fetchpatch , jaxlib , lapack , numpy @@ -19,7 +20,7 @@ let in buildPythonPackage rec { pname = "jax"; - version = "0.3.4"; + version = "0.3.6"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -28,12 +29,18 @@ buildPythonPackage rec { owner = "google"; repo = pname; rev = "jax-v${version}"; - sha256 = "sha256-RZqSJP2vtt8U6nmftV2VzfkMGkkk3100QqsjI7PpQbc="; + hash = "sha256-eGdAEZFHadNTHgciP4KMYHdwksz9g6un0Ar+A/KV5TE="; }; patches = [ # See https://github.com/google/jax/issues/7944 ./cache-fix.patch + + # See https://github.com/google/jax/issues/10292 + (fetchpatch { + url = "https://github.com/google/jax/commit/cadc8046d56e0c1433cf48a2f106947d5f4ecbfd.patch"; + hash = "sha256-jrpIqt4LzWAswt/Cpwtfa5d1Yn31HcXkVH3ETmaigA0="; + }) ]; # jaxlib is _not_ included in propagatedBuildInputs because there are @@ -54,21 +61,27 @@ buildPythonPackage rec { pytest-xdist ]; + # high parallelism will result in the tests getting stuck + dontUsePytestXdist = true; + # NOTE: Don't run the tests in the expiremental directory as they require flax # which creates a circular dependency. See https://discourse.nixos.org/t/how-to-nix-ify-python-packages-with-circular-dependencies/14648/2. # Not a big deal, this is how the JAX docs suggest running the test suite # anyhow. pytestFlagsArray = [ - "-n auto" + "--numprocesses=4" "-W ignore::DeprecationWarning" "tests/" ]; - # See - # * https://github.com/google/jax/issues/9705 - # * https://discourse.nixos.org/t/getting-different-results-for-the-same-build-on-two-equally-configured-machines/17921 - # * https://github.com/NixOS/nixpkgs/issues/161960 - disabledTests = lib.optionals usingMKL [ + disabledTests = [ + # Exceeds tolerance when the machine is busy + "test_custom_linear_solve_aux" + ] ++ lib.optionals usingMKL [ + # See + # * https://github.com/google/jax/issues/9705 + # * https://discourse.nixos.org/t/getting-different-results-for-the-same-build-on-two-equally-configured-machines/17921 + # * https://github.com/NixOS/nixpkgs/issues/161960 "test_custom_linear_solve_cholesky" "test_custom_root_with_aux" "testEigvalsGrad_shape" diff --git a/pkgs/development/python-modules/jaxlib/bin.nix b/pkgs/development/python-modules/jaxlib/bin.nix index 0929831e32a4b..1eb4cc18ed069 100644 --- a/pkgs/development/python-modules/jaxlib/bin.nix +++ b/pkgs/development/python-modules/jaxlib/bin.nix @@ -18,7 +18,6 @@ , autoPatchelfHook , buildPythonPackage , config -, cudatoolkit_11 , cudnn , fetchurl , flatbuffers @@ -29,11 +28,16 @@ , stdenv # Options: , cudaSupport ? config.cudaSupport or false +, cudaPackages ? {} }: +let + inherit (cudaPackages) cudatoolkit cudnn; +in + # There are no jaxlib wheels targeting cudnn <8.0.5, and although there are # wheels for cudatoolkit <11.1, we don't support them. -assert cudaSupport -> lib.versionAtLeast cudatoolkit_11.version "11.1"; +assert cudaSupport -> lib.versionAtLeast cudatoolkit.version "11.1"; assert cudaSupport -> lib.versionAtLeast cudnn.version "8.0.5"; let @@ -116,7 +120,7 @@ buildPythonPackage rec { rpath=$(patchelf --print-rpath $file) # For some reason `makeLibraryPath` on `cudatoolkit_11` maps to # <cudatoolkit_11.lib>/lib which is different from <cudatoolkit_11>/lib. - patchelf --set-rpath "$rpath:${cudatoolkit_11}/lib:${lib.makeLibraryPath [ cudatoolkit_11.lib cudnn ]}" $file + patchelf --set-rpath "$rpath:${cudatoolkit}/lib:${lib.makeLibraryPath [ cudatoolkit.lib cudnn ]}" $file done ''; @@ -127,7 +131,7 @@ buildPythonPackage rec { # more info. postInstall = lib.optional cudaSupport '' mkdir -p $out/bin - ln -s ${cudatoolkit_11}/bin/ptxas $out/bin/ptxas + ln -s ${cudatoolkit}/bin/ptxas $out/bin/ptxas ''; pythonImportsCheck = [ "jaxlib" ]; diff --git a/pkgs/development/python-modules/jaxlib/default.nix b/pkgs/development/python-modules/jaxlib/default.nix index 363bfe5613463..002858a8fa156 100644 --- a/pkgs/development/python-modules/jaxlib/default.nix +++ b/pkgs/development/python-modules/jaxlib/default.nix @@ -18,11 +18,6 @@ , wheel , which - # Build-time and runtime CUDA dependencies: -, cudatoolkit ? null -, cudnn ? null -, nccl ? null - # Python dependencies: , absl-py , flatbuffers @@ -42,6 +37,7 @@ # CUDA flags: , cudaCapabilities ? [ "sm_35" "sm_50" "sm_60" "sm_70" "sm_75" "compute_80" ] , cudaSupport ? false +, cudaPackages ? {} # MKL: , mklSupport ? true @@ -49,6 +45,8 @@ let + inherit (cudaPackages) cudatoolkit cudnn nccl; + pname = "jaxlib"; version = "0.3.0"; @@ -57,6 +55,8 @@ let homepage = "https://github.com/google/jax"; license = licenses.asl20; maintainers = with maintainers; [ ndl ]; + platforms = [ "x86_64-linux" "aarch64-darwin" "x86_64-darwin"]; + hydraPlatforms = ["x86_64-linux" ]; # Don't think anybody is checking the darwin builds }; cudatoolkit_joined = symlinkJoin { @@ -216,9 +216,9 @@ let fetchAttrs = { sha256 = if cudaSupport then - "1k0rjxqjm703gd9navwzx5x3874b4dxamr62m1fxhm79d271zxis" + "0d2rqwk9n4a6c51m4g21rxymv85kw2sdksni30cdx3pdcdbqgic7" else - "0ivah1w41jcj13jm740qzwx5h0ia8vbj71pjgd0zrfk3c92kll41"; + "0q540mwmh7grig0qq48ynzqi0gynimxnrq7k97wribqpkx99k39d"; }; buildAttrs = { diff --git a/pkgs/development/python-modules/jeepney/default.nix b/pkgs/development/python-modules/jeepney/default.nix index 3079f152e4444..6ec1fb811cf08 100644 --- a/pkgs/development/python-modules/jeepney/default.nix +++ b/pkgs/development/python-modules/jeepney/default.nix @@ -2,6 +2,7 @@ , buildPythonPackage , fetchPypi , pythonOlder +, flit-core , async-timeout , dbus , pytest @@ -13,15 +14,21 @@ buildPythonPackage rec { pname = "jeepney"; - version = "0.7.1"; + version = "0.8.0"; - disabled = pythonOlder "3.6"; + disabled = pythonOlder "3.7"; + + format = "pyproject"; src = fetchPypi { inherit pname version; - sha256 = "fa9e232dfa0c498bd0b8a3a73b8d8a31978304dcef0515adc859d4e096f96f4f"; + sha256 = "5efe48d255973902f6badc3ce55e2aa6c5c3b3bc642059ef3a91247bcfcc5806"; }; + nativeBuildInputs = [ + flit-core + ]; + checkInputs = [ async-timeout dbus diff --git a/pkgs/development/python-modules/jenkins-job-builder/default.nix b/pkgs/development/python-modules/jenkins-job-builder/default.nix index bc5432cb6e3f6..99c5aff43c0e2 100644 --- a/pkgs/development/python-modules/jenkins-job-builder/default.nix +++ b/pkgs/development/python-modules/jenkins-job-builder/default.nix @@ -9,11 +9,11 @@ buildPythonPackage rec { pname = "jenkins-job-builder"; - version = "3.12.0"; + version = "4.0.0"; src = fetchPypi { inherit pname version; - sha256 = "sha256-gpsot4LW1IBfYt8eb72WJqMzWEAMt4gqWOD1KhTQjds="; + sha256 = "sha256-6bsiq3LwlBZdF378HXEIgZSKf7NsTjo3bbSmt7XkYgM="; }; postPatch = '' diff --git a/pkgs/development/python-modules/jinja2/default.nix b/pkgs/development/python-modules/jinja2/default.nix index 7c9971b0c4544..29b08df8e0fea 100644 --- a/pkgs/development/python-modules/jinja2/default.nix +++ b/pkgs/development/python-modules/jinja2/default.nix @@ -10,12 +10,13 @@ buildPythonPackage rec { pname = "Jinja2"; - version = "3.0.3"; - disabled = pythonOlder "3.6"; + version = "3.1.1"; + + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "611bb273cd68f3b993fabdc4064fc858c5b47a973cb5aa7999ec1ba405c87cd7"; + sha256 = "sha256-ZAvtS7UBy9FxlLPKzh3CEm9bYZzwaKcmuYGSoP3nSuk="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/jira/default.nix b/pkgs/development/python-modules/jira/default.nix index b22f5ccd73a4d..c6b1386adec00 100644 --- a/pkgs/development/python-modules/jira/default.nix +++ b/pkgs/development/python-modules/jira/default.nix @@ -5,37 +5,39 @@ , flaky , keyring , requests-mock -, requests_oauthlib +, requests-oauthlib , requests-toolbelt , setuptools-scm , setuptools-scm-git-archive , pytestCheckHook +, pythonOlder }: buildPythonPackage rec { pname = "jira"; version = "3.1.1"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "pycontribs"; repo = pname; rev = version; - sha256 = "04s2zgwxip54g894hps2cm081cp07mbi7qipmsv4dvailhsg43nn"; + hash = "sha256-1g7yNKRR7Ua2rjfiE1c94LKAQGVCX0gSeqTc2Pn7QhM="; }; - postPatch = '' - substituteInPlace setup.cfg \ - --replace "--cov-report=xml --cov jira" "" - ''; - - nativeBuildInputs = [ setuptools-scm setuptools-scm-git-archive ]; + nativeBuildInputs = [ + setuptools-scm + setuptools-scm-git-archive + ]; SETUPTOOLS_SCM_PRETEND_VERSION = version; propagatedBuildInputs = [ defusedxml keyring - requests_oauthlib + requests-oauthlib requests-toolbelt ]; @@ -45,11 +47,20 @@ buildPythonPackage rec { requests-mock ]; + postPatch = '' + substituteInPlace setup.cfg \ + --replace "--cov-report=xml --cov jira" "" + ''; + + pythonImportsCheck = [ + "jira" + ]; + # impure tests because of connectivity attempts to jira servers doCheck = false; meta = with lib; { - description = "This library eases the use of the JIRA REST API from Python."; + description = "Library to interact with the JIRA REST API"; homepage = "https://github.com/pycontribs/jira"; license = licenses.bsd2; maintainers = with maintainers; [ globin ]; diff --git a/pkgs/development/python-modules/jmespath/default.nix b/pkgs/development/python-modules/jmespath/default.nix index 3f74ae8d810e5..18c2f46216f22 100644 --- a/pkgs/development/python-modules/jmespath/default.nix +++ b/pkgs/development/python-modules/jmespath/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "jmespath"; - version = "0.10.0"; + version = "1.0.0"; src = fetchPypi { inherit pname version; - sha256 = "b85d0567b8666149a93172712e68920734333c0ce7e89b78b3e987f71e5ed4f9"; + sha256 = "sha256-pJDigO3R9X1t6IY2mS0Ftx6X1pomoZ8Fjs99MER0v14="; }; buildInputs = [ nose ]; diff --git a/pkgs/development/python-modules/joblib/default.nix b/pkgs/development/python-modules/joblib/default.nix index 2b011f56c1e8f..ad7db290d67e6 100644 --- a/pkgs/development/python-modules/joblib/default.nix +++ b/pkgs/development/python-modules/joblib/default.nix @@ -1,4 +1,5 @@ { lib +, pythonAtLeast , pythonOlder , buildPythonPackage , fetchPypi @@ -28,6 +29,7 @@ buildPythonPackage rec { disabledTests = [ "test_disk_used" # test_disk_used is broken: https://github.com/joblib/joblib/issues/57 "test_parallel_call_cached_function_defined_in_jupyter" # jupyter not available during tests + "test_nested_parallel_warnings" # tests is flaky under load ] ++ lib.optionals stdenv.isDarwin [ "test_dispatch_multiprocessing" # test_dispatch_multiprocessing is broken only on Darwin. ]; diff --git a/pkgs/development/python-modules/josepy/default.nix b/pkgs/development/python-modules/josepy/default.nix index 036b60e9eca25..100228bf4f146 100644 --- a/pkgs/development/python-modules/josepy/default.nix +++ b/pkgs/development/python-modules/josepy/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "josepy"; - version = "1.12.0"; + version = "1.13.0"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "267004a64f08c016cd54b7aaf7c323fa3ef3679fb62f4b086cd56448d0fecb25"; + sha256 = "sha256-iTHa84+KTIUnSg6LfLJa3f2NHyj5+4++0FPdUa7HXck="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/jsbeautifier/default.nix b/pkgs/development/python-modules/jsbeautifier/default.nix index bdd0897acbe68..5109f8ffe27b7 100644 --- a/pkgs/development/python-modules/jsbeautifier/default.nix +++ b/pkgs/development/python-modules/jsbeautifier/default.nix @@ -9,14 +9,14 @@ buildPythonApplication rec { pname = "jsbeautifier"; - version = "1.14.2"; + version = "1.14.3"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-PskybkfTilQ5W97/h2lWakcnWOcLnhG6fMVs/spqm/Y="; + hash = "sha256-1tV2J8+ezYzZAbnsetSogSeo3t6RAXf6SyGedtAvm9c="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/json-home-client/default.nix b/pkgs/development/python-modules/json-home-client/default.nix new file mode 100644 index 0000000000000..be3d99904dcdb --- /dev/null +++ b/pkgs/development/python-modules/json-home-client/default.nix @@ -0,0 +1,40 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, pythonOlder +# build inputs +, typing-extensions +, uri-template +}: + +buildPythonPackage rec { + pname = "json-home-client"; + version = "1.1.1"; + + disabled = pythonOlder "3.6"; + + src = fetchFromGitHub { + owner = "plinss"; + repo = "json_home_client"; + rev = "v${version}"; + sha256 = "sha256-DhnvvY1nMe1sdRE+OgjBt4TsLmiqnD8If4rl700zW9E="; + }; + + postPatch = '' + sed -i -e 's/0.0.0/${version}/' setup.py + ''; + + propagatedBuildInputs = [ + typing-extensions + uri-template + ]; + + pythonImportsCheck = [ "json_home_client" ]; + + meta = with lib; { + description = "Client class for calling http+json APIs in Python"; + homepage = "https://github.com/plinss/json_home_client"; + license = licenses.mit; + maintainers = [ maintainers.kvark ]; + }; +} diff --git a/pkgs/development/python-modules/json-schema-for-humans/default.nix b/pkgs/development/python-modules/json-schema-for-humans/default.nix index a9faf437f80fe..8fb0e2dd40cf3 100644 --- a/pkgs/development/python-modules/json-schema-for-humans/default.nix +++ b/pkgs/development/python-modules/json-schema-for-humans/default.nix @@ -31,6 +31,11 @@ buildPythonPackage rec { hash = "sha256-H0jvOnrWE4/xxRYNehshHBRNc/qLX1+sCV7O1ACCdew="; }; + postPatch = '' + substituteInPlace pyproject.toml \ + --replace 'pytz = "^2021.1"' 'pytz = "*"' + ''; + nativeBuildInputs = [ poetry-core ]; @@ -54,12 +59,6 @@ buildPythonPackage rec { pytestCheckHook ]; - postPatch = '' - # https://github.com/coveooss/json-schema-for-humans/issues/127 - substituteInPlace pyproject.toml \ - --replace 'PyYAML = "^5.4.1"' 'PyYAML = "*"' - ''; - disabledTests = [ # Tests require network access "test_references_url" diff --git a/pkgs/development/python-modules/jsondiff/default.nix b/pkgs/development/python-modules/jsondiff/default.nix index 0b6f012098189..fe41d0dd85401 100644 --- a/pkgs/development/python-modules/jsondiff/default.nix +++ b/pkgs/development/python-modules/jsondiff/default.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { pname = "jsondiff"; - version = "1.3.0"; + version = "1.3.1"; src = fetchPypi { inherit pname version; - sha256 = "5122bf4708a031b02db029366184a87c5d0ddd5a327a5884ee6cf0193e599d71"; + sha256 = "sha256-BM+uvUpeVziUirYVcQ3D7pjvvfhRJV/Tl3xMLuWecxI="; }; postPatch = '' diff --git a/pkgs/development/python-modules/jsonpickle/default.nix b/pkgs/development/python-modules/jsonpickle/default.nix index a91e6b3accd29..1ffbbdd5e8954 100644 --- a/pkgs/development/python-modules/jsonpickle/default.nix +++ b/pkgs/development/python-modules/jsonpickle/default.nix @@ -9,11 +9,11 @@ buildPythonPackage rec { pname = "jsonpickle"; - version = "2.0.0"; + version = "2.1.0"; src = fetchPypi { inherit pname version; - sha256 = "0be49cba80ea6f87a168aa8168d717d00c6ca07ba83df3cec32d3b30bfe6fb9a"; + sha256 = "sha256-hGhM/FM4pTQXPI3WmAnkDyhl0L4fiit6+EZeW5aNz6k="; }; checkInputs = [ pytest ]; diff --git a/pkgs/development/python-modules/junos-eznc/default.nix b/pkgs/development/python-modules/junos-eznc/default.nix index 426b990ccac58..d693c73130be8 100644 --- a/pkgs/development/python-modules/junos-eznc/default.nix +++ b/pkgs/development/python-modules/junos-eznc/default.nix @@ -1,43 +1,77 @@ { lib , buildPythonPackage -, fetchPypi -, six -, scp -, pyserial -, paramiko -, netaddr +, fetchpatch +, fetchFromGitHub + +# propagates +, jinja2 +, lxml , ncclient +, netaddr , ntc-templates -, lxml -, jinja2 +, paramiko +, pyparsing +, pyserial , pyyaml +, scp +, six , transitions , yamlordereddictloader + +# tests +, mock , nose +, pytestCheckHook }: buildPythonPackage rec { pname = "junos-eznc"; version = "2.6.3"; + format = "setuptools"; - src = fetchPypi { - inherit pname version; - sha256 = "4eee93d0af203af7cee54a8f0c7bd28af683e829edf1fd68feba85d0ad737395"; + src = fetchFromGitHub { + owner = "Juniper"; + repo = "py-junos-eznc"; + rev = version; + hash = "sha256-XhQJwtS518AzSwyaWE392nfNdYe9+iYHvXxQsjJfzI8="; }; + patches = [ + (fetchpatch { + # Fixes tests with lxml>=4.8.0; remove > 2.6.3 + url = "https://github.com/Juniper/py-junos-eznc/commit/048f750bb7357b6f6b9db8ad64bea479298c74fb.patch"; + hash = "sha256-DYVj0BNPwDSbxDrzHhaq4F4kz1bliXB6Au3I63mRauc="; + }) + ]; + postPatch = '' substituteInPlace requirements.txt \ --replace "ncclient==0.6.9" "ncclient" ''; - checkInputs = [ nose ]; - propagatedBuildInputs = [ - scp six pyserial paramiko netaddr ncclient ntc-templates lxml jinja2 pyyaml transitions yamlordereddictloader + jinja2 + lxml + ncclient + netaddr + ntc-templates + paramiko + pyparsing + pyserial + pyyaml + scp + six + transitions + yamlordereddictloader + ]; + + checkInputs = [ + mock + nose ]; checkPhase = '' - nosetests -v --with-coverage --cover-package=jnpr.junos --cover-inclusive -a unit + nosetests -v -a unit --exclude=test_sw_put_ftp ''; pythonImportsCheck = [ "jnpr.junos" ]; diff --git a/pkgs/development/python-modules/jupyter-client/default.nix b/pkgs/development/python-modules/jupyter-client/default.nix index 9cb465947551a..2670fc163f6c2 100644 --- a/pkgs/development/python-modules/jupyter-client/default.nix +++ b/pkgs/development/python-modules/jupyter-client/default.nix @@ -14,11 +14,11 @@ buildPythonPackage rec { pname = "jupyter_client"; - version = "7.1.0"; + version = "7.2.1"; src = fetchPypi { inherit pname version; - sha256 = "a5f995a73cffb314ed262713ae6dfce53c6b8216cea9f332071b8ff44a6e1654"; + sha256 = "sha256-qhdyeekyBdBoHsDi4hDaAbIsWhRkpWq9RVrcrGTw3pE="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/jupyter-packaging/default.nix b/pkgs/development/python-modules/jupyter-packaging/default.nix index f3fd7747ff86c..bb2837d28fc88 100644 --- a/pkgs/development/python-modules/jupyter-packaging/default.nix +++ b/pkgs/development/python-modules/jupyter-packaging/default.nix @@ -10,13 +10,13 @@ buildPythonPackage rec { pname = "jupyter-packaging"; - version = "0.11.1"; + version = "0.12.0"; disabled = pythonOlder "3.7"; src = fetchPypi { pname = "jupyter_packaging"; inherit version; - sha256 = "6f5c7eeea98f7f3c8fb41d565a94bf59791768a93f93148b3c2dfb7ebade8eec"; + sha256 = "sha256-snRV1grck6e6ouC484a+gbkyu048ARYEbfntIwzT+qw="; }; propagatedBuildInputs = [ deprecation packaging tomlkit ]; diff --git a/pkgs/development/python-modules/jupyter_console/default.nix b/pkgs/development/python-modules/jupyter_console/default.nix index 9716fbe8e5d7d..5a3176b462c6e 100644 --- a/pkgs/development/python-modules/jupyter_console/default.nix +++ b/pkgs/development/python-modules/jupyter_console/default.nix @@ -12,12 +12,12 @@ buildPythonPackage rec { pname = "jupyter_console"; - version = "6.4.0"; + version = "6.4.3"; disabled = pythonOlder "3.5"; src = fetchPypi { inherit pname version; - sha256 = "242248e1685039cd8bff2c2ecb7ce6c1546eb50ee3b08519729e6e881aec19c7"; + sha256 = "sha256-VfMmJrC+ZHqF4yF93Nsi22nvx56LQDuXceuezGlgGbU="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/jupyter_core/default.nix b/pkgs/development/python-modules/jupyter_core/default.nix index a7dd89a1f89a0..b7838ff5915f6 100644 --- a/pkgs/development/python-modules/jupyter_core/default.nix +++ b/pkgs/development/python-modules/jupyter_core/default.nix @@ -2,33 +2,54 @@ , buildPythonPackage , fetchPypi , isPy3k +, fetchpatch +, python , ipython , traitlets , glibcLocales , mock -, pytest +, pytestCheckHook , nose }: buildPythonPackage rec { pname = "jupyter_core"; - version = "4.9.1"; + version = "4.9.2"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "dce8a7499da5a53ae3afd5a9f4b02e5df1d57250cf48f3ad79da23b4778cd6fa"; + sha256 = "sha256-1puuuf+xKLjNJlf88nA/icdp0Wc8hRgSEZ46Kg6TrZo="; }; - checkInputs = [ pytest mock glibcLocales nose ]; + checkInputs = [ pytestCheckHook mock glibcLocales nose ]; propagatedBuildInputs = [ ipython traitlets ]; - patches = [ ./tests_respect_pythonpath.patch ]; + patches = [ + # install jupyter_core/*.py files + (fetchpatch { + url = "https://github.com/jupyter/jupyter_core/pull/253/commits/3bbeaebec0a53520523162d5e8d5c6ca02b1b782.patch"; + sha256 = "sha256-QeAfj7wLz4egVUPMAgrZ9Wn/Tv60LrIXLgHGVoH41wQ="; + }) + ./tests_respect_pythonpath.patch + ]; - checkPhase = '' - HOME=$TMPDIR LC_ALL=en_US.utf8 py.test + preCheck = '' + export HOME=$TMPDIR + export LC_ALL=en_US.utf8 ''; + disabledTests = [ + # creates a temporary script, which isn't aware of PYTHONPATH + "test_argv0" + ]; + + postCheck = '' + $out/bin/jupyter --help > /dev/null + ''; + + pythonImportsCheck = [ "jupyter_core" ]; + meta = with lib; { description = "Jupyter core package. A base package on which Jupyter projects rely"; homepage = "https://jupyter.org/"; diff --git a/pkgs/development/python-modules/jupyterlab-git/default.nix b/pkgs/development/python-modules/jupyterlab-git/default.nix index 9d2907072e62a..9f36e03d48854 100644 --- a/pkgs/development/python-modules/jupyterlab-git/default.nix +++ b/pkgs/development/python-modules/jupyterlab-git/default.nix @@ -17,14 +17,14 @@ buildPythonPackage rec { pname = "jupyterlab-git"; - version = "0.34.1"; + version = "0.36.0"; disabled = pythonOlder "3.6"; src = fetchPypi { pname = "jupyterlab_git"; inherit version; - sha256 = "c7a03f526eb19175df73fedd5dee3cdae2d39e0474eef8f55c1c55b219ab26d9"; + sha256 = "sha256-K+h1ra9PsqKlSSPnc1jgSODICv3FoEdwqBGYWQYs6wE="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/jupyterlab/default.nix b/pkgs/development/python-modules/jupyterlab/default.nix index fbea0935ff304..1a72398f05a4f 100644 --- a/pkgs/development/python-modules/jupyterlab/default.nix +++ b/pkgs/development/python-modules/jupyterlab/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "jupyterlab"; - version = "3.3.2"; + version = "3.3.4"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "sha256-PHFr9VkssoxcVcYVxuW9PvxxiY9pV9E3GbVkeLu7WHo="; + sha256 = "sha256-4ENVhIs9kaxNlcLjhGoEKbM+nC7ceWaPtPxNIS8eUQc="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/jupyterlab_server/default.nix b/pkgs/development/python-modules/jupyterlab_server/default.nix index ed0fe4bca2d76..e612cfaeab043 100644 --- a/pkgs/development/python-modules/jupyterlab_server/default.nix +++ b/pkgs/development/python-modules/jupyterlab_server/default.nix @@ -16,16 +16,20 @@ buildPythonPackage rec { pname = "jupyterlab_server"; - version = "2.10.3"; + version = "2.12.0"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "3fb84a5813d6d836ceda773fb2d4e9ef3c7944dbc1b45a8d59d98641a80de80a"; + sha256 = "sha256-AOD0tMOZ9Vk4Mj6hDPktkVKI/hJ1PjXRBp9soItyq78="; }; postPatch = '' - sed -i "/^addopts/d" pyproject.toml + substituteInPlace pyproject.toml \ + --replace "--cov jupyterlab_server --cov-report term-missing --cov-report term:skip-covered" "" + + # translation tests try to install additional packages into read only paths + rm -r tests/translations/ ''; propagatedBuildInputs = [ requests jsonschema pyjson5 Babel jupyter_server ]; @@ -37,8 +41,6 @@ buildPythonPackage rec { ruamel-yaml ]; - pytestFlagsArray = [ "--pyargs" "jupyterlab_server" ]; - __darwinAllowLocalNetworking = true; meta = with lib; { diff --git a/pkgs/development/python-modules/jupytext/default.nix b/pkgs/development/python-modules/jupytext/default.nix index 6e0668de1470d..a7a7d48c9d1dc 100644 --- a/pkgs/development/python-modules/jupytext/default.nix +++ b/pkgs/development/python-modules/jupytext/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { pname = "jupytext"; - version = "1.13.7"; + version = "1.13.8"; format = "pyproject"; disabled = pythonOlder "3.6"; @@ -26,8 +26,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "mwouts"; repo = pname; - rev = "v${version}"; - sha256 = "sha256-DWK5ZoPL6Ek3dXHOlZfecQKLNwBqDjMZ77XZ7YLCXKI="; + rev = "refs/tags/v${version}"; + sha256 = "sha256-ebe5sQJxA8QE6eJp6vPUyMaEvZUPqzCmQ6damzo1BVo="; }; buildInputs = [ diff --git a/pkgs/development/python-modules/kaldi-active-grammar/default.nix b/pkgs/development/python-modules/kaldi-active-grammar/default.nix index 46fc619b4cb3a..a1ef7e314656e 100644 --- a/pkgs/development/python-modules/kaldi-active-grammar/default.nix +++ b/pkgs/development/python-modules/kaldi-active-grammar/default.nix @@ -5,6 +5,7 @@ , cmake , ush , requests +, six , numpy , cffi , openfst @@ -12,6 +13,11 @@ , callPackage }: +# +# Maintainer note: only in-tree dependant is `dragonfly`, try to +# update the two alongside eachother. +# + let kaldi = callPackage ./fork.nix { }; in @@ -48,7 +54,7 @@ buildPythonPackage rec { buildInputs = [ openfst kaldi ]; nativeBuildInputs = [ scikit-build cmake ]; - propagatedBuildInputs = [ ush requests numpy cffi ]; + propagatedBuildInputs = [ ush requests numpy cffi six ]; doCheck = false; # no tests exist diff --git a/pkgs/development/python-modules/karton-core/default.nix b/pkgs/development/python-modules/karton-core/default.nix index 07f317a8aba5a..562d8880692fc 100644 --- a/pkgs/development/python-modules/karton-core/default.nix +++ b/pkgs/development/python-modules/karton-core/default.nix @@ -8,13 +8,13 @@ buildPythonPackage rec { pname = "karton-core"; - version = "4.3.0"; + version = "4.4.0"; src = fetchFromGitHub { owner = "CERT-Polska"; repo = "karton"; - rev = "v${version}"; - sha256 = "sha256-pIYDY+pie4xqH11UHBal7/+MVmJDgNCFVpSD9we9ZPA="; + rev = "refs/tags/v${version}"; + sha256 = "sha256-TwTq44l/Nx+FQ6tFZHat4SPGOmHSwYfg7ShbGnxpkVw="; }; propagatedBuildInputs = [ minio redis ]; diff --git a/pkgs/development/python-modules/kbcstorage/default.nix b/pkgs/development/python-modules/kbcstorage/default.nix new file mode 100644 index 0000000000000..913b7981edd09 --- /dev/null +++ b/pkgs/development/python-modules/kbcstorage/default.nix @@ -0,0 +1,69 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub + +# build +, setuptools-scm + +# propagates +, azure-storage-blob +, boto3 +, requests + +# tests +, responses +, python +}: + +buildPythonPackage rec { + pname = "sapi-python-client"; + version = "0.4.1"; + format = "setuptools"; + + src = fetchFromGitHub { + owner = "keboola"; + repo = pname; + rev = version; + sha256 = "189dzj06vzp7366h2qsfvbjmw9qgl7jbp8syhynn9yvrjqp4k8h3"; + }; + + SETUPTOOLS_SCM_PRETEND_VERSION = version; + + nativeBuildInputs = [ + setuptools-scm + ]; + + propagatedBuildInputs = [ + azure-storage-blob + boto3 + requests + ]; + + # requires API token and an active keboola bucket + # ValueError: Root URL is required. + doCheck = false; + + checkInputs = [ + responses + ]; + + checkPhase = '' + runHook preCheck + ${python.interpreter} -m unittest discover + runHook postCheck + ''; + + pythonImportsCheck = [ + "kbcstorage" + "kbcstorage.buckets" + "kbcstorage.client" + "kbcstorage.tables" + ]; + + meta = with lib; { + description = "Keboola Connection Storage API client"; + homepage = "https://github.com/keboola/sapi-python-client"; + maintainers = with maintainers; [ mrmebelman ]; + license = licenses.mit; + }; +} diff --git a/pkgs/development/python-modules/keepalive/default.nix b/pkgs/development/python-modules/keepalive/default.nix index b6daec6ca2006..6a4fcdb265f47 100644 --- a/pkgs/development/python-modules/keepalive/default.nix +++ b/pkgs/development/python-modules/keepalive/default.nix @@ -19,6 +19,7 @@ buildPythonPackage rec { description = "An HTTP handler for `urllib2` that supports HTTP 1.1 and keepalive"; homepage = "https://github.com/wikier/keepalive"; license = licenses.asl20; + broken = true; # uses use_2to3, which is no longer supported for setuptools>=58 }; } diff --git a/pkgs/development/python-modules/keras/default.nix b/pkgs/development/python-modules/keras/default.nix index 2b9a269e280fc..dbdebefdb5a08 100644 --- a/pkgs/development/python-modules/keras/default.nix +++ b/pkgs/development/python-modules/keras/default.nix @@ -6,12 +6,12 @@ buildPythonPackage rec { pname = "keras"; - version = "2.7.0"; + version = "2.8.0"; format = "wheel"; src = fetchPypi { inherit format pname version; - sha256 = "0c33ae1f728064ca0d35dfba999e9c316f03623bf5688c82fb83cc74a80ea248"; + sha256 = "sha256-dE053GV33NgP9KTUFUnpK3fWoX4O3VikMdMGVuKbyU4="; }; checkInputs = [ diff --git a/pkgs/development/python-modules/kiss-headers/default.nix b/pkgs/development/python-modules/kiss-headers/default.nix index 0ceced85cacfe..43d1f784fab94 100644 --- a/pkgs/development/python-modules/kiss-headers/default.nix +++ b/pkgs/development/python-modules/kiss-headers/default.nix @@ -2,14 +2,14 @@ buildPythonPackage rec { pname = "kiss-headers"; - version = "2.3.0"; + version = "2.3.1"; format = "setuptools"; src = fetchFromGitHub { owner = "Ousret"; repo = pname; - rev = version; - sha256 = "sha256-/eTRyxFyAKQMzE/JjdoEN3w0lRiaIJcsJHTWV8M0CYQ="; + rev = "refs/tags/${version}"; + sha256 = "sha256-xPjw/uJTmvmQZDrI3i1KTUeAZuDF1mc13hvFBl8Erh0="; }; propagatedBuildInputs = [ requests ]; diff --git a/pkgs/development/python-modules/kivy-garden/default.nix b/pkgs/development/python-modules/kivy-garden/default.nix index edfad0c9b91dc..1475b4448230d 100644 --- a/pkgs/development/python-modules/kivy-garden/default.nix +++ b/pkgs/development/python-modules/kivy-garden/default.nix @@ -1,29 +1,31 @@ { lib -, buildPythonPackage, fetchPypi +, buildPythonPackage +, fetchFromGitHub , requests }: buildPythonPackage rec { pname = "kivy-garden"; - version = "0.1.4"; + version = "0.1.5"; + format = "setuptools"; - src = fetchPypi { - inherit pname version; - sha256 = "0wkcpr2zc1q5jb0bi7v2dgc0vs5h1y7j42mviyh764j2i0kz8mn2"; + src = fetchFromGitHub { + owner = "kivy-garden"; + repo = "garden"; + rev = "v${version}"; + hash = "sha256-xOMBPFKV7mTa51Q0VKja7b0E509IaWjwlJVlSRVdct8="; }; propagatedBuildInputs = [ requests ]; pythonImportsCheck = [ "garden" ]; - # There are no tests in the Pypi archive and building from source is not - # easily feasible because the build is done using buildozer and multiple - # repositories. + # There are no tests doCheck = false; meta = with lib; { description = "The kivy garden installation script, split into its own package for convenient use in buildozer."; - homepage = "https://pypi.python.org/pypi/kivy-garden"; + homepage = "https://github.com/kivy-garden/garden"; license = licenses.mit; maintainers = with maintainers; [ risson ]; }; diff --git a/pkgs/development/python-modules/kiwisolver/default.nix b/pkgs/development/python-modules/kiwisolver/default.nix index e5649c58e465a..b968fa3a50aa6 100644 --- a/pkgs/development/python-modules/kiwisolver/default.nix +++ b/pkgs/development/python-modules/kiwisolver/default.nix @@ -4,30 +4,42 @@ , stdenv , libcxx , cppy +, setuptools-scm +, pythonOlder }: buildPythonPackage rec { pname = "kiwisolver"; - version = "1.3.2"; + version = "1.4.2"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "fc4453705b81d03568d5b808ad8f09c77c47534f6ac2e72e733f9ca4714aa75c"; + hash = "sha256-f2BtkbiogWvkdlE6d/0wq+ZiJwOb1vi0BsNIywJH3Mk="; }; - NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isDarwin "-I${lib.getDev libcxx}/include/c++/v1"; + NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isDarwin [ + "-I${lib.getDev libcxx}/include/c++/v1" + ]; nativeBuildInputs = [ + setuptools-scm + ]; + + buildInputs = [ cppy ]; - # Does not include tests - doCheck = false; + pythonImportsCheck = [ + "kiwisolver" + ]; - meta = { - description = "A fast implementation of the Cassowary constraint solver"; + meta = with lib; { + description = "Implementation of the Cassowary constraint solver"; homepage = "https://github.com/nucleic/kiwi"; - license = lib.licenses.bsd3; + license = licenses.bsd3; + maintainers = with maintainers; [ ]; }; - } diff --git a/pkgs/development/python-modules/kubernetes/default.nix b/pkgs/development/python-modules/kubernetes/default.nix index 8508e5178f528..61333cc52bd71 100644 --- a/pkgs/development/python-modules/kubernetes/default.nix +++ b/pkgs/development/python-modules/kubernetes/default.nix @@ -11,7 +11,7 @@ , python-dateutil , pyyaml , requests -, requests_oauthlib +, requests-oauthlib , urllib3 , websocket-client @@ -24,6 +24,7 @@ buildPythonPackage rec { pname = "kubernetes"; version = "20.13.0"; format = "setuptools"; + disabled = pythonOlder "3.6"; src = fetchFromGitHub { @@ -41,7 +42,7 @@ buildPythonPackage rec { python-dateutil pyyaml requests - requests_oauthlib + requests-oauthlib urllib3 websocket-client ]; @@ -61,7 +62,7 @@ buildPythonPackage rec { ]; meta = with lib; { - description = "Kubernetes python client"; + description = "Kubernetes Python client"; homepage = "https://github.com/kubernetes-client/python"; license = licenses.asl20; maintainers = with maintainers; [ lsix ]; diff --git a/pkgs/development/python-modules/labelbox/default.nix b/pkgs/development/python-modules/labelbox/default.nix index c89782d4027e5..27f05d83aa058 100644 --- a/pkgs/development/python-modules/labelbox/default.nix +++ b/pkgs/development/python-modules/labelbox/default.nix @@ -19,14 +19,14 @@ buildPythonPackage rec { pname = "labelbox"; - version = "3.11.1"; + version = "3.15.0"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "Labelbox"; repo = "labelbox-python"; - rev = "v${version}"; - sha256 = "114h9phvbdknyvqdnjba3pd7i4iznffhgx9d569lq0hfla3hl61a"; + rev = "v.${version}"; + sha256 = "sha256-pJkDC/2EDPWbIw9WqV9kdYmr4X6apXtholzd0IYjgDg="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/labgrid/default.nix b/pkgs/development/python-modules/labgrid/default.nix index c95acdf68e30c..2032eb33d60cc 100644 --- a/pkgs/development/python-modules/labgrid/default.nix +++ b/pkgs/development/python-modules/labgrid/default.nix @@ -6,6 +6,7 @@ , jinja2 , lib , mock +, packaging , pexpect , psutil , pyserial @@ -44,6 +45,7 @@ buildPythonPackage rec { attrs autobahn jinja2 + packaging pexpect pyserial pyudev diff --git a/pkgs/development/python-modules/ledgerblue/default.nix b/pkgs/development/python-modules/ledgerblue/default.nix index ff489f4cf222b..b52a8e5b4c8e9 100644 --- a/pkgs/development/python-modules/ledgerblue/default.nix +++ b/pkgs/development/python-modules/ledgerblue/default.nix @@ -1,25 +1,48 @@ -{ lib, fetchPypi, buildPythonPackage, hidapi -, pycrypto, pillow, protobuf, future, ecpy, python-u2flib-host, pycryptodomex +{ lib +, buildPythonPackage +, ecpy +, fetchPypi +, future +, hidapi +, pillow +, protobuf +, pycrypto +, pycryptodomex +, pythonOlder +, python-u2flib-host , websocket-client }: buildPythonPackage rec { pname = "ledgerblue"; - version = "0.1.41"; + version = "0.1.42"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "7246a1a0442a63aff0b5de2796d306f0033e1937b3c9b9c2a92c9101cde4fe8d"; + hash = "sha256-UNquetZ1sCLO9T5p5b3jTSu+52xuc5XdyHNKsvvPdck="; }; propagatedBuildInputs = [ - hidapi pycrypto pillow protobuf future ecpy python-u2flib-host pycryptodomex websocket-client + ecpy + future + hidapi + pillow + protobuf + pycrypto + pycryptodomex + python-u2flib-host + websocket-client ]; # No tests doCheck = false; - pythonImportsCheck = [ "ledgerblue" ]; + pythonImportsCheck = [ + "ledgerblue" + ]; meta = with lib; { description = "Python library to communicate with Ledger Blue/Nano S"; diff --git a/pkgs/development/python-modules/lektor/default.nix b/pkgs/development/python-modules/lektor/default.nix index f88e14d0a3e7c..020506d519100 100644 --- a/pkgs/development/python-modules/lektor/default.nix +++ b/pkgs/development/python-modules/lektor/default.nix @@ -1,55 +1,84 @@ { lib +, Babel , buildPythonPackage -, fetchFromGitHub , click -, watchdog , exifread -, requests -, mistune +, fetchFromGitHub +, filetype +, flask , inifile -, Babel , jinja2 -, flask +, marshmallow +, marshmallow-dataclass +, mistune +, pip , pyopenssl -, ndg-httpsclient -, pytestCheckHook -, pytest-cov +, pytest-click , pytest-mock , pytest-pylint -, pytest-click -, isPy27 -, functools32 +, pytestCheckHook +, pythonOlder +, python-slugify +, requests , setuptools +, watchdog +, werkzeug }: buildPythonPackage rec { pname = "lektor"; - version = "3.3.1"; + version = "3.3.3"; + format = "pyproject"; + + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "lektor"; - repo = "lektor"; - rev = version; - sha256 = "04gn3jybqf9wc6l9mi0djpki60adnk7gppmv987ik676k5x8f1kk"; + repo = pname; + rev = "refs/tags/v${version}"; + hash = "sha256-3jPN4VQdIUVjSSGJxPek2RrnXzCwkDxoEBqk4vuL+nc="; }; propagatedBuildInputs = [ - click watchdog exifread requests mistune inifile Babel jinja2 - flask pyopenssl ndg-httpsclient setuptools - ] ++ lib.optionals isPy27 [ functools32 ]; + Babel + click + exifread + filetype + flask + inifile + jinja2 + marshmallow + marshmallow-dataclass + mistune + pip + pyopenssl + python-slugify + requests + setuptools + watchdog + werkzeug + ]; checkInputs = [ - pytestCheckHook pytest-cov pytest-mock pytest-pylint pytest-click + pytest-click + pytest-mock + pytest-pylint + pytestCheckHook ]; - # many errors -- tests assume inside of git repo, linting errors 13/317 fail - doCheck = false; + pythonImportsCheck = [ + "lektor" + ]; + + disabledTests = [ + # Test requires network access + "test_path_installed_plugin_is_none" + ]; meta = with lib; { description = "A static content management system"; - homepage = "https://www.getlektor.com/"; - license = licenses.bsd0; + homepage = "https://www.getlektor.com/"; + license = licenses.bsd0; maintainers = with maintainers; [ costrouc ]; }; - } diff --git a/pkgs/development/python-modules/levenshtein/default.nix b/pkgs/development/python-modules/levenshtein/default.nix index 64a9a3b5e996b..ebc1c51137534 100644 --- a/pkgs/development/python-modules/levenshtein/default.nix +++ b/pkgs/development/python-modules/levenshtein/default.nix @@ -2,14 +2,17 @@ , buildPythonPackage , fetchFromGitHub , pythonOlder +, cmake +, cython , pytestCheckHook , rapidfuzz +, scikit-build }: buildPythonPackage rec { pname = "levenshtein"; - version = "0.17.0"; - format = "setuptools"; + version = "0.18.1"; + format = "pyproject"; disabled = pythonOlder "3.6"; @@ -17,13 +20,18 @@ buildPythonPackage rec { owner = "maxbachmann"; repo = "Levenshtein"; rev = "v${version}"; - sha256 = "1a14cw2314jb5lrm979zipzk3av4630lxdr4jzj2wl5qh3yw4w52"; + # https://github.com/maxbachmann/Levenshtein/issues/22 + fetchSubmodules = true; + sha256 = "sha256-WREYdD5MFOpCzH4BSceRpzQZdpi3Xxxn0DpMvDsNlGo="; }; - postPatch = '' - substituteInPlace setup.cfg \ - --replace "rapidfuzz >= 1.8.2, < 1.9" "rapidfuzz" - ''; + nativeBuildInputs = [ + cmake + cython + scikit-build + ]; + + dontUseCmakeConfigure = true; propagatedBuildInputs = [ rapidfuzz diff --git a/pkgs/development/python-modules/libcst/default.nix b/pkgs/development/python-modules/libcst/default.nix index 0c4a8985e4015..ccd12e4aaae3b 100644 --- a/pkgs/development/python-modules/libcst/default.nix +++ b/pkgs/development/python-modules/libcst/default.nix @@ -1,12 +1,16 @@ { lib +, stdenv , buildPythonPackage , dataclasses , fetchFromGitHub , hypothesis +, libiconv , pytestCheckHook , python , pythonOlder , pyyaml +, rustPlatform +, setuptools-rust , setuptools-scm , typing-extensions , typing-inspect @@ -14,8 +18,8 @@ buildPythonPackage rec { pname = "libcst"; - version = "0.3.23"; - format = "setuptools"; + version = "0.4.1"; + format = "pyproject"; disabled = pythonOlder "3.6"; @@ -23,9 +27,18 @@ buildPythonPackage rec { owner = "instagram"; repo = pname; rev = "v${version}"; - sha256 = "1r4aiqpndqa75119faknsghi7zxyjrx5r6i7cb3d0liwiqrkzrvx"; + sha256 = "sha256-soAlt1KBpCn5JxM1b2LZ3vOpBn9HPGdbm+BBYbyEkfE="; }; + cargoDeps = rustPlatform.fetchCargoTarball { + inherit src; + sourceRoot = "source/${cargoRoot}"; + name = "${pname}-${version}"; + hash = "sha256:1rz1c0dv3f1h2m5hwdisl3rbqnmifbva4f0c4vygk7rh1q27l515"; + }; + + cargoRoot = "native"; + postPatch = '' # test try to format files, which isn't necessary when consuming releases sed -i libcst/codegen/generate.py \ @@ -35,8 +48,12 @@ buildPythonPackage rec { SETUPTOOLS_SCM_PRETEND_VERSION = version; nativeBuildInputs = [ + setuptools-rust setuptools-scm - ]; + rustPlatform.cargoSetupHook + ] ++ (with rustPlatform; [ rust.cargo rust.rustc ]); + + buildInputs = lib.optionals stdenv.isDarwin [ libiconv ]; propagatedBuildInputs = [ hypothesis diff --git a/pkgs/development/python-modules/libevdev/default.nix b/pkgs/development/python-modules/libevdev/default.nix index 4a4ba489e0a62..494e887c79bca 100644 --- a/pkgs/development/python-modules/libevdev/default.nix +++ b/pkgs/development/python-modules/libevdev/default.nix @@ -9,12 +9,12 @@ buildPythonPackage rec { pname = "libevdev"; - version = "0.9"; + version = "0.10"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "17agnigmzscmdjqmrylg1lza03hwjhgxbpf4l705s6i7p7ndaqrs"; + sha256 = "sha256-9LM2Ftr6qmQYysCxso+XJSthwJdOU01J+yL8ZWbtwRM="; }; patches = [ diff --git a/pkgs/development/python-modules/libgpuarray/default.nix b/pkgs/development/python-modules/libgpuarray/default.nix index 2be115ae3658e..89a83df42684f 100644 --- a/pkgs/development/python-modules/libgpuarray/default.nix +++ b/pkgs/development/python-modules/libgpuarray/default.nix @@ -9,7 +9,7 @@ , six , nose , Mako -, cudaSupport ? false, cudatoolkit +, cudaSupport ? false, cudaPackages , openclSupport ? true, ocl-icd, clblas }: @@ -30,7 +30,7 @@ buildPythonPackage rec { configurePhase = "cmakeConfigurePhase"; libraryPath = lib.makeLibraryPath ( - lib.optionals cudaSupport [ cudatoolkit.lib cudatoolkit.out ] + lib.optionals cudaSupport (with cudaPackages; [ cudatoolkit.lib cudatoolkit.out ]) ++ lib.optionals openclSupport ([ clblas ] ++ lib.optional (!stdenv.isDarwin) ocl-icd) ); diff --git a/pkgs/development/python-modules/libtmux/default.nix b/pkgs/development/python-modules/libtmux/default.nix index 7a7e116aa2212..74515e1c1396a 100644 --- a/pkgs/development/python-modules/libtmux/default.nix +++ b/pkgs/development/python-modules/libtmux/default.nix @@ -3,19 +3,20 @@ , buildPythonPackage , poetry-core , pytestCheckHook -, pkgs +, procps +, tmux }: buildPythonPackage rec { pname = "libtmux"; - version = "0.10.3"; + version = "0.11.0"; format = "pyproject"; src = fetchFromGitHub { owner = "tmux-python"; repo = pname; rev = "v${version}"; - hash = "sha256:0syj8m4x2mcq96b76b7h75dsmcai22m15pfgkk90rpg7rp6sn772"; + hash = "sha256-QbKqS40la6UGZENyGEw5kXigzexp3q7ff43fKlQ9GqE="; }; nativeBuildInputs = [ @@ -23,8 +24,9 @@ buildPythonPackage rec { ]; checkInputs = [ - pkgs.procps - pkgs.tmux + procps + tmux + pytestCheckHook ]; diff --git a/pkgs/development/python-modules/lightwave2/default.nix b/pkgs/development/python-modules/lightwave2/default.nix index f840a2186cfb7..1f2558ef7611b 100644 --- a/pkgs/development/python-modules/lightwave2/default.nix +++ b/pkgs/development/python-modules/lightwave2/default.nix @@ -7,14 +7,14 @@ buildPythonPackage rec { pname = "lightwave2"; - version = "0.8.1"; + version = "0.8.14"; format = "setuptools"; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - sha256 = "sha256-UULOQawsY2N0xxYlgIZKs8Xyl0XDqC6fSSKvo8ZBEcY="; + sha256 = "sha256-zUPo81MC1K830ss7ECfawiYU1RNah9PIKAz1Uqz7c/w="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/limits/default.nix b/pkgs/development/python-modules/limits/default.nix index 9a19dda15789a..7cb622df047ec 100644 --- a/pkgs/development/python-modules/limits/default.nix +++ b/pkgs/development/python-modules/limits/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "limits"; - version = "2.2.0"; + version = "2.4.0"; src = fetchPypi { inherit pname version; - sha256 = "da6346f0dcf85f17f0f1cc709c3408a3058cf6fee68313c288127c287237b411"; + sha256 = "sha256-jiK2PfJjECB6d7db1HRZnwpGE6fZFjZQ7TpCjpzHrjU="; }; propagatedBuildInputs = [ six ]; diff --git a/pkgs/development/python-modules/lmnotify/default.nix b/pkgs/development/python-modules/lmnotify/default.nix index 4e5526a424dae..bf9d857dc74d2 100644 --- a/pkgs/development/python-modules/lmnotify/default.nix +++ b/pkgs/development/python-modules/lmnotify/default.nix @@ -3,28 +3,39 @@ , fetchPypi , oauthlib , requests -, requests_oauthlib +, requests-oauthlib +, pythonOlder }: buildPythonPackage rec { pname = "lmnotify"; version = "0.0.6"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "sha256-cCP7BU2f7QJe9gAI298cvkp3OGijvBv8G1RN7qfZ5PE="; + hash = "sha256-cCP7BU2f7QJe9gAI298cvkp3OGijvBv8G1RN7qfZ5PE="; }; - propagatedBuildInputs = [ oauthlib requests requests_oauthlib ]; + propagatedBuildInputs = [ + oauthlib + requests + requests-oauthlib + ]; - doCheck = false; # no tests exist + # Module has no tests + doCheck = false; - pythonImportsCheck = [ "lmnotify" ]; + pythonImportsCheck = [ + "lmnotify" + ]; meta = with lib; { description = "Python package for sending notifications to LaMetric Time"; homepage = "https://github.com/keans/lmnotify"; - maintainers = with maintainers; [ rhoriguchi ]; license = licenses.mit; + maintainers = with maintainers; [ rhoriguchi ]; }; } diff --git a/pkgs/development/python-modules/losant-rest/default.nix b/pkgs/development/python-modules/losant-rest/default.nix index 6dac34a9f7a84..8056e93c51a78 100644 --- a/pkgs/development/python-modules/losant-rest/default.nix +++ b/pkgs/development/python-modules/losant-rest/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "losant-rest"; - version = "1.16.0"; + version = "1.16.1"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "Losant"; repo = "losant-rest-python"; rev = "v${version}"; - sha256 = "sha256-1beURMpQ2klwupcd4wJZud6MnAKzwXPvVlobk/eSvXo="; + sha256 = "sha256-mdSqGeVfZTSW65eQiYerjlq6afq2dyYjUi38DVsI6wQ="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/lru-dict/default.nix b/pkgs/development/python-modules/lru-dict/default.nix new file mode 100644 index 0000000000000..b075ead342973 --- /dev/null +++ b/pkgs/development/python-modules/lru-dict/default.nix @@ -0,0 +1,34 @@ +{ lib +, buildPythonPackage +, fetchPypi +, pytestCheckHook +}: + +let + pname = "lru-dict"; + version = "1.1.7"; +in +buildPythonPackage { + inherit pname version; + format = "setuptools"; + + src = fetchPypi { + inherit pname version; + hash = "sha256-RbgfZ9dTQdRDOrreeZpH6cQqniKhGFMdy15UmGQDLXw="; + }; + + checkInputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ + "lru" + ]; + + meta = with lib; { + description = "Fast and memory efficient LRU cache for Python"; + homepage = "https://github.com/amitdev/lru-dict"; + license = licenses.mit; + maintainers = with maintainers; [ hexa ]; + }; +} diff --git a/pkgs/development/python-modules/luxtronik/default.nix b/pkgs/development/python-modules/luxtronik/default.nix index 7466397ebb71e..7f7225bdb92a1 100644 --- a/pkgs/development/python-modules/luxtronik/default.nix +++ b/pkgs/development/python-modules/luxtronik/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "luxtronik"; - version = "0.3.11"; + version = "0.3.12"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "Bouni"; repo = "python-luxtronik"; rev = version; - sha256 = "sha256-pngtkEuWmOD1MG7/Bh+8iqCxU0l/fGHA8uZxYoxOE5Y="; + sha256 = "sha256-qQwMahZ3EzXzI7FyTL71WzDpLqmIgVYxiJ0IGvlw8dY="; }; # Project has no tests diff --git a/pkgs/development/python-modules/lxmf/default.nix b/pkgs/development/python-modules/lxmf/default.nix new file mode 100644 index 0000000000000..c6044844a62f6 --- /dev/null +++ b/pkgs/development/python-modules/lxmf/default.nix @@ -0,0 +1,39 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, rns +, pythonOlder +}: + +buildPythonPackage rec { + pname = "lxmf"; + version = "0.1.5"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "markqvist"; + repo = "lxmf"; + rev = "refs/tags/${version}"; + hash = "sha256-9JG/EnL7vW4P7QiT6Xa0GLfmu1JeM0dlFSp3VRE47NI="; + }; + + propagatedBuildInputs = [ + rns + ]; + + # Module has no tests + doCheck = false; + + pythonImportsCheck = [ + "LXMF" + ]; + + meta = with lib; { + description = "Lightweight Extensible Message Format for Reticulum"; + homepage = "https://github.com/markqvist/lxmf"; + license = licenses.mit; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/lxml/default.nix b/pkgs/development/python-modules/lxml/default.nix index 2c549b6830a16..3ef230eb8e8d1 100644 --- a/pkgs/development/python-modules/lxml/default.nix +++ b/pkgs/development/python-modules/lxml/default.nix @@ -8,13 +8,13 @@ buildPythonPackage rec { pname = "lxml"; - version = "4.7.1"; + version = "4.8.0"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "lxml-${version}"; - sha256 = "0xji4kcw1fl3nqg04q6zlympkx2kv2s1r1p18763dshgpisqgiq4"; + sha256 = "sha256-ppyLn8B0YFQivRCOE8TjKGdDDQHbb7UdTUkevznoVC8="; }; # setuptoolsBuildPhase needs dependencies to be passed through nativeBuildInputs diff --git a/pkgs/development/python-modules/lz4/default.nix b/pkgs/development/python-modules/lz4/default.nix index 9e2cc9b31e155..c6966e632f05e 100644 --- a/pkgs/development/python-modules/lz4/default.nix +++ b/pkgs/development/python-modules/lz4/default.nix @@ -2,6 +2,7 @@ , buildPythonPackage , fetchFromGitHub , pythonOlder +, python # native inputs , pkgconfig @@ -14,7 +15,7 @@ buildPythonPackage rec { pname = "python-lz4"; - version = "3.1.12"; + version = "4.0.0"; format = "setuptools"; disabled = pythonOlder "3.5"; @@ -24,7 +25,7 @@ buildPythonPackage rec { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "sha256-fqt9aJGqZpfbiYtU8cmm7UQaixZwbTKFBwRfR1B/qic="; + sha256 = "sha256-9gp67i2fotvFOpkaQZ82/YKnDEs3DnzXfuNCVRJg88I="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; @@ -50,13 +51,13 @@ buildPythonPackage rec { psutil ]; - # leave build directory, so the installed library gets imported - preCheck = '' - pushd tests - ''; + # for lz4.steam + PYLZ4_EXPERIMENTAL = true; - postCheck = '' - popd + # prevent local lz4 directory from getting imported as it lacks native extensions + preCheck = '' + rm -r lz4 + export PYTHONPATH=$out/${python.sitePackages}:$PYTHONPATH ''; meta = with lib; { diff --git a/pkgs/development/python-modules/magicgui/default.nix b/pkgs/development/python-modules/magicgui/default.nix index 03ca9d7915971..e437ee7290b26 100644 --- a/pkgs/development/python-modules/magicgui/default.nix +++ b/pkgs/development/python-modules/magicgui/default.nix @@ -9,20 +9,29 @@ , pyside2 , psygnal , docstring-parser +, napari # a reverse-dependency, for tests }: buildPythonPackage rec { pname = "magicgui"; - version = "0.3.0"; + version = "0.3.7"; + + format = "pyproject"; + src = fetchFromGitHub { owner = "napari"; repo = "magicgui"; rev = "v${version}"; - sha256 = "sha256-DvL1szk2RoCrpisjp0BVNL6qFZtYc2oYDenX59Cxbug="; + sha256 = "sha256-LYXNNr5lS3ibQk2NIopZkB8kzC7j3yY8moGMk0Gr+hU="; }; + + SETUPTOOLS_SCM_PRETEND_VERSION = version; + nativeBuildInputs = [ setuptools-scm ]; propagatedBuildInputs = [ typing-extensions qtpy pyside2 psygnal docstring-parser ]; checkInputs = [ pytestCheckHook pytest-mypy-plugins ]; + doCheck = false; # Reports "Fatal Python error" - SETUPTOOLS_SCM_PRETEND_VERSION = version; + + passthru.tests = { inherit napari; }; meta = with lib; { description = "Build GUIs from python functions, using magic. (napari/magicgui)"; diff --git a/pkgs/development/python-modules/mailchecker/default.nix b/pkgs/development/python-modules/mailchecker/default.nix index ab609b597a4e7..61e4c3d21f07b 100644 --- a/pkgs/development/python-modules/mailchecker/default.nix +++ b/pkgs/development/python-modules/mailchecker/default.nix @@ -6,14 +6,14 @@ buildPythonPackage rec { pname = "mailchecker"; - version = "4.1.13"; + version = "4.1.15"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-4ez18K9ksVGjzspHHcw/Ja6hxoKTkYLBFn65m7VBWYk="; + hash = "sha256-DOtLJKNvmj5dlveZX9sScfJZa3SY7GH7xfZHhIsybVQ="; }; # Module has no tests diff --git a/pkgs/development/python-modules/manticore/default.nix b/pkgs/development/python-modules/manticore/default.nix index 0c36f2cc6cc6e..2e1bff7e21ef0 100644 --- a/pkgs/development/python-modules/manticore/default.nix +++ b/pkgs/development/python-modules/manticore/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { pname = "manticore"; - version = "0.3.6"; + version = "0.3.7"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -32,7 +32,7 @@ buildPythonPackage rec { owner = "trailofbits"; repo = "manticore"; rev = version; - sha256 = "sha256-L112YwrBcdcLBeBsPLWt3C57u2WDvGLq50EzW9ojdyg="; + sha256 = "sha256-+17VBfAtkZZIi3SF5Num1Uqg3WjIpgbz3Jx65rD5zkM="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/mariadb/default.nix b/pkgs/development/python-modules/mariadb/default.nix index 987fe203edb79..93260e9aac268 100644 --- a/pkgs/development/python-modules/mariadb/default.nix +++ b/pkgs/development/python-modules/mariadb/default.nix @@ -2,13 +2,13 @@ buildPythonPackage rec { pname = "mariadb"; - version = "1.0.10"; + version = "1.0.11"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-eQKLpgURc9rRrQvnUYOJyrcCOfkrT/i4gT2uVcPyxT0="; + hash = "sha256-dpFsiSvJNsWw824loUEfZRp7fOl4mSrjqN5+KD79rL8="; extension = "zip"; }; diff --git a/pkgs/development/python-modules/markupsafe/default.nix b/pkgs/development/python-modules/markupsafe/default.nix index 12845da7e37a8..0c36299b1f123 100644 --- a/pkgs/development/python-modules/markupsafe/default.nix +++ b/pkgs/development/python-modules/markupsafe/default.nix @@ -7,13 +7,15 @@ buildPythonPackage rec { pname = "markupsafe"; - version = "2.0.1"; - disabled = pythonOlder "3.6"; + version = "2.1.1"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchPypi { pname = "MarkupSafe"; inherit version; - sha256 = "02k2ynmqvvd0z0gakkf8s4idyb606r7zgga41jrkhqmigy06fk2r"; + sha256 = "sha256-f5EZfMnkj5idEuTm+8RklcRGY238gbnM9Quw7HS5HUs="; }; checkInputs = [ diff --git a/pkgs/development/python-modules/marshmallow-dataclass/default.nix b/pkgs/development/python-modules/marshmallow-dataclass/default.nix index 4b36ee9b74ef1..730254bcf8257 100644 --- a/pkgs/development/python-modules/marshmallow-dataclass/default.nix +++ b/pkgs/development/python-modules/marshmallow-dataclass/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "marshmallow-dataclass"; - version = "8.5.3"; + version = "8.5.5"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "lovasoa"; repo = "marshmallow_dataclass"; rev = "v${version}"; - sha256 = "0mngkjfs2nxxr0y77n429hb22rmjxbnn95j4vwqr9y6q16bqxs0w"; + sha256 = "sha256-sozq+L3pa9iprAWtQd/L+LCfTWfDue04WzQ/fbM0mps="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/marshmallow-sqlalchemy/default.nix b/pkgs/development/python-modules/marshmallow-sqlalchemy/default.nix index 9887f42bd8f39..e7921a29f54ad 100644 --- a/pkgs/development/python-modules/marshmallow-sqlalchemy/default.nix +++ b/pkgs/development/python-modules/marshmallow-sqlalchemy/default.nix @@ -10,12 +10,12 @@ buildPythonPackage rec { pname = "marshmallow-sqlalchemy"; - version = "0.27.0"; + version = "0.28.0"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "1521b129564444648c523a38f6446c137f1aae5c9c7de1ec151d5ebf03fd407d"; + sha256 = "sha256-+2sGaG84/sLqDsU6XuSXkhlAnisiYPm8keS0MQXRl4I="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/matchpy/default.nix b/pkgs/development/python-modules/matchpy/default.nix index 8ee3d60f80101..efcf1741ab415 100644 --- a/pkgs/development/python-modules/matchpy/default.nix +++ b/pkgs/development/python-modules/matchpy/default.nix @@ -1,11 +1,9 @@ { lib , buildPythonPackage -, fetchpatch -, fetchPypi +, fetchFromGitHub , hopcroftkarp , multiset -, pytest -, pytest-runner +, pytestCheckHook , hypothesis , setuptools-scm , isPy27 @@ -13,37 +11,45 @@ buildPythonPackage rec { pname = "matchpy"; - version = "0.5.1"; + version = "0.5.5"; # Don't upgrade to 4.3.1, this tag is very old disabled = isPy27; - src = fetchPypi { - inherit pname version; - sha256 = "1vvf1cd9kw5z1mzvypc9f030nd18lgvvjc8j56b1s9b7dyslli2r"; + src = fetchFromGitHub { + owner = "HPAC"; + repo = pname; + rev = version; + hash = "sha256-n5rXIjqVQZzEbfIZVQiGLh2PR1DHAJ9gumcrbvwnasA="; }; - patches = [ - # Fix tests for pytest 4. Remove with the next release - (fetchpatch { - url = "https://github.com/HPAC/matchpy/commit/b405a2717a7793d58c47b2e2197d9d00c06fb13c.patch"; - includes = [ "tests/conftest.py" ]; - sha256 = "1b6gqf2vy9qxg384nqr9k8il335afhbdmlyx4vhd8r8rqpv7gax9"; - }) - ]; - postPatch = '' + sed -i '/pytest-runner/d' setup.cfg + substituteInPlace setup.cfg \ - --replace "hypothesis>=3.6,<4.0" "hypothesis" \ - --replace "pytest>=3.0,<4.0" "pytest" + --replace "multiset>=2.0,<3.0" "multiset" ''; - buildInputs = [ setuptools-scm pytest-runner ]; - checkInputs = [ pytest hypothesis ]; - propagatedBuildInputs = [ hopcroftkarp multiset ]; + nativeBuildInputs = [ + setuptools-scm + ]; + + propagatedBuildInputs = [ + hopcroftkarp + multiset + ]; + + checkInputs = [ + pytestCheckHook + hypothesis + ]; + + pythonImportsCheck = [ + "matchpy" + ]; meta = with lib; { description = "A library for pattern matching on symbolic expressions"; homepage = "https://github.com/HPAC/matchpy"; license = licenses.mit; - maintainers = [ maintainers.costrouc ]; + maintainers = with maintainers; [ costrouc ]; }; } diff --git a/pkgs/development/python-modules/matrix-nio/default.nix b/pkgs/development/python-modules/matrix-nio/default.nix index 665167e290ea9..724a1459b7794 100644 --- a/pkgs/development/python-modules/matrix-nio/default.nix +++ b/pkgs/development/python-modules/matrix-nio/default.nix @@ -41,6 +41,7 @@ buildPythonPackage rec { postPatch = '' substituteInPlace pyproject.toml \ --replace 'aiofiles = "^0.6.0"' 'aiofiles = "*"' \ + --replace 'h11 = "^0.12.0"' 'h11 = "*"' \ --replace 'jsonschema = "^3.2.0"' 'jsonschema = "*"' \ --replace 'cachetools = { version = "^4.2.1", optional = true }' 'cachetools = { version = "*", optional = true }' ''; diff --git a/pkgs/development/python-modules/mccabe/default.nix b/pkgs/development/python-modules/mccabe/default.nix index f20cb18b48852..f47e4e4d4b6e9 100644 --- a/pkgs/development/python-modules/mccabe/default.nix +++ b/pkgs/development/python-modules/mccabe/default.nix @@ -1,15 +1,27 @@ -{ lib, buildPythonPackage, fetchPypi, pytest, pytest-runner }: +{ lib +, buildPythonPackage +, fetchPypi +, pytest +, hypothesis +, hypothesmith +, python +}: buildPythonPackage rec { pname = "mccabe"; - version = "0.6.1"; + version = "0.7.0"; src = fetchPypi { inherit pname version; - sha256 = "07w3p1qm44hgxf3vvwz84kswpsx6s7kvaibzrsx5dzm0hli1i3fx"; + sha256 = "sha256-NI4CQMM7YLvfTlIxku+RnyjLLD19XHeU90AJKQ8jYyU="; }; - buildInputs = [ pytest pytest-runner ]; + buildInputs = [ + pytest + ]; + + # https://github.com/PyCQA/mccabe/issues/93 + doCheck = false; meta = with lib; { description = "McCabe checker, plugin for flake8"; diff --git a/pkgs/development/python-modules/md-toc/default.nix b/pkgs/development/python-modules/md-toc/default.nix index a37e82a62d34e..5d3cde1d038c6 100644 --- a/pkgs/development/python-modules/md-toc/default.nix +++ b/pkgs/development/python-modules/md-toc/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "md-toc"; - version = "8.1.1"; + version = "8.1.3"; format = "setuptools"; disabled = pythonOlder "3.5"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "frnmst"; repo = pname; rev = version; - sha256 = "sha256-Dlqia+B7WJZlFGlIhgUWdND1qhSS/FOPoFH+uim6i8I="; + sha256 = "sha256-/Hi2CW3aqbvCr7xGHD9lAe9U84waSjVfTfWq76NXNT4="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/mdurl/default.nix b/pkgs/development/python-modules/mdurl/default.nix index 37b3e9ad56ac5..da44a1dbbc3d6 100644 --- a/pkgs/development/python-modules/mdurl/default.nix +++ b/pkgs/development/python-modules/mdurl/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "mdurl"; - version = "0.1.0"; + version = "0.1.1"; format = "pyproject"; disabled = pythonOlder "3.6"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "hukkin"; repo = pname; rev = version; - sha256 = "sha256-AVklWFc4o5R9OzS9BYauuOaxm89P/Ih5l3Vrb2P0El4="; + sha256 = "sha256-SBJSs+i+I0jF90i3o6BUgLCDR6Et34fXEmQ7fbDoAbA="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/mechanize/default.nix b/pkgs/development/python-modules/mechanize/default.nix index aa309ff33cea9..5b0ca1735cbd8 100644 --- a/pkgs/development/python-modules/mechanize/default.nix +++ b/pkgs/development/python-modules/mechanize/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "mechanize"; - version = "0.4.7"; + version = "0.4.8"; src = fetchPypi { inherit pname version; - sha256 = "1773a8f5818398e0010e781dc0f942cd88b107a57424c904d545cd827c216809"; + sha256 = "sha256-XoasB3c1fgBusEzSj37Z+BHUjf+mA9OJGsbSuSKA3JE="; }; propagatedBuildInputs = [ html5lib ]; diff --git a/pkgs/development/python-modules/mergedb/default.nix b/pkgs/development/python-modules/mergedb/default.nix new file mode 100644 index 0000000000000..b31d4ddf19280 --- /dev/null +++ b/pkgs/development/python-modules/mergedb/default.nix @@ -0,0 +1,51 @@ +{ lib +, buildPythonPackage +, colorama +, fetchPypi +, jinja2 +, pytestCheckHook +, pythonOlder +, pyyaml +, setuptools +, setuptools-scm +}: + +buildPythonPackage rec { + pname = "mergedb"; + version = "0.1.1"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; + + src = fetchPypi { + inherit pname version; + sha256 = "2034c18dca23456c5b166b63d94300bcd8ec9f386e6cd639c2f66e141c0313f9"; + }; + + nativeBuildInputs = [ + setuptools-scm + ]; + + propagatedBuildInputs = [ + pyyaml + colorama + jinja2 + setuptools + ]; + + checkInputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ + "mergedb" + ]; + + meta = with lib; { + description = "A tool/library for deep merging YAML files"; + homepage = "https://github.com/graysonhead/mergedb"; + license = licenses.gpl3Only; + maintainers = with maintainers; [ graysonhead ]; + }; +} + diff --git a/pkgs/development/python-modules/merkletools/default.nix b/pkgs/development/python-modules/merkletools/default.nix index 92acdaf58ed42..a57f926a615f5 100644 --- a/pkgs/development/python-modules/merkletools/default.nix +++ b/pkgs/development/python-modules/merkletools/default.nix @@ -15,6 +15,6 @@ buildPythonPackage rec { description = "Python tools for creating Merkle trees, generating Merkle proofs, and verification of Merkle proofs"; homepage = "https://github.com/Tierion/pymerkletools"; license = licenses.mit; - maintainers = with maintainers; [ chiiruno ]; + maintainers = with maintainers; [ Madouura ]; }; } diff --git a/pkgs/development/python-modules/meshio/default.nix b/pkgs/development/python-modules/meshio/default.nix index 54f8431ba2792..1df5a7f478074 100644 --- a/pkgs/development/python-modules/meshio/default.nix +++ b/pkgs/development/python-modules/meshio/default.nix @@ -6,22 +6,24 @@ , h5py , exdown , pytestCheckHook +, rich }: buildPythonPackage rec { pname = "meshio"; - version = "5.2.2"; + version = "5.3.4"; format = "pyproject"; src = fetchPypi { inherit pname version; - sha256 = "209885ac31b00155e43c27859d1aff0ba7f97f319ee7bed453a8b9e1677a4e52"; + sha256 = "sha256-4kBpLX/yecErE8bl17QDYpqGrStE6SMJWLPwDB7DafA="; }; propagatedBuildInputs = [ numpy netcdf4 h5py + rich ]; checkInputs = [ diff --git a/pkgs/development/python-modules/metakernel/default.nix b/pkgs/development/python-modules/metakernel/default.nix index f94ddb12ac5d2..417b4d914e632 100644 --- a/pkgs/development/python-modules/metakernel/default.nix +++ b/pkgs/development/python-modules/metakernel/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "metakernel"; - version = "0.28.2"; + version = "0.29.0"; src = fetchPypi { inherit pname version; - sha256 = "8811a4497444495639ef000902f4c6e8a7e2c57da1d47a8a24bcc9083548b389"; + sha256 = "sha256-+B8ywp7q42g8H+BPFK+D1VyLfyqgnrYIN3ai/mdcwcA="; }; propagatedBuildInputs = [ ipykernel ]; diff --git a/pkgs/development/python-modules/meteofrance-api/default.nix b/pkgs/development/python-modules/meteofrance-api/default.nix new file mode 100644 index 0000000000000..5e738adb62bf4 --- /dev/null +++ b/pkgs/development/python-modules/meteofrance-api/default.nix @@ -0,0 +1,76 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, poetry +, pytestCheckHook +, pythonOlder +, pytz +, requests +, requests-mock +, typing-extensions +, urllib3 +}: + +buildPythonPackage rec { + pname = "meteofrance-api"; + version = "1.0.2"; + format = "pyproject"; + + disabled = pythonOlder "3.6"; + + src = fetchFromGitHub { + owner = "hacf-fr"; + repo = pname; + rev = "v${version}"; + hash = "sha256-X8f0z9ZPXH7Wc3GqHmPptxpNxbHeezdOzw4gZCprumU="; + }; + + nativeBuildInputs = [ + # Doesn't work with poetry-core at the moment + poetry + ]; + + propagatedBuildInputs = [ + pytz + requests + urllib3 + ] ++ lib.optionals (pythonOlder "3.7") [ + typing-extensions + ]; + + checkInputs = [ + pytestCheckHook + requests-mock + ]; + + postPatch = '' + # https://github.com/hacf-fr/meteofrance-api/pull/378 + substituteInPlace pyproject.toml \ + --replace 'pytz = ">=2020.4,<2022.0"' 'pytz = ">=2020.4,<2023.0"' + ''; + + pythonImportsCheck = [ + "meteofrance_api" + ]; + + disabledTests = [ + # Tests require network access + "test_currentphenomenons" + "test_forecast" + "test_full_with_coastal_bulletint" + "test_fulls" + "test_no_rain_expected" + "test_picture_of_the_day" + "test_places" + "test_rain" + "test_session" + "test_workflow" + ]; + + meta = with lib; { + description = "Module to access information from the Meteo-France API"; + homepage = "https://github.com/hacf-fr/meteofrance-api"; + license = licenses.mit; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/mezzanine/default.nix b/pkgs/development/python-modules/mezzanine/default.nix index 2c78575d3704a..6607dc0739dec 100644 --- a/pkgs/development/python-modules/mezzanine/default.nix +++ b/pkgs/development/python-modules/mezzanine/default.nix @@ -1,38 +1,56 @@ { lib - +, beautifulsoup4 +, bleach , buildPythonPackage -, fetchPypi -, isPyPy -, pyflakes -, pep8 +, chardet , django , django_contrib_comments +, fetchPypi , filebrowser_safe -, grappelli_safe -, bleach -, tzlocal -, beautifulsoup4 -, requests -, requests_oauthlib , future +, grappelli_safe +, isPyPy +, pep8 , pillow -, chardet +, pyflakes +, pythonOlder +, requests +, requests-oauthlib +, tzlocal }: buildPythonPackage rec { - version = "5.1.0"; - pname = "Mezzanine"; + pname = "mezzanine"; + version = "5.1.3"; + format = "setuptools"; + + disabled = pythonOlder "3.6" || isPyPy; src = fetchPypi { - inherit pname version; - sha256 = "ce1117c81416d2e0a77981419312e200aec1cf3cb3ea9630083bd29e74bbb265"; + pname = "Mezzanine"; + inherit version; + hash = "sha256-G/Oj5g70tFUhnbSVElVk0s9Ka+MEuPsEgj6blcFBOoY="; }; - disabled = isPyPy || lib.versionOlder django.version "1.11" - || lib.versionAtLeast django.version "2.0"; + buildInputs = [ + pyflakes + pep8 + ]; - buildInputs = [ pyflakes pep8 ]; - propagatedBuildInputs = [ django django_contrib_comments filebrowser_safe grappelli_safe bleach tzlocal beautifulsoup4 requests requests_oauthlib future pillow chardet ]; + propagatedBuildInputs = [ + beautifulsoup4 + bleach + chardet + django + django_contrib_comments + filebrowser_safe + future + grappelli_safe + pillow + requests + requests-oauthlib + tzlocal + ]; # Tests Fail Due to Syntax Warning, Fixed for v3.1.11+ doCheck = false; @@ -41,12 +59,10 @@ buildPythonPackage rec { sed -i 's/==/>=/' setup.py ''; - LC_ALL="en_US.UTF-8"; + LC_ALL = "en_US.UTF-8"; meta = with lib; { - description = '' - A content management platform built using the Django framework - ''; + description = "Content management platform built using the Django framework"; longDescription = '' Mezzanine is a powerful, consistent, and flexible content management platform. Built using the Django framework, Mezzanine @@ -64,11 +80,9 @@ buildPythonPackage rec { ''; homepage = "http://mezzanine.jupo.org/"; downloadPage = "https://github.com/stephenmcd/mezzanine/releases"; - license = licenses.free; + license = licenses.bsd2; maintainers = with maintainers; [ prikhi ]; platforms = platforms.unix; - # mezzanine requires django-1.11. Consider overriding python package set to use django_1_11" - broken = versionOlder django.version "1.11" || versionAtLeast django.version "2.0"; }; - } + diff --git a/pkgs/development/python-modules/minio/default.nix b/pkgs/development/python-modules/minio/default.nix index 477ed47e9dd14..5b142406fab09 100644 --- a/pkgs/development/python-modules/minio/default.nix +++ b/pkgs/development/python-modules/minio/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "minio"; - version = "7.1.2"; + version = "7.1.4"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "minio"; repo = "minio-py"; rev = version; - sha256 = "sha256-KluSdmhpSSqUTLVdFpIGwre7LOu3A16rt73FvaTmuz8="; + sha256 = "sha256-IzITqo23pRf83SFpnBZdryGHIsxh+7HrLVLM9CT5nQQ="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/mitmproxy/default.nix b/pkgs/development/python-modules/mitmproxy/default.nix index f3b24ffabff2f..055cb8aee99a3 100644 --- a/pkgs/development/python-modules/mitmproxy/default.nix +++ b/pkgs/development/python-modules/mitmproxy/default.nix @@ -111,6 +111,7 @@ buildPythonPackage rec { # Tests require terminal "test_integration" ]; + dontUsePytestXdist = true; pythonImportsCheck = [ "mitmproxy" ]; diff --git a/pkgs/development/python-modules/mkdocs-material/default.nix b/pkgs/development/python-modules/mkdocs-material/default.nix index dc67a51582408..a0df100089261 100644 --- a/pkgs/development/python-modules/mkdocs-material/default.nix +++ b/pkgs/development/python-modules/mkdocs-material/default.nix @@ -1,21 +1,28 @@ -{ lib, callPackage, buildPythonApplication, fetchFromGitHub +{ lib +, callPackage +, buildPythonApplication +, fetchFromGitHub , jinja2 , markdown , mkdocs , mkdocs-material-extensions , pygments , pymdown-extensions +, pythonOlder }: buildPythonApplication rec { pname = "mkdocs-material"; - version = "8.2.7"; + version = "8.2.11"; + format = "setuptools"; + + disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "squidfunk"; repo = pname; - rev = version; - sha256 = "sha256-Jh0FmtBCYCEk6mYFLOKb1HQXQ4Wc9Z6JCHFVu420IBk="; + rev = "refs/tags/${version}"; + hash = "sha256-YAXdIA36QWwdQxTux6Sy/F0j8lprSO+5/VezFcsGQYg="; }; propagatedBuildInputs = [ @@ -30,7 +37,9 @@ buildPythonApplication rec { # No tests for python doCheck = false; - pythonImportsCheck = [ "mkdocs" ]; + pythonImportsCheck = [ + "mkdocs" + ]; meta = with lib; { description = "Material for mkdocs"; diff --git a/pkgs/development/python-modules/mkdocs/default.nix b/pkgs/development/python-modules/mkdocs/default.nix index 7d4f1cc66c6e2..13604bc975a3e 100644 --- a/pkgs/development/python-modules/mkdocs/default.nix +++ b/pkgs/development/python-modules/mkdocs/default.nix @@ -3,7 +3,6 @@ lib , buildPythonPackage , fetchFromGitHub -, fetchpatch , pythonOlder # runtime deps , click @@ -24,24 +23,16 @@ buildPythonPackage rec { pname = "mkdocs"; - version = "1.2.3"; + version = "1.3.0"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = pname; repo = pname; rev = version; - sha256 = "sha256-LBw2ftGyeNvARQ8xiYUho8BiQh+aIEqROP51gKvNxEo="; + sha256 = "sha256-S4xkr3jS5GvkMu8JnEGfqhmkxy3FtZZb7Rbuniltudg="; }; - patches = [ - (fetchpatch { - url = "https://github.com/mkdocs/mkdocs/commit/c93fc91e4dc0ef33e2ea418aaa32b0584a8d354a.patch"; - sha256 = "sha256-7uLIuQOt6KU/+iS9cwhXkWPAHzZkQdMyNBxSMut5WK4="; - excludes = [ "tox.ini" ]; - }) - ]; - propagatedBuildInputs = [ click jinja2 diff --git a/pkgs/development/python-modules/mlflow/default.nix b/pkgs/development/python-modules/mlflow/default.nix index 49d6bd7a3248e..10c69b0761127 100644 --- a/pkgs/development/python-modules/mlflow/default.nix +++ b/pkgs/development/python-modules/mlflow/default.nix @@ -27,12 +27,12 @@ buildPythonPackage rec { pname = "mlflow"; - version = "1.24.0"; + version = "1.25.1"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "sha256-6hZwiOuHtB8RFwgyfPeV8plLBPlnAdVP1f1bNah4en4="; + sha256 = "sha256-jDePRRbWNz+VvFe2x8LcpD8mUNSc7lq2ucNFf8RvBgA="; }; # run into https://stackoverflow.com/questions/51203641/attributeerror-module-alembic-context-has-no-attribute-config diff --git a/pkgs/development/python-modules/mock/default.nix b/pkgs/development/python-modules/mock/default.nix index 72e40d750ed13..464a6ae969d77 100644 --- a/pkgs/development/python-modules/mock/default.nix +++ b/pkgs/development/python-modules/mock/default.nix @@ -1,31 +1,30 @@ { lib , buildPythonPackage , fetchPypi -, isPy27 -, funcsigs -, six -, pbr +, fetchpatch , python +, pythonOlder , pytest }: buildPythonPackage rec { pname = "mock"; version = "4.0.3"; + format = "setuptools"; + + disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; sha256 = "7d3fbbde18228f4ff2f1f119a45cdffa458b4c0dee32eb4d2bb2f82554bac7bc"; }; - propagatedBuildInputs = [ six pbr ] ++ lib.optionals isPy27 [ funcsigs ]; - - # On PyPy for Python 2.7 in particular, Mock's tests have a known failure. - # Mock upstream has a decoration to disable the failing test and make - # everything pass, but it is not yet released. The commit: - # https://github.com/testing-cabal/mock/commit/73bfd51b7185#diff-354f30a63fb0907d4ad57269548329e3L12 - #doCheck = !(python.isPyPy && python.isPy27); - doCheck = false; # Infinite recursion pytest + patches = [ + (fetchpatch { + url = "https://github.com/testing-cabal/mock/commit/f3e3d82aab0ede7e25273806dc0505574d85eae2.patch"; + sha256 = "sha256-wPrv1/WeICZHn31UqFlICFsny2knvn3+Xg8BZoaGbwQ="; + }) + ]; checkPhase = '' ${python.interpreter} -m unittest discover @@ -37,8 +36,7 @@ buildPythonPackage rec { meta = with lib; { description = "Mock objects for Python"; - homepage = "http://python-mock.sourceforge.net/"; + homepage = "https://github.com/testing-cabal/mock"; license = licenses.bsd2; }; - } diff --git a/pkgs/development/python-modules/mocket/default.nix b/pkgs/development/python-modules/mocket/default.nix index 1a0b7ee907bcb..d5fe44b37e746 100644 --- a/pkgs/development/python-modules/mocket/default.nix +++ b/pkgs/development/python-modules/mocket/default.nix @@ -19,12 +19,12 @@ buildPythonPackage rec { pname = "mocket"; - version = "3.10.4"; + version = "3.10.5"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "831c23bf891c525828b7da49a358c6e0698481e4c8b3a61a69e87f36d06ef969"; + sha256 = "sha256-rF6ol5T6wH0nNmaP+lHQL8H+XZz1kl7OEe7NNO4MCtw="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/modeled/default.nix b/pkgs/development/python-modules/modeled/default.nix index acf8ee4c11232..c49077d2181b6 100644 --- a/pkgs/development/python-modules/modeled/default.nix +++ b/pkgs/development/python-modules/modeled/default.nix @@ -4,7 +4,7 @@ , zetup , six , moretools -, pathpy +, path , pytestCheckHook }: @@ -20,7 +20,7 @@ buildPythonPackage rec { buildInputs = [ zetup ]; - propagatedBuildInputs = [ six moretools pathpy ]; + propagatedBuildInputs = [ six moretools path ]; checkInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/monero/default.nix b/pkgs/development/python-modules/monero/default.nix new file mode 100644 index 0000000000000..907e54417d6dd --- /dev/null +++ b/pkgs/development/python-modules/monero/default.nix @@ -0,0 +1,51 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, pycryptodomex +, pysocks +, pynacl +, requests +, six +, varint +, pytestCheckHook +, pytest-cov +, responses +}: + +buildPythonPackage rec { + pname = "monero"; + version = "1.0.1"; + + src = fetchFromGitHub { + owner = "monero-ecosystem"; + repo = "monero-python"; + rev = "v${version}"; + sha256 = "sha256-ZjAShIeGVVIKlwgSNPVSN7eaqhKu3wEpDP9wgBMOyZU="; + }; + + postPatch = '' + substituteInPlace requirements.txt \ + --replace 'pynacl~=1.4' 'pynacl>=1.4' \ + --replace 'ipaddress' "" + ''; + + pythonImportsCheck = [ "monero" ]; + + propagatedBuildInputs = [ + pycryptodomex + pynacl + pysocks + requests + six + varint + ]; + + checkInputs = [ pytestCheckHook pytest-cov responses ]; + + meta = with lib; { + description = "Comprehensive Python module for handling Monero"; + homepage = "https://github.com/monero-ecosystem/monero-python"; + license = licenses.bsd3; + maintainers = with maintainers; [ prusnak ]; + }; +} diff --git a/pkgs/development/python-modules/mongoengine/default.nix b/pkgs/development/python-modules/mongoengine/default.nix index d609f465e2771..269ebf2ef3cfd 100644 --- a/pkgs/development/python-modules/mongoengine/default.nix +++ b/pkgs/development/python-modules/mongoengine/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "mongoengine"; - version = "0.23.1"; + version = "0.24.0"; disabled = isPy27; src = fetchFromGitHub { owner = "MongoEngine"; repo = pname; rev = "v${version}"; - sha256 = "1lj33pgdrp4rvjzcg2glvz1f87np1pfnqhlwbdcijav9rxqc0w70"; + sha256 = "sha256-BQSB4SGlejARFreeTfqFMzCWvBc6Vvq9EOMLjhAihdI="; }; propagatedBuildInputs = [ @@ -36,12 +36,15 @@ buildPythonPackage rec { postPatch = '' substituteInPlace setup.py \ - --replace "coverage==4.2" "coverage" + --replace "coverage==4.2" "coverage" \ + --replace "pymongo>=3.4,<=4.0" "pymongo" ''; # tests require mongodb running in background doCheck = false; + pythonImportsCheck = [ "mongoengine" ]; + meta = with lib; { description = "MongoEngine is a Python Object-Document Mapper for working with MongoDB"; homepage = "http://mongoengine.org/"; diff --git a/pkgs/development/python-modules/moonraker-api/default.nix b/pkgs/development/python-modules/moonraker-api/default.nix index 9f6ca7e91a785..50ba81d6d5260 100644 --- a/pkgs/development/python-modules/moonraker-api/default.nix +++ b/pkgs/development/python-modules/moonraker-api/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "moonraker-api"; - version = "2.0.4"; + version = "2.0.5"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "cmroche"; repo = pname; rev = "v${version}"; - sha256 = "1hhm3jnl9qm44y4k927fzw1n32c3551kgsk7i57qw25nca9x3k61"; + sha256 = "sha256-PgFsXmdAmHXK0wZ6xLTu94RdME1L2H1Mb6V+qFlGXSk="; }; postPatch = '' diff --git a/pkgs/development/python-modules/moretools/default.nix b/pkgs/development/python-modules/moretools/default.nix index 5a96682accdb7..01f6b58a9475a 100644 --- a/pkgs/development/python-modules/moretools/default.nix +++ b/pkgs/development/python-modules/moretools/default.nix @@ -1,5 +1,5 @@ { lib, buildPythonPackage, fetchPypi -, six, pathpy, zetup, pytest +, six, path, zetup, pytest , decorator }: buildPythonPackage rec { @@ -16,7 +16,7 @@ buildPythonPackage rec { ''; nativeBuildInputs = [ zetup ]; - checkInputs = [ six pathpy pytest ]; + checkInputs = [ six path pytest ]; propagatedBuildInputs = [ decorator ]; meta = with lib; { diff --git a/pkgs/development/python-modules/motionblinds/default.nix b/pkgs/development/python-modules/motionblinds/default.nix index 0d8a131a8e426..f3cf778fcbad4 100644 --- a/pkgs/development/python-modules/motionblinds/default.nix +++ b/pkgs/development/python-modules/motionblinds/default.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { pname = "motionblinds"; - version = "0.6.4"; + version = "0.6.5"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -15,8 +15,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "starkillerOG"; repo = "motion-blinds"; - rev = version; - sha256 = "sha256-k0o6zGhuQPCh9bxXd7v9Hfjo1vKmf5kpw7MGJ31/1Mw="; + rev = "refs/tags/${version}"; + sha256 = "sha256-RAGsVHi/f+0gIzVomhC8h3JvoD4EEe6dK9PBi5daTgU="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/moto/default.nix b/pkgs/development/python-modules/moto/default.nix index 1d9d077437982..7f3251a6cc228 100644 --- a/pkgs/development/python-modules/moto/default.nix +++ b/pkgs/development/python-modules/moto/default.nix @@ -1,269 +1,127 @@ -{ lib, buildPythonPackage, fetchPypi, isPy27, fetchpatch +{ lib +, buildPythonPackage +, fetchPypi +, pythonOlder + +# runtime , aws-xray-sdk -, backports_tempfile , boto3 , botocore , cfn-lint +, cryptography , docker , flask , flask-cors -, freezegun +, graphql-core +, idna , jinja2 , jsondiff -, mock -, pyaml +, python-dateutil , python-jose , pytz +, pyyaml , requests , responses -, six , sshpubkeys -, sure , werkzeug , xmltodict -, parameterized -, idna -, nose + +# tests +, freezegun , pytestCheckHook , pytest-xdist +, sure }: buildPythonPackage rec { pname = "moto"; - version = "3.0.2"; + version = "3.1.3"; + format = "setuptools"; + + disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "sha256-vZ1oofOYUkFETDFKwSmifvvn+bCi/6NQAxu950NYk5k="; + sha256 = "sha256-+kgVlfVhHZ/r2vCg0Skwe1433mh2w30DXO7+Rs59isA="; }; - postPatch = '' - substituteInPlace setup.py \ - --replace "ecdsa<0.15" "ecdsa" \ - --replace "idna<3,>=2.5" "idna" \ - --replace "MarkupSafe<2.0" "MarkupSafe" \ - ''; - propagatedBuildInputs = [ aws-xray-sdk boto3 botocore cfn-lint + cryptography docker - flask # required for server + flask + flask-cors + graphql-core + idna jinja2 jsondiff - mock - pyaml + python-dateutil python-jose pytz - six + pyyaml requests responses sshpubkeys werkzeug xmltodict - idna - ] ++ lib.optionals isPy27 [ backports_tempfile ]; + ]; checkInputs = [ - boto3 - flask-cors freezegun - parameterized pytestCheckHook - pytest-xdist sure ]; - # Multiple test files still import boto, rather than boto3 like - # boto is long-deprecated and broken on python3.9 - # https://github.com/spulec/moto/blob/63ce647123755e4c4693a89f52c254596004c098/tests/test_autoscaling/test_autoscaling.py#L2 - # NOTE: This should change to use disabledTestFiles / disabledTestPaths once that - # feature stabalizes: see #113153 (mostly the discussion therein), #113167, #110700 pytestFlagsArray = [ - "-n $NIX_BUILD_CORES" - "--ignore=tests/test_awslambda/test_policy.py" - "--ignore=tests/test_autoscaling/test_autoscaling.py" - "--ignore=tests/test_autoscaling/test_cloudformation.py" - "--ignore=tests/test_autoscaling/test_elbv2.py" - "--ignore=tests/test_autoscaling/test_launch_configurations.py" - "--ignore=tests/test_autoscaling/test_policies.py" - "--ignore=tests/test_autoscaling/test_server.py" - "--ignore=tests/test_awslambda/test_lambda.py" - "--ignore=tests/test_awslambda/test_lambda_cloudformation.py" - "--ignore=tests/test_batch/test_cloudformation.py" - "--ignore=tests/test_batch/test_server.py" - "--ignore=tests/test_cloudformation/test_cloudformation_depends_on.py" - "--ignore=tests/test_cloudformation/test_cloudformation_stack_crud.py" - "--ignore=tests/test_cloudformation/test_cloudformation_stack_crud_boto3.py" - "--ignore=tests/test_cloudformation/test_cloudformation_stack_integration.py" - "--ignore=tests/test_cloudformation/test_stack_parsing.py" - "--ignore=tests/test_cloudformation/test_validate.py" - "--ignore=tests/test_cloudwatch/test_cloudwatch.py" - "--ignore=tests/test_cognitoidentity/test_server.py" - "--ignore=tests/test_config/test_config.py" - "--ignore=tests/test_core/test_auth.py" - "--ignore=tests/test_core/test_decorator_calls.py" - "--ignore=tests/test_core/test_nested.py" - "--ignore=tests/test_core/test_server.py" - "--ignore=tests/test_datapipeline/test_datapipeline.py" - "--ignore=tests/test_datapipeline/test_server.py" - "--ignore=tests/test_datasync/test_datasync.py" - "--ignore=tests/test_dynamodb/test_dynamodb.py" - "--ignore=tests/test_dynamodb/test_dynamodb_table_with_range_key.py" - "--ignore=tests/test_dynamodb/test_dynamodb_table_without_range_key.py" - "--ignore=tests/test_dynamodb/test_server.py" - "--ignore=tests/test_dynamodb2/test_dynamodb.py" - "--ignore=tests/test_dynamodb2/test_dynamodb_table_with_range_key.py" - "--ignore=tests/test_dynamodb2/test_dynamodb_table_without_range_key.py" - "--ignore=tests/test_dynamodb2/test_server.py" - "--ignore=tests/test_ec2/test_amazon_dev_pay.py" - "--ignore=tests/test_ec2/test_amis.py" - "--ignore=tests/test_ec2/test_availability_zones_and_regions.py" - "--ignore=tests/test_ec2/test_customer_gateways.py" - "--ignore=tests/test_ec2/test_dhcp_options.py" - "--ignore=tests/test_ec2/test_elastic_block_store.py" - "--ignore=tests/test_ec2/test_elastic_ip_addresses.py" - "--ignore=tests/test_ec2/test_elastic_network_interfaces.py" - "--ignore=tests/test_ec2/test_general.py" - "--ignore=tests/test_ec2/test_instances.py" - "--ignore=tests/test_ec2/test_internet_gateways.py" - "--ignore=tests/test_ec2/test_ip_addresses.py" - "--ignore=tests/test_ec2/test_key_pairs.py" - "--ignore=tests/test_ec2/test_monitoring.py" - "--ignore=tests/test_ec2/test_network_acls.py" - "--ignore=tests/test_ec2/test_placement_groups.py" - "--ignore=tests/test_ec2/test_regions.py" - "--ignore=tests/test_ec2/test_reserved_instances.py" - "--ignore=tests/test_ec2/test_route_tables.py" - "--ignore=tests/test_ec2/test_security_groups.py" - "--ignore=tests/test_ec2/test_spot_instances.py" - "--ignore=tests/test_ec2/test_subnets.py" - "--ignore=tests/test_ec2/test_tags.py" - "--ignore=tests/test_ec2/test_virtual_private_gateways.py" - "--ignore=tests/test_ec2/test_vm_export.py" - "--ignore=tests/test_ec2/test_vm_import.py" - "--ignore=tests/test_ec2/test_vpc_peering.py" - "--ignore=tests/test_ec2/test_vpcs.py" - "--ignore=tests/test_ec2/test_vpn_connections.py" - "--ignore=tests/test_ec2/test_vpn_connections.py" - "--ignore=tests/test_ec2/test_windows.py" - "--ignore=tests/test_ecs/test_ecs_boto3.py" - "--ignore=tests/test_elb/test_elb.py" - "--ignore=tests/test_elb/test_server.py" - "--ignore=tests/test_elbv2/test_elbv2.py" - "--ignore=tests/test_elbv2/test_server.py" - "--ignore=tests/test_emr/test_emr.py" - "--ignore=tests/test_emr/test_server.py" - "--ignore=tests/test_glacier/test_glacier_archives.py" - "--ignore=tests/test_glacier/test_glacier_jobs.py" - "--ignore=tests/test_glacier/test_glacier_vaults.py" - "--ignore=tests/test_iam/test_iam.py" - "--ignore=tests/test_iam/test_iam_cloudformation.py" - "--ignore=tests/test_iam/test_iam_groups.py" - "--ignore=tests/test_iam/test_server.py" - "--ignore=tests/test_iot/test_server.py" - "--ignore=tests/test_iotdata/test_server.py" - "--ignore=tests/test_kinesis/test_kinesis.py" - "--ignore=tests/test_kinesis/test_kinesis_cloudformation.py" - "--ignore=tests/test_kinesis/test_server.py" - "--ignore=tests/test_kinesisvideo/test_server.py" - "--ignore=tests/test_kinesisvideoarchivedmedia/test_server.py" - "--ignore=tests/test_kms/test_kms.py" - "--ignore=tests/test_kms/test_server.py" - "--ignore=tests/test_kms/test_utils.py" - "--ignore=tests/test_logs/test_logs.py" - "--ignore=tests/test_polly/test_server.py" - "--ignore=tests/test_rds/test_rds.py" - "--ignore=tests/test_rds/test_server.py" - "--ignore=tests/test_rds2/test_server.py" - "--ignore=tests/test_redshift/test_redshift.py" - "--ignore=tests/test_redshift/test_server.py" - "--ignore=tests/test_resourcegroupstaggingapi/test_resourcegroupstaggingapi.py" - "--ignore=tests/test_route53/test_route53.py" - "--ignore=tests/test_s3/test_s3.py" - "--ignore=tests/test_s3/test_s3_cloudformation.py" - "--ignore=tests/test_s3/test_s3_lifecycle.py" - "--ignore=tests/test_s3/test_s3_storageclass.py" - "--ignore=tests/test_s3/test_s3_utils.py" - "--ignore=tests/test_s3bucket_path/test_s3bucket_path.py" - "--ignore=tests/test_s3bucket_path/test_s3bucket_path_combo.py" - "--ignore=tests/test_secretsmanager/test_server.py" - "--ignore=tests/test_ses/test_server.py" - "--ignore=tests/test_ses/test_ses.py" - "--ignore=tests/test_ses/test_ses_boto3.py" - "--ignore=tests/test_ses/test_ses_sns_boto3.py" - "--ignore=tests/test_sns/test_application.py" - "--ignore=tests/test_sns/test_application_boto3.py" - "--ignore=tests/test_sns/test_publishing.py" - "--ignore=tests/test_sns/test_publishing_boto3.py" - "--ignore=tests/test_sns/test_server.py" - "--ignore=tests/test_sns/test_subscriptions.py" - "--ignore=tests/test_sns/test_subscriptions_boto3.py" - "--ignore=tests/test_sns/test_topics.py" - "--ignore=tests/test_sns/test_topics_boto3.py" - "--ignore=tests/test_sqs/test_server.py" - "--ignore=tests/test_sqs/test_sqs.py" - "--ignore=tests/test_ssm/test_ssm_boto3.py" - "--ignore=tests/test_ssm/test_ssm_docs.py" - "--ignore=tests/test_sts/test_server.py" - "--ignore=tests/test_sts/test_sts.py" - "--ignore=tests/test_swf/models/test_activity_task.py" - "--ignore=tests/test_swf/models/test_decision_task.py" - "--ignore=tests/test_swf/models/test_timeout.py" - "--ignore=tests/test_swf/models/test_workflow_execution.py" - "--ignore=tests/test_swf/responses/test_activity_tasks.py" - "--ignore=tests/test_swf/responses/test_activity_types.py" - "--ignore=tests/test_swf/responses/test_decision_tasks.py" - "--ignore=tests/test_swf/responses/test_domains.py" - "--ignore=tests/test_swf/responses/test_timeouts.py" - "--ignore=tests/test_swf/responses/test_workflow_executions.py" - "--ignore=tests/test_swf/responses/test_workflow_types.py" - # attempts web connections - "--ignore=tests/test_appsync/test_appsync_schema.py" - "--ignore=tests/test_awslambda/test_lambda_eventsourcemapping.py" - "--ignore=tests/test_awslambda/test_lambda_invoke.py" - "--ignore=tests/test_batch/test_batch_jobs.py" - "--ignore=tests/**/*_integration.py" + # Disable tests that try to access the network + "--deselect=tests/test_cloudformation/test_cloudformation_custom_resources.py::test_create_custom_lambda_resource__verify_cfnresponse_failed" + "--deselect=tests/test_cloudformation/test_server.py::test_cloudformation_server_get" + "--deselect=tests/test_core/test_decorator_calls.py::test_context_manager" + "--deselect=tests/test_core/test_decorator_calls.py::test_decorator_start_and_stop" + "--deselect=tests/test_core/test_request_mocking.py::test_passthrough_requests" + "--deselect=tests/test_firehose/test_firehose_put.py::test_put_record_batch_http_destination" + "--deselect=tests/test_firehose/test_firehose_put.py::test_put_record_http_destination" + "--deselect=tests/test_logs/test_integration.py::test_put_subscription_filter_with_lambda" + "--deselect=tests/test_sqs/test_integration.py::test_invoke_function_from_sqs_exception" + "--deselect=tests/test_sqs/test_sqs_integration.py::test_invoke_function_from_sqs_exception" + "--deselect=tests/test_stepfunctions/test_stepfunctions.py::test_state_machine_creation_fails_with_invalid_names" + "--deselect=tests/test_stepfunctions/test_stepfunctions.py::test_state_machine_list_executions_with_pagination" + "--deselect=tests/test_iotdata/test_iotdata.py::test_update" + "--deselect=tests/test_iotdata/test_iotdata.py::test_basic" + "--deselect=tests/test_iotdata/test_iotdata.py::test_delete_field_from_device_shadow" + "--deselect=tests/test_iotdata/test_iotdata.py::test_publish" + "--deselect=tests/test_s3/test_server.py::test_s3_server_bucket_versioning" + + # json.decoder.JSONDecodeError: Expecting value: line 1 column 1 (char 0) + "--deselect=tests/test_cloudformation/test_cloudformation_stack_integration.py::test_lambda_function" + + # AssertionError: CloudWatch log event was not found. + "--deselect=tests/test_logs/test_integration.py::test_subscription_filter_applies_to_new_streams" + + # KeyError: 'global' + "--deselect=tests/test_iotdata/test_server.py::test_iotdata_list" + "--deselect=tests/test_iotdata/test_server.py::test_publish" + + # Blocks test execution + "--deselect=tests/test_utilities/test_threaded_server.py::TestThreadedMotoServer::test_load_data_from_inmemory_client" + ]; + + disabledTestPaths = [ + # xml.parsers.expat.ExpatError: out of memory: line 1, column 0 + "tests/test_sts/test_sts.py" + # botocore.exceptions.NoCredentialsError: Unable to locate credentials + "tests/test_redshiftdata/test_redshiftdata.py" + # Tries to access the network + "tests/test_appsync/test_appsync_schema.py" + "tests/test_awslambda/test_lambda_eventsourcemapping.py" + "tests/test_awslambda/test_lambda_invoke.py" + "tests/test_batch/test_batch_jobs.py" ]; disabledTests = [ - # these tests rely on the network - "test_server" - "test_managedblockchain_nodes" - "test_swf" - "test_simple_instance" - "test_passthrough_requests" - "test_s3_server_get" - "test_s3_server_bucket_create" - "test_s3_server_post_to_bucket" - "test_s3_server_put_ipv6" - "test_s3_server_put_ipv4" - "test_http_proxying_integration" - "test_submit_job_by_name" - "test_submit_job" - "test_list_jobs" - "test_terminate_job" - "test_idtoken_contains_kid_header" - "test_latest_meta_data" - "test_meta_data_iam" - "test_meta_data_security_credentials" - "test_meta_data_default_role" - "test_reset_api" - "test_data_api" - "test_requests_to_amazon_subdomains_dont_work" - "test_get_records_seq" - "test_stream_with_range_key" - "test_create_notebook_instance_bad_volume_size" - "http_destination" - "test_invoke_function_from_sqs_exception" - "test_state_machine_list_executions_with_pagination" - "test_put_subscription_filter_with_lambda" - "test_create_custom_lambda_resource__verify_cfnresponse_failed" - "test_state_machine_creation_fails_with_invalid_names" - # needs graphql - "test_get_schema_creation_status" # only appears in aarch64 currently, but best to be safe "test_state_machine_list_executions_with_filter" ]; diff --git a/pkgs/development/python-modules/msal-extensions/default.nix b/pkgs/development/python-modules/msal-extensions/default.nix index f81395f0245b7..a811018da214b 100644 --- a/pkgs/development/python-modules/msal-extensions/default.nix +++ b/pkgs/development/python-modules/msal-extensions/default.nix @@ -11,11 +11,11 @@ buildPythonPackage rec { pname = "msal-extensions"; - version = "0.3.1"; + version = "1.0.0"; src = fetchPypi { inherit pname version; - sha256 = "d9029af70f2cbdc5ad7ecfed61cb432ebe900484843ccf72825445dbfe62d311"; + sha256 = "sha256-xnarpWsMzjeD3htcXs/oKNuZgWeHUSbKS0fcZDZFE1Q="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/msrest/default.nix b/pkgs/development/python-modules/msrest/default.nix index 6eb6e49cdddae..da130f289fda6 100644 --- a/pkgs/development/python-modules/msrest/default.nix +++ b/pkgs/development/python-modules/msrest/default.nix @@ -1,51 +1,66 @@ { lib +, aiodns +, aiohttp , buildPythonPackage -, fetchFromGitHub -, isPy3k -, requests -, requests_oauthlib -, isodate , certifi -, enum34 ? null -, typing -, aiohttp -, aiodns -, pytest +, fetchFromGitHub , httpretty -, mock -, futures ? null +, isodate +, pytest-aiohttp +, pytestCheckHook +, pythonOlder +, requests +, requests-oauthlib , trio }: buildPythonPackage rec { - version = "0.6.21"; pname = "msrest"; + version = "0.6.21"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; - # no tests in PyPI tarball - # see https://github.com/Azure/msrest-for-python/pull/152 src = fetchFromGitHub { owner = "Azure"; repo = "msrest-for-python"; rev = "v${version}"; - sha256 = "sha256-IlBwlVQ/v+vJmCWNbFZKGL6a9K09z4AYrPm3kwaA/nI="; + hash = "sha256-IlBwlVQ/v+vJmCWNbFZKGL6a9K09z4AYrPm3kwaA/nI="; }; propagatedBuildInputs = [ - requests requests_oauthlib isodate certifi - ] ++ lib.optionals (!isPy3k) [ enum34 typing ] - ++ lib.optionals isPy3k [ aiohttp aiodns ]; + aiodns + aiohttp + certifi + isodate + requests + requests-oauthlib + ]; + + checkInputs = [ + httpretty + pytest-aiohttp + pytestCheckHook + trio + ]; - checkInputs = [ pytest httpretty ] - ++ lib.optionals (!isPy3k) [ mock futures ] - ++ lib.optional isPy3k trio; + disabledTests = [ + # Test require network access + "test_basic_aiohttp" + "test_basic_aiohttp" + "test_basic_async_requests" + "test_basic_async_requests" + "test_conf_async_requests" + "test_conf_async_requests" + "test_conf_async_trio_requests" + ]; - # Deselected tests require network access - checkPhase = '' - pytest tests/ -k "not test_conf_async_trio_requests" - ''; + pythonImportsCheck = [ + "msrest" + ]; meta = with lib; { - description = "The runtime library 'msrest' for AutoRest generated Python clients."; + description = "The runtime library for AutoRest generated Python clients"; homepage = "https://github.com/Azure/msrest-for-python"; license = licenses.mit; maintainers = with maintainers; [ bendlas jonringer maxwilson ]; diff --git a/pkgs/development/python-modules/multidict/default.nix b/pkgs/development/python-modules/multidict/default.nix index 0ea21ecbe405a..6ee071732691b 100644 --- a/pkgs/development/python-modules/multidict/default.nix +++ b/pkgs/development/python-modules/multidict/default.nix @@ -7,13 +7,13 @@ buildPythonPackage rec { pname = "multidict"; - version = "5.2.0"; + version = "6.0.2"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "0dd1c93edb444b33ba2274b66f63def8a327d607c6c790772f448a53b6ea59ce"; + sha256 = "sha256-X/O9dfOOTEPx9HDy33pNQwuCHEziK+OE4UWctX1rsBM="; }; postPatch = '' diff --git a/pkgs/development/python-modules/mutagen/default.nix b/pkgs/development/python-modules/mutagen/default.nix index 33fc3c02daeba..b5415c51c4cda 100644 --- a/pkgs/development/python-modules/mutagen/default.nix +++ b/pkgs/development/python-modules/mutagen/default.nix @@ -1,37 +1,70 @@ { lib , buildPythonPackage +, pythonOlder , fetchPypi -, isPy27 -, flake8 + +# docs +, python +, sphinx +, sphinx_rtd_theme + +# tests , hypothesis -, pycodestyle -, pyflakes -, pytest -, setuptools -, pkgs +, pytestCheckHook }: buildPythonPackage rec { pname = "mutagen"; version = "1.45.1"; - disabled = isPy27; # abandoned + format = "pyproject"; + + disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; sha256 = "6397602efb3c2d7baebd2166ed85731ae1c1d475abca22090b7141ff5034b3e1"; }; - propagatedBuildInputs = [ setuptools ]; + outputs = [ "out" "doc" ]; + + nativeBuildInputs = [ + sphinx + sphinx_rtd_theme + ]; + + postInstall = '' + ${python.interpreter} setup.py build_sphinx --build-dir=$doc + ''; + checkInputs = [ - pkgs.faad2 pkgs.flac pkgs.vorbis-tools pkgs.liboggz - pkgs.glibcLocales pycodestyle pyflakes pytest hypothesis flake8 + hypothesis + pytestCheckHook + ]; + + disabledTests = [ + # Hypothesis produces unreliable results: Falsified on the first call but did not on a subsequent one + "test_test_fileobj_save" + ]; + + disabledTestPaths = [ + # we are not interested in code quality measurements + "tests/quality/test_flake8.py" ]; - LC_ALL = "en_US.UTF-8"; meta = with lib; { - description = "Python multimedia tagging library"; + description = "Python module for handling audio metadata"; + longDescription = '' + Mutagen is a Python module to handle audio metadata. It supports + ASF, FLAC, MP4, Monkey's Audio, MP3, Musepack, Ogg Opus, Ogg FLAC, + Ogg Speex, Ogg Theora, Ogg Vorbis, True Audio, WavPack, OptimFROG, + and AIFF audio files. All versions of ID3v2 are supported, and all + standard ID3v2.4 frames are parsed. It can read Xing headers to + accurately calculate the bitrate and length of MP3s. ID3 and APEv2 + tags can be edited regardless of audio format. It can also + manipulate Ogg streams on an individual packet/page level. + ''; homepage = "https://mutagen.readthedocs.io"; - license = licenses.lgpl2Plus; - platforms = platforms.all; + changelog = "https://mutagen.readthedocs.io/en/latest/changelog.html#release-${lib.replaceStrings [ "." ] [ "-" ] version}"; + license = licenses.gpl2Plus; }; } diff --git a/pkgs/development/python-modules/mutmut/default.nix b/pkgs/development/python-modules/mutmut/default.nix index ae0f06213a87d..626c768f2a81c 100644 --- a/pkgs/development/python-modules/mutmut/default.nix +++ b/pkgs/development/python-modules/mutmut/default.nix @@ -7,7 +7,7 @@ , pony , junit-xml , pythonOlder -, testVersion +, testers }: let self = buildPythonApplication rec { @@ -31,7 +31,7 @@ let self = buildPythonApplication rec { propagatedBuildInputs = [ click glob2 parso pony junit-xml ]; - passthru.tests.version = testVersion { package = self; }; + passthru.tests.version = testers.testVersion { package = self; }; meta = with lib; { description = "mutation testing system for Python, with a strong focus on ease of use"; diff --git a/pkgs/development/python-modules/mwclient/default.nix b/pkgs/development/python-modules/mwclient/default.nix index bffc4247632d7..da260251e9f2b 100644 --- a/pkgs/development/python-modules/mwclient/default.nix +++ b/pkgs/development/python-modules/mwclient/default.nix @@ -1,11 +1,21 @@ -{ lib, buildPythonPackage, fetchFromGitHub -, requests, requests_oauthlib, six -, pytest, pytestcache, pytest-cov, responses, mock +{ lib +, buildPythonPackage +, fetchFromGitHub +, mock +, pytestCheckHook +, pythonOlder +, requests +, requests-oauthlib +, responses +, six }: buildPythonPackage rec { version = "0.10.1"; pname = "mwclient"; + format = "setuptools"; + + disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "mwclient"; @@ -14,17 +24,31 @@ buildPythonPackage rec { sha256 = "120snnsh9n5svfwkyj1w9jrxf99jnqm0jk282yypd3lpyca1l9hj"; }; - checkInputs = [ pytest pytestcache pytest-cov responses mock ]; + propagatedBuildInputs = [ + requests + requests-oauthlib + six + ]; - propagatedBuildInputs = [ requests requests_oauthlib six ]; + checkInputs = [ + mock + pytestCheckHook + responses + ]; - checkPhase = '' - py.test + postPatch = '' + substituteInPlace setup.cfg \ + --replace " --cov mwclient test" "" ''; + pythonImportsCheck = [ + "mwclient" + ]; + meta = with lib; { description = "Python client library to the MediaWiki API"; license = licenses.mit; homepage = "https://github.com/mwclient/mwclient"; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/development/python-modules/mwoauth/default.nix b/pkgs/development/python-modules/mwoauth/default.nix index 8743329917e72..0a12052abc7e0 100644 --- a/pkgs/development/python-modules/mwoauth/default.nix +++ b/pkgs/development/python-modules/mwoauth/default.nix @@ -1,40 +1,47 @@ { lib , buildPythonPackage -, six +, fetchPypi +, oauthlib , pyjwt +, pythonOlder , requests -, oauthlib -, requests_oauthlib -, fetchPypi +, requests-oauthlib +, six }: buildPythonPackage rec { pname = "mwoauth"; version = "0.3.7"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "9e0d70a1fa6f452584de1cb853ae6c11f41233549f7839cfb879f99410f6ad46"; + hash = "sha256-ng1wofpvRSWE3hy4U65sEfQSM1SfeDnPuHn5lBD2rUY="; }; propagatedBuildInputs = [ oauthlib pyjwt requests - requests_oauthlib + requests-oauthlib six ]; postPatch = '' # https://github.com/mediawiki-utilities/python-mwoauth/pull/43 - substituteInPlace setup.py --replace "PyJWT>=1.0.1,<2.0.0" "PyJWT>=1.0.1" + substituteInPlace setup.py \ + --replace "PyJWT>=1.0.1,<2.0.0" "PyJWT>=1.0.1" ''; # PyPI source has no tests included # https://github.com/mediawiki-utilities/python-mwoauth/issues/44 doCheck = false; - pythonImportsCheck = [ "mwoauth" ]; + pythonImportsCheck = [ + "mwoauth" + ]; meta = with lib; { description = "Python library to perform OAuth handshakes with a MediaWiki installation"; diff --git a/pkgs/development/python-modules/mxnet/default.nix b/pkgs/development/python-modules/mxnet/default.nix index 47f4d80ad9271..a9e778bdd8c6f 100644 --- a/pkgs/development/python-modules/mxnet/default.nix +++ b/pkgs/development/python-modules/mxnet/default.nix @@ -6,10 +6,11 @@ , graphviz , python , isPy3k +, isPy310 }: buildPythonPackage { - inherit (pkgs.mxnet) pname version src meta; + inherit (pkgs.mxnet) pname version src; buildInputs = [ pkgs.mxnet ]; propagatedBuildInputs = [ requests numpy graphviz ]; @@ -32,4 +33,7 @@ buildPythonPackage { ln -s ${pkgs.mxnet}/lib/libmxnet.so $out/${python.sitePackages}/mxnet ''; + meta = pkgs.mxnet.meta // { + broken = (pkgs.mxnet.broken or false) || (isPy310 && pkgs.mxnet.cudaSupport); + }; } diff --git a/pkgs/development/python-modules/myfitnesspal/default.nix b/pkgs/development/python-modules/myfitnesspal/default.nix index f6df7b88f8528..791cb708be5c5 100644 --- a/pkgs/development/python-modules/myfitnesspal/default.nix +++ b/pkgs/development/python-modules/myfitnesspal/default.nix @@ -9,6 +9,7 @@ , python-dateutil , requests , rich +, typing-extensions , pytestCheckHook , mock , nose @@ -36,6 +37,7 @@ buildPythonPackage rec { python-dateutil requests rich + typing-extensions ]; checkInputs = [ diff --git a/pkgs/development/python-modules/myjwt/default.nix b/pkgs/development/python-modules/myjwt/default.nix index 0fecd439e3f53..3c21c2c8106f6 100644 --- a/pkgs/development/python-modules/myjwt/default.nix +++ b/pkgs/development/python-modules/myjwt/default.nix @@ -10,6 +10,7 @@ , pyperclip , pytest-mock , pytestCheckHook +, pythonOlder , questionary , requests , requests-mock @@ -17,13 +18,16 @@ buildPythonPackage rec { pname = "myjwt"; - version = "1.5.0"; + version = "1.6.0"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "mBouamama"; repo = "MyJWT"; - rev = version; - sha256 = "sha256-kZkqFeaQPd56BVaYmCWAbVu1xwbPAIlQC3u5/x3dh7A="; + rev = "refs/tags/${version}"; + sha256 = "sha256-A9tsQ6L+y3doL5pJbau3yKnmQtX2IPXWyW/YCLhS7nc="; }; propagatedBuildInputs = [ @@ -48,7 +52,9 @@ buildPythonPackage rec { sed -i -e "s/==[0-9.]*//" requirements.txt ''; - pythonImportsCheck = [ "myjwt" ]; + pythonImportsCheck = [ + "myjwt" + ]; meta = with lib; { description = "CLI tool for testing vulnerabilities of JSON Web Tokens (JWT)"; diff --git a/pkgs/development/python-modules/mypy-boto3-s3/default.nix b/pkgs/development/python-modules/mypy-boto3-s3/default.nix index 4f33912d3dfe5..c77dc38466369 100644 --- a/pkgs/development/python-modules/mypy-boto3-s3/default.nix +++ b/pkgs/development/python-modules/mypy-boto3-s3/default.nix @@ -8,19 +8,18 @@ buildPythonPackage rec { pname = "mypy-boto3-s3"; - version = "1.21.7"; + version = "1.22.0.post1"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-SWzL6AMXoZzYw3LwrBdvbe9JzLMudZioKZWo7HtHM8U="; + hash = "sha256-lOpsygYi1iCZ9DgqOjfJ4HL9PvRmLqMpEWqgeOyFCI4="; }; propagatedBuildInputs = [ boto3 - ] ++ lib.optionals (pythonOlder "3.9") [ typing-extensions ]; diff --git a/pkgs/development/python-modules/mypy/default.nix b/pkgs/development/python-modules/mypy/default.nix index 5c5e985641ff7..937c958717242 100644 --- a/pkgs/development/python-modules/mypy/default.nix +++ b/pkgs/development/python-modules/mypy/default.nix @@ -14,22 +14,22 @@ buildPythonPackage rec { pname = "mypy"; - version = "0.931"; + version = "0.941"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "python"; repo = "mypy"; rev = "v${version}"; - sha256 = "1v83flrdxh8grcp40qw04q4hzjflih9xwib64078vsxv2w36f817"; + hash = "sha256-H2SWJA0WWyKV7/5miFawv4JRXu/J7H6Wer1eBL+Tru0="; }; patches = [ # FIXME: Remove patch after upstream has decided the proper solution. # https://github.com/python/mypy/pull/11143 (fetchpatch { - url = "https://github.com/python/mypy/commit/f1755259d54330cd087cae763cd5bbbff26e3e8a.patch"; - sha256 = "sha256-5gPahX2X6+/qUaqDQIGJGvh9lQ2EDtks2cpQutgbOHk="; + url = "https://github.com/python/mypy/commit/e7869f05751561958b946b562093397027f6d5fa.patch"; + hash = "sha256-waIZ+m3tfvYE4HJ8kL6rN/C4fMjvLEe9UoPbt9mHWIM="; }) ]; diff --git a/pkgs/development/python-modules/napari-npe2/default.nix b/pkgs/development/python-modules/napari-npe2/default.nix new file mode 100644 index 0000000000000..0fd2c3e5e979a --- /dev/null +++ b/pkgs/development/python-modules/napari-npe2/default.nix @@ -0,0 +1,54 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, appdirs +, pyyaml +, pytomlpp +, pydantic +, magicgui +, typer +, setuptools-scm +, napari # reverse dependency, for tests +}: + +let + pname = "napari-npe2"; + version = "0.3.0"; +in +buildPythonPackage { + inherit pname version; + + format = "pyproject"; + + src = fetchFromGitHub { + owner = "napari"; + repo = "npe2"; + rev = "v${version}"; + hash = "sha256-IyDUeztWQ8JWXDo//76iHzAlWWaZP6/0lwCh0eZAZsM="; + }; + + SETUPTOOLS_SCM_PRETEND_VERSION = version; + + nativeBuildInputs = [ + # npe2 *can* build without it, + # but then setuptools refuses to acknowledge it when building napari + setuptools-scm + ]; + propagatedBuildInputs = [ + appdirs + pyyaml + pytomlpp + pydantic + magicgui + typer + ]; + + passthru.tests = { inherit napari; }; + + meta = with lib; { + description = "Yet another plugin system for napari (the image visualizer)"; + homepage = "https://github.com/napari/npe2"; + license = licenses.bsd3; + maintainers = with maintainers; [ SomeoneSerge ]; + }; +} diff --git a/pkgs/development/python-modules/napari/default.nix b/pkgs/development/python-modules/napari/default.nix index 74936da4f7254..837936f17a0a6 100644 --- a/pkgs/development/python-modules/napari/default.nix +++ b/pkgs/development/python-modules/napari/default.nix @@ -6,7 +6,7 @@ , superqt , typing-extensions , tifffile -, napari-plugin-engine +, napari-npe2 , pint , pyyaml , numpydoc @@ -28,16 +28,25 @@ , wrapQtAppsHook }: mkDerivationWith buildPythonPackage rec { pname = "napari"; - version = "0.4.12"; + version = "0.4.15"; + + format = "pyproject"; + src = fetchFromGitHub { owner = "napari"; repo = pname; rev = "v${version}"; - sha256 = "sha256-0QSI0mgDjF70/X58fE7uWwlBUCGY5gsvbCm4oJkp2Yk="; + sha256 = "sha256-52TDMU6box7TA26P0F9ZgPr8fyzYM646lPUfOektOuE="; }; - nativeBuildInputs = [ setuptools-scm wrapQtAppsHook ]; + + SETUPTOOLS_SCM_PRETEND_VERSION = version; + + nativeBuildInputs = [ + setuptools-scm + wrapQtAppsHook + ]; propagatedBuildInputs = [ - napari-plugin-engine + napari-npe2 cachey napari-svg napari-console @@ -60,7 +69,7 @@ jsonschema scipy ]; - SETUPTOOLS_SCM_PRETEND_VERSION = version; + dontUseSetuptoolsCheck = true; postFixup = '' wrapQtApp $out/bin/napari diff --git a/pkgs/development/python-modules/nats-py/default.nix b/pkgs/development/python-modules/nats-py/default.nix index f87eb269da7a3..3cc92514bd6ea 100644 --- a/pkgs/development/python-modules/nats-py/default.nix +++ b/pkgs/development/python-modules/nats-py/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "nats-py"; - version = "2.0.0"; + version = "2.1.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -18,8 +18,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "nats-io"; repo = "nats.py"; - rev = "v${version}"; - hash = "sha256-BraT30J7OIcW2NXAwjcg9PYu+kgf8f1iDjKiN9J6l7Y="; + rev = "refs/tags/v${version}"; + hash = "sha256-OwxTcjHB1YLijEtTA+QFjEmihqXsiitIcCtdl/3uipI="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/nbclient/default.nix b/pkgs/development/python-modules/nbclient/default.nix index c5e3facc06224..1b2071e7f0c58 100644 --- a/pkgs/development/python-modules/nbclient/default.nix +++ b/pkgs/development/python-modules/nbclient/default.nix @@ -6,12 +6,12 @@ buildPythonPackage rec { pname = "nbclient"; - version = "0.5.10"; + version = "0.5.13"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "b5fdea88d6fa52ca38de6c2361401cfe7aaa7cd24c74effc5e489cec04d79088"; + sha256 = "sha256-QMUsm148MfrsruafICs/U+ONfBxWPeD63enX7aD9r+g="; }; inherit doCheck; diff --git a/pkgs/development/python-modules/nbconvert/default.nix b/pkgs/development/python-modules/nbconvert/default.nix index ab91f22acc442..5a89210170fe2 100644 --- a/pkgs/development/python-modules/nbconvert/default.nix +++ b/pkgs/development/python-modules/nbconvert/default.nix @@ -5,6 +5,7 @@ , glibcLocales , entrypoints , bleach +, beautifulsoup4 , mistune , nbclient , jinja2 @@ -23,11 +24,11 @@ buildPythonPackage rec { pname = "nbconvert"; - version = "6.4.0"; + version = "6.4.5"; src = fetchPypi { inherit pname version; - sha256 = "5412ec774c6db4fccecb8c4ba07ec5d37d6dcf5762593cb3d6ecbbeb562ebbe5"; + sha256 = "sha256-IRY6jiBzwHEJyo85iDbkXv26KqzqaNb3WopUX+8HDU4="; }; # Add $out/share/jupyter to the list of paths that are used to search for @@ -45,7 +46,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ entrypoints bleach mistune jinja2 pygments traitlets testpath jupyter_core nbformat ipykernel pandocfilters tornado jupyter-client - defusedxml + defusedxml beautifulsoup4 (nbclient.override { doCheck = false; }) # avoid infinite recursion jupyterlab-pygments ]; diff --git a/pkgs/development/python-modules/nbformat/default.nix b/pkgs/development/python-modules/nbformat/default.nix index a8e6993d6458c..e110934fdd13a 100644 --- a/pkgs/development/python-modules/nbformat/default.nix +++ b/pkgs/development/python-modules/nbformat/default.nix @@ -12,11 +12,11 @@ buildPythonPackage rec { pname = "nbformat"; - version = "5.1.3"; + version = "5.2.0"; src = fetchPypi { inherit pname version; - sha256 = "b516788ad70771c6250977c1374fcca6edebe6126fd2adb5a69aa5c2356fd1c8"; + sha256 = "sha256-k98LnGciHTj7lwxI9tNhgZpsOIKZoO8xcbu5Eu3+EyQ="; }; LC_ALL="en_US.utf8"; diff --git a/pkgs/development/python-modules/ncclient/default.nix b/pkgs/development/python-modules/ncclient/default.nix index 2cb040ed8a38d..3457c71af4ca5 100644 --- a/pkgs/development/python-modules/ncclient/default.nix +++ b/pkgs/development/python-modules/ncclient/default.nix @@ -9,13 +9,13 @@ buildPythonPackage rec { pname = "ncclient"; - version = "0.6.12"; + version = "0.6.13"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "1sjvqaxb54nmqljiw5bg1423msa9rg015wiix9fsm6djk3wpklmk"; + sha256 = "sha256-NrilXB1NFcqNCGrwshhuLdhQoeHJ12PSp4MBScT9kYc="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/ndg-httpsclient/default.nix b/pkgs/development/python-modules/ndg-httpsclient/default.nix index 0082b8e8db239..39429950b71c6 100644 --- a/pkgs/development/python-modules/ndg-httpsclient/default.nix +++ b/pkgs/development/python-modules/ndg-httpsclient/default.nix @@ -1,6 +1,7 @@ { lib , buildPythonPackage , fetchFromGitHub +, pyasn1 , pyopenssl }: @@ -8,8 +9,6 @@ buildPythonPackage rec { version = "0.5.1"; pname = "ndg-httpsclient"; - propagatedBuildInputs = [ pyopenssl ]; - src = fetchFromGitHub { owner = "cedadev"; repo = "ndg_httpsclient"; @@ -17,6 +16,12 @@ buildPythonPackage rec { sha256 = "0lhsgs4am4xyjssng5p0vkfwqncczj1dpa0vss4lrhzq86mnn5rz"; }; + + propagatedBuildInputs = [ + pyasn1 + pyopenssl + ]; + # uses networking doCheck = false; diff --git a/pkgs/development/python-modules/neo4j-driver/default.nix b/pkgs/development/python-modules/neo4j-driver/default.nix index 63a2efafbd6ec..c86ae1b00c4fa 100644 --- a/pkgs/development/python-modules/neo4j-driver/default.nix +++ b/pkgs/development/python-modules/neo4j-driver/default.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { pname = "neo4j-driver"; - version = "4.4.2"; + version = "4.4.3"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -16,7 +16,7 @@ buildPythonPackage rec { owner = "neo4j"; repo = "neo4j-python-driver"; rev = version; - sha256 = "sha256-rYedmxQvT+RjVdbDckLv00J4YuEQtMuIc8Q5FGWr3Rw="; + sha256 = "sha256-YApj4EA0e3Q9V+ujnJC7/eSS0DybnZH22LnnSla/mw4="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/net2grid/default.nix b/pkgs/development/python-modules/net2grid/default.nix deleted file mode 100644 index 05b5321a69cfa..0000000000000 --- a/pkgs/development/python-modules/net2grid/default.nix +++ /dev/null @@ -1,58 +0,0 @@ -{ lib -, aiohttp -, aresponses -, buildPythonPackage -, fetchFromGitHub -, poetry-core -, pytest-asyncio -, pytestCheckHook -, pythonOlder -, yarl -}: - -buildPythonPackage rec { - pname = "net2grid"; - version = "3.0.0"; - format = "pyproject"; - - disabled = pythonOlder "3.9"; - - src = fetchFromGitHub { - owner = "klaasnicolaas"; - repo = "python-net2grid"; - rev = "v${version}"; - hash = "sha256-nT9qMv4Zr7SjNwHRN3HRR11yl+Oue8VVCfJr2n1D02Q="; - }; - - nativeBuildInputs = [ - poetry-core - ]; - - propagatedBuildInputs = [ - aiohttp - yarl - ]; - - checkInputs = [ - aresponses - pytest-asyncio - pytestCheckHook - ]; - - postPatch = '' - substituteInPlace pyproject.toml \ - --replace '"0.0.0"' '"${version}"' \ - --replace 'addopts = "--cov"' "" - ''; - - pythonImportsCheck = [ - "net2grid" - ]; - - meta = with lib; { - description = "Module for interacting with NET2GRID devices"; - homepage = "https://github.com/klaasnicolaas/python-net2grid"; - license = with licenses; [ mit ]; - maintainers = with maintainers; [ fab ]; - }; -} diff --git a/pkgs/development/python-modules/netmiko/default.nix b/pkgs/development/python-modules/netmiko/default.nix index 0934439f74730..3081b5a6b7cdc 100644 --- a/pkgs/development/python-modules/netmiko/default.nix +++ b/pkgs/development/python-modules/netmiko/default.nix @@ -3,11 +3,11 @@ buildPythonPackage rec { pname = "netmiko"; - version = "3.4.0"; + version = "4.0.0"; src = fetchPypi { inherit pname version; - sha256 = "14s9c6ws32swizcmfdqmlkkk2yqw6071ybq3w94fhkl6jzfvkbdc"; + sha256 = "sha256-fVhBkiO1JpqMIFl32xlwSjeCd7aObocXPAr069fKdmc="; }; buildInputs = [ setuptools ]; diff --git a/pkgs/development/python-modules/networkx/default.nix b/pkgs/development/python-modules/networkx/default.nix index e8769f9efc7dd..140eb9bb24c95 100644 --- a/pkgs/development/python-modules/networkx/default.nix +++ b/pkgs/development/python-modules/networkx/default.nix @@ -10,11 +10,11 @@ buildPythonPackage rec { pname = "networkx"; # upgrade may break sage, please test the sage build or ping @timokau on upgrade - version = "2.6.3"; + version = "2.7.1"; src = fetchPypi { inherit pname version; - sha256 = "c0946ed31d71f1b732b5aaa6da5a0388a345019af232ce2f49c766e2d6795c51"; + sha256 = "sha256-0RlLp1Pl7tB83s0dI8XNejx3IJm9jb0v6jZniM9N57o="; }; propagatedBuildInputs = [ decorator setuptools ]; diff --git a/pkgs/development/python-modules/nextcord/default.nix b/pkgs/development/python-modules/nextcord/default.nix index ab814061b58db..5f4997259136e 100644 --- a/pkgs/development/python-modules/nextcord/default.nix +++ b/pkgs/development/python-modules/nextcord/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "nextcord"; - version = "2.0.0a9"; + version = "2.0.0a10"; format = "setuptools"; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = "nextcord"; repo = "nextcord"; rev = version; - hash = "sha256-9UJLfSYud/pIkIkJ75jE3pxsYm5bKNNRCwjDerDHp9c="; + hash = "sha256-p99WJ4y2iJQTI3wHbh+jwJyLnE3aBXnHxrehDYYek/4="; }; patches = [ diff --git a/pkgs/development/python-modules/nibabel/default.nix b/pkgs/development/python-modules/nibabel/default.nix index 60f5fcde63fe9..dc0a6d12f0c1b 100644 --- a/pkgs/development/python-modules/nibabel/default.nix +++ b/pkgs/development/python-modules/nibabel/default.nix @@ -3,7 +3,7 @@ , fetchPypi , isPy27 , packaging -, pytest +, pytestCheckHook , nose , numpy , h5py @@ -23,11 +23,14 @@ buildPythonPackage rec { propagatedBuildInputs = [ numpy scipy h5py packaging pydicom ]; - checkInputs = [ nose pytest ]; + checkInputs = [ + pytestCheckHook + ]; - checkPhase = '' - pytest - ''; + disabledTests = [ + # https://github.com/nipy/nibabel/issues/951 + "test_filenames" + ]; meta = with lib; { homepage = "https://nipy.org/nibabel"; diff --git a/pkgs/development/python-modules/nilearn/default.nix b/pkgs/development/python-modules/nilearn/default.nix index 60e11ef1d12da..2494a446a8113 100644 --- a/pkgs/development/python-modules/nilearn/default.nix +++ b/pkgs/development/python-modules/nilearn/default.nix @@ -3,11 +3,11 @@ buildPythonPackage rec { pname = "nilearn"; - version = "0.8.1"; + version = "0.9.0"; src = fetchPypi { inherit pname version; - sha256 = "a0489940855130f35bbc4cac0750479a6f82025215ea7b1d778faca064219298"; + sha256 = "sha256-+cjjCt71FImRCux3JLVpneF4Qn065jhz2tmyPdMh/nY="; }; checkInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/nipype/neurdflib.nix b/pkgs/development/python-modules/nipype/neurdflib.nix index 0a266ff7bf826..8095b0fb0401e 100644 --- a/pkgs/development/python-modules/nipype/neurdflib.nix +++ b/pkgs/development/python-modules/nipype/neurdflib.nix @@ -3,7 +3,7 @@ , fetchPypi , isodate , html5lib -, SPARQLWrapper +, sparqlwrapper , networkx , nose , python @@ -18,7 +18,7 @@ buildPythonPackage rec { sha256 = "d34493cee15029ff5db16157429585ff863ba5542675a4d8a94a0da1bc6e3a50"; }; - propagatedBuildInputs = [ isodate html5lib SPARQLWrapper ]; + propagatedBuildInputs = [ isodate html5lib sparqlwrapper ]; checkInputs = [ networkx nose ]; diff --git a/pkgs/development/python-modules/nix-prefetch-github/default.nix b/pkgs/development/python-modules/nix-prefetch-github/default.nix index 6df6f15c068be..7ef63348dfb3a 100644 --- a/pkgs/development/python-modules/nix-prefetch-github/default.nix +++ b/pkgs/development/python-modules/nix-prefetch-github/default.nix @@ -2,12 +2,13 @@ , lib , buildPythonPackage , git +, which , pythonOlder }: buildPythonPackage rec { pname = "nix-prefetch-github"; - version = "5.0.1"; + version = "5.1.2"; disabled = pythonOlder "3.7"; @@ -15,10 +16,10 @@ buildPythonPackage rec { owner = "seppeljordan"; repo = "nix-prefetch-github"; rev = "v${version}"; - sha256 = "DOmFfUCLJ+rnS4PznQaQrDrqjUU4DXmOrC9BspqKZVM="; + sha256 = "GHUH3Oog800qrdgXs5AEa4O6ovZ1LT0k3P4YwEHfwlY="; }; - checkInputs = [ git ]; + checkInputs = [ git which ]; checkPhase = '' python -m unittest discover diff --git a/pkgs/development/python-modules/nocasedict/default.nix b/pkgs/development/python-modules/nocasedict/default.nix index 982f2abe880d9..d9140d591c81c 100644 --- a/pkgs/development/python-modules/nocasedict/default.nix +++ b/pkgs/development/python-modules/nocasedict/default.nix @@ -1,5 +1,8 @@ -{ lib, buildPythonPackage, fetchPypi -, pytest +{ lib +, buildPythonPackage +, fetchPypi +, pytestCheckHook +, six }: buildPythonPackage rec { @@ -11,8 +14,12 @@ buildPythonPackage rec { sha256 = "sha256-giC5e6BrCOst7e13TEBsd+DKDVNSrnEkn2+dHyoXvXs="; }; + propagatedBuildInputs = [ + six + ]; + checkInputs = [ - pytest + pytestCheckHook ]; pythonImportsCheck = [ diff --git a/pkgs/development/python-modules/nodeenv/default.nix b/pkgs/development/python-modules/nodeenv/default.nix index d88661ae757cb..1ff2d47b32d63 100644 --- a/pkgs/development/python-modules/nodeenv/default.nix +++ b/pkgs/development/python-modules/nodeenv/default.nix @@ -1,4 +1,4 @@ -{ lib, buildPythonPackage, fetchPypi, setuptools }: +{ lib, buildPythonPackage, fetchPypi, setuptools, python, which }: buildPythonPackage rec { pname = "nodeenv"; @@ -16,6 +16,13 @@ buildPythonPackage rec { # Tests not included in PyPI tarball doCheck = false; + preFixup = '' + substituteInPlace $out/${python.sitePackages}/nodeenv.py \ + --replace '["which", candidate]' '["${lib.getBin which}/bin/which", candidate]' + ''; + + pythonImportsCheck = [ "nodeenv" ]; + meta = with lib; { description = "Node.js virtual environment builder"; homepage = "https://github.com/ekalinin/nodeenv"; diff --git a/pkgs/development/python-modules/nomadnet/default.nix b/pkgs/development/python-modules/nomadnet/default.nix new file mode 100644 index 0000000000000..4505c33a696bd --- /dev/null +++ b/pkgs/development/python-modules/nomadnet/default.nix @@ -0,0 +1,43 @@ +{ lib +, buildPythonPackage +, rns +, fetchFromGitHub +, lxmf +, urwid +, pythonOlder +}: + +buildPythonPackage rec { + pname = "nomadnet"; + version = "0.1.7"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "markqvist"; + repo = "NomadNet"; + rev = version; + hash = "sha256-WJpcV6+cnK1525lbYvkWqrGasioph72nuoNV4oWxVK0="; + }; + + propagatedBuildInputs = [ + rns + lxmf + urwid + ]; + + # Module has no tests + doCheck = false; + + pythonImportsCheck = [ + "nomadnet" + ]; + + meta = with lib; { + description = "Off-grid, resilient mesh communication"; + homepage = "https://github.com/markqvist/NomadNet"; + license = licenses.gpl3Only; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/nose-cover3/default.nix b/pkgs/development/python-modules/nose-cover3/default.nix deleted file mode 100644 index b75dcc526c5fd..0000000000000 --- a/pkgs/development/python-modules/nose-cover3/default.nix +++ /dev/null @@ -1,27 +0,0 @@ -{ lib -, buildPythonPackage -, fetchPypi -, nose -}: - -buildPythonPackage rec { - pname = "nose-cover3"; - version = "0.1.0"; - - src = fetchPypi { - inherit pname version; - sha256 = "1la4hhc1yszjpcchvkqk5xmzlb2g1b3fgxj9wwc58qc549whlcc1"; - }; - - propagatedBuildInputs = [ nose ]; - - # No tests included - doCheck = false; - - meta = with lib; { - description = "Coverage 3.x support for Nose"; - homepage = "https://github.com/ask/nosecover3"; - license = licenses.lgpl21; - }; - -} diff --git a/pkgs/development/python-modules/nose/default.nix b/pkgs/development/python-modules/nose/default.nix index 451c71897da9a..586af7a904233 100644 --- a/pkgs/development/python-modules/nose/default.nix +++ b/pkgs/development/python-modules/nose/default.nix @@ -23,7 +23,9 @@ buildPythonPackage rec { --replace "from setuptools.command.build_py import Mixin2to3" "from distutils.util import Mixin2to3" ''; - preBuild = '' + preBuild = lib.optionalString + ((python.isPy3k or false) && (python.pname != "pypy3")) + '' 2to3 -wn nose functional_tests unit_tests ''; diff --git a/pkgs/development/python-modules/notebook/default.nix b/pkgs/development/python-modules/notebook/default.nix index 7a1902cb21144..3ead3cf4fe200 100644 --- a/pkgs/development/python-modules/notebook/default.nix +++ b/pkgs/development/python-modules/notebook/default.nix @@ -27,12 +27,12 @@ buildPythonPackage rec { pname = "notebook"; - version = "6.4.7"; + version = "6.4.10"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "b01da66f11a203b3839d6afa4013674bcfff41c36552f9ad0fbcb2d93c92764a"; + sha256 = "sha256-JAina8YokoOo7s/KZ+KY7IPGfbUaTC4bcT3RgLs56Q4="; }; LC_ALL = "en_US.utf8"; diff --git a/pkgs/development/python-modules/nplusone/default.nix b/pkgs/development/python-modules/nplusone/default.nix index d9a340d824918..898d209d91381 100644 --- a/pkgs/development/python-modules/nplusone/default.nix +++ b/pkgs/development/python-modules/nplusone/default.nix @@ -8,7 +8,6 @@ , mock , peewee , pytest-django -, pytest-pythonpath , pytestCheckHook , six , sqlalchemy @@ -38,7 +37,6 @@ buildPythonPackage rec { mock peewee pytest-django - pytest-pythonpath pytestCheckHook sqlalchemy webtest @@ -54,6 +52,7 @@ buildPythonPackage rec { postPatch = '' substituteInPlace pytest.ini \ + --replace "python_paths" "pythonpath" \ --replace "--cov nplusone --cov-report term-missing" "" ''; diff --git a/pkgs/development/python-modules/numba/default.nix b/pkgs/development/python-modules/numba/default.nix index c1415a07b68e0..d656a56e3c17d 100644 --- a/pkgs/development/python-modules/numba/default.nix +++ b/pkgs/development/python-modules/numba/default.nix @@ -13,21 +13,33 @@ # CUDA-only dependencies: , addOpenGLRunpath ? null -, cudatoolkit ? null +, cudaPackages ? {} # CUDA flags: , cudaSupport ? false }: -buildPythonPackage rec { - version = "0.55.0"; + +let + inherit (cudaPackages) cudatoolkit; +in buildPythonPackage rec { + version = "0.55.1"; pname = "numba"; disabled = pythonOlder "3.6" || pythonAtLeast "3.10"; src = fetchPypi { inherit pname version; - sha256 = "sha256-siHr2ZdmKh3Ld+TwkUDgIvv+dXetB4H8LgIUE126bL0="; + sha256 = "sha256-A+kGmiZm0chPk7ANvXFvuP7d6Lssbvr6LwSEKkZELqM="; }; + postPatch = '' + # numpy + substituteInPlace setup.py \ + --replace "1.22" "2" + + substituteInPlace numba/__init__.py \ + --replace "(1, 21)" "(2, 0)" + ''; + NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isDarwin "-I${lib.getDev libcxx}/include/c++/v1"; propagatedBuildInputs = [ numpy llvmlite setuptools ] ++ lib.optionals cudaSupport [ cudatoolkit cudatoolkit.lib ]; diff --git a/pkgs/development/python-modules/numpydoc/default.nix b/pkgs/development/python-modules/numpydoc/default.nix index 0f57847b3a624..b770ac26fbd7f 100644 --- a/pkgs/development/python-modules/numpydoc/default.nix +++ b/pkgs/development/python-modules/numpydoc/default.nix @@ -1,23 +1,54 @@ -{ lib, buildPythonPackage, fetchPypi, isPy27 +{ lib +, buildPythonPackage +, fetchPypi +, isPy27 , jinja2 -, nose -, pytest , sphinx +, pytestCheckHook +, matplotlib }: buildPythonPackage rec { pname = "numpydoc"; - version = "1.1.0"; + version = "1.2.1"; + format = "setuptools"; + disabled = isPy27; src = fetchPypi { inherit pname; inherit version; - sha256 = "c36fd6cb7ffdc9b4e165a43f67bf6271a7b024d0bb6b00ac468c9e2bfc76448e"; + sha256 = "sha256-fOgm7Q1Uw/3JCXmSqNc6TUWdxGhhE1HGjkRP7ESkWvY="; }; - checkInputs = [ nose pytest ]; - propagatedBuildInputs = [ sphinx jinja2 ]; + postPatch = '' + substituteInPlace setup.py \ + --replace "Jinja2>=2.10,<3.1" "Jinja2>=2.10,<3.2" + substituteInPlace setup.cfg \ + --replace "--cov-report=" "" \ + --replace "--cov=numpydoc" "" + ''; + + propagatedBuildInputs = [ + jinja2 + sphinx + ]; + + checkInputs = [ + matplotlib + pytestCheckHook + ]; + + disabledTests = [ + # https://github.com/numpy/numpydoc/issues/373 + "test_MyClass" + "test_my_function" + "test_reference" + ]; + + pythonImportsCheck = [ + "numpydoc" + ]; meta = { description = "Sphinx extension to support docstrings in Numpy format"; diff --git a/pkgs/development/python-modules/nunavut/default.nix b/pkgs/development/python-modules/nunavut/default.nix index f4cc9d3140e46..4cfce289917af 100644 --- a/pkgs/development/python-modules/nunavut/default.nix +++ b/pkgs/development/python-modules/nunavut/default.nix @@ -2,22 +2,24 @@ , buildPythonPackage , pythonOlder , fetchPypi +, importlib-resources , pydsdl , pyyaml }: buildPythonPackage rec { pname = "nunavut"; - version = "1.6.2"; + version = "1.7.5"; disabled = pythonOlder "3.5"; src = fetchPypi { inherit pname version; - sha256 = "c6f99eaa65935b2c8a3f004025fb3c0309e11655c391d0fcd318d2a8665ca5c4"; + sha256 = "sha256-4wZfj2C6aUNqHaA00KiiXbKOMf/XBSD0N2+9c++e0K8="; }; propagatedBuildInputs = [ + importlib-resources pydsdl pyyaml ]; diff --git a/pkgs/development/python-modules/oasatelematics/default.nix b/pkgs/development/python-modules/oasatelematics/default.nix new file mode 100644 index 0000000000000..c4d7ca1213872 --- /dev/null +++ b/pkgs/development/python-modules/oasatelematics/default.nix @@ -0,0 +1,40 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, pytestCheckHook +, pythonOlder +, requests +}: + +buildPythonPackage rec { + pname = "oasatelematics"; + version = "0.3"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "panosmz"; + repo = pname; + rev = "v${version}"; + hash = "sha256-3O7XbNVj1S3ZwheklEhm0ivw16Tj7drML/xYC9383Kg="; + }; + + propagatedBuildInputs = [ + requests + ]; + + # Module has no tests + doCheck = false; + + pythonImportsCheck = [ + "oasatelematics" + ]; + + meta = with lib; { + description = "Python wrapper for the OASA Telematics API"; + homepage = "https://github.com/panosmz/oasatelematics"; + license = licenses.gpl3Only; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/oauthlib/default.nix b/pkgs/development/python-modules/oauthlib/default.nix index 01e6ca29b5d9b..3a2f5cb1bddc5 100644 --- a/pkgs/development/python-modules/oauthlib/default.nix +++ b/pkgs/development/python-modules/oauthlib/default.nix @@ -1,28 +1,26 @@ { lib -, buildPythonPackage -, fetchFromGitHub - -# propagates , blinker +, buildPythonPackage , cryptography -, pyjwt - -# test +, fetchFromGitHub , mock +, pyjwt , pytestCheckHook +, pythonOlder }: buildPythonPackage rec { pname = "oauthlib"; - version = "3.1.1"; + version = "3.2.0"; format = "setuptools"; - # master supports pyjwt==1.7.1 + disabled = pythonOlder "3.7"; + src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - hash = "sha256:1bgxpzh11i0x7h9py3a29cz5z714b3p498b62znnn5ciy0cr80sv"; + hash = "sha256-41JFURG8G8BjlAlNu2+lbj84XR/trAk1U5OPYxPq+5M="; }; propagatedBuildInputs = [ @@ -36,10 +34,14 @@ buildPythonPackage rec { pytestCheckHook ]; + pythonImportsCheck = [ + "oauthlib" + ]; + meta = with lib; { + description = "Generic, spec-compliant, thorough implementation of the OAuth request-signing logic"; homepage = "https://github.com/idan/oauthlib"; - description = "A generic, spec-compliant, thorough implementation of the OAuth request-signing logic"; - maintainers = with maintainers; [ prikhi ]; license = licenses.bsd3; + maintainers = with maintainers; [ prikhi ]; }; } diff --git a/pkgs/development/python-modules/objax/default.nix b/pkgs/development/python-modules/objax/default.nix index da0a70aafb4c7..84d56962cc4d9 100644 --- a/pkgs/development/python-modules/objax/default.nix +++ b/pkgs/development/python-modules/objax/default.nix @@ -7,7 +7,7 @@ , parameterized , pillow , scipy -, tensorflow-tensorboard +, tensorboard }: buildPythonPackage rec { @@ -33,7 +33,7 @@ buildPythonPackage rec { parameterized pillow scipy - tensorflow-tensorboard + tensorboard ]; pythonImportsCheck = [ diff --git a/pkgs/development/python-modules/oci/default.nix b/pkgs/development/python-modules/oci/default.nix index 8fd06ae3b403c..879a317469e20 100644 --- a/pkgs/development/python-modules/oci/default.nix +++ b/pkgs/development/python-modules/oci/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "oci"; - version = "2.60.0"; + version = "2.63.0"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "oracle"; repo = "oci-python-sdk"; rev = "v${version}"; - hash = "sha256-fXeea4MftVSJWzanHeAuERRiQLBp8l1l1Cw2lG3uz24="; + hash = "sha256-EIn7BRXsVf7R2ij8iK3hrNWnLehxKDBlk96lAhFh0xw="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/ocrmypdf/default.nix b/pkgs/development/python-modules/ocrmypdf/default.nix index fe5211802807d..72565e55419c8 100644 --- a/pkgs/development/python-modules/ocrmypdf/default.nix +++ b/pkgs/development/python-modules/ocrmypdf/default.nix @@ -27,7 +27,7 @@ buildPythonPackage rec { pname = "ocrmypdf"; - version = "13.4.1"; + version = "13.4.3"; src = fetchFromGitHub { owner = "jbarlow83"; @@ -39,7 +39,7 @@ buildPythonPackage rec { extraPostFetch = '' rm "$out/.git_archival.txt" ''; - sha256 = "sha256-gxgeEwm3cYNllcmRTZhdyIWWGKXTewyVW314k732swE="; + hash = "sha256-kriT3NV9Lj44WjOeK6+pILjfRMt9QMcKU57si394xxI="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; diff --git a/pkgs/development/python-modules/ondilo/default.nix b/pkgs/development/python-modules/ondilo/default.nix index 271243ab791e1..c766e2cb158d9 100644 --- a/pkgs/development/python-modules/ondilo/default.nix +++ b/pkgs/development/python-modules/ondilo/default.nix @@ -4,30 +4,35 @@ , oauthlib , pythonOlder , requests -, requests_oauthlib +, requests-oauthlib }: buildPythonPackage rec { pname = "ondilo"; version = "0.3.0"; + format = "setuptools"; + disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "JeromeHXP"; repo = pname; rev = version; - sha256 = "sha256-MI6K+41I/IVi+GRBdmRIHbljULDFLAwpo3W8tdxCOBM="; + hash = "sha256-MI6K+41I/IVi+GRBdmRIHbljULDFLAwpo3W8tdxCOBM="; }; propagatedBuildInputs = [ oauthlib requests - requests_oauthlib + requests-oauthlib ]; # Project has no tests doCheck = false; - pythonImportsCheck = [ "ondilo" ]; + + pythonImportsCheck = [ + "ondilo" + ]; meta = with lib; { description = "Python package to access Ondilo ICO APIs"; diff --git a/pkgs/development/python-modules/onnx/default.nix b/pkgs/development/python-modules/onnx/default.nix index d32b82365dc71..377521bb2f878 100644 --- a/pkgs/development/python-modules/onnx/default.nix +++ b/pkgs/development/python-modules/onnx/default.nix @@ -1,5 +1,6 @@ { lib , buildPythonPackage +, bash , cmake , fetchPypi , isPy27 @@ -14,14 +15,14 @@ buildPythonPackage rec { pname = "onnx"; - version = "1.10.2"; + version = "1.11.0"; format = "setuptools"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "sha256-JNc8p9/X5sczmUT4lVS0AQcZiZM3kk/KFEfY8bXbUNY="; + sha256 = "sha256-7KIkx8LI7kByoHQ+SJioSpvfgpe15ZEKJjLkxBgv+yo="; }; nativeBuildInputs = [ @@ -43,8 +44,9 @@ buildPythonPackage rec { postPatch = '' chmod +x tools/protoc-gen-mypy.sh.in - patchShebangs tools/protoc-gen-mypy.sh.in tools/protoc-gen-mypy.py - + patchShebangs tools/protoc-gen-mypy.py + substituteInPlace tools/protoc-gen-mypy.sh.in \ + --replace "/bin/bash" "${bash}/bin/bash" substituteInPlace setup.py \ --replace "setup_requires.append('pytest-runner')" "" ''; @@ -53,6 +55,11 @@ buildPythonPackage rec { export MAX_JOBS=$NIX_BUILD_CORES ''; + disabledTestPaths = [ + # Unexpected output fields from running code: {'stderr'} + "onnx/examples/np_array_tensorproto.ipynb" + ]; + # The executables are just utility scripts that aren't too important postInstall = '' rm -r $out/bin diff --git a/pkgs/development/python-modules/openai/default.nix b/pkgs/development/python-modules/openai/default.nix index 4fb744826b794..b137050ebff88 100644 --- a/pkgs/development/python-modules/openai/default.nix +++ b/pkgs/development/python-modules/openai/default.nix @@ -9,6 +9,7 @@ , pandas-stubs , requests , tqdm +, wandb # Check dependencies , pytest-mock @@ -17,7 +18,7 @@ buildPythonPackage rec { pname = "openai"; - version = "0.16.0"; + version = "0.18.1"; disabled = pythonOlder "3.7.1"; @@ -26,7 +27,7 @@ buildPythonPackage rec { owner = "openai"; repo = "openai-python"; rev = "v${version}"; - sha256 = "sha256-9BxFOiGIf3Cy7OU0as6onV5ltECInM9wwCr+qCMuPbU="; + sha256 = "sha256-ii/w29aRGhuzR6E+kbknsSrVZlOurpy/tTVGeAYKkXo="; }; propagatedBuildInputs = [ @@ -35,6 +36,7 @@ buildPythonPackage rec { pandas-stubs requests tqdm + wandb ]; pythonImportsCheck = [ "openai" ]; diff --git a/pkgs/development/python-modules/openapi-core/default.nix b/pkgs/development/python-modules/openapi-core/default.nix index 199ea38ae4ab8..32989e7f9ce5a 100644 --- a/pkgs/development/python-modules/openapi-core/default.nix +++ b/pkgs/development/python-modules/openapi-core/default.nix @@ -68,6 +68,8 @@ buildPythonPackage rec { disabledTestPaths = [ # AttributeError: 'str' object has no attribute '__name__' "tests/integration/validation" + # requires secrets and additional configuration + "tests/integration/contrib/test_django.py" # Unable to detect SECRET_KEY and ROOT_URLCONF "tests/integration/contrib/test_django.py" ]; diff --git a/pkgs/development/python-modules/openapi-schema-validator/default.nix b/pkgs/development/python-modules/openapi-schema-validator/default.nix index 8251c2cd01751..ced5f8ed68b8a 100644 --- a/pkgs/development/python-modules/openapi-schema-validator/default.nix +++ b/pkgs/development/python-modules/openapi-schema-validator/default.nix @@ -14,14 +14,14 @@ buildPythonPackage rec { pname = "openapi-schema-validator"; - version = "0.2.0"; + version = "0.2.3"; format = "pyproject"; src = fetchFromGitHub { owner = "p1c2u"; repo = pname; rev = version; - sha256 = "sha256-HoXtDlXOoYqzsM4FxVfLQdIlpJXaNUcQo8//B4JqJoA="; + sha256 = "sha256-rgl2B55dnbpZszr+gWM0FgeXMKfrkDG7HeZBSw5Eles="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/openapi-spec-validator/default.nix b/pkgs/development/python-modules/openapi-spec-validator/default.nix index 4e61a86a5013e..7ef70ab3d3ff8 100644 --- a/pkgs/development/python-modules/openapi-spec-validator/default.nix +++ b/pkgs/development/python-modules/openapi-spec-validator/default.nix @@ -1,17 +1,23 @@ { lib, buildPythonPackage, isPy27, fetchPypi , jsonschema, openapi-schema-validator, pyyaml, six, pathlib -, mock, pytest, pytest-cov, pytest-flake8, tox, setuptools }: +, mock, pytest, pytest-cov, pytest-flake8, tox, setuptools +, poetry-core +, requests +}: buildPythonPackage rec { pname = "openapi-spec-validator"; - version = "0.3.1"; + version = "0.4.0"; + format = "pyproject"; src = fetchPypi { inherit pname version; - sha256 = "3d70e6592754799f7e77a45b98c6a91706bdd309a425169d17d8e92173e198a2"; + sha256 = "sha256-l/JYhQr8l7BI98JlOFXg+I+masEDwr5Qd8eWCsoq1Jo="; }; - propagatedBuildInputs = [ jsonschema openapi-schema-validator pyyaml six setuptools ] + nativeBuildInputs = [ poetry-core ]; + + propagatedBuildInputs = [ jsonschema openapi-schema-validator pyyaml six setuptools requests ] ++ (lib.optionals (isPy27) [ pathlib ]); checkInputs = [ mock pytest pytest-cov pytest-flake8 tox ]; diff --git a/pkgs/development/python-modules/openhomedevice/default.nix b/pkgs/development/python-modules/openhomedevice/default.nix index 57c0182abd780..533a6f66f7f01 100644 --- a/pkgs/development/python-modules/openhomedevice/default.nix +++ b/pkgs/development/python-modules/openhomedevice/default.nix @@ -8,14 +8,16 @@ buildPythonPackage rec { pname = "openhomedevice"; - version = "2.0.1"; + version = "2.0.2"; + format = "setuptools"; + disabled = pythonOlder "3.5"; src = fetchFromGitHub { owner = "bazwilliams"; repo = pname; rev = version; - sha256 = "sha256-BQgwXg15+xEGfPm0HJWpKXbNuCgc0VcAD5AuVSDXd8g="; + hash = "sha256-D4n/fv+tgdKiU7CemI+12cqoox2hsqRYlCHY7daD5fM="; }; propagatedBuildInputs = [ @@ -26,7 +28,10 @@ buildPythonPackage rec { # Tests are currently outdated # https://github.com/bazwilliams/openhomedevice/issues/20 doCheck = false; - pythonImportsCheck = [ "openhomedevice" ]; + + pythonImportsCheck = [ + "openhomedevice" + ]; meta = with lib; { description = "Python module to access Linn Ds and Openhome devices"; diff --git a/pkgs/development/python-modules/openshift/default.nix b/pkgs/development/python-modules/openshift/default.nix index 78e0c53c9112f..c233f88c73f9c 100644 --- a/pkgs/development/python-modules/openshift/default.nix +++ b/pkgs/development/python-modules/openshift/default.nix @@ -12,13 +12,13 @@ buildPythonPackage rec { pname = "openshift"; - version = "0.12.1"; + version = "0.13.1"; src = fetchFromGitHub { owner = "openshift"; repo = "openshift-restclient-python"; rev = "v${version}"; - sha256 = "1di55xg3nl4dwrrfw314p4mfm6593kdi7ia517v1sm6x5p4hjl78"; + sha256 = "sha256-9mMHih2xuQve8hEnc5x4f9Pd4wX7IMy3vrxxGFCG+8o="; }; postPatch = '' diff --git a/pkgs/development/python-modules/opentracing/default.nix b/pkgs/development/python-modules/opentracing/default.nix index 381b0d76b1445..bf7ec6a938ff4 100644 --- a/pkgs/development/python-modules/opentracing/default.nix +++ b/pkgs/development/python-modules/opentracing/default.nix @@ -5,12 +5,15 @@ , futures ? null , gevent , mock -, pytest -, tornado }: +, pytestCheckHook +, tornado +, six +}: buildPythonPackage rec { pname = "opentracing"; version = "2.4.0"; + format = "setuptools"; src = fetchPypi { inherit pname version; @@ -19,11 +22,13 @@ buildPythonPackage rec { propagatedBuildInputs = lib.optional isPy27 futures; - checkInputs = [ gevent mock pytest tornado ]; - - checkPhase = '' - pytest - ''; + checkInputs = [ + gevent + mock + pytestCheckHook + six + tornado + ]; meta = with lib; { homepage = "https://github.com/opentracing/opentracing-python"; diff --git a/pkgs/development/python-modules/optax/default.nix b/pkgs/development/python-modules/optax/default.nix index f3790a3f59f42..b0f896a18ebb1 100644 --- a/pkgs/development/python-modules/optax/default.nix +++ b/pkgs/development/python-modules/optax/default.nix @@ -38,7 +38,6 @@ buildPythonPackage rec { tensorflow tensorflow-datasets ]; - pytestFlagsArray = [ "-n $NIX_BUILD_CORES" ]; pythonImportsCheck = [ "optax" diff --git a/pkgs/development/python-modules/ordered-set/default.nix b/pkgs/development/python-modules/ordered-set/default.nix index 7546566cb3aac..8ea71fd2d901f 100644 --- a/pkgs/development/python-modules/ordered-set/default.nix +++ b/pkgs/development/python-modules/ordered-set/default.nix @@ -1,24 +1,39 @@ -{ buildPythonPackage, fetchPypi, lib, isPy27, pytest }: +{ lib +, buildPythonPackage +, fetchPypi +, pythonOlder +, flit-core +, pytestCheckHook +}: buildPythonPackage rec { pname = "ordered-set"; - version = "4.0.2"; - disabled = isPy27; + version = "4.1.0"; + format = "pyproject"; - checkInputs = [ pytest ]; + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "159syfbqnwqnivzjfn3x7ak3xwrxmnzbji7c2qhj1jjv0pgv54xs"; + sha256 = "sha256-aUqORMh2V8WSku3nKJHrkdNBMfZTFGOqswCRkcdzZKg="; }; - checkPhase = '' - py.test test.py - ''; + nativeBuildInputs = [ + flit-core + ]; - meta = { + checkInputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ + "ordered_set" + ]; + + meta = with lib; { description = "A MutableSet that remembers its order, so that every entry has an index."; - license = lib.licenses.mit; - maintainers = [ lib.maintainers.MostAwesomeDude ]; + homepage = "https://github.com/rspeer/ordered-set"; + license = licenses.mit; + maintainers = with maintainers; [ MostAwesomeDude ]; }; } diff --git a/pkgs/development/python-modules/ormar/default.nix b/pkgs/development/python-modules/ormar/default.nix index 5546f58b26240..8678e512fdf0e 100644 --- a/pkgs/development/python-modules/ormar/default.nix +++ b/pkgs/development/python-modules/ormar/default.nix @@ -70,8 +70,8 @@ buildPythonPackage rec { postPatch = '' substituteInPlace pyproject.toml \ - --replace 'SQLAlchemy = ">=1.3.18,<=1.4.29"' 'SQLAlchemy = ">=1.3.18"' \ - --replace 'databases = ">=0.3.2,!=0.5.0,!=0.5.1,!=0.5.2,!=0.5.3,<0.5.5"' 'databases = ">=0.5.5"' + --replace 'SQLAlchemy = ">=1.3.18,<=1.4.31"' 'SQLAlchemy = ">=1.3.18"' \ + --replace 'databases = ">=0.3.2,!=0.5.0,!=0.5.1,!=0.5.2,!=0.5.3,<=0.5.5"' 'databases = ">=0.5.5"' ''; disabledTests = [ @@ -84,8 +84,8 @@ buildPythonPackage rec { ]; meta = with lib; { - homepage = "https://github.com/collerek/ormar"; description = "Async ORM with fastapi in mind and pydantic validation"; + homepage = "https://github.com/collerek/ormar"; license = licenses.mit; maintainers = with maintainers; [ andreasfelix ]; }; diff --git a/pkgs/development/python-modules/osc-lib/default.nix b/pkgs/development/python-modules/osc-lib/default.nix index e9a662412b771..2777fc5be7546 100644 --- a/pkgs/development/python-modules/osc-lib/default.nix +++ b/pkgs/development/python-modules/osc-lib/default.nix @@ -43,7 +43,13 @@ buildPythonPackage rec { ]; checkPhase = '' - stestr run + # tests parse cli output which slightly changed + stestr run -e <(echo " + osc_lib.tests.utils.test_tags.TestTagHelps.test_add_tag_filtering_option_to_parser + osc_lib.tests.utils.test_tags.TestTagHelps.test_add_tag_option_to_parser_for_create + osc_lib.tests.utils.test_tags.TestTagHelps.test_add_tag_option_to_parser_for_set + osc_lib.tests.utils.test_tags.TestTagHelps.test_add_tag_option_to_parser_for_unset + ") ''; pythonImportsCheck = [ "osc_lib" ]; diff --git a/pkgs/development/python-modules/oslo-context/default.nix b/pkgs/development/python-modules/oslo-context/default.nix index f38b9bb09b39d..7f5fa9b98ca0e 100644 --- a/pkgs/development/python-modules/oslo-context/default.nix +++ b/pkgs/development/python-modules/oslo-context/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "oslo.context"; - version = "3.4.0"; + version = "4.1.0"; src = fetchPypi { inherit pname version; - sha256 = "970f96361c5de9a5dc86d48a648289d77118180ca13ba5eeb307137736ffa953"; + sha256 = "sha256-damnIqVS+6ionooBAo+oKmGQqzF6lZG7gzA6IhCnkUQ="; }; postPatch = '' diff --git a/pkgs/development/python-modules/oslo-log/default.nix b/pkgs/development/python-modules/oslo-log/default.nix index a2e6eac8e3894..c2b11dd3167bb 100644 --- a/pkgs/development/python-modules/oslo-log/default.nix +++ b/pkgs/development/python-modules/oslo-log/default.nix @@ -11,16 +11,20 @@ , pyinotify , python-dateutil , pytestCheckHook +, pythonOlder }: buildPythonPackage rec { pname = "oslo-log"; - version = "4.6.1"; + version = "4.7.0"; + format = "setuptools"; + + disabled = pythonOlder "3.6"; src = fetchPypi { pname = "oslo.log"; inherit version; - sha256 = "0dlnxjci9mpwhgfv19fy1z7xrdp8m95skrj5dr60all3pr7n22f6"; + hash = "sha256-ycLEyW098LLuuTG0djvbCpBbqvKbiVgW2Vd41p+hJwc="; }; propagatedBuildInputs = [ @@ -44,7 +48,9 @@ buildPythonPackage rec { "test_logging_handle_error" ]; - pythonImportsCheck = [ "oslo_log" ]; + pythonImportsCheck = [ + "oslo_log" + ]; meta = with lib; { description = "oslo.log library"; diff --git a/pkgs/development/python-modules/ovh/default.nix b/pkgs/development/python-modules/ovh/default.nix index 305b03b4d144d..b9ab287260d64 100644 --- a/pkgs/development/python-modules/ovh/default.nix +++ b/pkgs/development/python-modules/ovh/default.nix @@ -1,20 +1,45 @@ { lib , buildPythonPackage , fetchPypi +, mock +, nose +, requests +, yanc }: buildPythonPackage rec { pname = "ovh"; - version = "0.5.0"; - - # Needs yanc - doCheck = false; + version = "1.0.0"; + format = "setuptools"; src = fetchPypi { inherit pname version; - sha256 = "f74d190c4bff0953d76124cb8ed319a8a999138720e42957f0db481ef4746ae8"; + sha256 = "sha256-IQzwu0gwfPNPOLQLCO99KL5Hu2094Y+acQBFXVGzHhU="; }; + propagatedBuildInputs = [ + requests + ]; + + preCheck = '' + export HOME=$(mktemp -d) + ''; + + checkInputs = [ + mock + nose + yanc + ]; + + # requires network + checkPhase = '' + nosetests . \ + -e test_config_get_conf \ + -e test_config_get_custom_conf \ + -e test_endpoints \ + -e test_init_from_custom_config + ''; + meta = { description = "Thin wrapper around OVH's APIs"; homepage = "https://github.com/ovh/python-ovh"; diff --git a/pkgs/development/python-modules/packageurl-python/default.nix b/pkgs/development/python-modules/packageurl-python/default.nix index 5236cc7bbf8e5..c2d74d0d3c16c 100644 --- a/pkgs/development/python-modules/packageurl-python/default.nix +++ b/pkgs/development/python-modules/packageurl-python/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "packageurl-python"; - version = "0.9.8.1"; + version = "0.9.9"; src = fetchPypi { inherit pname version; - sha256 = "sha256-Z14OyAWPoIN6BAUEcXi96mp9C0aWaYP6eeHAoa+rHJ4="; + sha256 = "sha256-hyoENLmkSLP6l1cXEfad0qP7cjRa1myQsX2Cev6oLwk="; }; checkInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/packaging/default.nix b/pkgs/development/python-modules/packaging/default.nix index 648a548e521b5..69457e2a5569e 100644 --- a/pkgs/development/python-modules/packaging/default.nix +++ b/pkgs/development/python-modules/packaging/default.nix @@ -2,40 +2,44 @@ , buildPythonPackage , fetchPypi , pyparsing -, six , pytestCheckHook , pretend , setuptools }: -buildPythonPackage rec { - pname = "packaging"; - version = "21.3"; - format = "pyproject"; +let + packaging = buildPythonPackage rec { + pname = "packaging"; + version = "21.3"; + format = "pyproject"; - src = fetchPypi { - inherit pname version; - sha256 = "sha256-3UfEKSfYmrkR5gZRiQfMLTofOLvQJjhZcGQ/nFuOz+s="; - }; + src = fetchPypi { + inherit pname version; + sha256 = "sha256-3UfEKSfYmrkR5gZRiQfMLTofOLvQJjhZcGQ/nFuOz+s="; + }; + + nativeBuildInputs = [ + setuptools + ]; - nativeBuildInputs = [ - setuptools - ]; + propagatedBuildInputs = [ pyparsing ]; - propagatedBuildInputs = [ pyparsing six ]; + checkInputs = [ + pytestCheckHook + pretend + ]; - checkInputs = [ - pytestCheckHook - pretend - ]; + # Prevent circular dependency + doCheck = false; - # Prevent circular dependency - doCheck = false; + passthru.tests = packaging.overridePythonAttrs (_: { doCheck = true; }); - meta = with lib; { - description = "Core utilities for Python packages"; - homepage = "https://github.com/pypa/packaging"; - license = [ licenses.bsd2 licenses.asl20 ]; - maintainers = with maintainers; [ bennofs ]; + meta = with lib; { + description = "Core utilities for Python packages"; + homepage = "https://github.com/pypa/packaging"; + license = with licenses; [ bsd2 asl20 ]; + maintainers = with maintainers; [ bennofs ]; + }; }; -} +in +packaging diff --git a/pkgs/development/python-modules/paho-mqtt/default.nix b/pkgs/development/python-modules/paho-mqtt/default.nix index 341ef8321835b..fb249acf63333 100644 --- a/pkgs/development/python-modules/paho-mqtt/default.nix +++ b/pkgs/development/python-modules/paho-mqtt/default.nix @@ -5,6 +5,7 @@ , isPy3k , pytestCheckHook , mock +, six }: buildPythonPackage rec { @@ -18,16 +19,9 @@ buildPythonPackage rec { sha256 = "sha256-9nH6xROVpmI+iTKXfwv2Ar1PAmWbEunI3HO0pZyK6Rg="; }; - postPatch = '' - substituteInPlace setup.py \ - --replace "pylama" "" \ - --replace "'pytest-runner'" "" - substituteInPlace setup.cfg \ - --replace "--pylama" "" - ''; - checkInputs = [ pytestCheckHook + six ] ++ lib.optional (!isPy3k) [ mock ]; diff --git a/pkgs/development/python-modules/pandas/default.nix b/pkgs/development/python-modules/pandas/default.nix index 536f883f29a2d..70919715eefdc 100644 --- a/pkgs/development/python-modules/pandas/default.nix +++ b/pkgs/development/python-modules/pandas/default.nix @@ -27,12 +27,12 @@ buildPythonPackage rec { pname = "pandas"; - version = "1.3.5"; + version = "1.4.2"; format = "setuptools"; src = fetchPypi { inherit pname version; - sha256 = "1e4285f5de1012de20ca46b188ccf33521bff61ba5c5ebd78b4fb28e5416a9f1"; + sha256 = "sha256-krwfxYXxRjyoJ7RVNZV4FbfeshjFSbfBhALDIsdUmhI="; }; nativeBuildInputs = [ cython ]; @@ -71,10 +71,16 @@ buildPythonPackage rec { doCheck = !stdenv.isAarch32 && !stdenv.isAarch64; # upstream doesn't test this architecture + # don't max out build cores, it breaks tests + dontUsePytestXdist = true; + pytestFlagsArray = [ + # https://github.com/pandas-dev/pandas/blob/main/test_fast.sh + "--skip-db" "--skip-slow" "--skip-network" - "--numprocesses" "0" + "-m" "'not single_cpu'" + "--numprocesses" "4" ]; disabledTests = [ diff --git a/pkgs/development/python-modules/panel/default.nix b/pkgs/development/python-modules/panel/default.nix index 48247112d958c..dca9b44c81738 100644 --- a/pkgs/development/python-modules/panel/default.nix +++ b/pkgs/development/python-modules/panel/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "panel"; - version = "0.12.7"; + version = "0.13.0"; format = "wheel"; @@ -23,7 +23,7 @@ buildPythonPackage rec { # tries to fetch even more artifacts src = fetchPypi { inherit pname version format; - hash = "sha256-VcoMGYT48WduyuyTB/4KJybT/pBKV0hB1pSpZGagAeA="; + hash = "sha256-Iv1Lb45n2XUHSluZzdF2Bf/hXZmgs++9/av26rHgePc="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/parameterizedtestcase/default.nix b/pkgs/development/python-modules/parameterizedtestcase/default.nix index 20e662cd66d61..9d277af8d1a9c 100644 --- a/pkgs/development/python-modules/parameterizedtestcase/default.nix +++ b/pkgs/development/python-modules/parameterizedtestcase/default.nix @@ -27,5 +27,6 @@ buildPythonPackage rec { homepage = "https://github.com/msabramo/python_unittest_parameterized_test_case"; license = licenses.mit; maintainers = with maintainers; [ dotlambda ]; + broken = python.isPy3k; # uses use_2to3 }; } diff --git a/pkgs/development/python-modules/parse-type/default.nix b/pkgs/development/python-modules/parse-type/default.nix index 5cfb4b610ce7a..3356853e8ac4a 100644 --- a/pkgs/development/python-modules/parse-type/default.nix +++ b/pkgs/development/python-modules/parse-type/default.nix @@ -8,13 +8,13 @@ buildPythonPackage rec { pname = "parse-type"; - version = "0.5.6"; + version = "0.6.0"; src = fetchFromGitHub { owner = "jenisys"; repo = "parse_type"; rev = "v${version}"; - sha256 = "sha256-CJroqJIi5DpmR8i1lr8OJ+234615PhpVUsqK91XOT3E="; + sha256 = "sha256-v79zzAAwXYoK2N8ZPl1L90qOwMRexAV2wCTMvo4vrSc="; }; propagatedBuildInputs = [ @@ -29,7 +29,7 @@ buildPythonPackage rec { postPatch = '' substituteInPlace pytest.ini \ --replace "--metadata PACKAGE_UNDER_TEST parse_type" "" \ - --replace "--metadata PACKAGE_VERSION 0.5.6" "" \ + --replace "--metadata PACKAGE_VERSION ${version}" "" \ --replace "--html=build/testing/report.html --self-contained-html" "" \ --replace "--junit-xml=build/testing/report.xml" "" ''; diff --git a/pkgs/development/python-modules/parsimonious/default.nix b/pkgs/development/python-modules/parsimonious/default.nix index 557e632f2edad..d517e9433e41f 100644 --- a/pkgs/development/python-modules/parsimonious/default.nix +++ b/pkgs/development/python-modules/parsimonious/default.nix @@ -1,29 +1,46 @@ { lib , buildPythonPackage , fetchPypi -, nose -, six +, regex +, pytestCheckHook +, pythonOlder }: buildPythonPackage rec { - version = "0.8.1"; pname = "parsimonious"; + version = "0.9.0"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "3add338892d580e0cb3b1a39e4a1b427ff9f687858fdd61097053742391a9f6b"; + hash = "sha256-sq0a5jovZb149eCorFEKmPNgekPx2yqNRmNqXZ5KMME="; }; - checkInputs = [ nose ]; - propagatedBuildInputs = [ six ]; + propagatedBuildInputs = [ + regex + ]; + + checkInputs = [ + pytestCheckHook + ]; - # performance tests tend to fail sometimes - NOSE_EXCLUDE = "test_benchmarks"; + postPatch = '' + substituteInPlace setup.py \ + --replace "regex>=2022.3.15" "regex" + ''; + + pythonImportsCheck = [ + "parsimonious" + "parsimonious.grammar" + "parsimonious.nodes" + ]; meta = with lib; { + description = "Arbitrary-lookahead parser"; homepage = "https://github.com/erikrose/parsimonious"; - description = "Fast arbitrary-lookahead parser written in pure Python"; license = licenses.mit; + maintainers = with maintainers; [ ]; }; - } diff --git a/pkgs/development/python-modules/path.py/default.nix b/pkgs/development/python-modules/path.py/default.nix deleted file mode 100644 index e49b1ceb462cc..0000000000000 --- a/pkgs/development/python-modules/path.py/default.nix +++ /dev/null @@ -1,50 +0,0 @@ -{ lib -, buildPythonPackage -, fetchPypi -, setuptools-scm -, pytestCheckHook -, pytest-flake8 -, glibcLocales -, packaging -, isPy38 -, importlib-metadata -, fetchpatch -}: - -buildPythonPackage rec { - pname = "path.py"; - version = "12.0.1"; - - src = fetchPypi { - inherit pname version; - sha256 = "9f2169633403aa0423f6ec000e8701dd1819526c62465f5043952f92527fea0f"; - }; - - checkInputs = [ pytestCheckHook pytest-flake8 glibcLocales packaging ]; - buildInputs = [ setuptools-scm ]; - propagatedBuildInputs = [ - importlib-metadata - ]; - - LC_ALL = "en_US.UTF-8"; - - meta = { - description = "A module wrapper for os.path"; - homepage = "https://github.com/jaraco/path.py"; - license = lib.licenses.mit; - }; - - # ignore performance test which may fail when the system is under load - # test_version fails with 3.8 https://github.com/jaraco/path.py/issues/172 - disabledTests = [ "TestPerformance" ] ++ lib.optionals isPy38 [ "test_version"]; - - dontUseSetuptoolsCheck = true; - - patches = [ - (fetchpatch { - url = "https://github.com/jaraco/path.py/commit/02eb16f0eb2cdc0015972ce963357aaa1cd0b84b.patch"; - sha256 = "0bqa8vjwil7jn35a6984adcm24pvv3pjkhszv10qv6yr442d1mk9"; - }) - ]; - -} diff --git a/pkgs/development/python-modules/path/default.nix b/pkgs/development/python-modules/path/default.nix new file mode 100644 index 0000000000000..a22aa64e8b1e5 --- /dev/null +++ b/pkgs/development/python-modules/path/default.nix @@ -0,0 +1,51 @@ +{ lib +, buildPythonPackage +, pythonOlder +, fetchPypi + +# build time +, setuptools-scm + +# tests +, pytestCheckHook +, appdirs +, packaging +}: + +buildPythonPackage rec { + pname = "path"; + version = "16.4.0"; + format = "pyproject"; + + disabled = pythonOlder "3.7"; + + src = fetchPypi { + inherit pname version; + hash = "sha256-uvLnV8Sxm+ggj55n5I+0dbSld9VhNZDORmk7298IL1I="; + }; + + nativeBuildInputs = [ + setuptools-scm + ]; + + checkInputs = [ + pytestCheckHook + ]; + + disabledTests = [ + # creates a file, checks when it was last accessed/modified + # AssertionError: assert 1650036414.0 == 1650036414.960688 + "test_utime" + ]; + + pythonImportsCheck = [ + "path" + ]; + + meta = with lib; { + description = "Object-oriented file system path manipulation"; + homepage = "https://github.com/jaraco/path"; + license = licenses.mit; + maintainers = with maintainers; [ ]; + }; +} diff --git a/pkgs/development/python-modules/pathlib2/default.nix b/pkgs/development/python-modules/pathlib2/default.nix index 757ddc7d97463..f0f0163652ca0 100644 --- a/pkgs/development/python-modules/pathlib2/default.nix +++ b/pkgs/development/python-modules/pathlib2/default.nix @@ -5,28 +5,32 @@ , pythonOlder , scandir ? null , glibcLocales -, mock ? null +, mock +, typing }: buildPythonPackage rec { pname = "pathlib2"; - version = "2.3.6"; + version = "2.3.7.post1"; src = fetchPypi { inherit pname version; - sha256 = "7d8bcb5555003cdf4a8d2872c538faa3a0f5d20630cb360e518ca3b981795e5f"; + sha256 = "sha256-n+DtrYmLg8DD4ZnIQrJ+0hZkXS4Xd1ey3Wc4TUETxkE="; }; - propagatedBuildInputs = [ six ] ++ lib.optional (pythonOlder "3.5") scandir; - checkInputs = [ glibcLocales ] ++ lib.optional (pythonOlder "3.3") mock; + propagatedBuildInputs = [ six ] + ++ lib.optionals (pythonOlder "3.5") [ scandir typing ]; + checkInputs = [ glibcLocales ] + ++ lib.optional (pythonOlder "3.3") mock; preCheck = '' export LC_ALL="en_US.UTF-8" ''; - meta = { + meta = with lib; { description = "This module offers classes representing filesystem paths with semantics appropriate for different operating systems."; - homepage = "https://pypi.python.org/pypi/pathlib2/"; - license = with lib.licenses; [ mit ]; + homepage = "https://pypi.org/project/pathlib2/"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ SuperSandro2000 ]; }; } diff --git a/pkgs/development/python-modules/pdm-pep517/default.nix b/pkgs/development/python-modules/pdm-pep517/default.nix index aa99d5f23f7b7..f91df4f6e5ea8 100644 --- a/pkgs/development/python-modules/pdm-pep517/default.nix +++ b/pkgs/development/python-modules/pdm-pep517/default.nix @@ -8,13 +8,13 @@ buildPythonPackage rec { pname = "pdm-pep517"; - version = "0.10.2"; + version = "0.12.3"; format = "pyproject"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "83bb71a7588df69ea0d77dc6524741c3a1af54ad5f421341428de648bfc03a29"; + sha256 = "sha256-EXv7Fhm4a+s0/gCbjUGsrPeQ0fxSQMzBH2ytoVHUaIc="; }; preCheck = '' diff --git a/pkgs/development/python-modules/peco/default.nix b/pkgs/development/python-modules/peco/default.nix new file mode 100644 index 0000000000000..72450237a542f --- /dev/null +++ b/pkgs/development/python-modules/peco/default.nix @@ -0,0 +1,39 @@ +{ lib +, aiohttp +, buildPythonPackage +, fetchPypi +, pydantic +, pythonOlder +}: + +buildPythonPackage rec { + pname = "peco"; + version = "0.0.29"; + format = "pyproject"; + + disabled = pythonOlder "3.7"; + + src = fetchPypi { + inherit pname version; + hash = "sha256-zL0tBTwm+l5eyxlWr2xoE+nLpMfUKri1/yD+WgTUqHQ="; + }; + + propagatedBuildInputs = [ + aiohttp + pydantic + ]; + + # Module has no tests + doCheck = false; + + pythonImportsCheck = [ + "peco" + ]; + + meta = with lib; { + description = "Library for interacting with the PECO outage map"; + homepage = "https://github.com/IceBotYT/peco-outage-api"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/peewee/default.nix b/pkgs/development/python-modules/peewee/default.nix index 852ba5ffbcb7c..85a58271b6d38 100644 --- a/pkgs/development/python-modules/peewee/default.nix +++ b/pkgs/development/python-modules/peewee/default.nix @@ -14,14 +14,14 @@ buildPythonPackage rec { pname = "peewee"; - version = "3.14.8"; + version = "3.14.9"; format = "setuptools"; src = fetchFromGitHub { owner = "coleifer"; repo = pname; rev = version; - sha256 = "sha256-BJSM+7+VdW6SxN4/AXsX8NhQPdIFoYrVRVwR9OsJ3QE="; + sha256 = "sha256-8rwWKsOOYUrk2k1piCurb1LkB9zzmSITq52qWdyx4yk="; }; buildInputs = [ diff --git a/pkgs/development/python-modules/pelican/default.nix b/pkgs/development/python-modules/pelican/default.nix index 436192e18b8d5..723b3888edb8c 100644 --- a/pkgs/development/python-modules/pelican/default.nix +++ b/pkgs/development/python-modules/pelican/default.nix @@ -28,14 +28,14 @@ buildPythonPackage rec { pname = "pelican"; - version = "4.7.1"; + version = "4.7.2"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "getpelican"; repo = pname; rev = version; - sha256 = "0w3r4ifbrl6mhfphabqs048qys7x6k164ds63jr10l3namljm8ad"; + hash = "sha256-ZBGzsyCtFt5uj9mpOpGdTzGJET0iwOAgDTy80P6anRU="; # Remove unicode file names which leads to different checksums on HFS+ # vs. other filesystems because of unicode normalisation. extraPostFetch = '' diff --git a/pkgs/development/python-modules/pencompy/default.nix b/pkgs/development/python-modules/pencompy/default.nix new file mode 100644 index 0000000000000..b2648e36e5a12 --- /dev/null +++ b/pkgs/development/python-modules/pencompy/default.nix @@ -0,0 +1,32 @@ +{ lib +, buildPythonPackage +, fetchPypi +, pythonOlder +}: + +buildPythonPackage rec { + pname = "pencompy"; + version = "0.0.4"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; + + src = fetchPypi { + inherit pname version; + hash = "sha256-PjALTsk0Msv3g8M6k0v6ftzDAuFKyIPSpfvT8S3YL48="; + }; + + # Module has no tests + doCheck = false; + + pythonImportsCheck = [ + "pencompy" + ]; + + meta = with lib; { + description = "Library for interacting with Pencom relay boards"; + homepage = "https://github.com/dubnom/pencompy"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/pep257/default.nix b/pkgs/development/python-modules/pep257/default.nix deleted file mode 100644 index d6205fc6e72ec..0000000000000 --- a/pkgs/development/python-modules/pep257/default.nix +++ /dev/null @@ -1,23 +0,0 @@ -{ lib, buildPythonPackage, fetchFromGitHub, pytestCheckHook, mock }: - -buildPythonPackage rec { - pname = "pep257"; - version = "6.1.1"; - - src = fetchFromGitHub { - owner = "GreenSteam"; - repo = "pep257"; - rev = version; - sha256 = "0hcf3nyvzl8kd6gmc9qsiigz7vpwrjxcd1bd50dd63cad87qqicg"; - }; - - checkInputs = [ pytestCheckHook mock ]; - - meta = with lib; { - homepage = "https://github.com/GreenSteam/pep257/"; - description = "Python docstring style checker"; - longDescription = "Static analysis tool for checking compliance with Python PEP 257."; - license = licenses.mit; - maintainers = with maintainers; [ ]; - }; -} diff --git a/pkgs/development/python-modules/perfplot/default.nix b/pkgs/development/python-modules/perfplot/default.nix index ca8f867e6e30c..a2bb6baec9694 100644 --- a/pkgs/development/python-modules/perfplot/default.nix +++ b/pkgs/development/python-modules/perfplot/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "perfplot"; - version = "0.9.13"; + version = "0.10.1"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "nschloe"; repo = pname; rev = "v${version}"; - sha256 = "0ry5x38sv8gh505z6ip90jymm7kfgyf80y3vjb2i6z567bnblam6"; + sha256 = "sha256-5qZolEJWjhqk1JakcGBWZ1hxeP1cLqcB7IZ3ufjOC/o="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/pex/default.nix b/pkgs/development/python-modules/pex/default.nix index 0c22823d565ec..19bf4676b01a6 100644 --- a/pkgs/development/python-modules/pex/default.nix +++ b/pkgs/development/python-modules/pex/default.nix @@ -7,14 +7,14 @@ buildPythonPackage rec { pname = "pex"; - version = "2.1.75"; + version = "2.1.82"; format = "flit"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-G5JE4/ZWZYo8Fpy3ZhIaWNzGfEkWb9qA9vL3UVTqf0Q="; + hash = "sha256-VwbpcKPtPH/43E+lfzUken8JvX8QtTa6o0H0S2RXbYk="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/pg8000/default.nix b/pkgs/development/python-modules/pg8000/default.nix index 8653c28c878d9..c871a7bccb850 100644 --- a/pkgs/development/python-modules/pg8000/default.nix +++ b/pkgs/development/python-modules/pg8000/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "pg8000"; - version = "1.24.1"; + version = "1.26.1"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "sha256-KRIixd39ZqP8DTIXAM9ZHIsPkw0vyEh3fWz8/1VEPOY="; + sha256 = "sha256-zNK2/hkK3ddMCTpivgcwuemfPqA6oO96uV7Rt/9p0lc="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pgspecial/default.nix b/pkgs/development/python-modules/pgspecial/default.nix index 308e8c9c8b640..e7b4e62ab575d 100644 --- a/pkgs/development/python-modules/pgspecial/default.nix +++ b/pkgs/development/python-modules/pgspecial/default.nix @@ -10,11 +10,11 @@ buildPythonPackage rec { pname = "pgspecial"; - version = "1.13.0"; + version = "1.13.1"; src = fetchPypi { inherit pname version; - sha256 = "3847e205b19469f16ded05bda24b4758056d67ade4075a5ded4ce6628a9bad01"; + sha256 = "sha256-1dq5ZpCQgnWRbcLGIu+uIX8ULggWX6NmlJ1By8VlhwE="; }; propagatedBuildInputs = [ @@ -28,6 +28,11 @@ buildPythonPackage rec { pytestCheckHook ]; + disabledTests = [ + # requires a postgresql server + "test_slash_dp_pattern_schema" + ]; + meta = with lib; { description = "Meta-commands handler for Postgres Database"; homepage = "https://pypi.python.org/pypi/pgspecial"; diff --git a/pkgs/development/python-modules/phe/default.nix b/pkgs/development/python-modules/phe/default.nix index 86a5ec848ace9..0e589a04dbf9c 100644 --- a/pkgs/development/python-modules/phe/default.nix +++ b/pkgs/development/python-modules/phe/default.nix @@ -2,7 +2,7 @@ let pname = "phe"; - version = "1.4.0"; + version = "1.5.0"; in buildPythonPackage { @@ -13,7 +13,7 @@ buildPythonPackage { src = fetchPypi { inherit pname version; - sha256 = "0wzlk7d24kp0f5kpm0kvvc88mm42144f5cg9pcpb1dsfha75qy5m"; + sha256 = "sha256-mS+3CR0kJ/DZczlG+PNQrN1NHQEgV/Kq02S6eflwM5w="; }; buildInputs = [ click gmpy2 numpy ]; diff --git a/pkgs/development/python-modules/phik/default.nix b/pkgs/development/python-modules/phik/default.nix index a7cb6e7e838e2..2919fb5c733a5 100644 --- a/pkgs/development/python-modules/phik/default.nix +++ b/pkgs/development/python-modules/phik/default.nix @@ -19,12 +19,12 @@ buildPythonPackage rec { pname = "phik"; - version = "0.12.0"; + version = "0.12.2"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "959fd40482246e3f643cdac5ea04135b2c11a487e917af7d4e75843f47183549"; + sha256 = "sha256-sGdOuCnSMpBDP3GNI2ASK+gEsXDMyAetnZqNHBOYVTM="; }; checkInputs = [ diff --git a/pkgs/development/python-modules/phonemizer/default.nix b/pkgs/development/python-modules/phonemizer/default.nix index 29f7266b69101..88bb69e9952ff 100644 --- a/pkgs/development/python-modules/phonemizer/default.nix +++ b/pkgs/development/python-modules/phonemizer/default.nix @@ -12,11 +12,11 @@ buildPythonApplication rec { pname = "phonemizer"; - version = "3.0.1"; + version = "3.1.1"; src = fetchPypi { inherit pname version; - sha256 = "1b4ea53b8da9a156361dff1d0c04ac1a8e65e6966d1cb9a8147c200960b32296"; + sha256 = "sha256-PWVK0NLVa0Rx1xyUyQF2/RvUo3/geskn53FcEv0Jr0c="; }; postPatch = '' diff --git a/pkgs/development/python-modules/phonenumbers/default.nix b/pkgs/development/python-modules/phonenumbers/default.nix index 9faad1e96de20..4f8dc93c671ec 100644 --- a/pkgs/development/python-modules/phonenumbers/default.nix +++ b/pkgs/development/python-modules/phonenumbers/default.nix @@ -6,12 +6,12 @@ buildPythonPackage rec { pname = "phonenumbers"; - version = "8.12.43"; + version = "8.12.47"; format = "setuptools"; src = fetchPypi { inherit pname version; - sha256 = "sha256-HIJwouJX1sZUWKQig/gtPsp/e52SVFSmlm4vBN914c8="; + sha256 = "sha256-Vv1gXS9UYOHfIRcIW2U7s4MiKV7GWOasqvycl2hn1SI="; }; checkInputs = [ diff --git a/pkgs/development/python-modules/pickleshare/default.nix b/pkgs/development/python-modules/pickleshare/default.nix index 34798cc3ee5e4..381f03bdce5cc 100644 --- a/pkgs/development/python-modules/pickleshare/default.nix +++ b/pkgs/development/python-modules/pickleshare/default.nix @@ -1,7 +1,7 @@ { lib , buildPythonPackage , fetchPypi -, pathpy +, path , pathlib2 , pythonOlder }: @@ -15,7 +15,7 @@ buildPythonPackage rec { sha256 = "87683d47965c1da65cdacaf31c8441d12b8044cdec9aca500cd78fc2c683afca"; }; - propagatedBuildInputs = [ pathpy ] + propagatedBuildInputs = [ path ] ++ lib.optional (pythonOlder "3.4") pathlib2; # No proper test suite diff --git a/pkgs/development/python-modules/pikepdf/default.nix b/pkgs/development/python-modules/pikepdf/default.nix index bb8c2c385c237..0b72031a4bc7c 100644 --- a/pkgs/development/python-modules/pikepdf/default.nix +++ b/pkgs/development/python-modules/pikepdf/default.nix @@ -25,7 +25,7 @@ buildPythonPackage rec { pname = "pikepdf"; - version = "5.1.1"; + version = "5.1.2"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -40,7 +40,7 @@ buildPythonPackage rec { extraPostFetch = '' rm "$out/.git_archival.txt" ''; - hash = "sha256-LgF46DGVWNuUN2KGdfOGSokf4reDx55ay3gP2LO+4dY="; + hash = "sha256-VR2/+XCQb62FdkGZBxP2XTqatdFYZO1ngb8gvoJEvzs="; }; patches = [ diff --git a/pkgs/development/python-modules/pillow-simd/default.nix b/pkgs/development/python-modules/pillow-simd/default.nix index e2ea4c7138882..826d9f15252ee 100644 --- a/pkgs/development/python-modules/pillow-simd/default.nix +++ b/pkgs/development/python-modules/pillow-simd/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, buildPythonPackage, fetchFromGitHub, isPyPy, isPy3k , olefile, freetype, libjpeg, zlib, libtiff, libwebp, tcl, lcms2 -, libxcb, tk, libX11, openjpeg, libimagequant, pyroma, numpy +, libxcb, tk, libX11, openjpeg, libimagequant, pyroma, numpy, defusedxml , pytestCheckHook }@args: @@ -8,14 +8,14 @@ import ../pillow/generic.nix (rec { pname = "Pillow-SIMD"; # check for release version on https://pypi.org/project/Pillow-SIMD/#history # does not match the latest pillow release version! - version = "7.0.0.post3"; + version = "9.0.0.post1"; disabled = !isPy3k; src = fetchFromGitHub { owner = "uploadcare"; repo = "pillow-simd"; rev = "v${version}"; - sha256 = "1h832xp1bzf951hr4dmjmxqfsv28sx9lr2cq96qdz1c72k40zj1h"; + sha256 = "sha256-qTZYhgHjVMXqoYl3mG1xVrFaWrPidSY8HlyFQizV27Y="; }; meta = with lib; { diff --git a/pkgs/development/python-modules/pillow/default.nix b/pkgs/development/python-modules/pillow/default.nix index 8aa1ad1f4c4d0..47ed191c6d993 100644 --- a/pkgs/development/python-modules/pillow/default.nix +++ b/pkgs/development/python-modules/pillow/default.nix @@ -1,4 +1,9 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, isPyPy, isPy3k +{ lib +, stdenv +, buildPythonPackage +, pythonOlder +, fetchPypi +, isPyPy , defusedxml, olefile, freetype, libjpeg, zlib, libtiff, libwebp, tcl, lcms2, tk, libX11 , libxcb, openjpeg, libimagequant, pyroma, numpy, pytestCheckHook # for passthru.tests @@ -6,14 +11,15 @@ }@args: import ./generic.nix (rec { - pname = "Pillow"; - version = "9.0.1"; + pname = "pillow"; + version = "9.1.0"; - disabled = !isPy3k; + disabled = pythonOlder "3.7"; src = fetchPypi { - inherit pname version; - sha256 = "bIvII4p9/a96dfXsWmY/QXP4w2flo5+H5yBJXh7tdfo="; + pname = "Pillow"; + inherit version; + sha256 = "f401ed2bbb155e1ade150ccc63db1a4f6c1909d3d378f7d1235a44e90d75fb97"; }; passthru.tests = { diff --git a/pkgs/development/python-modules/pip-tools/default.nix b/pkgs/development/python-modules/pip-tools/default.nix index 307e99c04d80d..e2f2f565862ff 100644 --- a/pkgs/development/python-modules/pip-tools/default.nix +++ b/pkgs/development/python-modules/pip-tools/default.nix @@ -12,13 +12,13 @@ buildPythonPackage rec { pname = "pip-tools"; - version = "6.5.1"; + version = "6.6.0"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "sha256-gPViqmmfx2pCRTlpfgvvQeSQoFDlemohRoUxmBqdQZ4="; + sha256 = "sha256-mKokAERAocBInXGlZ6Tor98jx3gr/0g9EhmIHnMC3oM="; }; checkInputs = [ diff --git a/pkgs/development/python-modules/pip/default.nix b/pkgs/development/python-modules/pip/default.nix index 2ddba8f363e34..239c91fb88acf 100644 --- a/pkgs/development/python-modules/pip/default.nix +++ b/pkgs/development/python-modules/pip/default.nix @@ -14,14 +14,14 @@ buildPythonPackage rec { pname = "pip"; - version = "21.3.1"; + version = "22.0.4"; format = "other"; src = fetchFromGitHub { owner = "pypa"; repo = pname; rev = version; - sha256 = "sha256-A8oePI5VOKGJTY6ZuUhcOhRkz2I2FSdfsS2xIgktCVQ="; + sha256 = "sha256-gtDaopeFVpVFXpBtHDzBuZuXUrJciSSIppYXBx1anu4="; name = "${pname}-${version}-source"; }; diff --git a/pkgs/development/python-modules/pixcat/default.nix b/pkgs/development/python-modules/pixcat/default.nix new file mode 100644 index 0000000000000..026685cd63416 --- /dev/null +++ b/pkgs/development/python-modules/pixcat/default.nix @@ -0,0 +1,38 @@ +{ lib +, buildPythonPackage +, fetchPypi +, blessed +, docopt +, pillow +, requests +, dataclasses +, pythonOlder +}: + +buildPythonPackage rec { + pname = "pixcat"; + version = "0.1.4"; + + disabled = pythonOlder "3.6"; + + src = fetchPypi { + inherit pname version; + sha256 = "657c8fe04513caecccd6086b347aa4b85db6b4c0f761b162cb9cd789abe7abb6"; + }; + + propagatedBuildInputs = [ + blessed + docopt + pillow + requests + ]; + + pythonImportsCheck = [ "pixcat" ]; + + meta = with lib; { + description = "Display images on a kitty terminal with optional resizing"; + homepage = "https://github.com/mirukan/pixcat"; + license = licenses.lgpl3; + maintainers = [ maintainers.tilcreator ]; + }; +} diff --git a/pkgs/development/python-modules/plaid-python/default.nix b/pkgs/development/python-modules/plaid-python/default.nix index ac635fe4db5eb..efcdf3fd3a326 100644 --- a/pkgs/development/python-modules/plaid-python/default.nix +++ b/pkgs/development/python-modules/plaid-python/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "plaid-python"; - version = "9.2.0"; + version = "9.3.0"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-3yFfANMkn8CXCheNHU77WGeYxPV4gs2jvOl/rV+/6vY="; + hash = "sha256-7H6fpJl192L8MEWrQW89Fa/BTZ2GZXjDRcy0yc17hDI="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/platformdirs/default.nix b/pkgs/development/python-modules/platformdirs/default.nix index 2be8928f630f4..584d9361fb767 100644 --- a/pkgs/development/python-modules/platformdirs/default.nix +++ b/pkgs/development/python-modules/platformdirs/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "platformdirs"; - version = "2.5.0"; + version = "2.5.1"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = pname; repo = pname; rev = version; - sha256 = "sha256-fppwtY8VX8IQ96H930xItO7mS8LlxxHgBcKlwIL5P2E="; + sha256 = "sha256-z6WIwTWLlc/chNRxt3dqqa/IxYj1BBTcQ6OcfliHrvA="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; diff --git a/pkgs/development/python-modules/pleroma-bot/default.nix b/pkgs/development/python-modules/pleroma-bot/default.nix index 1dca45eca762b..ed586a4474b8b 100644 --- a/pkgs/development/python-modules/pleroma-bot/default.nix +++ b/pkgs/development/python-modules/pleroma-bot/default.nix @@ -4,30 +4,45 @@ , pytestCheckHook , requests-mock , oauthlib -, requests_oauthlib +, requests-oauthlib , requests , pyaml +, pythonOlder }: buildPythonPackage rec { pname = "pleroma-bot"; version = "0.8.6"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "robertoszek"; - repo = "pleroma-bot"; + repo = pname; rev = version; - sha256 = "1q0xhgqq41zbqiawpd4kbdx41zhwxxp5ipn1c2rc8d7pjyb5p75w"; + hash = "sha256-vJxblpf3NMSyYMHeWG7vHP5AeluTtMtVxOsHgvGDHeA="; }; - propagatedBuildInputs = [ pyaml requests requests_oauthlib oauthlib ]; - checkInputs = [ pytestCheckHook requests-mock ]; + propagatedBuildInputs = [ + pyaml + requests + requests-oauthlib + oauthlib + ]; + + checkInputs = [ + pytestCheckHook + requests-mock + ]; - pythonImportsCheck = [ "pleroma_bot" ]; + pythonImportsCheck = [ + "pleroma_bot" + ]; meta = with lib; { - homepage = "https://robertoszek.github.io/pleroma-bot/"; description = "Bot for mirroring one or multiple Twitter accounts in Pleroma/Mastodon"; + homepage = "https://robertoszek.github.io/pleroma-bot/"; license = licenses.mit; maintainers = with maintainers; [ robertoszek ]; }; diff --git a/pkgs/development/python-modules/plotly/default.nix b/pkgs/development/python-modules/plotly/default.nix index fbe869b07032f..fc24a4c2e6f7f 100644 --- a/pkgs/development/python-modules/plotly/default.nix +++ b/pkgs/development/python-modules/plotly/default.nix @@ -9,11 +9,11 @@ buildPythonPackage rec { pname = "plotly"; - version = "5.5.0"; + version = "5.6.0"; src = fetchPypi { inherit pname version; - sha256 = "20b8a1a0f0434f9b8d10eb7caa66e947a9a1d698e5a53d40d447bbc0d2ae41f0"; + sha256 = "sha256-2G5E69449HU9/5gqubXgPPhyqrj99TpAPpme03gVQzE="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/plugwise/default.nix b/pkgs/development/python-modules/plugwise/default.nix index cc2601e4a227b..fe364ea0ece80 100644 --- a/pkgs/development/python-modules/plugwise/default.nix +++ b/pkgs/development/python-modules/plugwise/default.nix @@ -19,14 +19,14 @@ buildPythonPackage rec { pname = "plugwise"; - version = "0.16.6"; + version = "0.17.7"; format = "setuptools"; src = fetchFromGitHub { owner = pname; repo = "python-plugwise"; - rev = "v${version}"; - sha256 = "sha256-hAYbYsLpiiJYdg9Rx5BjqNA9JTtKGu3DE0SpwOxlTWw="; + rev = "refs/tags/v${version}"; + sha256 = "sha256-PZoxI7s3LTb60oXFfsOi5mCaLOKzq6ed2yFKap0Q1Ng="; }; postPatch = '' diff --git a/pkgs/development/python-modules/plumbum/default.nix b/pkgs/development/python-modules/plumbum/default.nix index ae3c4941f6848..70b4421778f3e 100644 --- a/pkgs/development/python-modules/plumbum/default.nix +++ b/pkgs/development/python-modules/plumbum/default.nix @@ -50,6 +50,14 @@ buildPythonPackage rec { "test_change_env" "test_dictlike" "test_local" + # incompatible with pytest 7 + "test_incorrect_login" + ]; + + disabledTestPaths = [ + # incompatible with pytest7 + # https://github.com/tomerfiliba/plumbum/issues/594 + "tests/test_remote.py" ]; meta = with lib; { diff --git a/pkgs/development/python-modules/poetry-core/default.nix b/pkgs/development/python-modules/poetry-core/default.nix index e8632d0ed0782..5922d67fc8b76 100644 --- a/pkgs/development/python-modules/poetry-core/default.nix +++ b/pkgs/development/python-modules/poetry-core/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "poetry-core"; - version = "1.0.7"; + version = "1.0.8"; format = "pyproject"; src = fetchFromGitHub { owner = "python-poetry"; repo = pname; rev = version; - sha256 = "0v86x8f8pcbviv2cdn7jjbgj3c994qasx0bqk1kr0mj8m6pjwy9z"; + sha256 = "sha256-cs9SMGD9RdW8Wx/IAMq6gkOUBsney5r19hyGva98grk="; }; postPatch = lib.optionalString (pythonOlder "3.8") '' diff --git a/pkgs/development/python-modules/polars/default.nix b/pkgs/development/python-modules/polars/default.nix new file mode 100644 index 0000000000000..aa97cf6cc03f2 --- /dev/null +++ b/pkgs/development/python-modules/polars/default.nix @@ -0,0 +1,57 @@ +{ lib +, stdenv +, buildPythonPackage +, pythonOlder +, rustPlatform +, libiconv +, fetchzip +}: +let + pname = "polars"; + version = "0.13.19"; + rootSource = fetchzip { + url = "https://github.com/pola-rs/${pname}/archive/refs/tags/py-polars-v${version}.tar.gz"; + sha256 = "sha256-JOHjxTTPzS9Dd/ODp4r0ebU9hEonxrbjURJoq0BQCyI="; + }; +in +buildPythonPackage { + inherit pname version; + format = "pyproject"; + disabled = pythonOlder "3.6"; + src = rootSource; + preBuild = '' + cd py-polars + ''; + + cargoDeps = rustPlatform.fetchCargoTarball { + src = rootSource; + preBuild = '' + cd py-polars + ''; + name = "${pname}-${version}"; + sha256 = "sha256-KEt8lITY4El2afuh2cxnrDkXGN3MZgfKQU3Pe2jECF0="; + }; + cargoRoot = "py-polars"; + + nativeBuildInputs = with rustPlatform; [ cargoSetupHook maturinBuildHook ]; + + buildInputs = lib.optionals stdenv.isDarwin [ libiconv ]; + + pythonImportsCheck = [ "polars" ]; + # checkInputs = [ + # pytestCheckHook + # fixtures + # graphviz + # matplotlib + # networkx + # numpy + # pydot + # ]; + + meta = with lib; { + description = "Fast multi-threaded DataFrame library in Rust | Python | Node.js "; + homepage = "https://github.com/pola-rs/polars"; + license = licenses.asl20; + maintainers = with maintainers; [ happysalada ]; + }; +} diff --git a/pkgs/development/python-modules/policy-sentry/default.nix b/pkgs/development/python-modules/policy-sentry/default.nix index 969f1207a5b59..13308ef1c985c 100644 --- a/pkgs/development/python-modules/policy-sentry/default.nix +++ b/pkgs/development/python-modules/policy-sentry/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "policy-sentry"; - version = "0.12.2"; + version = "0.12.3"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "salesforce"; repo = "policy_sentry"; rev = version; - sha256 = "sha256-6yG60vUsvLpIiZ3i1D3NZOL9bINaF5ydrDvewqpEmpA="; + sha256 = "sha256-LaSSjqa5BniwOIeCH/oR8vVhy2rCSo2je3rTqB4ifLg="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/policyuniverse/default.nix b/pkgs/development/python-modules/policyuniverse/default.nix index 27a53eee42813..39f3be83ca2d6 100644 --- a/pkgs/development/python-modules/policyuniverse/default.nix +++ b/pkgs/development/python-modules/policyuniverse/default.nix @@ -6,12 +6,12 @@ buildPythonPackage rec { pname = "policyuniverse"; - version = "1.4.0.20220110"; + version = "1.5.0.20220421"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "sha256-EWuAhVTX6nXvyXtMuQQIVUbbRZNO8xUXXLR1XHpEid4="; + sha256 = "sha256-1rY77cIxqVcde+AYE6qfRgZzB8vb3yiQ3Bj+P0o1zFM="; }; # Tests are not shipped and there are no GitHub tags diff --git a/pkgs/development/python-modules/pooch/default.nix b/pkgs/development/python-modules/pooch/default.nix index 3b7ddaf280197..238e6ad62230b 100644 --- a/pkgs/development/python-modules/pooch/default.nix +++ b/pkgs/development/python-modules/pooch/default.nix @@ -11,12 +11,13 @@ buildPythonPackage rec { pname = "pooch"; - version = "1.5.2"; + version = "1.6.0"; + format = "pyproject"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "5969b2f1defbdc405df932767e05e0b536e2771c27f1f95d7f260bc99bf13581"; + sha256 = "sha256-V9IOxLEN1pTSsFu2S8axCcboWmwUBXlM6H7Ys0GrP0Q="; }; nativeBuildInputs = [ setuptools-scm ]; diff --git a/pkgs/development/python-modules/portalocker/default.nix b/pkgs/development/python-modules/portalocker/default.nix index 357ca815407fa..cd7d6d03bbd4c 100644 --- a/pkgs/development/python-modules/portalocker/default.nix +++ b/pkgs/development/python-modules/portalocker/default.nix @@ -22,6 +22,10 @@ buildPythonPackage rec { pytest-mypy ]; + disabledTests = [ + "test_combined" # no longer compatible with setuptools>=58 + ]; + meta = with lib; { description = "A library to provide an easy API to file locking"; homepage = "https://github.com/WoLpH/portalocker"; diff --git a/pkgs/development/python-modules/pre-commit-hooks/default.nix b/pkgs/development/python-modules/pre-commit-hooks/default.nix index eae35b5bac6da..db598b368c5b6 100644 --- a/pkgs/development/python-modules/pre-commit-hooks/default.nix +++ b/pkgs/development/python-modules/pre-commit-hooks/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "pre-commit-hooks"; - version = "4.1.0"; + version = "4.2.0"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -19,8 +19,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "pre-commit"; repo = pname; - rev = "v${version}"; - sha256 = "sha256-nxJp7LkCUkJj77RCeWedBusue3x0lZYatSidbueZqfo="; + rev = "refs/tags/v${version}"; + sha256 = "sha256-jSu4LutEgpeAbCgSHgk6VXQKLZo00T3TrQVZxsNU1co="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/prettytable/default.nix b/pkgs/development/python-modules/prettytable/default.nix index f914a0f3df449..7c4afe4a72842 100644 --- a/pkgs/development/python-modules/prettytable/default.nix +++ b/pkgs/development/python-modules/prettytable/default.nix @@ -10,11 +10,11 @@ buildPythonPackage rec { pname = "prettytable"; - version = "3.0.0"; + version = "3.2.0"; src = fetchPypi { inherit pname version; - sha256 = "69fe75d78ac8651e16dd61265b9e19626df5d630ae294fc31687aa6037b97a58"; + sha256 = "sha256-rn2WxkEAVD3GFmK0CijzsDwPlKUD7RIcb8ongsWBb4E="; }; nativeBuildInputs = [ setuptools-scm ]; diff --git a/pkgs/development/python-modules/prometheus-client/default.nix b/pkgs/development/python-modules/prometheus-client/default.nix index 7af4e2b02faae..9ba5068359bbc 100644 --- a/pkgs/development/python-modules/prometheus-client/default.nix +++ b/pkgs/development/python-modules/prometheus-client/default.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { pname = "prometheus-client"; - version = "0.12.0"; + version = "0.13.1"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -16,7 +16,7 @@ buildPythonPackage rec { owner = "prometheus"; repo = "client_python"; rev = "v${version}"; - sha256 = "1a0kllal5vkkdv325k0mx1mha2l9808mcz4dqx6qrgfskz8c2xjl"; + sha256 = "sha256-1sMnlUOvvdlUuh288UalAdlf0a1mpnM+Y/upwlnL1H8="; }; checkInputs = [ diff --git a/pkgs/development/python-modules/promise/default.nix b/pkgs/development/python-modules/promise/default.nix index 403f0c0979163..8833689cec122 100644 --- a/pkgs/development/python-modules/promise/default.nix +++ b/pkgs/development/python-modules/promise/default.nix @@ -18,6 +18,11 @@ buildPythonPackage rec { sha256 = "17mq1bm78xfl0x1g50ng502m5ldq6421rzz35hlqafsj0cq8dkp6"; }; + postPatch = '' + substituteInPlace tests/test_extra.py \ + --replace "assert_exc.traceback[-1].path.strpath" "str(assert_exc.traceback[-1].path)" + ''; + propagatedBuildInputs = [ six ]; diff --git a/pkgs/development/python-modules/prompt-toolkit/default.nix b/pkgs/development/python-modules/prompt-toolkit/default.nix index e38560be2eb68..be90726e189bc 100644 --- a/pkgs/development/python-modules/prompt-toolkit/default.nix +++ b/pkgs/development/python-modules/prompt-toolkit/default.nix @@ -3,12 +3,13 @@ , fetchPypi , pytestCheckHook , pythonOlder +, six , wcwidth }: buildPythonPackage rec { pname = "prompt-toolkit"; - version = "3.0.24"; + version = "3.0.28"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -16,10 +17,11 @@ buildPythonPackage rec { src = fetchPypi { pname = "prompt_toolkit"; inherit version; - sha256 = "1bb05628c7d87b645974a1bad3f17612be0c29fa39af9f7688030163f680bad6"; + sha256 = "sha256-nxzRax6GwpaPJRnX+zHdnWaZFvUVYSwmnRTp7VK1FlA="; }; propagatedBuildInputs = [ + six wcwidth ]; diff --git a/pkgs/development/python-modules/proto-plus/default.nix b/pkgs/development/python-modules/proto-plus/default.nix index dd2494729efd7..defc28d9429a3 100644 --- a/pkgs/development/python-modules/proto-plus/default.nix +++ b/pkgs/development/python-modules/proto-plus/default.nix @@ -10,12 +10,12 @@ buildPythonPackage rec { pname = "proto-plus"; - version = "1.19.8"; + version = "1.20.3"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "bdf45f0e0be71510eb2ec9db4da78afde7b5fb8b0a507a36340a9b6ce8e48e58"; + sha256 = "sha256-8osiW8nmwU4gb7f46Zakb7LM2QJkjlEtSWq7anFqSuU="; }; propagatedBuildInputs = [ protobuf ]; diff --git a/pkgs/development/python-modules/proxy-py/default.nix b/pkgs/development/python-modules/proxy-py/default.nix index 4bf07b1375eb4..6527f88e4891a 100644 --- a/pkgs/development/python-modules/proxy-py/default.nix +++ b/pkgs/development/python-modules/proxy-py/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "proxy-py"; - version = "2.3.1"; + version = "2.4.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "abhinavsingh"; repo = "proxy.py"; rev = "v${version}"; - sha256 = "sha256-qqwb3t8/xicDGfO6l843qRwh0yUfthnOIhgNeKIbEO4="; + sha256 = "sha256-VagX7ATVu6AT4POWoG9btizxFeBh9MLXiLpavtfXnyM="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/psautohint/default.nix b/pkgs/development/python-modules/psautohint/default.nix index 3004d5f7a9b92..b9fb5f3aa146a 100644 --- a/pkgs/development/python-modules/psautohint/default.nix +++ b/pkgs/development/python-modules/psautohint/default.nix @@ -3,19 +3,20 @@ , lxml, fs # for fonttools extras , setuptools-scm , pytestCheckHook, pytest-cov, pytest-xdist +, runAllTests ? false, psautohint # for passthru.tests }: buildPythonPackage rec { pname = "psautohint"; - version = "2.3.1"; + version = "2.4.0"; - disabled = pythonOlder "3.6"; + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "adobe-type-tools"; repo = pname; rev = "v${version}"; - sha256 = "1knh428af0lvzijvd72i30jcvx9n6ga0hai69kxg8386jdpmmvkg"; + sha256 = "125nx7accvbk626qlfar90va1995kp9qfrz6a978q4kv2kk37xai"; fetchSubmodules = true; # data dir for tests }; @@ -34,10 +35,7 @@ buildPythonPackage rec { pytest-cov pytest-xdist ]; - disabledTests = [ - # Test that fails on pytest >= v6 - # https://github.com/adobe-type-tools/psautohint/issues/284#issuecomment-742800965 - "test_hashmap_old_version" + disabledTests = lib.optionals (!runAllTests) [ # Slow tests, reduces test time from ~5 mins to ~30s "test_mmufo" "test_flex_ufo" @@ -48,6 +46,10 @@ buildPythonPackage rec { "test_otf" ]; + passthru.tests = { + fullTestsuite = psautohint.override { runAllTests = true; }; + }; + meta = with lib; { description = "Script to normalize the XML and other data inside of a UFO"; homepage = "https://github.com/adobe-type-tools/psautohint"; diff --git a/pkgs/development/python-modules/pubnub/default.nix b/pkgs/development/python-modules/pubnub/default.nix index c5fbe3d28590f..da417565d2d67 100644 --- a/pkgs/development/python-modules/pubnub/default.nix +++ b/pkgs/development/python-modules/pubnub/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "pubnub"; - version = "6.2.0"; + version = "6.3.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -21,8 +21,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = pname; repo = "python"; - rev = "v${version}"; - hash = "sha256-QOOPcWhhEqg7c0INQv88+eOP0povN8W4lLoaly9TGu0="; + rev = "refs/tags/v${version}"; + hash = "sha256-HnDCRwGrWYVW2WpCFDySVYzNW4/cNhVqNG2YfF5V3WY="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pure-python-adb/default.nix b/pkgs/development/python-modules/pure-python-adb/default.nix index c562f20e5ecbc..cb054feaf10f1 100644 --- a/pkgs/development/python-modules/pure-python-adb/default.nix +++ b/pkgs/development/python-modules/pure-python-adb/default.nix @@ -1,4 +1,10 @@ -{ aiofiles, buildPythonPackage, fetchPypi, lib, pythonOlder }: +{ aiofiles +, buildPythonPackage +, fetchPypi +, lib +, pythonOlder +, pytestCheckHook +}: buildPythonPackage rec { pname = "pure-python-adb"; @@ -11,11 +17,24 @@ buildPythonPackage rec { sha256 = "0kdr7w2fhgjpcf1k3l6an9im583iqkr6v8hb4q1zw30nh3bqkk0f"; }; - propagatedBuildInputs = [ aiofiles ]; - # Disable tests as they require docker, docker-compose and a dedicated - # android emulator - doCheck = false; - pythonImportsCheck = [ "ppadb.client" "ppadb.client_async" ]; + passthru.extras-require = { + async = [ + aiofiles + ]; + }; + + doCheck = pythonOlder "3.10"; # all tests result in RuntimeError on 3.10 + + checkInputs = [ + pytestCheckHook + ] + ++ passthru.extras-require.async; + + pythonImportsCheck = [ + "ppadb.client" + ] ++ lib.optionals doCheck [ + "ppadb.client_async" + ]; meta = with lib; { description = "Pure python implementation of the adb client"; diff --git a/pkgs/development/python-modules/purl/default.nix b/pkgs/development/python-modules/purl/default.nix index aa85ea3965ab9..8c7b208df2fea 100644 --- a/pkgs/development/python-modules/purl/default.nix +++ b/pkgs/development/python-modules/purl/default.nix @@ -1,4 +1,7 @@ -{ lib, buildPythonPackage, fetchFromGitHub +{ lib +, buildPythonPackage +, fetchFromGitHub +, six , pytestCheckHook }: @@ -13,7 +16,17 @@ buildPythonPackage rec { sha256 = "sha256-Jb3JRW/PtQ7NlO4eQ9DmTPu/sjvFTg2mztphoIF79gc="; }; - checkInputs = [ pytestCheckHook]; + propagatedBuildInputs = [ + six + ]; + + checkInputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ + "purl" + ]; meta = with lib; { description = "Immutable URL class for easy URL-building and manipulation"; diff --git a/pkgs/development/python-modules/pwntools/default.nix b/pkgs/development/python-modules/pwntools/default.nix index cfcbf14703b01..6a20a5d4bf270 100644 --- a/pkgs/development/python-modules/pwntools/default.nix +++ b/pkgs/development/python-modules/pwntools/default.nix @@ -27,12 +27,12 @@ let debuggerName = lib.strings.getName debugger; in buildPythonPackage rec { - version = "4.7.0"; + version = "4.8.0"; pname = "pwntools"; src = fetchPypi { inherit pname version; - sha256 = "sha256-dDiOKGdeehkp92PfWhzsaj1YlkEEm2z0drscVuxQqI4="; + sha256 = "sha256-QgUuLYg3EOTh2gQekWdabXGftOXvLdJFyyhT2hEmkpA="; }; postPatch = '' diff --git a/pkgs/development/python-modules/py-radix/default.nix b/pkgs/development/python-modules/py-radix/default.nix index 18fff5ec97f61..f4b064d41aac8 100644 --- a/pkgs/development/python-modules/py-radix/default.nix +++ b/pkgs/development/python-modules/py-radix/default.nix @@ -1,5 +1,6 @@ { lib , buildPythonPackage +, pythonAtLeast , fetchFromGitHub , coverage , nose @@ -9,6 +10,8 @@ buildPythonPackage rec { pname = "py-radix"; version = "0.10.0"; + disabled = pythonAtLeast "3.10"; # abandoned, remove when we move to py310/py311 + src = fetchFromGitHub { owner = "mjschultz"; repo = "py-radix"; diff --git a/pkgs/development/python-modules/py3rijndael/default.nix b/pkgs/development/python-modules/py3rijndael/default.nix new file mode 100644 index 0000000000000..be098df6a6a88 --- /dev/null +++ b/pkgs/development/python-modules/py3rijndael/default.nix @@ -0,0 +1,30 @@ +{ lib +, buildPythonPackage +, fetchPypi +, pytestCheckHook +}: + +let + pname = "py3rijndael"; + version = "0.3.3"; +in +buildPythonPackage { + inherit pname version; + format = "setuptools"; + + src = fetchPypi { + inherit pname version; + hash = "sha256-tmVaPr/zoQVA6u0EnoeI7qOsk9a3GzpqwrACJLvs6ag="; + }; + + checkInputs = [ + pytestCheckHook + ]; + + meta = with lib; { + description = "Rijndael algorithm library"; + homepage = "https://github.com/meyt/py3rijndael"; + license = licenses.mit; + maintainers = with maintainers; [ hexa ]; + }; +} diff --git a/pkgs/development/python-modules/py4j/default.nix b/pkgs/development/python-modules/py4j/default.nix index cf24d21e17f56..cdf8a3c49c37e 100644 --- a/pkgs/development/python-modules/py4j/default.nix +++ b/pkgs/development/python-modules/py4j/default.nix @@ -3,11 +3,11 @@ buildPythonPackage rec { pname = "py4j"; - version = "0.10.9.3"; + version = "0.10.9.5"; src = fetchPypi { inherit pname version; - sha256 = "0d92844da4cb747155b9563c44fc322c9a1562b3ef0979ae692dbde732d784dd"; + sha256 = "sha256-J2pKPFohVN8YYO8zA6knRg4C6XsEfcCkfBw/uMzjTbY="; }; # No tests in archive diff --git a/pkgs/development/python-modules/pyTelegramBotAPI/default.nix b/pkgs/development/python-modules/pyTelegramBotAPI/default.nix index 391afabf931f0..508e6f71d11fe 100644 --- a/pkgs/development/python-modules/pyTelegramBotAPI/default.nix +++ b/pkgs/development/python-modules/pyTelegramBotAPI/default.nix @@ -1,20 +1,36 @@ -{ lib, buildPythonPackage, fetchPypi, aiohttp, requests }: +{ lib +, buildPythonPackage +, fetchPypi +, aiohttp +, requests +, pythonOlder +}: buildPythonPackage rec { pname = "pyTelegramBotAPI"; - version = "4.4.0"; + version = "4.4.1"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "sha256-5vIjVqvr/+Cok9z3L+CaDIve2tb0mMVaMMPdMs5Ijmo="; + hash = "sha256-3Qppp/UDKiGChnvMOgW8EKygI75gYzv37c0ctExmK+g="; }; - propagatedBuildInputs = [ aiohttp requests ]; + propagatedBuildInputs = [ + aiohttp + requests + ]; + + pythonImportsCheck = [ + "telebot" + ]; meta = with lib; { homepage = "https://github.com/eternnoir/pyTelegramBotAPI"; description = "A simple, but extensible Python implementation for the Telegram Bot API"; - license = licenses.gpl2; + license = licenses.gpl2Only; maintainers = with maintainers; [ das_j ]; }; } diff --git a/pkgs/development/python-modules/pyamg/default.nix b/pkgs/development/python-modules/pyamg/default.nix index b2a230685cc8e..09a113a421858 100644 --- a/pkgs/development/python-modules/pyamg/default.nix +++ b/pkgs/development/python-modules/pyamg/default.nix @@ -10,11 +10,11 @@ buildPythonPackage rec { pname = "pyamg"; - version = "4.2.2"; + version = "4.2.3"; src = fetchPypi { inherit pname version; - sha256 = "sha256-mtrFqUwEustYlCcCiV1FQZm7dJKohu650xHdiNg6D6E="; + sha256 = "sha256-N608Hcr/JDXCq3yOw2lCrwcmxWPTUFm80Y6wdHP3GC4="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/pyasn1/default.nix b/pkgs/development/python-modules/pyasn1/default.nix index a0037d6468353..a3dbc7396b0d3 100644 --- a/pkgs/development/python-modules/pyasn1/default.nix +++ b/pkgs/development/python-modules/pyasn1/default.nix @@ -9,10 +9,12 @@ buildPythonPackage rec { sha256 = "aef77c9fb94a3ac588e87841208bdec464471d9871bd5050a287cc9a475cd0ba"; }; + pythonImportsCheck = [ "pyasn1" ]; + meta = with lib; { - description = "ASN.1 tools for Python"; - homepage = "http://pyasn1.sourceforge.net/"; - license = "mBSD"; - platforms = platforms.unix; # arbitrary choice + description = "Generic ASN.1 library for Python"; + homepage = "https://github.com/etingof/pyasn1"; + license = licenses.bsd2; + maintainers = with maintainers; [ SuperSandro2000 ]; }; } diff --git a/pkgs/development/python-modules/pyathena/default.nix b/pkgs/development/python-modules/pyathena/default.nix index fe9d3276e1be0..7a44cf995e3f0 100644 --- a/pkgs/development/python-modules/pyathena/default.nix +++ b/pkgs/development/python-modules/pyathena/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "pyathena"; - version = "2.5.1"; + version = "2.5.2"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "PyAthena"; inherit version; - sha256 = "sha256-GTcDiDtZGgTpdl6YBgPuztv7heEPZ/ymhup/4JwfELA="; + sha256 = "sha256-vjoK6lEitvd5vqSEE/ael8q00O05lquKIviFK/bPlVQ="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pyatmo/default.nix b/pkgs/development/python-modules/pyatmo/default.nix index 5cd314b6cb993..9d75c2b01d85f 100644 --- a/pkgs/development/python-modules/pyatmo/default.nix +++ b/pkgs/development/python-modules/pyatmo/default.nix @@ -9,7 +9,7 @@ , pytestCheckHook , pythonOlder , requests -, requests_oauthlib +, requests-oauthlib , requests-mock , setuptools-scm }: @@ -38,7 +38,7 @@ buildPythonPackage rec { aiohttp oauthlib requests - requests_oauthlib + requests-oauthlib ]; checkInputs = [ diff --git a/pkgs/development/python-modules/pybids/default.nix b/pkgs/development/python-modules/pybids/default.nix index 3ad29916575a9..4640be0c436db 100644 --- a/pkgs/development/python-modules/pybids/default.nix +++ b/pkgs/development/python-modules/pybids/default.nix @@ -14,12 +14,12 @@ }: buildPythonPackage rec { - version = "0.14.0"; + version = "0.15.0"; pname = "pybids"; src = fetchPypi { inherit pname version; - sha256 = "73c4d03aad333f2a7cb4405abe96f55a33cffa4b5a2d23fad6ac5767c45562ef"; + sha256 = "sha256-Eq+4x7h1uR5QHXfgCEZl+7usc9CBFQClvV36Yyrqbd0="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pybind11/default.nix b/pkgs/development/python-modules/pybind11/default.nix index 46c1307826ef2..8627ca53d54b2 100644 --- a/pkgs/development/python-modules/pybind11/default.nix +++ b/pkgs/development/python-modules/pybind11/default.nix @@ -36,7 +36,7 @@ buildPythonPackage rec { postBuild = '' # build tests - make + make -j $NIX_BUILD_CORES -l $NIX_BUILD_CORES ''; postInstall = '' @@ -60,6 +60,8 @@ buildPythonPackage rec { "tests/test_numpy_dtypes.py" # no need to test internal packaging "tests/extra_python_package/test_files.py" + # tests that try to parse setuptools stdout + "tests/extra_setuptools/test_setuphelper.py" ]; meta = with lib; { diff --git a/pkgs/development/python-modules/pybluez/default.nix b/pkgs/development/python-modules/pybluez/default.nix index 1cd7d91ef2593..55262a07a4cad 100644 --- a/pkgs/development/python-modules/pybluez/default.nix +++ b/pkgs/development/python-modules/pybluez/default.nix @@ -1,29 +1,45 @@ { lib +, stdenv , buildPythonPackage , fetchFromGitHub -, pkgs +, bluez +, gattlib }: buildPythonPackage rec { - version = "unstable-20160819"; pname = "pybluez"; - - propagatedBuildInputs = [ pkgs.bluez ]; + version = "unstable-2022-01-28"; + format = "setuptools"; src = fetchFromGitHub { - owner = "karulis"; + owner = pname; repo = pname; - rev = "a0b226a61b166e170d48539778525b31e47a4731"; - sha256 = "104dm5ngfhqisv1aszdlr3szcav2g3bhsgzmg4qfs09b3i5zj047"; + rev = "5096047f90a1f6a74ceb250aef6243e144170f92"; + hash = "sha256-GA58DfCFaVzZQA1HYpGQ68bznrt4SX1ojyOVn8hyCGo="; }; - # the tests do not pass + buildInputs = [ + bluez + ]; + + propagatedBuildInputs = [ + gattlib + ]; + + # there are no tests doCheck = false; + pythonImportsCheck = [ + "bluetooth" + "bluetooth.ble" + ]; + meta = with lib; { description = "Bluetooth Python extension module"; + homepage = "https://github.com/pybluez/pybluez"; license = licenses.gpl2; maintainers = with maintainers; [ leenaars ]; + broken = stdenv.isDarwin; # requires pyobjc-core, pyobjc-framework-Cocoa }; } diff --git a/pkgs/development/python-modules/pybotvac/default.nix b/pkgs/development/python-modules/pybotvac/default.nix index dff1374087a5b..2feee74d319f8 100644 --- a/pkgs/development/python-modules/pybotvac/default.nix +++ b/pkgs/development/python-modules/pybotvac/default.nix @@ -2,29 +2,35 @@ , buildPythonPackage , fetchPypi , requests -, requests_oauthlib +, requests-oauthlib , voluptuous +, pythonOlder }: buildPythonPackage rec { pname = "pybotvac"; version = "0.0.23"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "54b4fe565c10000c54d5644d081e2de1f850daefbac39cea74cea649b47bfb12"; + hash = "sha256-VLT+VlwQAAxU1WRNCB4t4fhQ2u+6w5zqdM6mSbR7+xI="; }; propagatedBuildInputs = [ requests - requests_oauthlib + requests-oauthlib voluptuous ]; # no tests doCheck = false; - pythonImportsCheck = [ "pybotvac" ]; + pythonImportsCheck = [ + "pybotvac" + ]; meta = with lib; { description = "Python module for interacting with Neato Botvac Connected vacuum robots"; diff --git a/pkgs/development/python-modules/pycapnp/default.nix b/pkgs/development/python-modules/pycapnp/default.nix index 8c63a11862239..cd2e8f450cd2b 100644 --- a/pkgs/development/python-modules/pycapnp/default.nix +++ b/pkgs/development/python-modules/pycapnp/default.nix @@ -20,16 +20,18 @@ buildPythonPackage rec { sha256 = "1xi6df93ggkpmwckwbi356v7m32zv5qry8s45hvsps66dz438kmi"; }; - buildInputs = [ capnproto cython pkgconfig ]; + nativeBuildInputs = [ cython pkgconfig ]; - # Tests disabled due to dependency on jinja and various other libraries. + buildInputs = [ capnproto ]; + + # Tests depend on schema_capnp which fails to generate doCheck = false; pythonImportsCheck = [ "capnp" ]; meta = with lib; { + homepage = "https://capnproto.github.io/pycapnp/"; maintainers = with maintainers; [ cstrahan lukeadams ]; license = licenses.bsd2; - homepage = "https://capnproto.github.io/pycapnp/"; }; } diff --git a/pkgs/development/python-modules/pycep-parser/default.nix b/pkgs/development/python-modules/pycep-parser/default.nix index d76f72630a6ba..3e8104ea33b8a 100644 --- a/pkgs/development/python-modules/pycep-parser/default.nix +++ b/pkgs/development/python-modules/pycep-parser/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "pycep-parser"; - version = "0.3.2"; + version = "0.3.4"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "gruebel"; repo = "pycep"; rev = version; - hash = "sha256-ud26xJQWdu7wtv75/K16HSSw0MvaSr3H1hDZBPjSzYE="; + hash = "sha256-o2sYPvZVevDqZV8EtKWTL2zHHzX2kmTZ4iVHsUhFv7M="; }; nativeBuildInputs = [ @@ -41,8 +41,7 @@ buildPythonPackage rec { postPatch = '' substituteInPlace pyproject.toml \ - --replace 'version = "0.3.2-alpha.4"' 'version = "${version}"' \ - --replace 'regex = "^2022.3.2"' 'regex = "*"' + --replace 'regex = "^2022.3.15"' 'regex = "*"' ''; pythonImportsCheck = [ diff --git a/pkgs/development/python-modules/pycfmodel/default.nix b/pkgs/development/python-modules/pycfmodel/default.nix index c47362e339e50..9aa41214bfcf0 100644 --- a/pkgs/development/python-modules/pycfmodel/default.nix +++ b/pkgs/development/python-modules/pycfmodel/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "pycfmodel"; - version = "0.18.0"; + version = "0.19.1"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -17,8 +17,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "Skyscanner"; repo = pname; - rev = version; - hash = "sha256-g249Nq4u4pPQLbW9Kw5vLwVKCaZoots5LD6yk1NPv6s="; + rev = "refs/tags/${version}"; + hash = "sha256-k059AfI3dTPMLAOColmTG4kz0z2bLO1oi8Bg0QeLork="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pycognito/default.nix b/pkgs/development/python-modules/pycognito/default.nix index 375453231b9bc..ff050c15bfe08 100644 --- a/pkgs/development/python-modules/pycognito/default.nix +++ b/pkgs/development/python-modules/pycognito/default.nix @@ -4,22 +4,25 @@ , envs , fetchFromGitHub , isPy27 +, freezegun , mock +, moto , pytestCheckHook , python-jose , requests +, requests-mock }: buildPythonPackage rec { pname = "pycognito"; - version = "2022.01.0"; + version = "2022.02.1"; disabled = isPy27; src = fetchFromGitHub { owner = "pvizeli"; repo = pname; rev = version; - sha256 = "sha256-mmlw3irMC0SFjfEinXHyoPNfTvCcO02zGyqQLj9STSY="; + sha256 = "sha256-0PqeZ8yy2MzvIi1xQNosR7V2Ma3tMT0Q/v4OIv7f1Kg="; }; propagatedBuildInputs = [ @@ -30,8 +33,11 @@ buildPythonPackage rec { ]; checkInputs = [ + freezegun mock + moto pytestCheckHook + requests-mock ]; postPatch = '' diff --git a/pkgs/development/python-modules/pycoolmasternet-async/default.nix b/pkgs/development/python-modules/pycoolmasternet-async/default.nix index 45b40ddeadb90..909feb9443283 100644 --- a/pkgs/development/python-modules/pycoolmasternet-async/default.nix +++ b/pkgs/development/python-modules/pycoolmasternet-async/default.nix @@ -6,7 +6,7 @@ buildPythonPackage rec { pname = "pycoolmasternet-async"; - version = "0.1.2"; + version = "0.1.3"; disabled = pythonOlder "3.7"; @@ -14,7 +14,7 @@ buildPythonPackage rec { owner = "OnFreund"; repo = "pycoolmasternet-async"; rev = "v${version}"; - sha256 = "0qzdk18iqrvin8p8zrydf69d6pii3j47j11h7ymmsx08gh7c176g"; + hash = "sha256-1Xd8OdN8d3g23kQZqihZrNLKoqLCbu5BvAMNitg8aDA="; }; # no tests implemented diff --git a/pkgs/development/python-modules/pycountry/default.nix b/pkgs/development/python-modules/pycountry/default.nix index 560c5a708122f..3583826f69a33 100644 --- a/pkgs/development/python-modules/pycountry/default.nix +++ b/pkgs/development/python-modules/pycountry/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "pycountry"; - version = "22.1.10"; + version = "22.3.5"; src = fetchPypi { inherit pname version; - sha256 = "b9a6d9cdbf53f81ccdf73f6f5de01b0d8493cab2213a230af3e34458de85ea32"; + sha256 = "sha256-shY6JGxYWJTYCPGHg+GRN8twoMGPs2dI3AH8bxCcFkY="; }; checkInputs = [ diff --git a/pkgs/development/python-modules/pycuda/default.nix b/pkgs/development/python-modules/pycuda/default.nix index cdd07e86110b0..1c443712db765 100644 --- a/pkgs/development/python-modules/pycuda/default.nix +++ b/pkgs/development/python-modules/pycuda/default.nix @@ -10,7 +10,7 @@ , decorator , appdirs , six -, cudatoolkit +, cudaPackages , python , mkDerivation , lib @@ -19,6 +19,8 @@ let compyte = import ./compyte.nix { inherit mkDerivation fetchFromGitHub; }; + + inherit (cudaPackages) cudatoolkit; in buildPythonPackage rec { pname = "pycuda"; diff --git a/pkgs/development/python-modules/pycurl/default.nix b/pkgs/development/python-modules/pycurl/default.nix index 5b62b3bb016b9..e7f3b87ad0c3c 100644 --- a/pkgs/development/python-modules/pycurl/default.nix +++ b/pkgs/development/python-modules/pycurl/default.nix @@ -50,16 +50,6 @@ buildPythonPackage rec { ''; disabledTests = [ - # libcurl stopped passing the reason phrase from the HTTP status line - # https://github.com/pycurl/pycurl/issues/679 - "test_failonerror" - "test_failonerror_status_line_invalid_utf8_python3" - # bottle>=0.12.17 escapes utf8 properly, so these test don't work anymore - # https://github.com/pycurl/pycurl/issues/669 - "test_getinfo_content_type_invalid_utf8_python3" - "test_getinfo_cookie_invalid_utf8_python3" - "test_getinfo_raw_content_type_invalid_utf8" - "test_getinfo_raw_cookie_invalid_utf8" # tests that require network access "test_keyfunction" "test_keyfunction_bogus_return" @@ -77,6 +67,6 @@ buildPythonPackage rec { homepage = "http://pycurl.io/"; description = "Python Interface To The cURL library"; license = with licenses; [ lgpl2Only mit ]; - maintainers = with maintainers; []; + maintainers = with maintainers; [ SuperSandro2000 ]; }; } diff --git a/pkgs/development/python-modules/pydmd/default.nix b/pkgs/development/python-modules/pydmd/default.nix index f80f900347848..68a19afddba71 100644 --- a/pkgs/development/python-modules/pydmd/default.nix +++ b/pkgs/development/python-modules/pydmd/default.nix @@ -35,9 +35,10 @@ buildPythonPackage rec { pytestCheckHook ]; - disabledTestPaths = [ - # Those tests take over 1.5 h on hydra. Also, an error and two failures - "tests/test_spdmd.py" + pytestFlagsArray = [ + # test suite takes over 100 vCPU hours, just run small subset of it. + # TODO: Add a passthru.tests with all tests + "tests/test_dmdbase.py" ]; pythonImportsCheck = [ diff --git a/pkgs/development/python-modules/pyee/default.nix b/pkgs/development/python-modules/pyee/default.nix index a252cd4505ac2..7a967c48a0426 100644 --- a/pkgs/development/python-modules/pyee/default.nix +++ b/pkgs/development/python-modules/pyee/default.nix @@ -1,30 +1,36 @@ { lib , buildPythonPackage , fetchPypi -, vcversioner , mock -, pytestCheckHook , pytest-asyncio , pytest-trio -, twisted +, pytestCheckHook , pythonOlder +, twisted +, typing-extensions +, vcversioner }: buildPythonPackage rec { pname = "pyee"; - version = "8.2.2"; + version = "9.0.4"; + format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "sha256-XH5g+N+VcQ2+F1UOFs4BU/g5kMAO90SEG0Pzce1T6+o="; + hash = "sha256-J3DEkoq8ch9GtwXmpysMWUgMSmnJqDygsAu5lPHqSzI="; }; buildInputs = [ vcversioner ]; + propagatedBuildInputs = [ + typing-extensions + ]; + checkInputs = [ mock pytest-asyncio @@ -33,7 +39,9 @@ buildPythonPackage rec { twisted ]; - pythonImportsCheck = [ "pyee" ]; + pythonImportsCheck = [ + "pyee" + ]; meta = with lib; { description = "A port of Node.js's EventEmitter to Python"; diff --git a/pkgs/development/python-modules/pyefergy/default.nix b/pkgs/development/python-modules/pyefergy/default.nix index 28fb058c52a26..7b7e587feddb4 100644 --- a/pkgs/development/python-modules/pyefergy/default.nix +++ b/pkgs/development/python-modules/pyefergy/default.nix @@ -1,11 +1,9 @@ { lib , aiohttp -, aresponses , buildPythonPackage , fetchFromGitHub , iso4217 , pytest-asyncio -, pytestCheckHook , pythonOlder , pytz }: @@ -21,7 +19,7 @@ buildPythonPackage rec { owner = "tkdrob"; repo = pname; rev = version; - sha256 = "sha256-AdoM+PcVoajxhnEfkyN9UuNufChu8XGmZDLNC3mjrps="; + hash = "sha256-AdoM+PcVoajxhnEfkyN9UuNufChu8XGmZDLNC3mjrps="; }; propagatedBuildInputs = [ @@ -30,11 +28,8 @@ buildPythonPackage rec { pytz ]; - checkInputs = [ - aresponses - pytest-asyncio - pytestCheckHook - ]; + # Tests require network access + doCheck =false; pythonImportsCheck = [ "pyefergy" diff --git a/pkgs/development/python-modules/pyezviz/default.nix b/pkgs/development/python-modules/pyezviz/default.nix index e6a2d5c022600..6499b91dda645 100644 --- a/pkgs/development/python-modules/pyezviz/default.nix +++ b/pkgs/development/python-modules/pyezviz/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "pyezviz"; - version = "0.2.0.6"; + version = "0.2.0.7"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "baqs"; repo = "pyEzviz"; rev = version; - sha256 = "sha256-3GRyM6OK0EpQ7wepTzqg+XANx9D0OVBTnw98i3b1V/8="; + sha256 = "sha256-cQsjEH+e2/rNXmCnhNRv2Vg5i/ax0x88w1pit2eVO2c="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pyfaidx/default.nix b/pkgs/development/python-modules/pyfaidx/default.nix index a2815c3e1e2d2..20b3e99eeb413 100644 --- a/pkgs/development/python-modules/pyfaidx/default.nix +++ b/pkgs/development/python-modules/pyfaidx/default.nix @@ -5,17 +5,18 @@ , numpy , setuptools-scm , six +, glibcLocales , pytestCheckHook }: buildPythonPackage rec { pname = "pyfaidx"; - version = "0.6.3.1"; + version = "0.6.4"; format = "setuptools"; src = fetchPypi { inherit pname version; - sha256 = "93adf036a75e08dc9b1dcd59de6a4db2f65a48c603edabe2e499764b6535ed50"; + sha256 = "sha256-e6O9yx30unSfdmWzTmoFKqToQkBqDflebfRxfMEj85I="; }; nativeBuildInputs = [ @@ -27,16 +28,15 @@ buildPythonPackage rec { ]; checkInputs = [ + glibcLocales nose numpy pytestCheckHook ]; - disabledTests = [ - # PyPI releases don't ship all the needed files for the tests - "test_index_zero_length" - "test_fetch_zero_length" - "test_read_back_index" + disabledTestPaths = [ + # FileNotFoundError: [Errno 2] No such file or directory: 'data/genes.fasta.gz' + "tests/test_Fasta_bgzip.py" ]; pythonImportsCheck = [ diff --git a/pkgs/development/python-modules/pyfakefs/default.nix b/pkgs/development/python-modules/pyfakefs/default.nix index 29803793fd6f8..c3c6513f331c2 100644 --- a/pkgs/development/python-modules/pyfakefs/default.nix +++ b/pkgs/development/python-modules/pyfakefs/default.nix @@ -7,13 +7,13 @@ }: buildPythonPackage rec { - version = "4.5.4"; + version = "4.5.6"; pname = "pyfakefs"; disabled = pythonOlder "3.5"; src = fetchPypi { inherit pname version; - sha256 = "5b5951e873f73bf12e3a19d8e4470c4b7962c51df753cf8c4caaf64e24a0a323"; + sha256 = "sha256-kU17+ZRAbPvv7gtNRZGPYMFbQGr+k/gZSoBNpaRQqCI="; }; postPatch = '' diff --git a/pkgs/development/python-modules/pygatt/default.nix b/pkgs/development/python-modules/pygatt/default.nix index 9d596e17236ed..8d6f67a4c7514 100644 --- a/pkgs/development/python-modules/pygatt/default.nix +++ b/pkgs/development/python-modules/pygatt/default.nix @@ -22,15 +22,19 @@ buildPythonPackage rec { }; propagatedBuildInputs = [ - pexpect pyserial ]; + passthru.extras-require.GATTTOOL = [ + pexpect + ]; + checkInputs = [ mock nose pytestCheckHook - ]; + ] + ++ passthru.extras-require.GATTTOOL; postPatch = '' # Not support for Python < 3.4 diff --git a/pkgs/development/python-modules/pygit2/default.nix b/pkgs/development/python-modules/pygit2/default.nix index b8b405a8ecf03..2d4deb16276b3 100644 --- a/pkgs/development/python-modules/pygit2/default.nix +++ b/pkgs/development/python-modules/pygit2/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "pygit2"; - version = "1.8.0"; + version = "1.9.1"; src = fetchPypi { inherit pname version; - sha256 = "sha256-bixc/1qh5D9DEDSAdhFS9cXWvvQPXB9QyHWKbonmbLY="; + sha256 = "sha256-72R5w7YZKCUxawVjNtt36/9ueEmusfu4i3YAGsM3uck="; }; preConfigure = lib.optionalString stdenv.isDarwin '' diff --git a/pkgs/development/python-modules/pygls/default.nix b/pkgs/development/python-modules/pygls/default.nix index 4c557b2676cdf..22cea8c0709db 100644 --- a/pkgs/development/python-modules/pygls/default.nix +++ b/pkgs/development/python-modules/pygls/default.nix @@ -4,6 +4,7 @@ , fetchFromGitHub , setuptools-scm , pydantic +, toml , typeguard , mock , pytest-asyncio @@ -13,6 +14,7 @@ buildPythonPackage rec { pname = "pygls"; version = "0.11.3"; + format = "setuptools"; disabled = !isPy3k; src = fetchFromGitHub { @@ -27,6 +29,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ pydantic + toml typeguard ]; # We don't know why an early version of pydantic is required, see: diff --git a/pkgs/development/python-modules/pyhanko-certvalidator/default.nix b/pkgs/development/python-modules/pyhanko-certvalidator/default.nix new file mode 100644 index 0000000000000..4675e48a56464 --- /dev/null +++ b/pkgs/development/python-modules/pyhanko-certvalidator/default.nix @@ -0,0 +1,73 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, pythonOlder +, aiohttp +, asn1crypto +, cryptography +, oscrypto +, requests +, uritools +, openssl +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "pyhanko-certvalidator"; + version = "0.19.5"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; + + # Tests are only available on GitHub + src = fetchFromGitHub { + owner = "MatthiasValvekens"; + repo = "certvalidator"; + rev = version; + sha256 = "sha256-UxlBggKgqvbKioG98UaKvhW0YgEa6PqV913nqYvTx1I="; + }; + + propagatedBuildInputs = [ + asn1crypto + cryptography + oscrypto + requests + uritools + ]; + + checkInputs = [ + aiohttp + pytestCheckHook + ]; + + disabledTestPaths = [ + # Test looks for libcrypto.so.1.1 + "dev/stress_test.py" + # Requests + "tests/test_crl_client.py" + ]; + + disabledTests = [ + # Look for nonexisting certificates + "test_basic_certificate_validator_tls" + # Failed to fetch OCSP response from http://ocsp.digicert.com + "test_fetch_ocsp_aiohttp" + "test_fetch_ocsp_requests" + "test_fetch_ocsp_err_requests" + # Unable to build a validation path for the certificate "%s" - no issuer matching "%s" was found + "test_revocation_mode_hard_aiohttp_autofetch" + # The path could not be validated because no revocation information could be found for intermediate certificate 1 + "test_revocation_mode_hard" + ]; + + pythonImportsCheck = [ + "pyhanko_certvalidator" + ]; + + meta = with lib; { + description = "Python library for validating X.509 certificates and paths"; + homepage = "https://github.com/MatthiasValvekens/certvalidator"; + license = licenses.mit; + maintainers = with maintainers; [ wolfangaukang ]; + }; +} diff --git a/pkgs/development/python-modules/pyhanko/0001-Updating-pytest-aiohttp-version.patch b/pkgs/development/python-modules/pyhanko/0001-Updating-pytest-aiohttp-version.patch new file mode 100644 index 0000000000000..562dc6461ef93 --- /dev/null +++ b/pkgs/development/python-modules/pyhanko/0001-Updating-pytest-aiohttp-version.patch @@ -0,0 +1,25 @@ +From 942d4fd37786941bae91b769ef6499a4b4da6843 Mon Sep 17 00:00:00 2001 +From: "P. R. d. O" <d.ol.rod@tutanota.com> +Date: Sat, 9 Apr 2022 12:40:59 -0600 +Subject: [PATCH] Updating pytest-aiohttp version + +--- + setup.py | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/setup.py b/setup.py +index fe33d9a..694fab4 100644 +--- a/setup.py ++++ b/setup.py +@@ -85,7 +85,7 @@ setup( + tests_require=[ + 'pytest>=6.1.1', 'requests-mock>=1.8.0', + 'freezegun>=1.1.0', 'certomancer~=0.8.1', +- 'aiohttp~=3.8.0', 'pytest-aiohttp~=0.3.0', ++ 'aiohttp~=3.8.0', 'pytest-aiohttp~=1.0.3', + 'python-pae==0.1.0' + ], + keywords="signature pdf pades digital-signature pkcs11" +-- +2.35.1 + diff --git a/pkgs/development/python-modules/pyhanko/default.nix b/pkgs/development/python-modules/pyhanko/default.nix new file mode 100644 index 0000000000000..2cd71ae0f33aa --- /dev/null +++ b/pkgs/development/python-modules/pyhanko/default.nix @@ -0,0 +1,132 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, pythonOlder +, asn1crypto +, click +, cryptography +, pyhanko-certvalidator +, pytz +, pyyaml +, qrcode +, requests +, tzlocal +, certomancer +, freezegun +, python-pae +, pytest-aiohttp +, requests-mock +, pytestCheckHook +# Flags to add to the library +, extraPubkeyAlgsSupport ? false +, oscrypto +, opentypeSupport ? false +, fonttools +, uharfbuzz +, imageSupport ? false +, pillow +, python-barcode +, pkcs11Support ? false +, python-pkcs11 +, asyncHttpSupport ? false +, aiohttp +}: + +buildPythonPackage rec { + pname = "pyhanko"; + version = "0.12.1"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; + + # Tests are only available on GitHub + src = fetchFromGitHub { + owner = "MatthiasValvekens"; + repo = "pyHanko"; + rev = version; + sha256 = "sha256-W60NTKEtCqJ/QdtNiieKUsrl2jIjIH86Wych68R3mBc="; + }; + + propagatedBuildInputs = [ + click + pyhanko-certvalidator + pytz + pyyaml + qrcode + tzlocal + ] ++ lib.optionals (extraPubkeyAlgsSupport) [ + oscrypto + ] ++ lib.optionals (opentypeSupport) [ + fonttools + uharfbuzz + ] ++ lib.optionals (imageSupport) [ + pillow + python-barcode + ] ++ lib.optionals (pkcs11Support) [ + python-pkcs11 + ] ++ lib.optionals (asyncHttpSupport) [ + aiohttp + ]; + + postPatch = '' + substituteInPlace setup.py \ + --replace ", 'pytest-runner'" "" \ + --replace "pytest-aiohttp~=0.3.0" "pytest-aiohttp~=1.0.3" + ''; + + checkInputs = [ + aiohttp + certomancer + freezegun + python-pae + pytest-aiohttp + requests-mock + pytestCheckHook + ]; + + disabledTestPaths = lib.optionals (!opentypeSupport) [ + "pyhanko_tests/test_stamp.py" + "pyhanko_tests/test_text.py" + ] ++ lib.optionals (!imageSupport) [ + "pyhanko_tests/test_barcode.py" + ] ++ lib.optionals (!pkcs11Support) [ + "pyhanko_tests/test_pkcs11.py" + ]; + + disabledTests = [ + # Most of the test require working with local certificates, + # contacting OSCP or performing requests + "test_generic_data_sign_legacy" + "test_generic_data_sign" + "test_cms_v3_sign" + "test_detached_cms_with_self_reported_timestamp" + "test_detached_cms_with_tst" + "test_detached_cms_with_content_tst" + "test_detached_cms_with_wrong_content_tst" + "test_detached_with_malformed_content_tst" + "test_noop_attribute_prov" + "test_detached_cades_cms_with_tst" + "test_read_qr_config" + "test_no_changes_policy" + "test_bogus_metadata_manipulation" + "test_tamper_sig_obj" + "test_signed_file_diff_proxied_objs" + "test_pades_revinfo_live" + "test_diff_fallback_ok" + "test_no_diff_summary" + "test_ocsp_embed" + "test_ts_fetch_aiohttp" + "test_ts_fetch_requests" + ]; + + pythonImportsCheck = [ + "pyhanko" + ]; + + meta = with lib; { + description = "Sign and stamp PDF files"; + homepage = "https://github.com/MatthiasValvekens/pyHanko"; + license = licenses.mit; + maintainers = with maintainers; [ wolfangaukang ]; + }; +} diff --git a/pkgs/development/python-modules/pyhaversion/default.nix b/pkgs/development/python-modules/pyhaversion/default.nix index 6028f19bdab22..84c5756689fdb 100644 --- a/pkgs/development/python-modules/pyhaversion/default.nix +++ b/pkgs/development/python-modules/pyhaversion/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "pyhaversion"; - version = "22.02.0"; + version = "22.4.1"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -19,8 +19,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "ludeeus"; repo = pname; - rev = version; - sha256 = "sha256-7cBUsTEZ9yVlWsUdKs4YWm647baN09AQJI+7CTORhLc="; + rev = "refs/tags/${version}"; + sha256 = "sha256-adM6LUo8ycD/3G19JIl4DcuVK/f0/9V8AG82qgYO0uM="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pyicu/default.nix b/pkgs/development/python-modules/pyicu/default.nix index 3281a7ceb8735..02226feff2ced 100644 --- a/pkgs/development/python-modules/pyicu/default.nix +++ b/pkgs/development/python-modules/pyicu/default.nix @@ -8,11 +8,11 @@ buildPythonPackage rec { pname = "PyICU"; - version = "2.8"; + version = "2.8.1"; src = fetchPypi { inherit pname version; - sha256 = "3d80de47045a8163db5aebc947c42b4d429eeea4f0c32af4f40b33981fa872b9"; + sha256 = "sha256-8LlUmof4e6fEE/E2edE3Jx4LN/HzmwEJrOOCV9TRSNY="; }; nativeBuildInputs = [ icu ]; # for icu-config, but should be replaced with pkg-config diff --git a/pkgs/development/python-modules/pyinfra/default.nix b/pkgs/development/python-modules/pyinfra/default.nix index fed8628ea2da1..130486a55f171 100644 --- a/pkgs/development/python-modules/pyinfra/default.nix +++ b/pkgs/development/python-modules/pyinfra/default.nix @@ -17,14 +17,14 @@ buildPythonPackage rec { pname = "pyinfra"; - version = "1.7.2"; + version = "2.0.1"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "sha256-qA65l0+E5jVdPghjcX2YiVtdhHRxt4ey28xOedgwHaM="; + sha256 = "sha256-157NtpA85FS27Ln1Xsvq5/qumSsr0WSDOhG0UwMUnRE="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pyisy/default.nix b/pkgs/development/python-modules/pyisy/default.nix index 5daadce41f444..4037146710085 100644 --- a/pkgs/development/python-modules/pyisy/default.nix +++ b/pkgs/development/python-modules/pyisy/default.nix @@ -8,13 +8,13 @@ buildPythonPackage rec { pname = "pyisy"; - version = "3.0.5"; + version = "3.0.6"; src = fetchFromGitHub { owner = "automicus"; repo = "PyISY"; - rev = "v${version}"; - hash = "sha256-lVutG/xJvVP0qS0UnEyS/9KwwqdRX6ownTKek8/VXbU="; + rev = "refs/tags/v${version}"; + hash = "sha256-4thCP9Xc3dtL6IaP863sW/L4aj4+QIPFv6p0kFLGh7E="; }; postPatch = '' diff --git a/pkgs/development/python-modules/pykerberos/default.nix b/pkgs/development/python-modules/pykerberos/default.nix index fd4c0088b08c1..67246ffbb1ab7 100644 --- a/pkgs/development/python-modules/pykerberos/default.nix +++ b/pkgs/development/python-modules/pykerberos/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "pykerberos"; - version = "1.2.3.dev0"; + version = "1.2.4"; src = fetchPypi { inherit pname version; - sha256 = "17zjiw6rqgfic32px86qls1i3z7anp15dgb3sprbdvywy98alryn"; + sha256 = "sha256-nXAevY/FlsmdMVXVukWBO9WQjSbvg7oK3SUO22IqvtQ="; }; nativeBuildInputs = [ krb5 ]; # for krb5-config diff --git a/pkgs/development/python-modules/pykeyatome/default.nix b/pkgs/development/python-modules/pykeyatome/default.nix index f4ea169b01e45..a9bfb58a9c181 100644 --- a/pkgs/development/python-modules/pykeyatome/default.nix +++ b/pkgs/development/python-modules/pykeyatome/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "pykeyatome"; - version = "1.4.1"; + version = "1.5.2"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -21,8 +21,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "jugla"; repo = "pyKeyAtome"; - rev = "V${version}"; - sha256 = "sha256-Gv418i2JLoovwagkZpv8PIJPW3I/0pRmXR/PJOJ2NBc="; + rev = "refs/tags/V${version}"; + sha256 = "sha256-9J8MaQs3+/Ld+v3WmA98lSu3iMrX4Se4q1jD1KeRTpw="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pylama/default.nix b/pkgs/development/python-modules/pylama/default.nix index 3f93aef0a3f7b..0289b2462136c 100644 --- a/pkgs/development/python-modules/pylama/default.nix +++ b/pkgs/development/python-modules/pylama/default.nix @@ -10,12 +10,14 @@ , pydocstyle , pyflakes , vulture +, isort +, pylint , pytestCheckHook }: buildPythonPackage rec { pname = "pylama"; - version = "8.3.6"; + version = "8.3.8"; format = "setuptools"; @@ -24,7 +26,7 @@ buildPythonPackage rec { owner = "klen"; repo = "pylama"; rev = version; - hash = "sha256-KU/G+2Fm4G/dUuNhhk8xM0Y8+7YOUUgREONM8CQGugw="; + hash = "sha256-g6Lq5NaieUI/alxqoVFfL5VaCHwB/jLcp02/N1W69yE="; }; patches = [ @@ -45,14 +47,22 @@ buildPythonPackage rec { ]; checkInputs = [ + # avoid infinite recursion pylint -> isort -> pylama + (pylint.override { + isort = isort.overridePythonAttrs (old: { + doCheck = false; + }); + }) pytestCheckHook ]; + preCheck = '' + export HOME=$TEMP + ''; + disabledTests = [ - "test_pylint" # infinite recursion "test_quotes" # FIXME package pylama-quotes "test_radon" # FIXME package radon - "test_sort" ]; pythonImportsCheck = [ @@ -62,6 +72,7 @@ buildPythonPackage rec { meta = with lib; { description = "Code audit tool for python"; homepage = "https://github.com/klen/pylama"; + changelog = "https://github.com/klen/pylama/blob/${version}/Changelog"; license = licenses.mit; maintainers = with maintainers; [ dotlambda ]; }; diff --git a/pkgs/development/python-modules/pylint-django/default.nix b/pkgs/development/python-modules/pylint-django/default.nix index 291ef8fba62ef..61d49bd3ba0db 100644 --- a/pkgs/development/python-modules/pylint-django/default.nix +++ b/pkgs/development/python-modules/pylint-django/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "pylint-django"; - version = "2.5.0"; + version = "2.5.2"; disabled = !isPy3k; src = fetchFromGitHub { owner = "PyCQA"; repo = pname; rev = "v${version}"; - sha256 = "1r48dss9qnzlifwy5ylkffdw35aaajmil0486mav056jm1vmi2pr"; + sha256 = "sha256-VgGdV1T154LauclGo6jpLPUrYn5vTOWwvO4IXQ9se7c="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pylint/default.nix b/pkgs/development/python-modules/pylint/default.nix index b52cb3e2f95cb..dda915bb7ef33 100644 --- a/pkgs/development/python-modules/pylint/default.nix +++ b/pkgs/development/python-modules/pylint/default.nix @@ -2,30 +2,35 @@ , lib , buildPythonPackage , fetchFromGitHub +, pythonAtLeast , pythonOlder , installShellFiles , astroid +, dill , isort -, GitPython , mccabe , platformdirs -, toml +, tomli +, typing-extensions +, GitPython , pytest-benchmark +, pytest-timeout , pytest-xdist , pytestCheckHook }: buildPythonPackage rec { pname = "pylint"; - version = "2.12.2"; + version = "2.13.5"; + format = "setuptools"; - disabled = pythonOlder "3.6"; + disabled = pythonOlder "3.6.2"; src = fetchFromGitHub { owner = "PyCQA"; repo = pname; rev = "v${version}"; - sha256 = "sha256-seBYBTB+8PLIovqxVohkoQEfDAZI1fehLgXuHeTx9Wo="; + sha256 = "sha256-FB99vmUtoTc0cTjDUSbx80Tesh0vASigSpPktrDYk08="; }; nativeBuildInputs = [ @@ -34,10 +39,14 @@ buildPythonPackage rec { propagatedBuildInputs = [ astroid + dill isort mccabe platformdirs - toml + ] ++ lib.optionals (pythonOlder "3.11") [ + tomli + ] ++ lib.optionals (pythonOlder "3.9") [ + typing-extensions ]; postInstall = '' @@ -48,9 +57,12 @@ buildPythonPackage rec { checkInputs = [ GitPython + # https://github.com/PyCQA/pylint/blob/main/requirements_test_min.txt pytest-benchmark + pytest-timeout pytest-xdist pytestCheckHook + typing-extensions ]; dontUseSetuptoolsCheck = true; @@ -61,10 +73,6 @@ buildPythonPackage rec { export HOME=$TEMPDIR ''; - pytestFlagsArray = [ - "-n auto" - ]; - disabledTestPaths = [ # tests miss multiple input files # FileNotFoundError: [Errno 2] No such file or directory diff --git a/pkgs/development/python-modules/pymazda/default.nix b/pkgs/development/python-modules/pymazda/default.nix index fdc7e1f67873f..5ee3234b70d81 100644 --- a/pkgs/development/python-modules/pymazda/default.nix +++ b/pkgs/development/python-modules/pymazda/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "pymazda"; - version = "0.3.2"; + version = "0.3.3"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "d51619cfbd90f4bb4e8fbfe1bccd58d4f5ece9bdb78d8f33fed1776d749d5fa9"; + sha256 = "sha256-jvDjitS8r0oyANxUGbYksX7O7dbEqZeWEpYc9gABb78="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pymc3/default.nix b/pkgs/development/python-modules/pymc3/default.nix index 7c1e46647e396..54a12481e116d 100644 --- a/pkgs/development/python-modules/pymc3/default.nix +++ b/pkgs/development/python-modules/pymc3/default.nix @@ -23,12 +23,12 @@ buildPythonPackage rec { pname = "pymc3"; - version = "3.11.4"; + version = "3.11.5"; disabled = pythonOlder "3.5"; src = fetchPypi { inherit pname version; - sha256 = "3b88d1e6c85f7fb8a9b99d6f136ac860672170370ec4146338fdd160c3b3fd3f"; + sha256 = "sha256-M0HLvZYpCROLfV6+TtfP7in0Cy/nyt64iLOda7wXE4w="; }; # No need for coverage stats in Nix builds diff --git a/pkgs/development/python-modules/pymemcache/default.nix b/pkgs/development/python-modules/pymemcache/default.nix index f30b6ea06b4c0..81c05f4e97c2e 100644 --- a/pkgs/development/python-modules/pymemcache/default.nix +++ b/pkgs/development/python-modules/pymemcache/default.nix @@ -1,6 +1,7 @@ { lib , buildPythonPackage , fetchFromGitHub +, six , future , mock , pytestCheckHook @@ -8,15 +9,20 @@ buildPythonPackage rec { pname = "pymemcache"; - version = "3.5.0"; + version = "3.5.1"; + format = "setuptools"; src = fetchFromGitHub { owner = "pinterest"; repo = pname; rev = "v${version}"; - sha256 = "sha256-O2qmcLWCUSc1f32irelIZOOuOziOUQXFGcuQJBXPvvM="; + sha256 = "sha256-DKqfv5gf9gzbnEPQSzy2mAaVYJZL9jmTKyGWVzj40T4="; }; + propagatedBuildInputs = [ + six + ]; + checkInputs = [ future mock diff --git a/pkgs/development/python-modules/pymfy/default.nix b/pkgs/development/python-modules/pymfy/default.nix index ab5b21e8881d8..e48966e9da064 100644 --- a/pkgs/development/python-modules/pymfy/default.nix +++ b/pkgs/development/python-modules/pymfy/default.nix @@ -6,13 +6,14 @@ , pytestCheckHook , pythonOlder , requests -, requests_oauthlib +, requests-oauthlib }: buildPythonPackage rec { pname = "pymfy"; version = "0.11.0"; format = "pyproject"; + disabled = pythonOlder "3.7"; src = fetchFromGitHub { @@ -22,11 +23,13 @@ buildPythonPackage rec { sha256 = "0wpjwjmywfyqgwvfa5kwcjpaljc32qa088kk88nl9nqdvc31mzhv"; }; - nativeBuildInputs = [ poetry-core ]; + nativeBuildInputs = [ + poetry-core + ]; propagatedBuildInputs = [ requests - requests_oauthlib + requests-oauthlib ]; checkInputs = [ @@ -34,7 +37,9 @@ buildPythonPackage rec { pytestCheckHook ]; - pythonImportsCheck = [ "pymfy" ]; + pythonImportsCheck = [ + "pymfy" + ]; meta = with lib; { description = "Python client for the Somfy Open API"; diff --git a/pkgs/development/python-modules/pymongo/default.nix b/pkgs/development/python-modules/pymongo/default.nix index bae4f7c25fb82..ba184f68b4b5a 100644 --- a/pkgs/development/python-modules/pymongo/default.nix +++ b/pkgs/development/python-modules/pymongo/default.nix @@ -6,12 +6,12 @@ buildPythonPackage rec { pname = "pymongo"; - version = "3.12.2"; + version = "3.12.3"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "64ea5e97fca1a37f83df9f3460bf63640bc0d725e12f3471e6acbf3a6040dd37"; + sha256 = "sha256-ConK3ABipeU2ZN3gQ/bAlxcrjBxfAJRJAJUoL/mZWl8="; }; # Tests call a running mongodb instance diff --git a/pkgs/development/python-modules/pympler/default.nix b/pkgs/development/python-modules/pympler/default.nix index 4f132ad2c8274..6fc917981a7f4 100644 --- a/pkgs/development/python-modules/pympler/default.nix +++ b/pkgs/development/python-modules/pympler/default.nix @@ -1,6 +1,7 @@ { lib, stdenv , buildPythonPackage , fetchPypi +, pytestCheckHook }: buildPythonPackage rec { @@ -12,9 +13,15 @@ buildPythonPackage rec { sha256 = "993f1a3599ca3f4fcd7160c7545ad06310c9e12f70174ae7ae8d4e25f6c5d3fa"; }; - postPatch = '' - rm test/asizeof/test_asizeof.py - ''; + checkInputs = [ + pytestCheckHook + ]; + + disabledTests = [ + # 'AssertionError: 'function (test.muppy.test_summary.func)' != 'function (muppy.test_summary.func)' + # https://github.com/pympler/pympler/issues/134 + "test_repr_function" + ]; doCheck = stdenv.hostPlatform.isLinux; diff --git a/pkgs/development/python-modules/pynello/default.nix b/pkgs/development/python-modules/pynello/default.nix index 43852cbcd4c24..a7a75d7c5ddd3 100644 --- a/pkgs/development/python-modules/pynello/default.nix +++ b/pkgs/development/python-modules/pynello/default.nix @@ -4,7 +4,7 @@ , python-dateutil , pythonOlder , requests -, requests_oauthlib +, requests-oauthlib }: buildPythonPackage rec { @@ -18,19 +18,21 @@ buildPythonPackage rec { owner = "pschmitt"; repo = pname; rev = version; - sha256 = "015rlccsn2vff9if82rjj2fza3bjbmawqhamc22wq40gq7pbfk5i"; + hash = "sha256-sUy37sEPEMyFYFVBzFVdcg31nZAyC+Ricm4LqxmjuQQ="; }; propagatedBuildInputs = [ python-dateutil requests - requests_oauthlib + requests-oauthlib ]; # Project has no tests doCheck = false; - pythonImportsCheck = [ "pynello" ]; + pythonImportsCheck = [ + "pynello" + ]; meta = with lib; { description = "Python library for nello.io intercoms"; diff --git a/pkgs/development/python-modules/pynetbox/default.nix b/pkgs/development/python-modules/pynetbox/default.nix index 14c74cc8669c4..e92776e72a296 100644 --- a/pkgs/development/python-modules/pynetbox/default.nix +++ b/pkgs/development/python-modules/pynetbox/default.nix @@ -10,13 +10,13 @@ buildPythonPackage rec { pname = "pynetbox"; - version = "6.6.1"; + version = "6.6.2"; src = fetchFromGitHub { owner = "netbox-community"; repo = pname; - rev = "v${version}"; - sha256 = "sha256-8oqbnCAMq29QIp9ETbMa3Ve8tTuJzQ0D8KlOYnLdUgQ="; + rev = "refs/tags/v${version}"; + sha256 = "sha256-W5ukrhqJTgOXM9MnbZWvNy9TCoEUGrFYfD+zGGNU07w="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; diff --git a/pkgs/development/python-modules/pynetdicom/default.nix b/pkgs/development/python-modules/pynetdicom/default.nix index fa2b369aa2bae..32c93b50e55e2 100644 --- a/pkgs/development/python-modules/pynetdicom/default.nix +++ b/pkgs/development/python-modules/pynetdicom/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "pynetdicom"; - version = "2.0.1"; + version = "2.0.2"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "pydicom"; repo = pname; rev = "v${version}"; - sha256 = "sha256-28SoOdS6sAj3KrfJT8PR2k8XLEY2zh0k9w1eq1y7V8M="; + sha256 = "sha256-/JWQUtFBW4uqCbs/nUxj1pRBfTCXV4wcqTkqvzpdFrM="; }; propagatedBuildInputs = [ @@ -40,14 +40,17 @@ buildPythonPackage rec { "TestAEGoodAssociation" "TestEchoSCP" "TestEchoSCPCLI" + "TestEventHandlingAcceptor" "TestFindSCP" "TestFindSCPCLI" "TestGetSCP" "TestGetSCPCLI" "TestMoveSCP" "TestMoveSCPCLI" + "TestPrimitive_N_GET" "TestQRGetServiceClass" "TestQRMoveServiceClass" + "TestSearch" "TestState" "TestStorageServiceClass" "TestStoreSCP" @@ -56,6 +59,11 @@ buildPythonPackage rec { "TestStoreSCUCLI" ]; + disabledTestPaths = [ + # Ignore apps tests + "pynetdicom/apps/tests/" + ]; + pythonImportsCheck = [ "pynetdicom" ]; diff --git a/pkgs/development/python-modules/pynetgear/default.nix b/pkgs/development/python-modules/pynetgear/default.nix index 1e93ebdc486e7..1eabc9daaee79 100644 --- a/pkgs/development/python-modules/pynetgear/default.nix +++ b/pkgs/development/python-modules/pynetgear/default.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { pname = "pynetgear"; - version = "0.9.3"; + version = "0.9.4"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -15,8 +15,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "MatMaul"; repo = pname; - rev = version; - sha256 = "sha256-zydSx2OZowf+1KZ5ZJ/1FDVqDZQZ4U0+q62eB1+s+WY="; + rev = "refs/tags/${version}"; + sha256 = "sha256-/oxwUukYq/a0WeO/XhkMW3Jj7I1icZZUDwh1mdbGi08="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pynina/default.nix b/pkgs/development/python-modules/pynina/default.nix index 8227e01edc24d..be81bd6e6557a 100644 --- a/pkgs/development/python-modules/pynina/default.nix +++ b/pkgs/development/python-modules/pynina/default.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { pname = "pynina"; - version = "0.1.7"; + version = "0.1.8"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "PyNINA"; inherit version; - sha256 = "sha256-7sceYmzOmXJMKaIdGmXMuCAum0aJeVTxx1w/jZy5Eig="; + sha256 = "sha256-U8/SzkkZJLRBpTQx8NRpFWUlckn4Jr0n9cHR4/plyb0="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pynndescent/default.nix b/pkgs/development/python-modules/pynndescent/default.nix index f15cfef63c6e0..79b914f6122cc 100644 --- a/pkgs/development/python-modules/pynndescent/default.nix +++ b/pkgs/development/python-modules/pynndescent/default.nix @@ -34,6 +34,16 @@ buildPythonPackage rec { pytestCheckHook ]; + disabledTests = [ + # numpy.core._exceptions._UFuncNoLoopError + "test_sparse_nn_descent_query_accuracy_angular" + "test_nn_descent_query_accuracy_angular" + "test_alternative_distances" + # scipy: ValueError: Unknown Distance Metric: wminkowski + # https://github.com/scikit-learn/scikit-learn/pull/21741 + "test_weighted_minkowski" + ]; + pythonImportsCheck = [ "pynndescent" ]; diff --git a/pkgs/development/python-modules/pyomo/default.nix b/pkgs/development/python-modules/pyomo/default.nix index e8d89e9ef2d25..20450cd9effc6 100644 --- a/pkgs/development/python-modules/pyomo/default.nix +++ b/pkgs/development/python-modules/pyomo/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "pyomo"; - version = "5.7.3"; + version = "6.3.0"; disabled = isPy27; # unable to import pyutilib.th src = fetchFromGitHub { repo = "pyomo"; owner = "pyomo"; rev = version; - sha256 = "sha256-p0/DdCwyXdzXElzjWewKs0Oi7BMXC+BxgYikdZL0t68="; + sha256 = "sha256-xyjiB5fDRf5y9Av5Cr+8wtU4pHzMHsM45mcmJEOaTWs="; }; checkInputs = [ nose glpk ]; diff --git a/pkgs/development/python-modules/pyopengl-accelerate/default.nix b/pkgs/development/python-modules/pyopengl-accelerate/default.nix index c6839bba98962..195ec563d50f6 100644 --- a/pkgs/development/python-modules/pyopengl-accelerate/default.nix +++ b/pkgs/development/python-modules/pyopengl-accelerate/default.nix @@ -1,11 +1,13 @@ { lib , buildPythonPackage +, pythonAtLeast , fetchPypi }: buildPythonPackage rec { pname = "pyopengl-accelerate"; version = "3.1.5"; + disabled = pythonAtLeast "3.10"; # fails to compile src = fetchPypi { pname = "PyOpenGL-accelerate"; diff --git a/pkgs/development/python-modules/pyopengl/default.nix b/pkgs/development/python-modules/pyopengl/default.nix index 72d6ae3325837..7370057ad720d 100644 --- a/pkgs/development/python-modules/pyopengl/default.nix +++ b/pkgs/development/python-modules/pyopengl/default.nix @@ -7,12 +7,12 @@ buildPythonPackage rec { pname = "pyopengl"; - version = "3.1.5"; + version = "3.1.6"; src = fetchPypi { pname = "PyOpenGL"; inherit version; - sha256 = "4107ba0d0390da5766a08c242cf0cf3404c377ed293c5f6d701e457c57ba3424"; + sha256 = "sha256-jqbIdzkn7adAW//G9buTvoFWmnsFyMrFDNlOlp3OXic="; }; propagatedBuildInputs = [ pillow ]; diff --git a/pkgs/development/python-modules/pyopenssl/default.nix b/pkgs/development/python-modules/pyopenssl/default.nix index e4655082af92b..d629d97637fa7 100644 --- a/pkgs/development/python-modules/pyopenssl/default.nix +++ b/pkgs/development/python-modules/pyopenssl/default.nix @@ -4,13 +4,9 @@ , fetchPypi , openssl , cryptography -, pyasn1 -, idna , pytestCheckHook , pretend , flaky -, glibcLocales -, six }: buildPythonPackage rec { @@ -30,9 +26,9 @@ buildPythonPackage rec { doCheck = !stdenv.isDarwin; nativeBuildInputs = [ openssl ]; - propagatedBuildInputs = [ cryptography pyasn1 idna six ]; + propagatedBuildInputs = [ cryptography ]; - checkInputs = [ pytestCheckHook pretend flaky glibcLocales ]; + checkInputs = [ pytestCheckHook pretend flaky ]; preCheck = '' export LANG="en_US.UTF-8" diff --git a/pkgs/development/python-modules/pyoppleio/default.nix b/pkgs/development/python-modules/pyoppleio/default.nix new file mode 100644 index 0000000000000..f0d11d86c7c27 --- /dev/null +++ b/pkgs/development/python-modules/pyoppleio/default.nix @@ -0,0 +1,37 @@ +{ lib +, buildPythonPackage +, crc16 +, fetchPypi +, pythonOlder +}: + +buildPythonPackage rec { + pname = "pyoppleio"; + version = "1.0.7"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; + + src = fetchPypi { + inherit pname version; + hash = "sha256-S1w3pPqhX903kkXUq9ALz0+zRvNGOimLughRRVKjV8E="; + }; + + propagatedBuildInputs = [ + crc16 + ]; + + # Module has no tests + doCheck = false; + + pythonImportsCheck = [ + "pyoppleio" + ]; + + meta = with lib; { + description = "Library for interacting with OPPLE lights"; + homepage = "https://github.com/jedmeng/python-oppleio"; + license = with licenses; [ asl20 ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/pyoverkiz/default.nix b/pkgs/development/python-modules/pyoverkiz/default.nix index f39b17a67541b..019a7682a7ef6 100644 --- a/pkgs/development/python-modules/pyoverkiz/default.nix +++ b/pkgs/development/python-modules/pyoverkiz/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "pyoverkiz"; - version = "1.3.14"; + version = "1.4.0"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "iMicknl"; repo = "python-overkiz-api"; rev = "v${version}"; - hash = "sha256-dyT2hrTQwYoKEZAVIed2N4259YlR2JmvOEpAuPLCur4="; + hash = "sha256-uaeSyRtnokUJ3jWTioVMuo+T3jFoH+SYTBT3HPCPjm8="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/pyownet/default.nix b/pkgs/development/python-modules/pyownet/default.nix index 2bdc18e1e2440..9a368c26087eb 100644 --- a/pkgs/development/python-modules/pyownet/default.nix +++ b/pkgs/development/python-modules/pyownet/default.nix @@ -14,6 +14,10 @@ buildPythonPackage rec { sha256 = "4f2fa4471c2f806b35090bdc6c092305c6eded3ff3736f8b586d35bdb157de62"; }; + postPatch = '' + sed -i '/use_2to3/d' setup.py + ''; + # tests access network doCheck = false; diff --git a/pkgs/development/python-modules/pypandoc/default.nix b/pkgs/development/python-modules/pypandoc/default.nix index 32bada43c1545..8e46be2697ce8 100644 --- a/pkgs/development/python-modules/pypandoc/default.nix +++ b/pkgs/development/python-modules/pypandoc/default.nix @@ -4,11 +4,11 @@ buildPythonPackage rec { pname = "pypandoc"; - version = "1.7.4"; + version = "1.7.5"; src = fetchPypi { inherit pname version; - sha256 = "sha256-KN4j9kbZ6ARAPGth180yptdso1arx563IXvb/2dI+G4="; + sha256 = "sha256-gCwmquF7ZBNsbQBpSdjOGDp9TZ+9Ty0FHmb0+59FylA="; }; patches = [ diff --git a/pkgs/development/python-modules/pyparsing/default.nix b/pkgs/development/python-modules/pyparsing/default.nix index 27047cf6eabc4..fb5abc5c3522b 100644 --- a/pkgs/development/python-modules/pyparsing/default.nix +++ b/pkgs/development/python-modules/pyparsing/default.nix @@ -5,31 +5,31 @@ # since this is a dependency of pytest, we need to avoid # circular dependencies , jinja2 +, pytestCheckHook , railroad-diagrams }: let pyparsing = buildPythonPackage rec { pname = "pyparsing"; - version = "3.0.6"; + version = "3.0.7"; src = fetchFromGitHub { owner = "pyparsing"; repo = pname; rev = "pyparsing_${version}"; - sha256 = "0n89ky7rx5yg09ssji8liahnyxip08hz7syc2k4pmlgs4978181a"; + sha256 = "sha256-RyvTTbFshAZgyZPgzqcq31E504RlnMZuf16jJYGqDDI="; }; # circular dependencies if enabled by default doCheck = false; checkInputs = [ jinja2 + pytestCheckHook railroad-diagrams ]; - checkPhase = '' - python -m unittest - ''; + pythonImportsCheck = [ "pyparsing" ]; passthru.tests = { check = pyparsing.overridePythonAttrs (_: { doCheck = true; }); @@ -39,9 +39,7 @@ let homepage = "https://github.com/pyparsing/pyparsing"; description = "An alternative approach to creating and executing simple grammars, vs. the traditional lex/yacc approach, or the use of regular expressions"; license = licenses.mit; - maintainers = with maintainers; [ - kamadorueda - ]; + maintainers = with maintainers; [ kamadorueda ]; }; }; in diff --git a/pkgs/development/python-modules/pypdf3/default.nix b/pkgs/development/python-modules/pypdf3/default.nix index 4970c0d527bb5..a4273497e3bc4 100644 --- a/pkgs/development/python-modules/pypdf3/default.nix +++ b/pkgs/development/python-modules/pypdf3/default.nix @@ -8,12 +8,12 @@ buildPythonPackage rec { pname = "pypdf3"; - version = "1.0.5"; + version = "1.0.6"; src = fetchPypi { pname = "PyPDF3"; inherit version; - sha256 = "sha256-DGKpR4p3z8tw4gKi5Hmj09svysD3Hkn4NklhgROmEAU="; + sha256 = "sha256-yUbzJzQZ43JY415yJz9JkEqxVyPYenYcERXvmXmfjF8="; }; LC_ALL = "en_US.UTF-8"; diff --git a/pkgs/development/python-modules/pyperf/default.nix b/pkgs/development/python-modules/pyperf/default.nix index 40a77fc0c7bd1..25cf9906cb44b 100644 --- a/pkgs/development/python-modules/pyperf/default.nix +++ b/pkgs/development/python-modules/pyperf/default.nix @@ -15,11 +15,11 @@ buildPythonPackage rec { pname = "pyperf"; - version = "2.3.0"; + version = "2.3.1"; src = fetchPypi { inherit pname version; - sha256 = "8a85dd42e067131d5b26b71472336da7f7f4b87ff9c97350d89f5ff0de9adedc"; + sha256 = "sha256-SsLiz3JKubUlInw7SmnxarXHFOpbrWHJdODF1XhyOKE="; }; checkInputs = [ nose psutil ] ++ diff --git a/pkgs/development/python-modules/pyplaato/default.nix b/pkgs/development/python-modules/pyplaato/default.nix index d4e91a985ef34..f070340f9290c 100644 --- a/pkgs/development/python-modules/pyplaato/default.nix +++ b/pkgs/development/python-modules/pyplaato/default.nix @@ -3,22 +3,32 @@ , fetchPypi , aiohttp , python-dateutil +, pythonOlder }: buildPythonPackage rec { pname = "pyplaato"; - version = "0.0.15"; + version = "0.0.18"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "1nykbkv2fg1x5min07cbi44x6am48f5gw3mnyj7x2kpmj6sqfpqp"; + hash = "sha256-HZF3Yxb/dTQSVzTkdAbfeD1Zyf8jFHoF3nt6OcdCnAM="; }; - propagatedBuildInputs = [ aiohttp python-dateutil ]; + propagatedBuildInputs = [ + aiohttp + python-dateutil + ]; - # Project has no tests + # Module has no tests doCheck = false; - pythonImportsCheck = [ "pyplaato" ]; + + pythonImportsCheck = [ + "pyplaato" + ]; meta = with lib; { description = "Python API client for fetching Plaato data"; diff --git a/pkgs/development/python-modules/pypng/default.nix b/pkgs/development/python-modules/pypng/default.nix new file mode 100644 index 0000000000000..968e9310318a0 --- /dev/null +++ b/pkgs/development/python-modules/pypng/default.nix @@ -0,0 +1,29 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "pypng"; + version = "0.0.21"; + format = "pyproject"; + + src = fetchFromGitHub { + owner = "drj11"; + repo = "pypng"; + rev = "${pname}-${version}"; + sha256 = "sha256-JU1GCSTm2s6Kczn6aRcF5DizPJVpizNtnAMJxTBi9vo="; + }; + + pythonImportsCheck = [ "png" ]; + + checkInputs = [ pytestCheckHook ]; + + meta = with lib; { + description = "Pure Python library for PNG image encoding/decoding"; + homepage = "https://github.com/drj11/pypng"; + license = licenses.mit; + maintainers = with maintainers; [ prusnak ]; + }; +} diff --git a/pkgs/development/python-modules/pyppeteer/default.nix b/pkgs/development/python-modules/pyppeteer/default.nix index 153be45ca8f56..a1857ec720670 100644 --- a/pkgs/development/python-modules/pyppeteer/default.nix +++ b/pkgs/development/python-modules/pyppeteer/default.nix @@ -1,6 +1,7 @@ { lib , appdirs , buildPythonPackage +, certifi , fetchFromGitHub , importlib-metadata , poetry-core @@ -16,7 +17,7 @@ buildPythonPackage rec { pname = "pyppeteer"; - version = "0.2.6"; + version = "1.0.2"; format = "pyproject"; disabled = pythonOlder "3.6"; @@ -25,7 +26,7 @@ buildPythonPackage rec { owner = pname; repo = pname; rev = version; - sha256 = "sha256-mMFQp8GMjKUc3yyB4c8Tgxut7LkMFa2cySO3iSA/aI4="; + sha256 = "sha256-izMaWtJdkLHMQbyq7o7n46xB8dOHXZ5uO0UXt+twjL4="; }; nativeBuildInputs = [ @@ -34,6 +35,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ appdirs + certifi importlib-metadata pyee tqdm @@ -49,6 +51,7 @@ buildPythonPackage rec { postPatch = '' substituteInPlace pyproject.toml \ + --replace 'pyee = "^8.1.0"' 'pyee = "*"' \ --replace 'websockets = "^9.1"' 'websockets = "*"' ''; diff --git a/pkgs/development/python-modules/pypykatz/default.nix b/pkgs/development/python-modules/pypykatz/default.nix index 2e2bd7def655d..72fdb6d3c5b48 100644 --- a/pkgs/development/python-modules/pypykatz/default.nix +++ b/pkgs/development/python-modules/pypykatz/default.nix @@ -1,4 +1,5 @@ { lib +, aesedb , aiosmb , aiowinreg , buildPythonPackage @@ -6,19 +7,24 @@ , minidump , minikerberos , msldap +, pythonOlder , winsspi }: buildPythonPackage rec { pname = "pypykatz"; - version = "0.5.2"; + version = "0.5.7"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "1lyvypi1g4l9fq1f9q05bdn6vq8y5y9ghmb6ziqdycr0lxn7lfdd"; + hash = "sha256-G+dbP+xtRH8dIU70HbimRJV+e/yYlo2ds5OAIzUcydY="; }; propagatedBuildInputs = [ + aesedb aiosmb aiowinreg minikerberos @@ -29,7 +35,10 @@ buildPythonPackage rec { # Project doesn't have tests doCheck = false; - pythonImportsCheck = [ "pypykatz" ]; + + pythonImportsCheck = [ + "pypykatz" + ]; meta = with lib; { description = "Mimikatz implementation in Python"; diff --git a/pkgs/development/python-modules/pyrad/default.nix b/pkgs/development/python-modules/pyrad/default.nix index 67841cab7d9fc..c8fb0310548d0 100644 --- a/pkgs/development/python-modules/pyrad/default.nix +++ b/pkgs/development/python-modules/pyrad/default.nix @@ -1,8 +1,17 @@ -{ buildPythonPackage, fetchFromGitHub, lib, netaddr, six, nose }: +{ buildPythonPackage +, fetchFromGitHub +, fetchpatch +, lib +, poetry-core +, netaddr +, six +, python +}: buildPythonPackage rec { pname = "pyrad"; version = "2.4"; + format = "pyproject"; src = fetchFromGitHub { owner = "pyradius"; @@ -11,19 +20,43 @@ buildPythonPackage rec { sha256 = "sha256-oqgkE0xG/8cmLeRZdGoHkaHbjtByeJwzBJwEdxH8oNY="; }; - propagatedBuildInputs = [ netaddr six ]; - checkInputs = [ nose ]; + patches = [ + (fetchpatch { + # Migrate to poetry-core + url = "https://github.com/pyradius/pyrad/commit/a4b70067dd6269e14a2f9530d820390a8a454231.patch"; + hash = "sha256-1We9wrVY3Or3GLIKK6hZvEjVYv6JOaahgP9zOMvgErE="; + }) + ]; + + nativeBuildInputs = [ + poetry-core + ]; + + propagatedBuildInputs = [ + netaddr + six + ]; + + preCheck = '' + substituteInPlace tests/testServer.py \ + --replace "def testBind(self):" "def dontTestBind(self):" \ + --replace "def testBindv6(self):" "def dontTestBindv6(self):" + ''; checkPhase = '' - nosetests -e testBind + runHook preCheck + ${python.interpreter} -m unittest discover + runHook postCheck ''; - pythonImportsCheck = [ "pyrad" ]; + pythonImportsCheck = [ + "pyrad" + ]; meta = with lib; { description = "Python RADIUS Implementation"; - homepage = "https://bitbucket.org/zzzeek/sqlsoup"; + homepage = "https://github.com/pyradius/pyrad"; license = licenses.bsd3; - maintainers = [ maintainers.globin ]; + maintainers = with maintainers; [ globin ]; }; } diff --git a/pkgs/development/python-modules/pyramid_jinja2/default.nix b/pkgs/development/python-modules/pyramid_jinja2/default.nix index d1eaf49e6bc23..455f4fb73b6c2 100644 --- a/pkgs/development/python-modules/pyramid_jinja2/default.nix +++ b/pkgs/development/python-modules/pyramid_jinja2/default.nix @@ -8,11 +8,11 @@ buildPythonPackage rec { pname = "pyramid_jinja2"; - version = "2.8"; + version = "2.10"; src = fetchPypi { inherit pname version; - sha256 = "81e0615cb3108f2a251ff3141ad0d698a5d03685819f3a836ea84787e8489502"; + sha256 = "sha256-8nEGnZ6ay6x622kSGQqEj2M49+V6+68+lSN/6DzI9NI="; }; buildInputs = [ webtest ]; diff --git a/pkgs/development/python-modules/pyres/default.nix b/pkgs/development/python-modules/pyres/default.nix index bb15a4d927ab2..a5b618d56902b 100644 --- a/pkgs/development/python-modules/pyres/default.nix +++ b/pkgs/development/python-modules/pyres/default.nix @@ -1,26 +1,10 @@ { lib, stdenv, fetchPypi, buildPythonPackage, fetchFromGitHub, simplejson, redis, setproctitle, nose, pkgs }: -let - - # the requirements of `pyres` support Redis 3.x (due to a missing upper-bound), - # but it doesn't support Redis 3.x. - redis' = redis.overridePythonAttrs (old: rec { - pname = "redis"; - version = "2.10.6"; - src = fetchPypi { - inherit pname version; - sha256 = "03vcgklykny0g0wpvqmy8p6azi2s078317wgb2xjv5m2rs9sjb52"; - }; - }); - -in - buildPythonPackage rec { pname = "pyres"; version = "1.5"; - # ps is used in Worker.worker_pids method - propagatedBuildInputs = [ simplejson setproctitle redis' pkgs.ps ]; + propagatedBuildInputs = [ simplejson setproctitle redis pkgs.ps ]; checkInputs = [ nose pkgs.redis ]; # PyPI tarball doesn't contain tests so let's use GitHub @@ -44,5 +28,6 @@ buildPythonPackage rec { homepage = "https://github.com/binarydud/pyres"; license = licenses.mit; maintainers = with maintainers; [ jluttine ]; + broken = true; # not compatible with latest redis }; } diff --git a/pkgs/development/python-modules/pyro-ppl/default.nix b/pkgs/development/python-modules/pyro-ppl/default.nix index f810cf6f37b69..d4837dd9fb141 100644 --- a/pkgs/development/python-modules/pyro-ppl/default.nix +++ b/pkgs/development/python-modules/pyro-ppl/default.nix @@ -2,12 +2,12 @@ , graphviz, networkx, six, opt-einsum, tqdm, pyro-api }: buildPythonPackage rec { - version = "1.8.0"; + version = "1.8.1"; pname = "pyro-ppl"; src = fetchPypi { inherit version pname; - sha256 = "68e4ea30f219227dd88e55de2550d3f8c20a20adbdb67ad1e13b50868bb2ac0c"; + sha256 = "sha256-18BJ6y50haYStN2ZwkwwnMhgx8vGsZczhwNPVDbRyNY="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pyrogram/default.nix b/pkgs/development/python-modules/pyrogram/default.nix index 971b8015a4178..c8f7dccc4f0fe 100644 --- a/pkgs/development/python-modules/pyrogram/default.nix +++ b/pkgs/development/python-modules/pyrogram/default.nix @@ -1,7 +1,7 @@ { lib , buildPythonPackage , pythonOlder -, fetchPypi +, fetchFromGitHub , pyaes , pysocks , async-lru @@ -12,14 +12,15 @@ buildPythonPackage rec { pname = "pyrogram"; - version = "1.4.12"; + version = "2.0.13"; - disabled = pythonOlder "3.6"; + disabled = pythonOlder "3.7"; - src = fetchPypi { - pname = "Pyrogram"; - inherit version; - hash = "sha256-rNGdWnZuhCU0Kg/CkeNjazKb76h8/VanZdF4yi0KWGU="; + src = fetchFromGitHub { + owner = "pyrogram"; + repo = "pyrogram"; + rev = "v${version}"; + hash = "sha256-8mnGfW8/2RbU4gFS8e72KAxMGGkb8XrhsyK01wD97rI="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pyrsistent/default.nix b/pkgs/development/python-modules/pyrsistent/default.nix index 75cecc7d70916..5a1b66bfa26c5 100644 --- a/pkgs/development/python-modules/pyrsistent/default.nix +++ b/pkgs/development/python-modules/pyrsistent/default.nix @@ -9,13 +9,13 @@ buildPythonPackage rec { pname = "pyrsistent"; - version = "0.18.0"; + version = "0.18.1"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "773c781216f8c2900b42a7b638d5b517bb134ae1acbebe4d1e8f1f41ea60eb4b"; + sha256 = "sha256-1NYfi5k6clW6cU3zrKUnAPgSUon4T3BM+AkWUXxG65Y="; }; propagatedBuildInputs = [ six ]; diff --git a/pkgs/development/python-modules/pysaj/default.nix b/pkgs/development/python-modules/pysaj/default.nix new file mode 100644 index 0000000000000..15f8dd0fccf07 --- /dev/null +++ b/pkgs/development/python-modules/pysaj/default.nix @@ -0,0 +1,41 @@ +{ lib +, aiohttp +, buildPythonPackage +, fetchFromGitHub +, lxml +, pythonOlder +}: + +buildPythonPackage rec { + pname = "pysaj"; + version = "0.0.16"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "fredericvl"; + repo = pname; + rev = "v${version}"; + hash = "sha256-7mN6GPRbXfEUfCrCrCs71SSt4x2Ch2y3a5rfXnuwVA0="; + }; + + propagatedBuildInputs = [ + aiohttp + lxml + ]; + + # Module has no tests + doCheck = false; + + pythonImportsCheck = [ + "pysaj" + ]; + + meta = with lib; { + description = "Library to communicate with SAJ inverters"; + homepage = "https://github.com/fredericvl/pysaj"; + license = with licenses; [ asl20 ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/pyscss/default.nix b/pkgs/development/python-modules/pyscss/default.nix index bbf4ee712c6a1..3b91236a6ccfe 100644 --- a/pkgs/development/python-modules/pyscss/default.nix +++ b/pkgs/development/python-modules/pyscss/default.nix @@ -11,13 +11,13 @@ buildPythonPackage rec { pname = "pyScss"; - version = "1.3.7"; + version = "1.4.0"; src = fetchFromGitHub { repo = "pyScss"; owner = "Kronuz"; - rev = version; - sha256 = "0701hziiiw67blafgpmjhzspmrss8mfvif7fw0rs8fikddwwc9g6"; + rev = "refs/tags/v${version}"; + sha256 = "sha256-z0y4z+/JE6rZWHAvps/taDZvutyVhxxs2gMujV5rNu4="; }; checkInputs = [ pytest ]; diff --git a/pkgs/development/python-modules/pysensibo/default.nix b/pkgs/development/python-modules/pysensibo/default.nix new file mode 100644 index 0000000000000..a4973efe5049c --- /dev/null +++ b/pkgs/development/python-modules/pysensibo/default.nix @@ -0,0 +1,39 @@ +{ lib +, aiohttp +, buildPythonPackage +, fetchFromGitHub +, pythonOlder +}: + +buildPythonPackage rec { + pname = "pysensibo"; + version = "1.0.12"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "andrey-git"; + repo = pname; + rev = version; + hash = "sha256-gXdyVEBcYCUOo8PHzsJLkjtnX1B1iRS/DAxdQDU3HaY="; + }; + + propagatedBuildInputs = [ + aiohttp + ]; + + # no tests implemented + doCheck = false; + + pythonImportsCheck = [ + "pysensibo" + ]; + + meta = with lib; { + description = "Module for interacting with Sensibo"; + homepage = "https://github.com/andrey-git/pysensibo"; + license = licenses.mit; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/pysigma-backend-insightidr/default.nix b/pkgs/development/python-modules/pysigma-backend-insightidr/default.nix new file mode 100644 index 0000000000000..46346f466b20d --- /dev/null +++ b/pkgs/development/python-modules/pysigma-backend-insightidr/default.nix @@ -0,0 +1,47 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, poetry-core +, pysigma +, pytestCheckHook +, pythonOlder +}: + +buildPythonPackage rec { + pname = "pysigma-backend-insightidr"; + version = "0.1.5"; + format = "pyproject"; + + disabled = pythonOlder "3.8"; + + src = fetchFromGitHub { + owner = "SigmaHQ"; + repo = "pySigma-backend-insightidr"; + rev = "refs/tags/v${version}"; + hash = "sha256-RjBRFNMIpjW/x5vShXUgi25oOmvRlD2zP6mNQJ7sG8M="; + }; + + nativeBuildInputs = [ + poetry-core + ]; + + propagatedBuildInputs = [ + pysigma + ]; + + checkInputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ + "sigma.backends.insight_idr" + "sigma.pipelines.insight_idr" + ]; + + meta = with lib; { + description = "Library to support the Rapid7 InsightIDR backend for pySigma"; + homepage = "https://github.com/SigmaHQ/pySigma-backend-insightidr"; + license = with licenses; [ lgpl21Only ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/pysigma-backend-splunk/default.nix b/pkgs/development/python-modules/pysigma-backend-splunk/default.nix index 2fc5c6a6ccdae..a8c0b3d6ea67c 100644 --- a/pkgs/development/python-modules/pysigma-backend-splunk/default.nix +++ b/pkgs/development/python-modules/pysigma-backend-splunk/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "pysigma-backend-splunk"; - version = "0.2.2"; + version = "0.3.2"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "SigmaHQ"; repo = "pySigma-backend-splunk"; rev = "v${version}"; - hash = "sha256-NAhAWK1eSSGQAlMGgMHrW/RTpT9LJMqwkhE9/8xWGT8="; + hash = "sha256-wcAqXFou20V2ZPOXCsF1Nky008q2xkfuI0RbTsatC6k="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/pysigma-pipeline-crowdstrike/default.nix b/pkgs/development/python-modules/pysigma-pipeline-crowdstrike/default.nix index 2d2aadb9eaec6..5ed92014fc2e9 100644 --- a/pkgs/development/python-modules/pysigma-pipeline-crowdstrike/default.nix +++ b/pkgs/development/python-modules/pysigma-pipeline-crowdstrike/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "pysigma-pipeline-crowdstrike"; - version = "0.1.4"; + version = "0.1.5"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "SigmaHQ"; repo = "pySigma-pipeline-crowdstrike"; rev = "v${version}"; - hash = "sha256-Riu2u1IouS1BMtXauXrNMIl06TU11pHdC0jjlOiR71s="; + hash = "sha256-TmvEWrkNu8gJ8rPFoRWd+uYob2rmmdasqxH1CYmz4Rk="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/pysigma-pipeline-sysmon/default.nix b/pkgs/development/python-modules/pysigma-pipeline-sysmon/default.nix index 7c1e959d74064..26f058c3e197a 100644 --- a/pkgs/development/python-modules/pysigma-pipeline-sysmon/default.nix +++ b/pkgs/development/python-modules/pysigma-pipeline-sysmon/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "pysigma-pipeline-sysmon"; - version = "0.1.3"; + version = "0.1.5"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "SigmaHQ"; repo = "pySigma-pipeline-sysmon"; rev = "v${version}"; - hash = "sha256-uJgV7emBqQN792EvfOz85BKoZY8DCCr8aUN7Ai8R9js="; + hash = "sha256-Bh0Qh+pY22lm/0vtJC4tFIl1KRF3zFQ8vcH0JEfYGAc="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/pysigma-pipeline-windows/default.nix b/pkgs/development/python-modules/pysigma-pipeline-windows/default.nix new file mode 100644 index 0000000000000..ef8595fa873cd --- /dev/null +++ b/pkgs/development/python-modules/pysigma-pipeline-windows/default.nix @@ -0,0 +1,46 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, poetry-core +, pysigma +, pytestCheckHook +, pythonOlder +}: + +buildPythonPackage rec { + pname = "pysigma-pipeline-windows"; + version = "0.1.0"; + format = "pyproject"; + + disabled = pythonOlder "3.8"; + + src = fetchFromGitHub { + owner = "SigmaHQ"; + repo = "pySigma-pipeline-windows"; + rev = "v${version}"; + hash = "sha256-BO6hiPLwEJX0sICqMZfcO4tqljdS+93Z1kG8IWsV9og="; + }; + + nativeBuildInputs = [ + poetry-core + ]; + + propagatedBuildInputs = [ + pysigma + ]; + + checkInputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ + "sigma.pipelines.windows" + ]; + + meta = with lib; { + description = "Library to support Windows service pipeline for pySigma"; + homepage = "https://github.com/SigmaHQ/pySigma-pipeline-windows"; + license = with licenses; [ lgpl21Only ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/pysigma/default.nix b/pkgs/development/python-modules/pysigma/default.nix index 1c7cd8ee299db..921de2e0c7e8e 100644 --- a/pkgs/development/python-modules/pysigma/default.nix +++ b/pkgs/development/python-modules/pysigma/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "pysigma"; - version = "0.4.5"; + version = "0.5.0"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "SigmaHQ"; repo = "pySigma"; rev = "v${version}"; - hash = "sha256-jZPimSkJ6qTs0kEMVhP9Gnxu0jxA0cmgdn5++CevgIM="; + hash = "sha256-HGF8Tu28ksIfaCKAbnJv6sDmoQrDDjteVLxbJN1HH3U="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/pysimplegui/default.nix b/pkgs/development/python-modules/pysimplegui/default.nix index d645a068d291c..31e40fcb12da3 100644 --- a/pkgs/development/python-modules/pysimplegui/default.nix +++ b/pkgs/development/python-modules/pysimplegui/default.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { pname = "pysimplegui"; - version = "4.57.0"; + version = "4.59.0"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "PySimpleGUI"; inherit version; - sha256 = "sha256-+Dcrv+esnthI74AFLK47sS2qI4sPvihuQlL54Zo32RM="; + sha256 = "sha256-GW6BwKQ36sSJNZXy7mlRW5hB5gjTUb08V33XqRNFT1E="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pyskyqremote/default.nix b/pkgs/development/python-modules/pyskyqremote/default.nix index e72e38b30cbaa..e7e52991f6e84 100644 --- a/pkgs/development/python-modules/pyskyqremote/default.nix +++ b/pkgs/development/python-modules/pyskyqremote/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "pyskyqremote"; - version = "0.3.5"; + version = "0.3.6"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -17,8 +17,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "RogerSelwyn"; repo = "skyq_remote"; - rev = version; - sha256 = "sha256-/BhNoU1dnZj07ZvG126srSb6eW00n8htFuDttq006QE="; + rev = "refs/tags/${version}"; + sha256 = "sha256-CCbLRb8eoMuYH3it2onfiUzHLW6sirePR/lqATpp4K0="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pyslurm/default.nix b/pkgs/development/python-modules/pyslurm/default.nix index f25651dcf98b2..248ccc41033ba 100644 --- a/pkgs/development/python-modules/pyslurm/default.nix +++ b/pkgs/development/python-modules/pyslurm/default.nix @@ -1,17 +1,27 @@ -{ lib, fetchFromGitHub, buildPythonPackage, cython, slurm }: +{ lib +, pythonOlder +, fetchFromGitHub +, buildPythonPackage +, cython +, slurm +}: buildPythonPackage rec { pname = "pyslurm"; - version = "19-05-0"; + version = "21.08.4"; + format = "setuptools"; + + disabled = pythonOlder "3.6"; src = fetchFromGitHub { repo = "pyslurm"; owner = "PySlurm"; - rev = version; - sha256 = "1lfb4q81y96syz5an1lzscfcvmfvlkf4cfl3i5zllw9r3gbarl2r"; + rev = "v${version}"; + hash = "sha256-9ZYTBO8g+5B9D8Ll5JjkJYFyh0RQNIjxg958UZoCNmA="; }; buildInputs = [ cython slurm ]; + setupPyBuildFlags = [ "--slurm-lib=${slurm}/lib" "--slurm-inc=${slurm.dev}/include" ]; # Test cases need /etc/slurm/slurm.conf and require a working slurm installation @@ -23,6 +33,5 @@ buildPythonPackage rec { license = licenses.gpl2; maintainers = with maintainers; [ bhipple ]; platforms = platforms.linux; - broken = true; # still needs slurm-19.05, but nixpkgs has slurm-20+ now }; } diff --git a/pkgs/development/python-modules/pysma/default.nix b/pkgs/development/python-modules/pysma/default.nix index 81fc1d5709e9a..efad8aaca9483 100644 --- a/pkgs/development/python-modules/pysma/default.nix +++ b/pkgs/development/python-modules/pysma/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "pysma"; - version = "0.6.10"; + version = "0.6.11"; format = "setuptools"; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - sha256 = "990abf6dba3f52b98970fc95aaf484e521faa9ff28c9c19f5a6dca3fddf5840c"; + sha256 = "sha256-x0sFJAdueSny0XoaOYbYLN8ZRS5B/iEVT62mqd4Voe4="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pysmappee/default.nix b/pkgs/development/python-modules/pysmappee/default.nix index c2322819ae459..ae9d5fa983040 100644 --- a/pkgs/development/python-modules/pysmappee/default.nix +++ b/pkgs/development/python-modules/pysmappee/default.nix @@ -1,25 +1,27 @@ { lib , buildPythonPackage -, fetchFromGitHub , cachetools +, fetchFromGitHub , paho-mqtt +, pythonOlder , pytz , requests -, requests_oauthlib +, requests-oauthlib , schedule -, pythonOlder }: buildPythonPackage rec { pname = "pysmappee"; version = "0.2.29"; + format = "setuptools"; + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "smappee"; repo = pname; rev = version; - sha256 = "sha256-Ffi55FZsZUKDcS4qV46NpRK3VP6axzrL2BO+hYW7J9E="; + hash = "sha256-Ffi55FZsZUKDcS4qV46NpRK3VP6axzrL2BO+hYW7J9E="; }; propagatedBuildInputs = [ @@ -27,14 +29,16 @@ buildPythonPackage rec { paho-mqtt pytz requests - requests_oauthlib + requests-oauthlib schedule ]; # Project has no tests doCheck = false; - pythonImportsCheck = [ "pysmappee" ]; + pythonImportsCheck = [ + "pysmappee" + ]; meta = with lib; { description = "Python Library for the Smappee dev API"; diff --git a/pkgs/development/python-modules/pysnmp-pyasn1/default.nix b/pkgs/development/python-modules/pysnmp-pyasn1/default.nix new file mode 100644 index 0000000000000..3caccf688b8c0 --- /dev/null +++ b/pkgs/development/python-modules/pysnmp-pyasn1/default.nix @@ -0,0 +1,41 @@ +{ lib +, buildPythonPackage +, pythonOlder +, fetchFromGitHub +, poetry-core +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "pysnmp-pyasn1"; + version = "1.1.2"; + format = "pyproject"; + + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "pysnmp"; + repo = "pyasn1"; + rev = "v${version}"; + hash = "sha256-R4reMwVcJBTfTEHUk6sSUugsEPuKIziH1WbjMakP/dA="; + }; + + nativeBuildInputs = [ + poetry-core + ]; + + checkInputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ + "pyasn1" + ]; + + meta = with lib; { + description = "Python ASN.1 encoder and decoder"; + homepage = "https://github.com/pysnmp/pyasn1"; + license = licenses.bsd2; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/pysnmp-pysmi/default.nix b/pkgs/development/python-modules/pysnmp-pysmi/default.nix new file mode 100644 index 0000000000000..0616a7c695e9f --- /dev/null +++ b/pkgs/development/python-modules/pysnmp-pysmi/default.nix @@ -0,0 +1,46 @@ +{ lib +, buildPythonPackage +, pythonOlder +, fetchFromGitHub +, ply +, poetry-core +, requests +}: + +buildPythonPackage rec { + pname = "pysnmp-pysmi"; + version = "1.1.8"; + format = "pyproject"; + + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "pysnmp"; + repo = "pysmi"; + rev = "v${version}"; + hash = "sha256-nsIEZPD7bfbePZukkudP0ZH/m8Be88QkVDM5PdjNHVk="; + }; + + nativeBuildInputs = [ + poetry-core + ]; + + propagatedBuildInputs = [ + ply + requests + ]; + + # Circular dependency with pysnmplib + doCheck = false; + + pythonImportsCheck = [ + "pysmi" + ]; + + meta = with lib; { + description = "SNMP MIB parser"; + homepage = "https://github.com/pysnmp/pysmi"; + license = licenses.bsd2; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/pysnmplib/default.nix b/pkgs/development/python-modules/pysnmplib/default.nix new file mode 100644 index 0000000000000..3c3333074a68c --- /dev/null +++ b/pkgs/development/python-modules/pysnmplib/default.nix @@ -0,0 +1,48 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, poetry-core +, pycryptodomex +, pysnmp-pyasn1 +, pysnmp-pysmi +, pythonOlder +}: + +buildPythonPackage rec { + pname = "pysnmplib"; + version = "5.0.10"; + format = "pyproject"; + + disabled = pythonOlder "3.8"; + + src = fetchFromGitHub { + owner = "pysnmp"; + repo = "pysnmp"; + rev = "v${version}"; + hash = "sha256-PsfsOVzeHCVdd1Bi+FYYi68Wzn1MI8dZUbRr/tmT+cA="; + }; + + nativeBuildInputs = [ + poetry-core + ]; + + propagatedBuildInputs = [ + pysnmp-pysmi + pysnmp-pyasn1 + pycryptodomex + ]; + + # Module has no test, examples are used for testing + doCheck = false; + + pythonImportsCheck = [ + "pysnmp" + ]; + + meta = with lib; { + description = "Implementation of v1/v2c/v3 SNMP engine"; + homepage = "https://github.com/pysnmp/pysnmp"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/pysnow/default.nix b/pkgs/development/python-modules/pysnow/default.nix index 1c9fccb706875..5baa9e9032159 100644 --- a/pkgs/development/python-modules/pysnow/default.nix +++ b/pkgs/development/python-modules/pysnow/default.nix @@ -1,56 +1,72 @@ { lib +, brotli , buildPythonPackage , fetchFromGitHub -, poetry -, brotli -, ijson -, nose +, fetchpatch , httpretty -, requests_oauthlib +, ijson +, poetry-core , python_magic , pytz +, pytestCheckHook +, requests-oauthlib }: buildPythonPackage rec { pname = "pysnow"; version = "0.7.16"; + format = "pyproject"; + - # tests not included in pypi tarball src = fetchFromGitHub { owner = "rbw"; repo = pname; rev = version; - sha256 = "0dj90w742klfcjnx7yhp0nzki2mzafqzzr0rk2dp6vxn8h58z8ww"; + hash = "sha256-nKOPCkS2b3ObmBnk/7FTv4o4vwUX+tOtZI5OQQ4HSTY="; }; - format = "pyproject"; - postPatch = '' - substituteInPlace pyproject.toml \ - --replace 'ijson = "^2.5.1"' 'ijson = "*"' \ - --replace 'pytz = "^2019.3"' 'pytz = "*"' \ - --replace 'oauthlib = "^3.1.0"' 'oauthlib = "*"' - ''; + nativeBuildInputs = [ + poetry-core + ]; - nativeBuildInputs = [ poetry ]; propagatedBuildInputs = [ brotli ijson python_magic pytz - requests_oauthlib + requests-oauthlib + ]; + + checkInputs = [ + httpretty + pytestCheckHook ]; - checkInputs = [ nose httpretty ]; - checkPhase = '' - nosetests --cover-package=pysnow --with-coverage --cover-erase + patches = [ + # Switch to peotry-core, https://github.com/rbw/pysnow/pull/183 + (fetchpatch { + name = "switch-to-poetry-core.patch"; + url = "https://github.com/rbw/pysnow/commit/f214a203432b329df5317f3a25b2c0d9b55a9029.patch"; + sha256 = "sha256-ViRR+9WStlaQwyrLGk/tMOUAcEMY+kB61ZEKGMQJ30o="; + }) + ]; + + postPatch = '' + substituteInPlace pyproject.toml \ + --replace 'ijson = "^2.5.1"' 'ijson = "*"' \ + --replace 'pytz = "^2019.3"' 'pytz = "*"' \ + --replace 'oauthlib = "^3.1.0"' 'oauthlib = "*"' ''; - pythonImportsCheck = [ "pysnow" ]; + + pythonImportsCheck = [ + "pysnow" + ]; meta = with lib; { description = "ServiceNow HTTP client library written in Python"; homepage = "https://github.com/rbw/pysnow"; license = licenses.mit; - maintainers = [ maintainers.almac ]; + maintainers = with maintainers; [ almac ]; }; } diff --git a/pkgs/development/python-modules/pyspark/default.nix b/pkgs/development/python-modules/pyspark/default.nix index 2e6f41aa23327..6acc5b3bf92f0 100644 --- a/pkgs/development/python-modules/pyspark/default.nix +++ b/pkgs/development/python-modules/pyspark/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "pyspark"; - version = "3.2.0"; + version = "3.2.1"; src = fetchPypi { inherit pname version; - sha256 = "bfea06179edbfb4bc76a0f470bd3c38e12f00e1023e3ad0373558d07cff102ab"; + sha256 = "sha256-C4E1kmLsbprHjDUzROfeAmAn0UDG3vlJ/w2Aq3D4mlQ="; }; # pypandoc is broken with pandoc2, so we just lose docs. @@ -18,7 +18,7 @@ buildPythonPackage rec { sed -i "s/'pypandoc'//" setup.py substituteInPlace setup.py \ - --replace py4j==0.10.9.2 'py4j>=0.10.9,<0.11' + --replace py4j==0.10.9.3 'py4j>=0.10.9,<0.11' ''; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pyspnego/default.nix b/pkgs/development/python-modules/pyspnego/default.nix index 561ec037c0a2a..563042091bf74 100644 --- a/pkgs/development/python-modules/pyspnego/default.nix +++ b/pkgs/development/python-modules/pyspnego/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "pyspnego"; - version = "0.3.1"; + version = "0.5.0"; disabled = pythonOlder "3.7"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "jborean93"; repo = pname; rev = "v${version}"; - sha256 = "sha256-f7CR7wMxHNNpxizV7MFCtWci3SSNvdx+W5i/rgOUSxY="; + sha256 = "sha256-CvPvyP7Vi2Ib+ikgUQt8JkVt5fxzapG590TgAehXqHE="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pytesseract/default.nix b/pkgs/development/python-modules/pytesseract/default.nix index 4aac6902ce3bb..13cfdaea214e1 100644 --- a/pkgs/development/python-modules/pytesseract/default.nix +++ b/pkgs/development/python-modules/pytesseract/default.nix @@ -1,8 +1,9 @@ -{ buildPythonPackage, fetchPypi, lib, pillow, tesseract, substituteAll, packaging }: +{ buildPythonPackage, fetchPypi, lib, packaging, pillow, tesseract, substituteAll }: buildPythonPackage rec { pname = "pytesseract"; version = "0.3.9"; + format = "pyproject"; src = fetchPypi { inherit pname version; @@ -16,8 +17,14 @@ buildPythonPackage rec { }) ]; - buildInputs = [ tesseract ]; - propagatedBuildInputs = [ pillow packaging ]; + buildInputs = [ + tesseract + ]; + + propagatedBuildInputs = [ + packaging + pillow + ]; # the package doesn't have any tests. doCheck = false; diff --git a/pkgs/development/python-modules/pytest-ansible/default.nix b/pkgs/development/python-modules/pytest-ansible/default.nix index 8285996170a22..ee8d7caf779ad 100644 --- a/pkgs/development/python-modules/pytest-ansible/default.nix +++ b/pkgs/development/python-modules/pytest-ansible/default.nix @@ -40,5 +40,7 @@ buildPythonPackage rec { description = "Plugin for py.test to simplify calling ansible modules from tests or fixtures"; license = licenses.mit; maintainers = [ maintainers.costrouc ]; + # https://github.com/ansible-community/pytest-ansible/blob/v2.2.4/setup.py#L124 + broken = lib.versionAtLeast ansible.version "2.10"; }; } diff --git a/pkgs/development/python-modules/pytest-astropy/default.nix b/pkgs/development/python-modules/pytest-astropy/default.nix index 9a3f46d476c2a..45ad26ab279e9 100644 --- a/pkgs/development/python-modules/pytest-astropy/default.nix +++ b/pkgs/development/python-modules/pytest-astropy/default.nix @@ -16,12 +16,12 @@ buildPythonPackage rec { pname = "pytest-astropy"; - version = "0.9.0"; + version = "0.10.0"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "7cdac1b2a5460f37477a329712c3a5d4af4ddf876b064731995663621be4308b"; + sha256 = "sha256-hePGbO7eTOZo9HOzzzd/yyqjxI4k8oqqN3roYATM4hE="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/pytest-asyncio/default.nix b/pkgs/development/python-modules/pytest-asyncio/default.nix index b8d3dffa3b0b9..8c368c50e32c8 100644 --- a/pkgs/development/python-modules/pytest-asyncio/default.nix +++ b/pkgs/development/python-modules/pytest-asyncio/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "pytest-asyncio"; - version = "0.18.0"; + version = "0.18.3"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "pytest-dev"; repo = pname; rev = "v${version}"; - hash = "sha256-PE66ogjfzj6cW3+UD5nZHSt6zg7b+j6Q4ACznE4j0j8="; + hash = "sha256-eopKlDKiTvGmqcqw44MKlhvSKswKZd/VDYRpZbuyOqM="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; @@ -29,17 +29,20 @@ buildPythonPackage rec { setuptools-scm ]; - propagatedBuildInputs = [ + buildInputs = [ pytest ]; checkInputs = [ flaky hypothesis - flaky pytestCheckHook ]; + disabledTestPaths = [ + "tests/trio" # pytest-trio causes infinite recursion + ]; + pythonImportsCheck = [ "pytest_asyncio" ]; @@ -47,6 +50,7 @@ buildPythonPackage rec { meta = with lib; { description = "Library for testing asyncio code with pytest"; homepage = "https://github.com/pytest-dev/pytest-asyncio"; + changelog = "https://github.com/pytest-dev/pytest-asyncio/blob/${src.rev}/CHANGELOG.rst"; license = licenses.asl20; maintainers = with maintainers; [ dotlambda ]; }; diff --git a/pkgs/development/python-modules/pytest-check/default.nix b/pkgs/development/python-modules/pytest-check/default.nix index 3498b9f8ab945..c690e01778b66 100644 --- a/pkgs/development/python-modules/pytest-check/default.nix +++ b/pkgs/development/python-modules/pytest-check/default.nix @@ -7,13 +7,13 @@ buildPythonPackage rec { pname = "pytest-check"; - version = "1.0.4"; + version = "1.0.5"; format = "flit"; src = fetchPypi { pname = "pytest_check"; inherit version; - sha256 = "c93eee5a98bcd28634a4ec657ab62c46d25fa384300811e5a925d9c4d98b9540"; + sha256 = "sha256-ucjbax3uPB5mFivQebgcCDKWy3Ex6YQVGcKKQIGKSHU="; }; buildInputs = [ pytest ]; diff --git a/pkgs/development/python-modules/pytest-cid/default.nix b/pkgs/development/python-modules/pytest-cid/default.nix index c1c918c4d60c2..767d300f7dd94 100644 --- a/pkgs/development/python-modules/pytest-cid/default.nix +++ b/pkgs/development/python-modules/pytest-cid/default.nix @@ -20,6 +20,11 @@ buildPythonPackage rec { sha256 = "sha256-H2RtMGYWukowTTfqZSx+hikxzkqw1v5bA4AfZfiVl8U="; }; + postPatch = '' + substituteInPlace pyproject.toml \ + --replace "pytest >= 5.0, < 7.0" "pytest >= 5.0" + ''; + propagatedBuildInputs = [ py-cid ]; diff --git a/pkgs/development/python-modules/pytest-describe/default.nix b/pkgs/development/python-modules/pytest-describe/default.nix new file mode 100644 index 0000000000000..7f5fbf3615975 --- /dev/null +++ b/pkgs/development/python-modules/pytest-describe/default.nix @@ -0,0 +1,40 @@ +{ lib +, buildPythonPackage +, fetchPypi + +# build +, pytest + +# tests +, pytestCheckHook +}: + +let + pname = "pytest-describe"; + version = "2.0.1"; +in +buildPythonPackage { + inherit pname version; + format = "setuptools"; + + src = fetchPypi { + inherit pname version; + hash = "sha256-5cuqMRafAGA0itXKAZECfl8fQfPyf97vIINl4JxV65o="; + }; + + buildInputs = [ + pytest + ]; + + checkInputs = [ + pytestCheckHook + ]; + + meta = with lib; { + description = "Describe-style plugin for the pytest framework"; + homepage = "https://github.com/pytest-dev/pytest-describe"; + changelog = "https://github.com/pytest-dev/pytest-describe/releases/tag/${version}"; + license = licenses.mit; + maintainers = with maintainers; [ hexa ]; + }; +} diff --git a/pkgs/development/python-modules/pytest-httpbin/default.nix b/pkgs/development/python-modules/pytest-httpbin/default.nix index 0069eb6f179ec..7dc70c49280f6 100644 --- a/pkgs/development/python-modules/pytest-httpbin/default.nix +++ b/pkgs/development/python-modules/pytest-httpbin/default.nix @@ -28,6 +28,12 @@ buildPythonPackage rec { six ]; + preCheck = '' + # Remove assertion that doesn't hold for Flask 2.1.0 + substituteInPlace tests/test_server.py \ + --replace "assert response.headers['Location'].startswith('https://')" "" + ''; + checkInputs = [ pytestCheckHook requests diff --git a/pkgs/development/python-modules/pytest-httpx/default.nix b/pkgs/development/python-modules/pytest-httpx/default.nix index 9536325ade513..569ac8606f6a1 100644 --- a/pkgs/development/python-modules/pytest-httpx/default.nix +++ b/pkgs/development/python-modules/pytest-httpx/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "pytest-httpx"; - version = "0.17.3"; + version = "0.20.0"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "Colin-b"; repo = "pytest_httpx"; rev = "v${version}"; - sha256 = "sha256-cJRzjNIN9Fc8vcjmndW+akjxDSp+wFahY2MEslgXIwM="; + sha256 = "sha256-9LDbVZgTmfyYAWylUy6Q4KH2gKpAa/o4IhqQV31BVgY="; }; buildInputs = [ diff --git a/pkgs/development/python-modules/pytest-isort/default.nix b/pkgs/development/python-modules/pytest-isort/default.nix index e628e6a158c51..234742f2e6d77 100644 --- a/pkgs/development/python-modules/pytest-isort/default.nix +++ b/pkgs/development/python-modules/pytest-isort/default.nix @@ -1,26 +1,64 @@ -{ lib, buildPythonPackage, fetchPypi, isPy27, mock, pytest, isort }: +{ lib +, buildPythonPackage +, fetchFromGitHub +, fetchpatch +, importlib-metadata +, isort +, poetry-core +, pytest +, pytestCheckHook +, pythonOlder +}: buildPythonPackage rec { pname = "pytest-isort"; - version = "2.0.0"; + version = "3.0.0"; + format = "pyproject"; - src = fetchPypi { - inherit pname version; - sha256 = "821a8c5c9c4f3a3c52cfa9c541fbe89ac9e28728125125af53724c4c3f129117"; + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "stephrdev"; + repo = pname; + rev = version; + hash = "sha256-gbEO3HBDeZ+nUACzpeV6iVuCdNHS5956wFzIYkbam+M="; }; - propagatedBuildInputs = [ isort ]; + nativeBuildInputs = [ + poetry-core + ]; + + buildInputs = [ + pytest + ]; + + propagatedBuildInputs = [ + isort + ] ++ lib.optionals (pythonOlder "3.8") [ + importlib-metadata + ]; + + checkInputs = [ + pytestCheckHook + ]; - checkInputs = [ pytest ] - ++ lib.optionals isPy27 [ mock ]; + patches = [ + # Can be removed with the next release, https://github.com/stephrdev/pytest-isort/pull/44 + (fetchpatch { + name = "switch-to-poetry-core.patch"; + url = "https://github.com/stephrdev/pytest-isort/commit/f17ed2d294ae90e415d051e1c720982e3dd01bff.patch"; + sha256 = "sha256-PiOs0c61BNx/tZN11DYblOd7tNzGthNnlkmYMTI9v18="; + }) + ]; - checkPhase = '' - py.test -vs --cache-clear - ''; + pythonImportsCheck = [ + "pytest_isort" + ]; meta = with lib; { description = "Pytest plugin to perform isort checks (import ordering)"; homepage = "https://github.com/moccu/pytest-isort/"; license = licenses.bsd3; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/development/python-modules/pytest-metadata/default.nix b/pkgs/development/python-modules/pytest-metadata/default.nix index 9f04cbe407d3b..057eb06ab3e06 100644 --- a/pkgs/development/python-modules/pytest-metadata/default.nix +++ b/pkgs/development/python-modules/pytest-metadata/default.nix @@ -1,13 +1,20 @@ -{ lib, buildPythonPackage, fetchPypi -, pytest, setuptools-scm }: +{ lib +, buildPythonPackage +, fetchPypi +, pytest +, pythonOlder +, setuptools-scm +}: buildPythonPackage rec { pname = "pytest-metadata"; - version = "1.11.0"; + version = "2.0.1"; + + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "71b506d49d34e539cc3cfdb7ce2c5f072bea5c953320002c95968e0238f8ecf1"; + sha256 = "sha256-XNtq7qi6kQkYHPnxScijrhQw/35EUGqPhmr4qYykYwE="; }; nativeBuildInputs = [ setuptools-scm ]; diff --git a/pkgs/development/python-modules/pytest-mock/default.nix b/pkgs/development/python-modules/pytest-mock/default.nix index 94db409be9184..837dec7c96d6d 100644 --- a/pkgs/development/python-modules/pytest-mock/default.nix +++ b/pkgs/development/python-modules/pytest-mock/default.nix @@ -1,5 +1,6 @@ { lib , buildPythonPackage +, fetchpatch , fetchPypi , pytest , pytest-asyncio @@ -16,6 +17,14 @@ buildPythonPackage rec { hash = "sha256-URK9ksyfGG7pbhqS78hJaepJSTnDrq05xQ9CHEzGlTQ="; }; + patches = [ + (fetchpatch { + # pytest7 compatbilitya + url = "https://github.com/pytest-dev/pytest-mock/commit/0577f1ad051fb8d0da94ea22dcb02346d74064b2.patch"; + hash = "sha256-eim4v7U8Mjigr462bXI0pKH/M0ANBzSRc0lT4RpbZ0w="; + }) + ]; + nativeBuildInputs = [ setuptools-scm ]; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pytest-mpl/default.nix b/pkgs/development/python-modules/pytest-mpl/default.nix index 747411ad74558..f0215ed7d7b2b 100644 --- a/pkgs/development/python-modules/pytest-mpl/default.nix +++ b/pkgs/development/python-modules/pytest-mpl/default.nix @@ -1,7 +1,9 @@ { lib , buildPythonPackage , fetchPypi +, setuptools-scm , pytest +, jinja2 , matplotlib , nose , pillow @@ -10,18 +12,25 @@ buildPythonPackage rec { pname = "pytest-mpl"; - version = "0.13"; + version = "0.15.0"; src = fetchPypi { inherit pname version; - sha256 = "582db6e14315f9b08cbd2df39b136dc344bfe8a27c2f05b995460fb0969ec19e"; + sha256 = "sha256-p5/UKLVoDYclp2o/MBb2oX1pHzxsQpHjmfwU1kFSKbw="; }; + nativeBuildInputs = [ + setuptools-scm + ]; + buildInputs = [ pytest ]; + SETUPTOOLS_SCM_PRETEND_VERSION=version; + propagatedBuildInputs = [ + jinja2 matplotlib nose pillow @@ -31,12 +40,18 @@ buildPythonPackage rec { pytestCheckHook ]; - # Broken since b6e98f18950c2b5dbdc725c1181df2ad1be19fee + disabledTests = [ + # Broken since b6e98f18950c2b5dbdc725c1181df2ad1be19fee "test_hash_fails" "test_hash_missing" ]; + disabledTestPaths = [ + # Following are broken since at least a1548780dbc79d76360580691dc1bb4af4e837f6 + "tests/subtests/test_subtest.py" + ]; + preCheck = '' export HOME=$(mktemp -d) mkdir -p $HOME/.config/matplotlib diff --git a/pkgs/development/python-modules/pytest-mypy/default.nix b/pkgs/development/python-modules/pytest-mypy/default.nix index 8c52fa2e69889..bec0ee59d0c5b 100644 --- a/pkgs/development/python-modules/pytest-mypy/default.nix +++ b/pkgs/development/python-modules/pytest-mypy/default.nix @@ -9,11 +9,11 @@ buildPythonPackage rec { pname = "pytest-mypy"; - version = "0.8.1"; + version = "0.9.1"; src = fetchPypi { inherit pname version; - sha256 = "1fa55723a4bf1d054fcba1c3bd694215a2a65cc95ab10164f5808afd893f3b11"; + sha256 = "sha256-n/o79AXBLFxr6ekuIr67arLJG5wy9FsPDJOvRzJpq1w="; }; nativeBuildInputs = [ setuptools-scm ]; diff --git a/pkgs/development/python-modules/pytest-pep257/default.nix b/pkgs/development/python-modules/pytest-pep257/default.nix deleted file mode 100644 index 827386786b795..0000000000000 --- a/pkgs/development/python-modules/pytest-pep257/default.nix +++ /dev/null @@ -1,20 +0,0 @@ -{ lib, buildPythonPackage, fetchPypi, pytest, pep257 }: - -buildPythonPackage rec { - pname = "pytest-pep257"; - version = "0.0.5"; - - src = fetchPypi { - inherit pname version; - sha256 = "082v3d5k4331x53za51kl8zxsndsw1pcyf1xdfpb2gjdjrhixb8w"; - }; - - buildInputs = [ pytest ]; - propagatedBuildInputs = [ pep257 ]; - - meta = with lib; { - homepage = "https://github.com/anderslime/pytest-pep257"; - description = "py.test plugin for PEP257"; - license = licenses.mit; - }; -} diff --git a/pkgs/development/python-modules/pytest-pythonpath/default.nix b/pkgs/development/python-modules/pytest-pythonpath/default.nix deleted file mode 100644 index 8c3fb48b430e6..0000000000000 --- a/pkgs/development/python-modules/pytest-pythonpath/default.nix +++ /dev/null @@ -1,26 +0,0 @@ -{ buildPythonPackage, fetchPypi, lib, pytest }: - -buildPythonPackage rec { - pname = "pytest-pythonpath"; - version = "0.7.4"; - - src = fetchPypi { - inherit pname version; - sha256 = "sha256-ZOGVsjqPjAxjH7Fogtmtb6QTftHylh3dFdUgZc1DXbY="; - }; - - buildInputs = [ pytest ]; - checkInputs = [ pytest ]; - - checkPhase = '' - pytest - ''; - - meta = with lib; { - description = - "Pytest plugin for adding to the PYTHONPATH from command line or configs"; - homepage = "https://github.com/bigsassy/pytest-pythonpath"; - maintainers = with maintainers; [ cript0nauta ]; - license = licenses.mit; - }; -} diff --git a/pkgs/development/python-modules/pytest-regressions/default.nix b/pkgs/development/python-modules/pytest-regressions/default.nix index 6866df7b71258..99099d3ac9247 100644 --- a/pkgs/development/python-modules/pytest-regressions/default.nix +++ b/pkgs/development/python-modules/pytest-regressions/default.nix @@ -15,14 +15,14 @@ buildPythonPackage rec { pname = "pytest-regressions"; - version = "2.3.0"; + version = "2.3.1"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "sha256-STWtZzbvhQ0NsSvl7jh0CjmYjmtRA/LTUQAAaze5Tg4="; + sha256 = "sha256-s+xM2zTo9idgYnXYuDTGXmDhowc+MmuzcnpCcnPQIh0="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; diff --git a/pkgs/development/python-modules/pytest-runner/default.nix b/pkgs/development/python-modules/pytest-runner/default.nix index d99f72299dd7d..baca23d774913 100644 --- a/pkgs/development/python-modules/pytest-runner/default.nix +++ b/pkgs/development/python-modules/pytest-runner/default.nix @@ -1,20 +1,29 @@ -{ lib, buildPythonPackage, fetchPypi, setuptools-scm, pytest }: +{ lib +, buildPythonPackage +, fetchPypi +, setuptools-scm +, pytest +}: buildPythonPackage rec { pname = "pytest-runner"; - version = "5.3.1"; + version = "6.0.0"; + format = "pyproject"; src = fetchPypi { inherit pname version; - sha256 = "0fce5b8dc68760f353979d99fdd6b3ad46330b6b1837e2077a89ebcf204aac91"; + sha256 = "sha256-tNhTYu0ptMNIZ43nl99Djw8FCUl924xkcJbAKm2HtoU="; }; - nativeBuildInputs = [ setuptools-scm pytest ]; - postPatch = '' rm pytest.ini ''; + nativeBuildInputs = [ + setuptools-scm + pytest + ]; + checkPhase = '' py.test tests ''; diff --git a/pkgs/development/python-modules/pytest-shutil/default.nix b/pkgs/development/python-modules/pytest-shutil/default.nix index e43a837d6aa4c..e3b2277fa99bb 100644 --- a/pkgs/development/python-modules/pytest-shutil/default.nix +++ b/pkgs/development/python-modules/pytest-shutil/default.nix @@ -1,6 +1,6 @@ { lib, isPyPy, buildPythonPackage, fetchPypi -, pytest, cmdline, pytest-cov, coverage, setuptools-git, mock, pathpy, execnet -, contextlib2, termcolor }: +, pytest, cmdline, pytest-cov, coverage, setuptools-git, mock, path, execnet +, contextlib2, termcolor, six }: buildPythonPackage rec { pname = "pytest-shutil"; @@ -11,9 +11,14 @@ buildPythonPackage rec { sha256 = "0q8j0ayzmnvlraml6i977ybdq4xi096djhf30n2m1rvnvrhm45nq"; }; + postPatch = '' + substituteInPlace setup.py \ + --replace "path.py" "path" + ''; + buildInputs = [ pytest ]; checkInputs = [ cmdline pytest ]; - propagatedBuildInputs = [ pytest-cov coverage setuptools-git mock pathpy execnet contextlib2 termcolor ]; + propagatedBuildInputs = [ pytest-cov coverage setuptools-git mock path execnet contextlib2 termcolor six ]; checkPhase = '' py.test ${lib.optionalString isPyPy "-k'not (test_run or test_run_integration)'"} diff --git a/pkgs/development/python-modules/pytest-snapshot/default.nix b/pkgs/development/python-modules/pytest-snapshot/default.nix index 34833bcc30a87..0d24f8fa202e5 100644 --- a/pkgs/development/python-modules/pytest-snapshot/default.nix +++ b/pkgs/development/python-modules/pytest-snapshot/default.nix @@ -5,18 +5,21 @@ , pytest , setuptools-scm , pytestCheckHook +, pythonOlder }: buildPythonPackage rec { pname = "pytest-snapshot"; - version = "0.8.1"; + version = "0.9.0"; format = "setuptools"; + disabled = pythonOlder "3.5"; + src = fetchFromGitHub { owner = "joseph-roitman"; repo = pname; - rev = "v${version}"; - sha256 = "sha256-ymB9h3Mc6GSMRsxIh6uuf111qLvIkNAnFsxR6O2SF7s="; + rev = "refs/tags/v${version}"; + sha256 = "sha256-0PZu9wL29iEppLxxbl4D0E4WfOHe61KUUld003cRBRU="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; diff --git a/pkgs/development/python-modules/pytest-socket/default.nix b/pkgs/development/python-modules/pytest-socket/default.nix index 1376d3e8412f8..bcd4abb4d4100 100644 --- a/pkgs/development/python-modules/pytest-socket/default.nix +++ b/pkgs/development/python-modules/pytest-socket/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "pytest-socket"; - version = "0.5.0"; + version = "0.5.1"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "miketheman"; repo = pname; rev = version; - hash = "sha256-HdGkpIHFsoAG2+8UyL9jSb3Dm8bWkYzREdY3i15ls/Q="; + hash = "sha256-QKHnuq2pqWMVUhF9nnhJggEK6SSyp6zBEfQX9tGND2E="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/pytest-subtests/default.nix b/pkgs/development/python-modules/pytest-subtests/default.nix index d5e379b524d5f..b1df1ceaad678 100644 --- a/pkgs/development/python-modules/pytest-subtests/default.nix +++ b/pkgs/development/python-modules/pytest-subtests/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "pytest-subtests"; - version = "0.6.0"; + version = "0.7.0"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "sha256-Pr0wao3PdRM/F0LyiMgvNkJuvPihMtTuiXgtIOhPwTo="; + sha256 = "sha256-lcRMd+P77emEi7iMqQs4SBX8uoCQ75qfVWWasWOxaBw="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/pytest-testmon/default.nix b/pkgs/development/python-modules/pytest-testmon/default.nix index 1b291778b2ad6..0f8d09e597d23 100644 --- a/pkgs/development/python-modules/pytest-testmon/default.nix +++ b/pkgs/development/python-modules/pytest-testmon/default.nix @@ -8,24 +8,19 @@ buildPythonPackage rec { pname = "pytest-testmon"; - version = "1.2.2"; + version = "1.3.1"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "e69d5aeac4e371986f94e8ad06e56d70633870d026f2306fca44051f02fcb688"; + sha256 = "sha256-6gWWCtm/GHknhjLyRdVf42koeaSKzk5/V0173DELmj0="; }; - propagatedBuildInputs = [ coverage ]; + propagatedBuildInputs = [ pytest coverage ]; - checkInputs = [ pytest ]; - - # avoid tests which try to import unittest_mixins - # unittest_mixins doesn't seem to be very active - checkPhase = '' - cd test - pytest test_{core,process_code,pytest_assumptions}.py - ''; + # The project does not include tests since version 1.3.0 + doCheck = false; + pythonImportsCheck = [ "testmon" ]; meta = with lib; { homepage = "https://github.com/tarpas/pytest-testmon/"; diff --git a/pkgs/development/python-modules/pytest-timeout/default.nix b/pkgs/development/python-modules/pytest-timeout/default.nix index f99340e48b3b2..e380068c59d35 100644 --- a/pkgs/development/python-modules/pytest-timeout/default.nix +++ b/pkgs/development/python-modules/pytest-timeout/default.nix @@ -9,12 +9,12 @@ buildPythonPackage rec { pname = "pytest-timeout"; - version = "2.0.2"; + version = "2.1.0"; format = "setuptools"; src = fetchPypi { inherit pname version; - sha256 = "e6f98b54dafde8d70e4088467ff621260b641eb64895c4195b6e5c8f45638112"; + sha256 = "sha256-wHygdATGEvirviIpSyPDaOLlEEtSHBeQGVVh834aw9k="; }; buildInputs = [ diff --git a/pkgs/development/python-modules/pytest-xdist/default.nix b/pkgs/development/python-modules/pytest-xdist/default.nix index fa1b0f63fabcd..b17b6f2f763a6 100644 --- a/pkgs/development/python-modules/pytest-xdist/default.nix +++ b/pkgs/development/python-modules/pytest-xdist/default.nix @@ -9,6 +9,7 @@ , pytest , pytest-forked , psutil +, pexpect }: buildPythonPackage rec { @@ -25,9 +26,15 @@ buildPythonPackage rec { buildInputs = [ pytest ]; - checkInputs = [ pytestCheckHook filelock ]; + checkInputs = [ pytestCheckHook filelock pexpect ]; propagatedBuildInputs = [ execnet pytest-forked psutil ]; + pytestFlagsArray = [ + # pytest can already use xdist at this point + "--numprocesses=$NIX_BUILD_CORES" + "--forked" + ]; + # access file system disabledTests = [ "test_distribution_rsyncdirs_example" @@ -40,6 +47,8 @@ buildPythonPackage rec { "test_internal_errors_propagate_to_controller" ]; + setupHook = ./setup-hook.sh; + meta = with lib; { description = "Pytest xdist plugin for distributed testing and loop-on-failing modes"; homepage = "https://github.com/pytest-dev/pytest-xdist"; diff --git a/pkgs/development/python-modules/pytest-xdist/setup-hook.sh b/pkgs/development/python-modules/pytest-xdist/setup-hook.sh new file mode 100644 index 0000000000000..5523a7f360f5f --- /dev/null +++ b/pkgs/development/python-modules/pytest-xdist/setup-hook.sh @@ -0,0 +1,18 @@ +pytestXdistHook() { + pytestFlagsArray+=( + "--numprocesses=$NIX_BUILD_CORES" + "--forked" + ) +} + +# the flags should be added before pytestCheckHook runs so +# until we have dependency mechanism in generic builder, we need to use this ugly hack. + +if [ -z "${dontUsePytestXdist-}" ] && [ -z "${dontUsePytestCheck-}" ]; then + if [[ " ${preDistPhases:-} " =~ " pytestCheckPhase " ]]; then + preDistPhases+=" " + preDistPhases="${preDistPhases/ pytestCheckPhase / pytestXdistHook pytestCheckPhase }" + else + preDistPhases+=" pytestXdistHook" + fi +fi diff --git a/pkgs/development/python-modules/pytest/default.nix b/pkgs/development/python-modules/pytest/default.nix index 0b1bb2b02030b..8c40c835feb02 100644 --- a/pkgs/development/python-modules/pytest/default.nix +++ b/pkgs/development/python-modules/pytest/default.nix @@ -1,56 +1,48 @@ -{ lib, buildPythonPackage, pythonOlder, fetchPypi, isPy3k, isPyPy -, pythonAtLeast, fetchpatch -, atomicwrites +{ lib +, buildPythonPackage +, pythonOlder +, fetchPypi +, isPyPy +, writeText + +# build +, setuptools-scm + +# propagates , attrs -, hypothesis , iniconfig -, more-itertools , packaging -, pathlib2 , pluggy , py +, tomli + +# tests +, hypothesis , pygments -, setuptools -, setuptools-scm -, six -, toml -, wcwidth -, writeText }: buildPythonPackage rec { pname = "pytest"; - version = "6.2.5"; - disabled = !isPy3k; + version = "7.1.1"; + format = "pyproject"; src = fetchPypi { inherit pname version; - sha256 = "131b36680866a76e6781d13f101efb86cf674ebb9762eb70d3082b6f29889e89"; + sha256 = "sha256-hBEyyu9rGtF6mv3kbcT2z6WaBflVWq5RUfc73yggymM="; }; - patches = lib.optionals (pythonAtLeast "3.10") [ - (fetchpatch { - # Fix test_errors_in_xfail_skip_expressions for Python 3.10.1, remove after 6.2.5 - url = "https://github.com/pytest-dev/pytest/commit/913439f5e5691f391e2969b3c8f0a49e50dce43a.patch"; - sha256 = "0hsl3lww6bx5k99cp8gj0fy9rg02kcfbwiiwjx2y8vbhwd5ns41p"; - }) + nativeBuildInputs = [ + setuptools-scm ]; - nativeBuildInputs = [ setuptools-scm ]; - propagatedBuildInputs = [ - atomicwrites attrs iniconfig - more-itertools packaging pluggy py - setuptools - six - toml - wcwidth - ] ++ lib.optionals (pythonOlder "3.6") [ pathlib2 ]; + tomli + ]; checkInputs = [ hypothesis @@ -59,17 +51,13 @@ buildPythonPackage rec { doCheck = !isPyPy; # https://github.com/pytest-dev/pytest/issues/3460 - preCheck = '' - # don't test bash builtins - rm testing/test_argcomplete.py - ''; - # Ignored file https://github.com/pytest-dev/pytest/pull/5605#issuecomment-522243929 # test_missing_required_plugins will emit deprecation warning which is treated as error checkPhase = '' runHook preCheck $out/bin/py.test -x testing/ \ --ignore=testing/test_junitxml.py \ + --ignore=testing/test_argcomplete.py \ -k "not test_collect_pyargs_with_testpaths and not test_missing_required_plugins" # tests leave behind unreproducible pytest binaries in the output directory, remove: @@ -95,7 +83,7 @@ buildPythonPackage rec { # - files are not needed after tests are finished pytestRemoveBytecodePhase () { # suffix is defined at: - # https://github.com/pytest-dev/pytest/blob/6.2.5/src/_pytest/assertion/rewrite.py#L51-L53 + # https://github.com/pytest-dev/pytest/blob/7.1.1/src/_pytest/assertion/rewrite.py#L51-L53 find $out -name "*-pytest-*.py[co]" -delete } preDistPhases+=" pytestRemoveBytecodePhase" diff --git a/pkgs/development/python-modules/python-barcode/default.nix b/pkgs/development/python-modules/python-barcode/default.nix new file mode 100644 index 0000000000000..7a586c2caed2a --- /dev/null +++ b/pkgs/development/python-modules/python-barcode/default.nix @@ -0,0 +1,48 @@ +{ lib +, buildPythonPackage +, fetchPypi +, pythonOlder +, setuptools-scm +, imagesSupport ? false +, pillow +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "python-barcode"; + version = "0.13.1"; + format = "setuptools"; + + disabled = pythonOlder "3.6"; + + src = fetchPypi { + inherit pname version; + sha256 = "sha256-+vukqiTp2Wl3e+UhwpT/GPbCs2rWO1/C8hCNly4jslI="; + }; + + propagatedBuildInputs = [ + setuptools-scm + ] ++ lib.optionals (imagesSupport) [ + pillow + ]; + + postPatch = '' + substituteInPlace setup.cfg \ + --replace "--cov=barcode" "" \ + --replace "--cov-report=term-missing:skip-covered" "" \ + --replace "--no-cov-on-fail" "" + ''; + + checkInputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ "barcode" ]; + + meta = with lib; { + description = "Create standard barcodes with Python"; + homepage = "https://github.com/WhyNotHugo/python-barcode"; + license = licenses.mit; + maintainers = with maintainers; [ wolfangaukang ]; + }; +} diff --git a/pkgs/development/python-modules/python-binance/default.nix b/pkgs/development/python-modules/python-binance/default.nix index cd1e09557ecb8..f5cd9b29f520e 100644 --- a/pkgs/development/python-modules/python-binance/default.nix +++ b/pkgs/development/python-modules/python-binance/default.nix @@ -14,14 +14,16 @@ buildPythonPackage rec { pname = "python-binance"; - version = "1.0.10"; + version = "1.0.16"; + format = "setuptools"; + disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "sammchardy"; repo = pname; - rev = "v${version}"; - sha256 = "09pq2blvky1ah4k8yc6zkp2g5nkn3awc52ad3lxvj6m33akfzxiv"; + rev = "refs/tags/v${version}"; + hash = "sha256-2v3qeykjQR/CUOC6F0Xomm49Q+wrYJS8vmL3+u6ew0M="; }; propagatedBuildInputs = [ @@ -44,7 +46,9 @@ buildPythonPackage rec { "tests/test_historical_klines.py" ]; - pythonImportsCheck = [ "binance" ]; + pythonImportsCheck = [ + "binance" + ]; meta = with lib; { description = "Binance Exchange API python implementation for automated trading"; diff --git a/pkgs/development/python-modules/python-daemon/default.nix b/pkgs/development/python-modules/python-daemon/default.nix index 074e5699e3d5a..cc12b14aa153e 100644 --- a/pkgs/development/python-modules/python-daemon/default.nix +++ b/pkgs/development/python-modules/python-daemon/default.nix @@ -51,6 +51,11 @@ buildPythonPackage rec { }) ]; + disabledTestPaths = [ + # requires removed distutils.command + "test_version.py" + ]; + disabledTests = [ "begin_with_TestCase" "changelog_TestCase" diff --git a/pkgs/development/python-modules/python-dbusmock/default.nix b/pkgs/development/python-modules/python-dbusmock/default.nix index 60e6f2e745526..378c58f02364f 100644 --- a/pkgs/development/python-modules/python-dbusmock/default.nix +++ b/pkgs/development/python-modules/python-dbusmock/default.nix @@ -5,13 +5,13 @@ buildPythonPackage rec { pname = "python-dbusmock"; - version = "0.25.0"; + version = "0.26.1"; src = fetchFromGitHub { owner = "martinpitt"; repo = pname; rev = version; - sha256 = "0zg2aib0k6hc1vvlbdcmp003m85dvkv7pndzgkc4vv2y9qpi0jp9"; + sha256 = "sha256-kavbWMTgKU/rBIo7RMs9NkwReYQyEdeFwMBSzEM9wa0="; }; prePatch = '' diff --git a/pkgs/development/python-modules/python-dotenv/default.nix b/pkgs/development/python-modules/python-dotenv/default.nix index 774ca6855aee3..d1b5d632b302c 100644 --- a/pkgs/development/python-modules/python-dotenv/default.nix +++ b/pkgs/development/python-modules/python-dotenv/default.nix @@ -11,12 +11,12 @@ buildPythonPackage rec { pname = "python-dotenv"; - version = "0.19.2"; + version = "0.20.0"; disabled = pythonOlder "3.5"; src = fetchPypi { inherit pname version; - sha256 = "a5de49a31e953b45ff2d2fd434bbc2670e8db5273606c1e737cc6b93eff3655f"; + sha256 = "sha256-t+OwSllpPELDb5qxzCrMRvpd+MeOF4/DOo1M0FyNSY8="; }; propagatedBuildInputs = [ click ]; diff --git a/pkgs/development/python-modules/python-family-hub-local/default.nix b/pkgs/development/python-modules/python-family-hub-local/default.nix new file mode 100644 index 0000000000000..01d9da8423ddd --- /dev/null +++ b/pkgs/development/python-modules/python-family-hub-local/default.nix @@ -0,0 +1,43 @@ +{ lib +, buildPythonPackage +, aiohttp +, async-timeout +, pillow +, fetchPypi +, pytestCheckHook +, pythonOlder +}: + +buildPythonPackage rec { + pname = "python-family-hub-local"; + version = "0.0.2"; + format = "setuptools"; + + disabled = pythonOlder "3.9"; + + src = fetchPypi { + inherit pname version; + extension = "zip"; + hash = "sha256-bbOBlUJ4g+HOcJihEBAz3lsHR9Gn07z8st14FRFeJbc="; + }; + + propagatedBuildInputs = [ + aiohttp + async-timeout + pillow + ]; + + # Module has no tests + doCheck = false; + + pythonImportsCheck = [ + "pyfamilyhublocal" + ]; + + meta = with lib; { + description = "Module to accesse information from Samsung FamilyHub fridges locally"; + homepage = "https://github.com/Klathmon/python-family-hub-local"; + license = licenses.asl20; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/python-glanceclient/default.nix b/pkgs/development/python-modules/python-glanceclient/default.nix index 754bac51ea682..3d290ae5eda5e 100644 --- a/pkgs/development/python-modules/python-glanceclient/default.nix +++ b/pkgs/development/python-modules/python-glanceclient/default.nix @@ -19,11 +19,11 @@ buildPythonApplication rec { pname = "python-glanceclient"; - version = "3.5.0"; + version = "3.6.0"; src = fetchPypi { inherit pname version; - sha256 = "417b9d814b43e62df4351f26a0d5569b801e9f99f7758bd8c82ef994c3629356"; + sha256 = "sha256-gi1IYtWJL2pltoKTRy5gsHTRwHlp0GHoBMbh1UP5g9o="; }; postPatch = '' diff --git a/pkgs/development/python-modules/python-google-nest/default.nix b/pkgs/development/python-modules/python-google-nest/default.nix index a1e612e1f74e4..3d086fa2684e9 100644 --- a/pkgs/development/python-modules/python-google-nest/default.nix +++ b/pkgs/development/python-modules/python-google-nest/default.nix @@ -2,7 +2,7 @@ , buildPythonPackage , fetchPypi , pythonOlder -, requests_oauthlib +, requests-oauthlib }: buildPythonPackage rec { @@ -14,11 +14,11 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "y3BOhorVkJ3rFPifNOopLMqk6y1fHX5vxHGiqWvWHhE="; + hash = "sha256-y3BOhorVkJ3rFPifNOopLMqk6y1fHX5vxHGiqWvWHhE="; }; propagatedBuildInputs = [ - requests_oauthlib + requests-oauthlib ]; # Project has no tests diff --git a/pkgs/development/python-modules/python-heatclient/default.nix b/pkgs/development/python-modules/python-heatclient/default.nix index 8ba5c7dd21fc8..d78682a8c66cf 100644 --- a/pkgs/development/python-modules/python-heatclient/default.nix +++ b/pkgs/development/python-modules/python-heatclient/default.nix @@ -22,11 +22,11 @@ buildPythonApplication rec { pname = "python-heatclient"; - version = "2.5.0"; + version = "2.5.1"; src = fetchPypi { inherit pname version; - sha256 = "b610748eb3f18f6bd762e0808accdf872308289a77c3b19ed2d8b9f306393a42"; + sha256 = "sha256-3l7XyxKm18BAM1DhNsCmRwcZR224+8m/jQ1YHrwLHCs="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/python-ironicclient/default.nix b/pkgs/development/python-modules/python-ironicclient/default.nix index c193cf7cd1ad9..83449a9285d3a 100644 --- a/pkgs/development/python-modules/python-ironicclient/default.nix +++ b/pkgs/development/python-modules/python-ironicclient/default.nix @@ -20,11 +20,11 @@ buildPythonApplication rec { pname = "python-ironicclient"; - version = "4.10.0"; + version = "4.11.0"; src = fetchPypi { inherit pname version; - sha256 = "8f3ad8ae1fc4df524ea05a458ad2567b58144e881807dbbb985e282902d732fd"; + sha256 = "sha256-zGG/3Cq7mARyuGGvqa4KGWFmx/UN+W2KMuy+RNenzXM="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/python-kasa/default.nix b/pkgs/development/python-modules/python-kasa/default.nix index 6adfbf5745d27..46ee0ad00fb2e 100644 --- a/pkgs/development/python-modules/python-kasa/default.nix +++ b/pkgs/development/python-modules/python-kasa/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "python-kasa"; - version = "0.4.2"; + version = "0.4.3"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -21,8 +21,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = pname; repo = pname; - rev = version; - sha256 = "sha256-5Ohks3yfqAAe+CiLEucibezmibl6TtktDXMHAhecXzA="; + rev = "refs/tags/${version}"; + sha256 = "sha256-r1PoOxFPA4zYFEpw+BakzDAJ13IMfcZpTJWkRt/q4go="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/python-logstash/default.nix b/pkgs/development/python-modules/python-logstash/default.nix index 55d3c60cd448a..7930dcd33e0a5 100644 --- a/pkgs/development/python-modules/python-logstash/default.nix +++ b/pkgs/development/python-modules/python-logstash/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "python-logstash"; - version = "0.4.6"; + version = "0.4.8"; src = fetchPypi { inherit pname version; - sha256 = "13763yx0k655y0c8gxv7jj6cqp45zypx2fmnc56jnn9zz1fkx50h"; + sha256 = "sha256-0E4c4R7MEH5KTzuAf8V9loEelkpVQIGzu7RHMvdO9fk="; }; # no tests diff --git a/pkgs/development/python-modules/python-manilaclient/default.nix b/pkgs/development/python-modules/python-manilaclient/default.nix index a2da2e4f4a761..09dc46ba9552c 100644 --- a/pkgs/development/python-modules/python-manilaclient/default.nix +++ b/pkgs/development/python-modules/python-manilaclient/default.nix @@ -22,11 +22,11 @@ buildPythonApplication rec { pname = "python-manilaclient"; - version = "3.2.0"; + version = "3.3.0"; src = fetchPypi { inherit pname version; - sha256 = "sha256-6iAed0mtEYHguYq4Rlh4YWT8E5hNqBYPcnG9/8RMspo="; + sha256 = "sha256-JFfkbJHmDQFbiWXw0Wp+0xSLyXowIHnsw7+5irZwhXo="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/python-miio/default.nix b/pkgs/development/python-modules/python-miio/default.nix index c1391995ddaa6..3cbc48c3cd65a 100644 --- a/pkgs/development/python-modules/python-miio/default.nix +++ b/pkgs/development/python-modules/python-miio/default.nix @@ -1,24 +1,24 @@ { lib +, android-backup +, appdirs +, attrs , buildPythonPackage -, pythonOlder -, fetchPypi -, poetry-core , click -, cryptography , construct -, zeroconf -, attrs -, pytz -, appdirs -, tqdm -, netifaces -, android-backup -, importlib-metadata , croniter +, cryptography , defusedxml -, pytestCheckHook +, fetchPypi +, importlib-metadata +, netifaces +, poetry-core , pytest-mock +, pytestCheckHook +, pythonOlder +, pytz , pyyaml +, tqdm +, zeroconf }: @@ -57,13 +57,16 @@ buildPythonPackage rec { ]; checkInputs = [ - pytestCheckHook pytest-mock + pytestCheckHook ]; postPatch = '' substituteInPlace pyproject.toml \ - --replace 'defusedxml = "^0"' 'defusedxml = "*"' \ + --replace 'defusedxml = "^0"' 'defusedxml = "*"' + # Will be fixed with the next release, https://github.com/rytilahti/python-miio/pull/1378 + substituteInPlace miio/integrations/vacuum/roborock/vacuum_cli.py \ + --replace "resultcallback" "result_callback" ''; pythonImportsCheck = [ diff --git a/pkgs/development/python-modules/python-pae/default.nix b/pkgs/development/python-modules/python-pae/default.nix new file mode 100644 index 0000000000000..067d2a2843e63 --- /dev/null +++ b/pkgs/development/python-modules/python-pae/default.nix @@ -0,0 +1,39 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, pythonOlder +, poetry-core +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "python-pae"; + version = "0.1.0"; + format = "pyproject"; + disabled = pythonOlder "3.7"; + + # Tests are on GitHub + src = fetchFromGitHub { + owner = "MatthiasValvekens"; + repo = "python-pae"; + rev = version; + sha256 = "sha256-D0X2T0ze79KR6Gno4UWpA/XvlkK6Y/jXUtLbzlOKr3E="; + }; + + nativeBuildInputs = [ + poetry-core + ]; + + checkInputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ "python_pae" ]; + + meta = with lib; { + description = "Pre-authentication encoding (PAE) implementation in Python"; + homepage = "https://github.com/MatthiasValvekens/python-pae"; + license = licenses.mit; + maintainers = with maintainers; [ wolfangaukang ]; + }; +} diff --git a/pkgs/development/python-modules/python-registry/default.nix b/pkgs/development/python-modules/python-registry/default.nix index fbf8df7f322d7..8b24ca08ff8bb 100644 --- a/pkgs/development/python-modules/python-registry/default.nix +++ b/pkgs/development/python-modules/python-registry/default.nix @@ -4,6 +4,7 @@ , fetchFromGitHub , pytestCheckHook , unicodecsv +, six }: buildPythonPackage rec { @@ -24,6 +25,7 @@ buildPythonPackage rec { checkInputs = [ pytestCheckHook + six ]; disabledTestPaths = [ diff --git a/pkgs/development/python-modules/python-slugify/default.nix b/pkgs/development/python-modules/python-slugify/default.nix index 16c4dc0f23085..2f22a20afb357 100644 --- a/pkgs/development/python-modules/python-slugify/default.nix +++ b/pkgs/development/python-modules/python-slugify/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "python-slugify"; - version = "6.1.0"; + version = "6.1.1"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-7/GQ5N+sl9L4wYkO5oJwns0jZQdCNhaH24LZXh5eJfU="; + hash = "sha256-AAAzl/TjFBTpIs5WezpNoozxQ2pT0zLJrutRx9jEaf0="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/python-smarttub/default.nix b/pkgs/development/python-modules/python-smarttub/default.nix index b41ddf01a8e9a..6770b589ce769 100644 --- a/pkgs/development/python-modules/python-smarttub/default.nix +++ b/pkgs/development/python-modules/python-smarttub/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "python-smarttub"; - version = "0.0.30"; + version = "0.0.31"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -21,8 +21,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "mdz"; repo = pname; - rev = "v${version}"; - sha256 = "sha256-PzmE0j/sas1Dc/U022dS3krROm292xJlL37+EWPEs+g="; + rev = "refs/tags/v${version}"; + sha256 = "sha256-tyE50HzwnrxXGWJ0+YRxCmSxtqrPnYmJzBH2ZDFJDZ4="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/python-snappy/default.nix b/pkgs/development/python-modules/python-snappy/default.nix index fe4d6ea7bda7d..397fcaa3dd0d1 100644 --- a/pkgs/development/python-modules/python-snappy/default.nix +++ b/pkgs/development/python-modules/python-snappy/default.nix @@ -4,35 +4,33 @@ , isPyPy , snappy , cffi -, nose +, python }: buildPythonPackage rec { pname = "python-snappy"; - version = "0.6.0"; + version = "0.6.1"; + format = "setuptools"; src = fetchPypi { inherit pname version; - sha256 = "06l9my361ig4x5ycyrmq33q83zcdib3y2zxfxv7k7dlpyp9ri2hn"; + sha256 = "sha256-tqEHqwYgasxTWdTFYyvZsi1EhwKnmzFpsMYuD7gIuyo="; }; buildInputs = [ snappy ]; propagatedBuildInputs = lib.optional isPyPy cffi; - checkInputs = [ nose ]; - checkPhase = '' - rm -r snappy # prevent local snappy from being picked up - nosetests test_snappy.py - '' + lib.optionalString isPyPy '' - nosetests test_snappy_cffi.py + runHook preCheck + ${python.interpreter} -m unittest discover + runHook postCheck ''; meta = with lib; { description = "Python library for the snappy compression library from Google"; homepage = "https://github.com/andrix/python-snappy"; license = licenses.bsd3; - maintainers = [ maintainers.costrouc ]; + maintainers = with maintainers; [ costrouc ]; }; } diff --git a/pkgs/development/python-modules/python-swiftclient/default.nix b/pkgs/development/python-modules/python-swiftclient/default.nix index cb3b5b850e36b..8c1e38ed45e07 100644 --- a/pkgs/development/python-modules/python-swiftclient/default.nix +++ b/pkgs/development/python-modules/python-swiftclient/default.nix @@ -10,11 +10,11 @@ buildPythonApplication rec { pname = "python-swiftclient"; - version = "3.13.0"; + version = "3.13.1"; src = fetchPypi { inherit pname version; - sha256 = "b200dcfbc6842bd4cac29efd0ea9ef34d3b8625957472ba7aa3ae0242437e2cc"; + sha256 = "sha256-LSbJC2OS9r76f7sW/Np75Eqibiropb7icF0dHIE4M/A="; }; propagatedBuildInputs = [ pbr python-keystoneclient ]; diff --git a/pkgs/development/python-modules/python-twitter/default.nix b/pkgs/development/python-modules/python-twitter/default.nix index f6814a8d0fda7..79d262a8b02a9 100644 --- a/pkgs/development/python-modules/python-twitter/default.nix +++ b/pkgs/development/python-modules/python-twitter/default.nix @@ -2,20 +2,23 @@ , buildPythonPackage , fetchFromGitHub , fetchpatch -, pytest-runner +, filetype , future +, hypothesis +, pytestCheckHook +, pythonOlder , requests +, requests-oauthlib , responses -, requests_oauthlib -, pytest -, hypothesis }: buildPythonPackage rec { pname = "python-twitter"; version = "3.5"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; - # No tests in PyPi Tarball src = fetchFromGitHub { owner = "bear"; repo = pname; @@ -31,12 +34,30 @@ buildPythonPackage rec { }) ]; - nativeBuildInputs = [ pytest-runner ]; - propagatedBuildInputs = [ future requests requests_oauthlib ]; - checkInputs = [ pytest responses hypothesis ]; + propagatedBuildInputs = [ + filetype + future + requests + requests-oauthlib + ]; + + checkInputs = [ + pytestCheckHook + responses + hypothesis + ]; + + postPatch = '' + substituteInPlace setup.py \ + --replace "'pytest-runner'" "" + ''; + + pythonImportsCheck = [ + "twitter" + ]; meta = with lib; { - description = "A Python wrapper around the Twitter API"; + description = "Python wrapper around the Twitter API"; homepage = "https://github.com/bear/python-twitter"; license = licenses.asl20; maintainers = [ maintainers.marsam ]; diff --git a/pkgs/development/python-modules/python-vagrant/default.nix b/pkgs/development/python-modules/python-vagrant/default.nix index 92ba757667daa..9984931e3a980 100644 --- a/pkgs/development/python-modules/python-vagrant/default.nix +++ b/pkgs/development/python-modules/python-vagrant/default.nix @@ -1,17 +1,22 @@ { lib, buildPythonPackage, fetchPypi }: buildPythonPackage rec { - version = "0.5.15"; + version = "1.0.0"; pname = "python-vagrant"; + format = "pyproject"; src = fetchPypi { inherit pname version; - sha256 = "1ikrh6canhcxg5y7pzmkcnnydikppv7s6sm9prfx90nk0ac8m6mg"; + sha256 = "sha256-qP6TzPL/N+zJXsL0nqdKkabOc6TbShapjdJtOXz9CeU="; }; # The tests try to connect to qemu doCheck = false; + pythonImportsCheck = [ + "vagrant" + ]; + meta = { description = "Python module that provides a thin wrapper around the vagrant command line executable"; homepage = "https://github.com/todddeluca/python-vagrant"; diff --git a/pkgs/development/python-modules/python3-saml/default.nix b/pkgs/development/python-modules/python3-saml/default.nix index a21ee97eca5db..dca35089f45fe 100644 --- a/pkgs/development/python-modules/python3-saml/default.nix +++ b/pkgs/development/python-modules/python3-saml/default.nix @@ -3,16 +3,21 @@ isodate, lxml, xmlsec, freezegun }: buildPythonPackage rec { pname = "python3-saml"; - version = "1.12.0"; + version = "1.14.0"; disabled = !isPy3k; src = fetchFromGitHub { owner = "onelogin"; repo = "python3-saml"; rev = "v${version}"; - sha256 = "sha256-VPUsjuo4FIes8ti0tkR0kT3J3RdUt1wtl4QEahVsc2c="; + sha256 = "sha256-TAfVXh1fSKhNn/lsi7elq4wFyKCxCtCYUTrnH3ytBTw="; }; + postPatch = '' + substituteInPlace setup.py \ + --replace "lxml<4.7.1" "lxml<5" + ''; + propagatedBuildInputs = [ isodate lxml xmlsec ]; diff --git a/pkgs/development/python-modules/pytibber/default.nix b/pkgs/development/python-modules/pytibber/default.nix index e2c788f1b3ebf..3b2d924695ace 100644 --- a/pkgs/development/python-modules/pytibber/default.nix +++ b/pkgs/development/python-modules/pytibber/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "pytibber"; - version = "0.22.1"; + version = "0.22.3"; format = "setuptools"; disabled = pythonOlder "3.9"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "Danielhiversen"; repo = "pyTibber"; rev = version; - hash = "sha256-kzKY9ixsAkfee5En0IzYl5izeXq3xY/8bc5Kz/qkE7U="; + hash = "sha256-tM8Uu/TpP5a7y+ePFko0bMoZJWG2efYA861Ez8dPeFY="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pytomlpp/default.nix b/pkgs/development/python-modules/pytomlpp/default.nix index 271d193ce019f..73c1987fb3c92 100644 --- a/pkgs/development/python-modules/pytomlpp/default.nix +++ b/pkgs/development/python-modules/pytomlpp/default.nix @@ -38,6 +38,14 @@ buildPythonPackage rec { # pelican requires > 2.7 doCheck = !pythonOlder "3.6"; + disabledTests = [ + # incompatible with pytest7 + # https://github.com/bobfang1992/pytomlpp/issues/66 + "test_loads_valid_toml_files" + "test_round_trip_for_valid_toml_files" + "test_decode_encode_binary" + ]; + preCheck = '' cd tests ''; diff --git a/pkgs/development/python-modules/pytomorrowio/default.nix b/pkgs/development/python-modules/pytomorrowio/default.nix new file mode 100644 index 0000000000000..2c695fc7e05a6 --- /dev/null +++ b/pkgs/development/python-modules/pytomorrowio/default.nix @@ -0,0 +1,38 @@ +{ lib +, buildPythonPackage +, pythonOlder +, fetchPypi +, aiohttp +, pytest-asyncio +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "pytomorrowio"; + version = "0.2.1"; + + disabled = pythonOlder "3.7"; + + src = fetchPypi { + inherit pname version; + sha256 = "aabb41436fb5834b687d73b334d95be07a18d5943d27a1fd06271b749558ba0e"; + }; + + propagatedBuildInputs = [ + aiohttp + ]; + + checkInputs = [ + pytest-asyncio + pytestCheckHook + ]; + + pythonImportsCheck = [ "pytomorrowio" ]; + + meta = { + description = "Async Python package to access the Tomorrow.io API"; + homepage = "https://github.com/raman325/pytomorrowio"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ dotlambda ]; + }; +} diff --git a/pkgs/development/python-modules/pytools/default.nix b/pkgs/development/python-modules/pytools/default.nix index 7dcd86705a35d..2ee74e64b0650 100644 --- a/pkgs/development/python-modules/pytools/default.nix +++ b/pkgs/development/python-modules/pytools/default.nix @@ -3,34 +3,36 @@ , fetchPypi , pythonOlder , decorator -, appdirs -, six , numpy -, pytest +, platformdirs +, pytestCheckHook }: buildPythonPackage rec { pname = "pytools"; - version = "2021.2.9"; + version = "2022.1.2"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "db6cf83c9ba0a165d545029e2301621486d1e9ef295684072e5cd75316a13755"; + sha256 = "sha256-XoJBAYgKJGNUdWNliAplu0FvaoyrZRO2j8u0j7oJD8s="; }; - checkInputs = [ pytest ]; - propagatedBuildInputs = [ decorator - appdirs - six numpy + platformdirs + ]; + + checkInputs = [ + pytestCheckHook ]; - checkPhase = '' - py.test -k 'not test_persistent_dict' - ''; + pythonImportsCheck = [ + "pytools" + "pytools.batchjob" + "pytools.lex" + ]; meta = { homepage = "https://github.com/inducer/pytools/"; diff --git a/pkgs/development/python-modules/pytorch-lightning/default.nix b/pkgs/development/python-modules/pytorch-lightning/default.nix index de75aa0ae8fbd..d3c9a96551591 100644 --- a/pkgs/development/python-modules/pytorch-lightning/default.nix +++ b/pkgs/development/python-modules/pytorch-lightning/default.nix @@ -6,12 +6,12 @@ , pytestCheckHook , pytorch , pyyaml -, tensorflow-tensorboard +, tensorboard , tqdm }: buildPythonPackage rec { pname = "pytorch-lightning"; - version = "1.5.8"; + version = "1.5.10"; disabled = isPy27; @@ -19,14 +19,14 @@ buildPythonPackage rec { owner = "PyTorchLightning"; repo = pname; rev = version; - sha256 = "161mz66l11z4350q93fmmq3x0jzbp5761lf4fx3yvz17qzp7ygkn"; + sha256 = "sha256-GP6/VZuRv8dS5wKQW7RbtOSa2vV9Af2Jp+ioEW3bIgc="; }; propagatedBuildInputs = [ future pytorch pyyaml - tensorflow-tensorboard + tensorboard tqdm ]; diff --git a/pkgs/development/python-modules/pytorch-metric-learning/default.nix b/pkgs/development/python-modules/pytorch-metric-learning/default.nix index e9728b3d676c5..64dfca2e94b03 100644 --- a/pkgs/development/python-modules/pytorch-metric-learning/default.nix +++ b/pkgs/development/python-modules/pytorch-metric-learning/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "pytorch-metric-learning"; - version = "1.1.0"; + version = "1.2.0"; disabled = isPy27; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "KevinMusgrave"; repo = pname; rev = "v${version}"; - sha256 = "0qvlxgdml22fzrs47yzqpfzak8lfdrzayvapawfz93cq8903h7qp"; + sha256 = "sha256-M/iH+pIuamOmvxLtKMzWXiuMCnMXzpVFRb/HfYfCKdc="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pytorch-pfn-extras/default.nix b/pkgs/development/python-modules/pytorch-pfn-extras/default.nix index 46bd35b9cfb85..c30f3bd5120d8 100644 --- a/pkgs/development/python-modules/pytorch-pfn-extras/default.nix +++ b/pkgs/development/python-modules/pytorch-pfn-extras/default.nix @@ -3,25 +3,32 @@ , lib , numpy , onnx +, packaging , pytestCheckHook , pytorch +, torchvision , typing-extensions }: buildPythonPackage rec { pname = "pytorch-pfn-extras"; - version = "0.5.6"; + version = "0.5.7"; src = fetchFromGitHub { owner = "pfnet"; repo = pname; rev = "v${version}"; - sha256 = "1ch4vhz3zjanj5advqsj51yy7idrp8yvydvcg4ymwa3wsfjrx58g"; + sha256 = "sha256-gB575ZKXZRAy5K5CkBtfG6KG1yQ9WDREIobsy43CEOc="; }; - propagatedBuildInputs = [ numpy pytorch typing-extensions ]; + propagatedBuildInputs = [ numpy packaging pytorch typing-extensions ]; - checkInputs = [ onnx pytestCheckHook ]; + checkInputs = [ onnx pytestCheckHook torchvision ]; + + # ignore all pytest warnings + preCheck = '' + rm pytest.ini + ''; pythonImportsCheck = [ "pytorch_pfn_extras" ]; @@ -29,6 +36,15 @@ buildPythonPackage rec { # Requires optuna which is currently (2022-02-16) marked as broken. "tests/pytorch_pfn_extras_tests/test_config_types.py" + # requires onnxruntime which was removed because of poor maintainability + # See https://github.com/NixOS/nixpkgs/pull/105951 https://github.com/NixOS/nixpkgs/pull/155058 + "tests/pytorch_pfn_extras_tests/onnx_tests/test_export.py" + "tests/pytorch_pfn_extras_tests/onnx_tests/test_torchvision.py" + "tests/pytorch_pfn_extras_tests/onnx_tests/utils.py" + + # RuntimeError: No Op registered for Gradient with domain_version of 9 + "tests/pytorch_pfn_extras_tests/onnx_tests/test_grad.py" + # Requires CUDA access which is not possible in the nix environment. "tests/pytorch_pfn_extras_tests/cuda_tests/test_allocator.py" "tests/pytorch_pfn_extras_tests/nn_tests/modules_tests/test_lazy_batchnorm.py" diff --git a/pkgs/development/python-modules/pytorch/bin.nix b/pkgs/development/python-modules/pytorch/bin.nix index 24533a08e4752..daa82bba580c7 100644 --- a/pkgs/development/python-modules/pytorch/bin.nix +++ b/pkgs/development/python-modules/pytorch/bin.nix @@ -76,6 +76,7 @@ in buildPythonPackage { # https://www.intel.com/content/www/us/en/developer/articles/license/onemkl-license-faq.html license = licenses.bsd3; platforms = platforms.linux ++ platforms.darwin; + hydraPlatforms = []; # output size 3.2G on 1.11.0 maintainers = with maintainers; [ junjihashimoto ]; }; } diff --git a/pkgs/development/python-modules/pytorch/breakpad-sigstksz.patch b/pkgs/development/python-modules/pytorch/breakpad-sigstksz.patch new file mode 100644 index 0000000000000..33a2304cb9b1a --- /dev/null +++ b/pkgs/development/python-modules/pytorch/breakpad-sigstksz.patch @@ -0,0 +1,13 @@ +diff --git a/third_party/breakpad/src/client/linux/handler/exception_handler.cc b/third_party/breakpad/src/client/linux/handler/exception_handler.cc +index ca353c4099..499be0a986 100644 +--- a/third_party/breakpad/src/client/linux/handler/exception_handler.cc ++++ b/third_party/breakpad/src/client/linux/handler/exception_handler.cc +@@ -138,7 +138,7 @@ void InstallAlternateStackLocked() { + // SIGSTKSZ may be too small to prevent the signal handlers from overrunning + // the alternative stack. Ensure that the size of the alternative stack is + // large enough. +- static const unsigned kSigStackSize = std::max(16384, SIGSTKSZ); ++ const unsigned kSigStackSize = std::max<unsigned>(16384, SIGSTKSZ); + + // Only set an alternative stack if there isn't already one, or if the current + // one is too small. diff --git a/pkgs/development/python-modules/pytorch/default.nix b/pkgs/development/python-modules/pytorch/default.nix index c370eaf6a9426..810460a30adea 100644 --- a/pkgs/development/python-modules/pytorch/default.nix +++ b/pkgs/development/python-modules/pytorch/default.nix @@ -1,5 +1,5 @@ -{ stdenv, lib, fetchFromGitHub, buildPythonPackage, python, - cudaSupport ? false, cudatoolkit, cudnn, nccl, magma, +{ stdenv, lib, fetchFromGitHub, fetchpatch, buildPythonPackage, python, + cudaSupport ? false, cudaPackages, magma, mklDnnSupport ? true, useSystemNccl ? true, MPISupport ? false, mpi, buildDocs ? false, @@ -12,7 +12,7 @@ numactl, # Propagated build inputs - dataclasses, numpy, pyyaml, cffi, click, typing-extensions, + numpy, pyyaml, cffi, click, typing-extensions, # Unit tests hypothesis, psutil, @@ -25,10 +25,14 @@ ninja, # dependencies for torch.utils.tensorboard - pillow, six, future, tensorflow-tensorboard, protobuf, + pillow, six, future, tensorboard, protobuf, isPy3k, pythonOlder }: +let + inherit (cudaPackages) cudatoolkit cudnn nccl; +in + # assert that everything needed for cuda is present and that the correct cuda versions are used assert !cudaSupport || (let majorIs = lib.versions.major cudatoolkit.version; in majorIs == "9" || majorIs == "10" || majorIs == "11"); @@ -117,9 +121,10 @@ let in buildPythonPackage rec { pname = "pytorch"; # Don't forget to update pytorch-bin to the same version. - version = "1.10.2"; + version = "1.11.0"; + format = "setuptools"; - disabled = !isPy3k; + disabled = pythonOlder "3.7.0"; outputs = [ "out" # output standard python package @@ -132,10 +137,15 @@ in buildPythonPackage rec { repo = "pytorch"; rev = "v${version}"; fetchSubmodules = true; - sha256 = "sha256-QcvoJqpZJXPSc9HLCJHetrp/hMESuC5kYl90d7Id0ZU="; + sha256 = "sha256-CEu63tdRBAF8CTchO3Qu8gUNObQylX6U08yDTI4/c/0="; }; - patches = lib.optionals stdenv.isDarwin [ + patches = [ + # Fix for a breakpad incompatibility with glibc>2.33 + # https://github.com/pytorch/pytorch/issues/70297 + # https://github.com/google/breakpad/commit/605c51ed96ad44b34c457bbca320e74e194c317e + ./breakpad-sigstksz.patch + ] ++ lib.optionals stdenv.isDarwin [ # pthreadpool added support for Grand Central Dispatch in April # 2020. However, this relies on functionality (DISPATCH_APPLY_AUTO) # that is available starting with macOS 10.13. However, our current @@ -144,13 +154,6 @@ in buildPythonPackage rec { ./pthreadpool-disable-gcd.diff ]; - # The dataclasses module is included with Python >= 3.7. This should - # be fixed with the next PyTorch release. - postPatch = '' - substituteInPlace setup.py \ - --replace "'dataclasses'" "'dataclasses; python_version < \"3.7\"'" - ''; - preConfigure = lib.optionalString cudaSupport '' export TORCH_CUDA_ARCH_LIST="${lib.strings.concatStringsSep ";" final_cudaArchList}" export CC=${cudatoolkit.cc}/bin/gcc CXX=${cudatoolkit.cc}/bin/g++ @@ -208,7 +211,7 @@ in buildPythonPackage rec { # https://github.com/pytorch/pytorch/issues/22346 # # Also of interest: pytorch ignores CXXFLAGS uses CFLAGS for both C and C++: - # https://github.com/pytorch/pytorch/blob/v1.2.0/setup.py#L17 + # https://github.com/pytorch/pytorch/blob/v1.11.0/setup.py#L17 NIX_CFLAGS_COMPILE = lib.optionals (blas.implementation == "mkl") [ "-Wno-error=array-bounds" ]; nativeBuildInputs = [ @@ -230,9 +233,8 @@ in buildPythonPackage rec { pyyaml typing-extensions # the following are required for tensorboard support - pillow six future tensorflow-tensorboard protobuf - ] ++ lib.optionals MPISupport [ mpi ] - ++ lib.optionals (pythonOlder "3.7") [ dataclasses ]; + pillow six future tensorboard protobuf + ] ++ lib.optionals MPISupport [ mpi ]; checkInputs = [ hypothesis ninja psutil ]; @@ -302,7 +304,7 @@ in buildPythonPackage rec { requiredSystemFeatures = [ "big-parallel" ]; passthru = { - inherit cudaSupport; + inherit cudaSupport cudaPackages; cudaArchList = final_cudaArchList; # At least for 1.10.2 `torch.fft` is unavailable unless BLAS provider is MKL. This attribute allows for easy detection of its availability. blasProvider = blas.provider; diff --git a/pkgs/development/python-modules/pytradfri/default.nix b/pkgs/development/python-modules/pytradfri/default.nix index e1c74b0846132..70f9acd0380fe 100644 --- a/pkgs/development/python-modules/pytradfri/default.nix +++ b/pkgs/development/python-modules/pytradfri/default.nix @@ -21,14 +21,17 @@ buildPythonPackage rec { hash = "sha256-12ol+2CnoPfkxmDGJJAkoafHGpQuWC4lh0N7lSvx2DE="; }; - propagatedBuildInputs = [ - aiocoap - dtlssocket - ]; + passthru.extras-require = { + async = [ + aiocoap + dtlssocket + ]; + }; checkInputs = [ pytestCheckHook - ]; + ] + ++ passthru.extras-require.async; pythonImportsCheck = [ "pytradfri" diff --git a/pkgs/development/python-modules/pyttsx3/default.nix b/pkgs/development/python-modules/pyttsx3/default.nix new file mode 100644 index 0000000000000..fc47623406027 --- /dev/null +++ b/pkgs/development/python-modules/pyttsx3/default.nix @@ -0,0 +1,24 @@ +{ lib, buildPythonPackage, fetchPypi, espeak-ng }: + +buildPythonPackage rec { + pname = "pyttsx3"; + version = "2.90"; + format = "wheel"; + + src = fetchPypi { + inherit pname version format; + sha256 = "a585b6d8cffc19bd92db1e0ccbd8aa9c6528dd2baa5a47045d6fed542a44aa19"; + dist = "py3"; + python = "py3"; + }; + + # This package has no tests + doCheck = false; + + meta = with lib; { + description = "Offline text-to-speech synthesis library"; + homepage = "https://github.com/nateshmbhat/pyttsx3"; + license = licenses.mpl20; + maintainers = [ maintainers.ethindp ]; + }; +} diff --git a/pkgs/development/python-modules/pytz/default.nix b/pkgs/development/python-modules/pytz/default.nix index f7f406e487cc7..27b18845804f9 100644 --- a/pkgs/development/python-modules/pytz/default.nix +++ b/pkgs/development/python-modules/pytz/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "pytz"; - version = "2021.3"; + version = "2022.1"; src = fetchPypi { inherit pname version; - sha256 = "acad2d8b20a1af07d4e4c9d2e9285c5ed9104354062f275f3fcd88dcef4f1326"; + sha256 = "sha256-HnYOL+aoFjvAs9mhnE+ENCr6Cir/6/qoSwG5eKAuyqc="; }; checkPhase = '' diff --git a/pkgs/development/python-modules/pyudev/default.nix b/pkgs/development/python-modules/pyudev/default.nix index 89cd50f085f67..24784afc842dc 100644 --- a/pkgs/development/python-modules/pyudev/default.nix +++ b/pkgs/development/python-modules/pyudev/default.nix @@ -4,11 +4,11 @@ buildPythonPackage rec { pname = "pyudev"; - version = "0.22.0"; + version = "0.23.2"; src = fetchPypi { inherit pname version; - sha256 = "0xmj6l08iih2js9skjqpv4w7y0dhxyg91zmrs6v5aa65gbmipfv9"; + sha256 = "sha256-Mq41hbMgpRvCg+CgQAD9iiVZnttEVB4vUDT2r+5dFcw="; }; postPatch = '' diff --git a/pkgs/development/python-modules/pyupgrade/default.nix b/pkgs/development/python-modules/pyupgrade/default.nix index 09c2c1ca7a69c..e2c48948b9784 100644 --- a/pkgs/development/python-modules/pyupgrade/default.nix +++ b/pkgs/development/python-modules/pyupgrade/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "pyupgrade"; - version = "2.31.1"; + version = "2.32.0"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "asottile"; repo = pname; rev = "v${version}"; - sha256 = "sha256-l4wF/I3wsA9nowIdLjNPUxCaTPBu5v5oPQ3oNbLh+/o="; + sha256 = "sha256-VSGi93R8O0LGKFBkWMclje64suOqq/Gf2vE2OHXLP5Q="; }; checkInputs = [ diff --git a/pkgs/development/python-modules/pyuv/default.nix b/pkgs/development/python-modules/pyuv/default.nix index 2d276c6dccab9..2f1870dd1c852 100644 --- a/pkgs/development/python-modules/pyuv/default.nix +++ b/pkgs/development/python-modules/pyuv/default.nix @@ -1,5 +1,6 @@ { lib , buildPythonPackage +, pythonAtLeast , fetchFromGitHub , libuv }: @@ -7,6 +8,7 @@ buildPythonPackage rec { pname = "pyuv"; version = "1.4.0"; + disabled = pythonAtLeast "3.10"; # https://github.com/saghul/pyuv/issues/273 src = fetchFromGitHub { owner = "saghul"; diff --git a/pkgs/development/python-modules/pyvcf/default.nix b/pkgs/development/python-modules/pyvcf/default.nix index 7c513617754fb..919477298b152 100644 --- a/pkgs/development/python-modules/pyvcf/default.nix +++ b/pkgs/development/python-modules/pyvcf/default.nix @@ -28,5 +28,6 @@ buildPythonPackage rec { vcf will attempt to parse the content of each record based on the data types specified in the meta-information lines ''; + broken = true; # uses the 2to3 feature, that got removed in setuptools 0.58 }; } diff --git a/pkgs/development/python-modules/pyverilog/default.nix b/pkgs/development/python-modules/pyverilog/default.nix index 8e41d26921fa9..115014a25bbb7 100644 --- a/pkgs/development/python-modules/pyverilog/default.nix +++ b/pkgs/development/python-modules/pyverilog/default.nix @@ -5,7 +5,6 @@ , jinja2 , ply , verilog -, pytest-pythonpath , pytestCheckHook }: @@ -32,8 +31,12 @@ buildPythonPackage rec { verilog ]; + preCheck = '' + substituteInPlace pytest.ini \ + --replace "python_paths" "pythonpath" + ''; + checkInputs = [ - pytest-pythonpath pytestCheckHook ]; diff --git a/pkgs/development/python-modules/pyvesync/default.nix b/pkgs/development/python-modules/pyvesync/default.nix index 96669c52634bd..45404c107fb1b 100644 --- a/pkgs/development/python-modules/pyvesync/default.nix +++ b/pkgs/development/python-modules/pyvesync/default.nix @@ -7,14 +7,14 @@ buildPythonPackage rec { pname = "pyvesync"; - version = "2.0.0"; + version = "2.0.2"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "sha256-+054tFirjMF3sGLRpTVCZ3V2KN627b57+fFl6GBMMcU="; + sha256 = "sha256-SsSzwuJvDbQ1AzF+q5bjOnFaR6M2UFixtlmk6sgjKOg="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pyvex/default.nix b/pkgs/development/python-modules/pyvex/default.nix index e3a810be91602..799271371c7b1 100644 --- a/pkgs/development/python-modules/pyvex/default.nix +++ b/pkgs/development/python-modules/pyvex/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "pyvex"; - version = "9.1.12332"; - format = "setuptools"; + version = "9.2.1"; + format = "pyproject"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-e1lruHgppQ8mJbTx6xsUDSkLCYQISqM9c1vsjdQU4eI="; + hash = "sha256-b6LZJmAyxklvZxvane19dK/kQfbLPjkk29RydiWMZCY="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pyvicare/default.nix b/pkgs/development/python-modules/pyvicare/default.nix index bd3daf7bfb0e2..379481953ee9c 100644 --- a/pkgs/development/python-modules/pyvicare/default.nix +++ b/pkgs/development/python-modules/pyvicare/default.nix @@ -1,11 +1,11 @@ { lib , buildPythonPackage , fetchFromGitHub -, pythonOlder -, requests_oauthlib -, simplejson , pkce , pytestCheckHook +, pythonOlder +, requests-oauthlib +, simplejson }: buildPythonPackage rec { @@ -25,7 +25,7 @@ buildPythonPackage rec { SETUPTOOLS_SCM_PRETEND_VERSION = version; propagatedBuildInputs = [ - requests_oauthlib + requests-oauthlib simplejson pkce ]; diff --git a/pkgs/development/python-modules/pyvips/default.nix b/pkgs/development/python-modules/pyvips/default.nix index b25d9d3b5ae44..3974767856677 100644 --- a/pkgs/development/python-modules/pyvips/default.nix +++ b/pkgs/development/python-modules/pyvips/default.nix @@ -1,23 +1,23 @@ -{ buildPythonPackage, fetchPypi, pytest-runner, pytestCheckHook, glib, vips, cffi -, pkg-config, pkgconfig, lib }: +{ buildPythonPackage, fetchFromGitHub, pytestCheckHook, glib, vips, cffi +, pkgconfig, lib }: buildPythonPackage rec { pname = "pyvips"; version = "2.1.16"; - src = fetchPypi { - inherit pname version; - sha256 = "654c03014a15f846786807a2ece6f525a8fec883d1c857742c8e37da149a81ed"; + src = fetchFromGitHub { + owner = "libvips"; + repo = "pyvips"; + rev = "v${version}"; + sha256 = "sha256-8CeQbx3f2i0lEU0wxPeUwHlUGtzOztzTOdFNjIDy8s0="; }; - nativeBuildInputs = [ pytest-runner pkgconfig pkg-config ]; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ glib vips ]; propagatedBuildInputs = [ cffi ]; - # tests are not included in pypi tarball - doCheck = false; checkInputs = [ pytestCheckHook ]; pythonImportsCheck = [ "pyvips" ]; diff --git a/pkgs/development/python-modules/pyvis/default.nix b/pkgs/development/python-modules/pyvis/default.nix index 498dba97b3254..f13e1bbac798f 100644 --- a/pkgs/development/python-modules/pyvis/default.nix +++ b/pkgs/development/python-modules/pyvis/default.nix @@ -6,25 +6,25 @@ , jinja2 , ipython , jsonpickle -, numpy }: +, numpy +}: buildPythonPackage rec { pname = "pyvis"; - version = "unstable-2021-04-29"; + version = "0.2.1"; - # We use unstable, as test are failing for 0.1.9 src = fetchFromGitHub { owner = "WestHealth"; repo = pname; - rev = "4c521302abf9725dcbe7f59962baf85360b2718d"; - sha256 = "sha256-DYbHQpxtSfiLbzmBGclym/ChM0WLBzSEC/3phDTtGY8="; + rev = "v${version}"; + sha256 = "sha256-cER5XYxnURzRLtrisWBu2kxtOiRqgaRTJYyaCMh2qqE="; }; patches = [ - # Remove when https://github.com/WestHealth/pyvis/pull/101 is merged. + # Fix test: https://github.com/WestHealth/pyvis/issues/138 (fetchpatch { - url = "https://github.com/WestHealth/pyvis/commit/158a34de45f970b17ffd746c6e705b89128e2445.patch"; - sha256 = "sha256-zK72nrnn5YLGNW6PKYUyHry5ORCdt1T1oH6n1X64DKg="; + url = "https://github.com/WestHealth/pyvis/commit/eaa24b882401e2e74353efa78bf4e71a880cfc47.patch"; + sha256 = "sha256-hyDypavoCM36SiuQda1U4FLUPdAjTIMtaeZ0KqfHKzI="; }) ]; diff --git a/pkgs/development/python-modules/pyvo/default.nix b/pkgs/development/python-modules/pyvo/default.nix new file mode 100644 index 0000000000000..715cf0196aa41 --- /dev/null +++ b/pkgs/development/python-modules/pyvo/default.nix @@ -0,0 +1,56 @@ +{ lib +, buildPythonPackage +, fetchPypi +, astropy +, pillow +, pythonOlder +, pytestCheckHook +, pytest-astropy +, requests +, requests-mock +, setuptools-scm +}: + +buildPythonPackage rec { + pname = "pyvo"; + version = "1.3"; + + disabled = pythonOlder "3.8"; # according to setup.cfg + + src = fetchPypi { + inherit pname version; + sha256 = "846a54a05a8ddb47a8c2cc3077434779b0e4ccc1b74a7a5408593cb673307d67"; + }; + + SETUPTOOLS_SCM_PRETEND_VERSION = version; + + nativeBuildInputs = [ + setuptools-scm + ]; + + propagatedBuildInputs = [ + astropy + requests + ]; + + checkInputs = [ + pillow + pytestCheckHook + pytest-astropy + requests-mock + ]; + + disabledTestPaths = [ + # touches network + "pyvo/dal/tests/test_datalink.py" + ]; + + pythonImportsCheck = [ "pyvo" ]; + + meta = with lib; { + description = "Astropy affiliated package for accessing Virtual Observatory data and services"; + homepage = "github.com/astropy/pyvo"; + license = licenses.bsd3; + maintainers = with maintainers; [ smaret ]; + }; +} diff --git a/pkgs/development/python-modules/pywavelets/default.nix b/pkgs/development/python-modules/pywavelets/default.nix index cbd7681c63f92..a85a59ff4ab65 100644 --- a/pkgs/development/python-modules/pywavelets/default.nix +++ b/pkgs/development/python-modules/pywavelets/default.nix @@ -10,12 +10,12 @@ buildPythonPackage rec { pname = "PyWavelets"; - version = "1.2.0"; + version = "1.3.0"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "6cbd69b047bb4e00873097472133425f5f08a4e6bc8b3f0ae709274d4d5e9a8d"; + sha256 = "sha256-y6qdYgUtna+Np2X8jnwww46iuOnhwYhBkT37SuxnHuU="; }; checkInputs = [ nose pytest ]; diff --git a/pkgs/development/python-modules/pywayland/default.nix b/pkgs/development/python-modules/pywayland/default.nix index 5be7042339093..d4fd8d28ae741 100644 --- a/pkgs/development/python-modules/pywayland/default.nix +++ b/pkgs/development/python-modules/pywayland/default.nix @@ -10,11 +10,11 @@ buildPythonPackage rec { pname = "pywayland"; - version = "0.4.11"; + version = "0.4.12"; src = fetchPypi { inherit pname version; - sha256 = "coUNrPcHLBDamgKiZ08ysg2maQ2wLRSijfNRblKMIZk="; + sha256 = "sha256-IAwBzV+wvQYgoJK1+GjAHm2aXWE2iVaMV2cduMtCkx8="; }; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/development/python-modules/pywbem/default.nix b/pkgs/development/python-modules/pywbem/default.nix index db7bd82b652b6..0547f3edd9386 100644 --- a/pkgs/development/python-modules/pywbem/default.nix +++ b/pkgs/development/python-modules/pywbem/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "pywbem"; - version = "1.4.0"; + version = "1.4.1"; src = fetchPypi { inherit pname version; - sha256 = "52f668f7ee1f03bdd80485692b648588b3e1909e2dc0754dceca497f5e9cf059"; + sha256 = "sha256-rYu75Kt+eVciwPJ/JlbJL8Zzp+BqFM0VGlDwMGRU0X4="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pywebview/default.nix b/pkgs/development/python-modules/pywebview/default.nix index 67f11ed291f5b..eaf4ae64a6538 100644 --- a/pkgs/development/python-modules/pywebview/default.nix +++ b/pkgs/development/python-modules/pywebview/default.nix @@ -2,24 +2,29 @@ , buildPythonPackage , fetchFromGitHub , importlib-resources +, proxy_tools +, pygobject3 , pyqtwebengine , pytest , pythonOlder , qt5 +, qtpy +, six , xvfb-run -, proxy_tools }: buildPythonPackage rec { pname = "pywebview"; - version = "3.5"; + version = "3.6.3"; + format = "setuptools"; + disabled = pythonOlder "3.5"; src = fetchFromGitHub { owner = "r0x0r"; repo = "pywebview"; rev = version; - sha256 = "sha256-+At/ToEylSPcLh/u2NHVTXQpMnw+2/afsevg5YAX/4c="; + hash = "sha256-qOLK4MHdpmcCazCNfojncD8XH7OJB2H/pIW5XAJAlDo="; }; nativeBuildInputs = [ @@ -29,10 +34,15 @@ buildPythonPackage rec { propagatedBuildInputs = [ pyqtwebengine proxy_tools - ] ++ lib.optionals (pythonOlder "3.7") [ importlib-resources ]; + six + ] ++ lib.optionals (pythonOlder "3.7") [ + importlib-resources + ]; checkInputs = [ + pygobject3 pytest + qtpy xvfb-run ]; @@ -54,11 +64,13 @@ buildPythonPackage rec { popd ''; - pythonImportsCheck = [ "webview" ]; + pythonImportsCheck = [ + "webview" + ]; meta = with lib; { - homepage = "https://github.com/r0x0r/pywebview"; description = "Lightweight cross-platform wrapper around a webview"; + homepage = "https://github.com/r0x0r/pywebview"; license = licenses.bsd3; maintainers = with maintainers; [ jojosch ]; }; diff --git a/pkgs/development/python-modules/pywlroots/default.nix b/pkgs/development/python-modules/pywlroots/default.nix index b4f23f71d7488..fdae8fdc10441 100644 --- a/pkgs/development/python-modules/pywlroots/default.nix +++ b/pkgs/development/python-modules/pywlroots/default.nix @@ -7,6 +7,7 @@ , libxkbcommon , libinput , pixman +, pythonOlder , udev , wlroots , wayland @@ -18,11 +19,14 @@ buildPythonPackage rec { pname = "pywlroots"; - version = "0.15.11"; + version = "0.15.13"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "sha256-L+59uf3/wqWnmWpqm8RAyIEarbj2Sdwf1Pbweh/z9C8="; + sha256 = "teZ8udox+4NefgA73gD5d6hPur/zjCapoMYPW36ax0s="; }; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/development/python-modules/qiskit-aer/default.nix b/pkgs/development/python-modules/qiskit-aer/default.nix index d7b195f1debf6..7fb67c5449bdc 100644 --- a/pkgs/development/python-modules/qiskit-aer/default.nix +++ b/pkgs/development/python-modules/qiskit-aer/default.nix @@ -30,7 +30,7 @@ buildPythonPackage rec { pname = "qiskit-aer"; - version = "0.10.3"; + version = "0.10.4"; format = "pyproject"; disabled = pythonOlder "3.6"; @@ -39,7 +39,7 @@ buildPythonPackage rec { owner = "Qiskit"; repo = "qiskit-aer"; rev = version; - sha256 = "sha256-COvJCj18qRNQJUXKrtlYJQGLjna44IgtNZeNVJJaIHg="; + sha256 = "sha256-mf+Pgw/daFkt1bvqSeYzlO/Sd2F2MtwZcLr+h1u+eb0="; }; postPatch = '' @@ -55,15 +55,14 @@ buildPythonPackage rec { cmake ninja scikit-build - pybind11 ]; buildInputs = [ blas catch2 + nlohmann_json fmt muparserx - nlohmann_json spdlog ]; @@ -71,6 +70,7 @@ buildPythonPackage rec { cvxpy cython # generates some cython files at runtime that need to be cython-ized numpy + pybind11 ]; preBuild = '' @@ -80,19 +80,18 @@ buildPythonPackage rec { dontUseCmakeConfigure = true; # *** Testing *** - pythonImportsCheck = [ "qiskit.providers.aer" "qiskit.providers.aer.backends.qasm_simulator" "qiskit.providers.aer.backends.controller_wrappers" # Checks C++ files built correctly. Only exists if built & moved to output ]; - # Slow tests disabledTests = [ - "test_snapshot" # TODO: these ~30 tests fail on setup due to pytest fixture issues? - "test_initialize_2" # TODO: simulations appear incorrect, off by >10%. - # These tests fail on cvxpy >= 1.1.15 + # these tests don't work with cvxpy >= 1.1.15 "test_clifford" "test_approx_random" + "test_snapshot" # TODO: these ~30 tests fail on setup due to pytest fixture issues? + "test_initialize_2" # TODO: simulations appear incorrect, off by >10%. + "test_pauli_error_2q_gate_from_string_1qonly" # these fail for some builds. Haven't been able to reproduce error locally. "test_kraus_gate_noise" diff --git a/pkgs/development/python-modules/qiskit-finance/default.nix b/pkgs/development/python-modules/qiskit-finance/default.nix index 1fc98361ad090..2c544d5a92ed5 100644 --- a/pkgs/development/python-modules/qiskit-finance/default.nix +++ b/pkgs/development/python-modules/qiskit-finance/default.nix @@ -33,6 +33,10 @@ buildPythonPackage rec { sha256 = "sha256-wnto3IqrJFAqIv6QAXe3BB9fvXQXe2fw/iUZe3+198M="; }; + postPatch = '' + substituteInPlace requirements.txt --replace "pandas<1.4.0" "pandas" + ''; + propagatedBuildInputs = [ fastdtw numpy diff --git a/pkgs/development/python-modules/qiskit-ibmq-provider/default.nix b/pkgs/development/python-modules/qiskit-ibmq-provider/default.nix index 0c8f74cf66dd7..ca2f9b22d835a 100644 --- a/pkgs/development/python-modules/qiskit-ibmq-provider/default.nix +++ b/pkgs/development/python-modules/qiskit-ibmq-provider/default.nix @@ -40,15 +40,15 @@ let in buildPythonPackage rec { pname = "qiskit-ibmq-provider"; - version = "0.18.3"; + version = "0.19.1"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "Qiskit"; repo = pname; - rev = version; - sha256 = "1n1w1lnq2xw94hhhn6kdvw8dqlxk5fxwpm8ng31gxbp1s3qgni17"; + rev = "refs/tags/${version}"; + sha256 = "sha256-VdGdaOxCwD2Qa0JCCDVZJtcjhmTssS/KgpcjoaPXYB8="; }; propagatedBuildInputs = [ @@ -58,6 +58,7 @@ buildPythonPackage rec { requests requests_ntlm websocket-client + websockets ] ++ lib.optionals withVisualization visualizationPackages; postPatch = '' @@ -72,12 +73,12 @@ buildPythonPackage rec { pproxy qiskit-aer vcrpy - websockets ] ++ lib.optionals (!withVisualization) visualizationPackages; pythonImportsCheck = [ "qiskit.providers.ibmq" ]; - # These disabled tests require internet connection, aren't skipped elsewhere disabledTests = [ + "test_coder_operators" # fails for some reason on nixos-21.05+ + # These disabled tests require internet connection, aren't skipped elsewhere "test_old_api_url" "test_non_auth_url" "test_non_auth_url_with_hub" diff --git a/pkgs/development/python-modules/qiskit-machine-learning/default.nix b/pkgs/development/python-modules/qiskit-machine-learning/default.nix index 511bc0b2a0bed..ad00a16a880ea 100644 --- a/pkgs/development/python-modules/qiskit-machine-learning/default.nix +++ b/pkgs/development/python-modules/qiskit-machine-learning/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { pname = "qiskit-machine-learning"; - version = "0.3.0"; + version = "0.3.1"; disabled = pythonOlder "3.6"; @@ -31,7 +31,7 @@ buildPythonPackage rec { owner = "qiskit"; repo = pname; rev = version; - sha256 = "0jycs18apnwrksarpwpmp7scndyx91vnv6fchil4jyx4kym8mnf9"; + sha256 = "sha256-8tnd6+tqofKuK/sBdqmClBtywHbu3VvwLjO9k4YoChA="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/qiskit-nature/default.nix b/pkgs/development/python-modules/qiskit-nature/default.nix index 2693daa6ead01..7b652c5072230 100644 --- a/pkgs/development/python-modules/qiskit-nature/default.nix +++ b/pkgs/development/python-modules/qiskit-nature/default.nix @@ -21,15 +21,15 @@ buildPythonPackage rec { pname = "qiskit-nature"; - version = "0.3.1"; + version = "0.3.2"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { - owner = "qiskit"; + owner = "Qiskit"; repo = pname; rev = version; - sha256 = "sha256-EkYppEOQGmRIxKC4ArXZb0b+p1gPGnP6AU8LbEbOpPo="; + sha256 = "sha256-BXUVRZ8X3OJiRexNXZsnvp+Yh8ARNYohYH49/IYFYM0="; }; propagatedBuildInputs = [ @@ -56,7 +56,7 @@ buildPythonPackage rec { ]; disabledTests = [ - "test_two_qubit_reduction" # unsure of failure reason. Might be related to recent cvxpy update? + "test_two_qubit_reduction" # failure cause unclear ]; meta = with lib; { diff --git a/pkgs/development/python-modules/qiskit-terra/default.nix b/pkgs/development/python-modules/qiskit-terra/default.nix index 1a5aa516c52d0..ca71de5dbbd6d 100644 --- a/pkgs/development/python-modules/qiskit-terra/default.nix +++ b/pkgs/development/python-modules/qiskit-terra/default.nix @@ -2,8 +2,8 @@ , pythonOlder , buildPythonPackage , fetchFromGitHub +, rustPlatform # Python requirements -, cython , dill , numpy , networkx @@ -14,6 +14,7 @@ , retworkx , scipy , scikit-quant ? null +, setuptools-rust , stevedore , symengine , sympy @@ -54,18 +55,24 @@ in buildPythonPackage rec { pname = "qiskit-terra"; - version = "0.19.2"; + version = "0.20.1"; - disabled = pythonOlder "3.6"; + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "qiskit"; repo = pname; rev = version; - sha256 = "sha256-P2QTdt1H9I5T/ONNoo7XEVnoHweOdq3p2NH3l3/yAn4="; + sha256 = "sha256-spKLPUlUXBmnIo/rnBPUFf72Vxd53xFhh409KzytpkI="; }; - nativeBuildInputs = [ cython ]; + nativeBuildInputs = [ setuptools-rust ] ++ (with rustPlatform; [ rust.rustc rust.cargo cargoSetupHook ]); + + cargoDeps = rustPlatform.fetchCargoTarball { + inherit src; + name = "${pname}-${version}"; + sha256 = "sha256-KNx7c5Jc1AWIpldMQ1AcWYuMb4W+yLY/cgB87hzPuVY="; + }; propagatedBuildInputs = [ dill @@ -96,7 +103,7 @@ buildPythonPackage rec { pythonImportsCheck = [ "qiskit" - "qiskit.transpiler.passes.routing.cython.stochastic_swap.swap_trial" + "qiskit.pulse" ]; disabledTestPaths = [ @@ -109,7 +116,10 @@ buildPythonPackage rec { ]; pytestFlagsArray = [ "--durations=10" ]; disabledTests = [ - "TestUnitarySynthesisPlugin" # uses unittest mocks for transpiler.run(), seems incompatible somehow w/ pytest infrastructure + "TestUnitarySynthesisPlugin" # use unittest mocks for transpiler.run(), seems incompatible somehow w/ pytest infrastructure + # matplotlib tests seems to fail non-deterministically + "TestMatplotlibDrawer" + "TestGraphMatplotlibDrawer" "test_copy" # assertNotIn doesn't seem to work as expected w/ pytest vs unittest # Flaky tests @@ -153,18 +163,14 @@ buildPythonPackage rec { "test_two_qubit_weyl_decomposition_ab0" "test_sample_counts_memory_superposition" "test_piecewise_polynomial_function" - "test_vqe_qasm" "test_piecewise_chebyshev_mutability" "test_bit_conditional_no_cregbundle" "test_gradient_wrapper2" "test_two_qubit_weyl_decomposition_abmb" "test_two_qubit_weyl_decomposition_abb" - "test_two_qubit_weyl_decomposition_aac" - "test_aqc" - "test_gradient" - "test_piecewise_polynomial_rotations_mutability" - "test_confidence_intervals_1" - "test_trotter_from_bound" + "test_vqe_qasm" + "test_dag_from_networkx" + "test_defaults_to_dict_46" ]; # Moves tests to $PACKAGEDIR/test. They can't be run from /build because of finding diff --git a/pkgs/development/python-modules/qiskit/default.nix b/pkgs/development/python-modules/qiskit/default.nix index aa81ba00a8cae..b3c15b1b3855c 100644 --- a/pkgs/development/python-modules/qiskit/default.nix +++ b/pkgs/development/python-modules/qiskit/default.nix @@ -28,15 +28,15 @@ in buildPythonPackage rec { pname = "qiskit"; # NOTE: This version denotes a specific set of subpackages. See https://qiskit.org/documentation/release_notes.html#version-history - version = "0.34.2"; + version = "0.36.1"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { - owner = "qiskit"; + owner = "Qiskit"; repo = "qiskit"; rev = version; - sha256 = "sha256-weL65IQs6vbjJiPJdaizU0ST6u9qDYb0LhTwC6yAdhY="; + sha256 = "sha256-cprFWWvYgfoJXvK0Xoi67BwOXQfz7XeHT/JbfErqblk="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/qtconsole/default.nix b/pkgs/development/python-modules/qtconsole/default.nix index 4cf9bd022daba..f9eecbe23a8e8 100644 --- a/pkgs/development/python-modules/qtconsole/default.nix +++ b/pkgs/development/python-modules/qtconsole/default.nix @@ -15,11 +15,11 @@ buildPythonPackage rec { pname = "qtconsole"; - version = "5.2.2"; + version = "5.3.0"; src = fetchPypi { inherit pname version; - sha256 = "8f9db97b27782184efd0a0f2d57ea3bd852d053747a2e442a9011329c082976d"; + sha256 = "sha256-jjUg/cdeRqvEzGz/7KFvomUnVBCbiug5+ijifR66ViU="; }; checkInputs = [ nose ] ++ lib.optionals isPy27 [mock]; diff --git a/pkgs/development/python-modules/qutip/default.nix b/pkgs/development/python-modules/qutip/default.nix index 8d19e360ca4d5..c1f078ecc1381 100644 --- a/pkgs/development/python-modules/qutip/default.nix +++ b/pkgs/development/python-modules/qutip/default.nix @@ -1,57 +1,69 @@ { lib, stdenv, fetchFromGitHub, buildPythonPackage, python, packaging, numpy -, cython, scipy, matplotlib, pytestCheckHook, pytest-rerunfailures }: +, cython, scipy, matplotlib, pytestCheckHook, pytest-rerunfailures +, doCheck ? false +}: -buildPythonPackage rec { - pname = "qutip"; - version = "4.6.3"; +let + self = buildPythonPackage rec { + pname = "qutip"; + version = "4.6.3"; - src = fetchFromGitHub { - owner = pname; - repo = pname; - rev = "v${version}"; - sha256 = "sha256-11K7Tl7PE98nM2vGsa+OKIJYu0Wmv8dT700PDt9RRVk="; - }; + src = fetchFromGitHub { + owner = pname; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-11K7Tl7PE98nM2vGsa+OKIJYu0Wmv8dT700PDt9RRVk="; + }; + + # QuTiP says it needs specific (old) Numpy versions. We overwrite them here + # as the tests work perfectly fine with up-to-date packages. + postPatch = '' + substituteInPlace setup.cfg --replace "numpy>=1.16.6,<1.20" "numpy>=1.16.6" + ''; + + # Disabling OpenMP support on Darwin. + setupPyGlobalFlags = lib.optional (!stdenv.isDarwin) "--with-openmp"; + + propagatedBuildInputs = [ + packaging + numpy + cython + scipy + matplotlib + ]; + + checkInputs = [ + pytestCheckHook + pytest-rerunfailures + ]; + + # test suite is very cpu intensive + inherit doCheck; + # - QuTiP tries to access the home directory to create an rc file for us. + # This of course fails and therefore, we provide a writable temp dir as HOME. + # - We need to go to another directory to run the tests from there. + # This is due to the Cython-compiled modules not being in the correct location + # of the source tree. + # - For running tests, see: + # https://qutip.org/docs/latest/installation.html#verifying-the-installation + checkPhase = '' + export OMP_NUM_THREADS=$NIX_BUILD_CORES + export HOME=$(mktemp -d) + mkdir -p test && cd test + ${python.interpreter} -c "import qutip.testing; qutip.testing.run()" + ''; + + pythonImportsCheck = [ "qutip" ]; + + passthru.tests = { + all-tests = self.override { doCheck = true; }; + }; - # QuTiP says it needs specific (old) Numpy versions. We overwrite them here - # as the tests work perfectly fine with up-to-date packages. - postPatch = '' - substituteInPlace setup.cfg --replace "numpy>=1.16.6,<1.20" "numpy>=1.16.6" - ''; - - # Disabling OpenMP support on Darwin. - setupPyGlobalFlags = lib.optional (!stdenv.isDarwin) "--with-openmp"; - - propagatedBuildInputs = [ - packaging - numpy - cython - scipy - matplotlib - ]; - - checkInputs = [ - pytestCheckHook - pytest-rerunfailures - ]; - - # - QuTiP tries to access the home directory to create an rc file for us. - # This of course fails and therefore, we provide a writable temp dir as HOME. - # - We need to go to another directory to run the tests from there. - # This is due to the Cython-compiled modules not being in the correct location - # of the source tree. - # - For running tests, see: - # https://qutip.org/docs/latest/installation.html#verifying-the-installation - checkPhase = '' - export OMP_NUM_THREADS=$NIX_BUILD_CORES - export HOME=$(mktemp -d) - mkdir -p test && cd test - ${python.interpreter} -c "import qutip.testing; qutip.testing.run()" - ''; - - meta = with lib; { - description = "Open-source software for simulating the dynamics of closed and open quantum systems"; - homepage = "https://qutip.org/"; - license = licenses.bsd3; - maintainers = [ maintainers.fabiangd ]; + meta = with lib; { + description = "Open-source software for simulating the dynamics of closed and open quantum systems"; + homepage = "https://qutip.org/"; + license = licenses.bsd3; + maintainers = [ maintainers.fabiangd ]; + }; }; -} +in self diff --git a/pkgs/development/python-modules/radio_beam/default.nix b/pkgs/development/python-modules/radio_beam/default.nix index 1fcf778a58cbc..bcb099887695d 100644 --- a/pkgs/development/python-modules/radio_beam/default.nix +++ b/pkgs/development/python-modules/radio_beam/default.nix @@ -3,14 +3,17 @@ , buildPythonPackage , setuptools-scm , astropy +, numpy +, scipy +, six , pytestCheckHook , pytest-doctestplus -, scipy }: buildPythonPackage rec { pname = "radio_beam"; version = "0.3.3"; + format = "pyproject"; src = fetchPypi { inherit version; @@ -22,9 +25,17 @@ buildPythonPackage rec { setuptools-scm ]; - propagatedBuildInputs = [ astropy ]; + propagatedBuildInputs = [ + astropy + numpy + scipy + six + ]; - checkInputs = [ pytestCheckHook pytest-doctestplus scipy ]; + checkInputs = [ + pytestCheckHook + pytest-doctestplus + ]; # Tests must be run in the build directory preCheck = '' diff --git a/pkgs/development/python-modules/rapidfuzz-capi/default.nix b/pkgs/development/python-modules/rapidfuzz-capi/default.nix new file mode 100644 index 0000000000000..b0235f1eda448 --- /dev/null +++ b/pkgs/development/python-modules/rapidfuzz-capi/default.nix @@ -0,0 +1,28 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +}: + +buildPythonPackage rec { + pname = "rapidfuzz-capi"; + version = "1.0.5"; + + src = fetchFromGitHub { + owner = "maxbachmann"; + repo = "rapidfuzz_capi"; + rev = "v${version}"; + hash = "sha256-0IvJl2JU/k1WbGPWRoucVGbVsEFNPHZT1ozEQAKQnPk="; + }; + + # upstream has no tests + doCheck = false; + + pythonImportsCheck = [ "rapidfuzz_capi" ]; + + meta = with lib; { + description = "C-API of RapidFuzz, which can be used to extend RapidFuzz from separate packages"; + homepage = "https://github.com/maxbachmann/rapidfuzz_capi"; + license = licenses.mit; + maintainers = with maintainers; [ dotlambda ]; + }; +} diff --git a/pkgs/development/python-modules/rapidfuzz/default.nix b/pkgs/development/python-modules/rapidfuzz/default.nix index 19ee86e93ab6d..45929e3c991d3 100644 --- a/pkgs/development/python-modules/rapidfuzz/default.nix +++ b/pkgs/development/python-modules/rapidfuzz/default.nix @@ -2,39 +2,63 @@ , buildPythonPackage , pythonOlder , fetchFromGitHub -, pytestCheckHook +, cmake +, cython_3 +, rapidfuzz-capi +, scikit-build +, jarowinkler +, numpy , hypothesis +, jarowinkler-cpp , pandas -, numpy +, pytestCheckHook +, rapidfuzz-cpp +, taskflow }: buildPythonPackage rec { pname = "rapidfuzz"; - version = "1.9.1"; + version = "2.0.11"; - disabled = pythonOlder "3.5"; + disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "maxbachmann"; repo = "RapidFuzz"; rev = "v${version}"; - fetchSubmodules = true; - sha256 = "sha256-aZqsQHrxmPqZARkqR1hWaj7XndOlCJjmWk1Cosx4skA="; + hash = "sha256-npmdnUMrmbHgUgqMxKBytgtL1weWw6BjVNmBkYSKNMw="; }; + nativeBuildInputs = [ + cmake + cython_3 + rapidfuzz-capi + scikit-build + ]; + + dontUseCmakeConfigure = true; + + buildInputs = [ + jarowinkler-cpp + rapidfuzz-cpp + taskflow + ]; + propagatedBuildInputs = [ + jarowinkler numpy ]; checkInputs = [ - pytestCheckHook hypothesis pandas + pytestCheckHook ]; - disabledTests = [ - "test_levenshtein_block" # hypothesis data generation too slow - ]; + preCheck = '' + # import from $out + rm -r rapidfuzz + ''; pythonImportsCheck = [ "rapidfuzz.fuzz" diff --git a/pkgs/development/python-modules/rasterio/default.nix b/pkgs/development/python-modules/rasterio/default.nix index 27d6d498c3470..8c73268e6b8de 100644 --- a/pkgs/development/python-modules/rasterio/default.nix +++ b/pkgs/development/python-modules/rasterio/default.nix @@ -1,31 +1,86 @@ -{ buildPythonPackage, lib, fetchFromGitHub, isPy3k -, cython, setuptools -, numpy, affine, attrs, cligj, click-plugins, snuggs, gdal -, pytest, pythonOlder, packaging, hypothesis, boto3 -, certifi, shapely +{ lib +, buildPythonPackage +, fetchFromGitHub +, pythonOlder + +# build time +, cython +, gdal + +# runtime +, affine +, attrs +, boto3 +, click +, click-plugins +, cligj +, matplotlib +, numpy +, snuggs + +# tests +, hypothesis +, packaging +, pytest-randomly +, pytestCheckHook +, shapely }: buildPythonPackage rec { pname = "rasterio"; - version = "1.2.10"; + version = "1.2.10"; # not x.y[ab]z, those are alpha/beta versions + format = "pyproject"; disabled = pythonOlder "3.6"; # Pypi doesn't ship the tests, so we fetch directly from GitHub src = fetchFromGitHub { - owner = "mapbox"; + owner = "rasterio"; repo = "rasterio"; rev = version; - sha256 = "sha256-xVGwQfQvxsqYihUYXENJAz9Qp9xBkhsGc/RheRTJxgo="; + hash = "sha256-xVGwQfQvxsqYihUYXENJAz9Qp9xBkhsGc/RheRTJxgo="; }; - checkInputs = [ boto3 pytest packaging hypothesis shapely ]; - nativeBuildInputs = [ cython gdal ]; - propagatedBuildInputs = [ certifi gdal numpy attrs affine cligj click-plugins snuggs setuptools ]; + nativeBuildInputs = [ + cython + gdal + ]; + + propagatedBuildInputs = [ + affine + attrs + boto3 + click + click-plugins + cligj + matplotlib + numpy + snuggs + ]; + + preCheck = '' + rm -rf rasterio + ''; + + checkInputs = [ + pytest-randomly + pytestCheckHook + packaging + hypothesis + shapely + ]; + + pytestFlagsArray = [ + "-m 'not network'" + ]; + + pythonImportsCheck = [ + "rasterio" + ]; meta = with lib; { description = "Python package to read and write geospatial raster data"; - license = licenses.bsd3; homepage = "https://rasterio.readthedocs.io/en/latest/"; + license = licenses.bsd3; maintainers = with maintainers; [ mredaelli ]; }; } diff --git a/pkgs/development/python-modules/rdflib/default.nix b/pkgs/development/python-modules/rdflib/default.nix index 73f170b90b1b6..1a587d8d61acd 100644 --- a/pkgs/development/python-modules/rdflib/default.nix +++ b/pkgs/development/python-modules/rdflib/default.nix @@ -2,16 +2,23 @@ , stdenv , buildPythonPackage , fetchFromGitHub -, html5lib +, pythonOlder + +# propagates , isodate -, networkx -, nose , pyparsing -, tabulate -, pandas + +# propagates <3.8 +, importlib-metadata + +# extras: networkx +, networkx + +# extras: html +, html5lib + +# tests , pytestCheckHook -, pythonOlder -, SPARQLWrapper }: buildPythonPackage rec { @@ -32,34 +39,37 @@ buildPythonPackage rec { isodate html5lib pyparsing - SPARQLWrapper + ] ++ lib.optionals (pythonOlder "3.8") [ + importlib-metadata ]; + passthru.extra-requires = { + html = [ + html5lib + ]; + networkx = [ + networkx + ]; + }; + checkInputs = [ - networkx - pandas - nose - tabulate pytestCheckHook - ]; + ] + ++ passthru.extra-requires.networkx + ++ passthru.extra-requires.html; pytestFlagsArray = [ # requires network access - "--deselect rdflib/__init__.py::rdflib" - "--deselect test/jsonld/test_onedotone.py::test_suite" + "--deselect=rdflib/__init__.py::rdflib" + "--deselect=test/jsonld/test_onedotone.py::test_suite" ]; disabledTests = [ # Requires network access - "api_key" - "BerkeleyDBTestCase" - "test_bad_password" "test_service" "testGuessFormatForParse" ] ++ lib.optional stdenv.isDarwin [ # Require loopback network access - "test_sparqlstore" - "test_sparqlupdatestore_mock" "TestGraphHTTP" ]; diff --git a/pkgs/development/python-modules/readme_renderer/default.nix b/pkgs/development/python-modules/readme_renderer/default.nix index 122c4fdf6653d..1c1ea480cd40c 100644 --- a/pkgs/development/python-modules/readme_renderer/default.nix +++ b/pkgs/development/python-modules/readme_renderer/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "readme-renderer"; - version = "34.0"; + version = "35.0"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -20,7 +20,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "readme_renderer"; inherit version; - sha256 = "sha256-37TRfyFwbRRfdHPgthyiRbpY6BDPmyIJpII5Z3+C5bA="; + sha256 = "sha256-pyeZms/CIvwh2CoS7UjJV8SYl4XlhlgHxlpIfSFndJc="; }; propagatedBuildInputs = [ @@ -43,6 +43,12 @@ buildPythonPackage rec { disabledTests = [ # https://github.com/pypa/readme_renderer/issues/221 "test_GFM_" + # Relies on old distutils behaviour removed by setuptools (TypeError: dist must be a Distribution instance) + "test_valid_rst" + "test_invalid_rst" + "test_malicious_rst" + "test_invalid_missing" + "test_invalid_empty" ]; pythonImportsCheck = [ diff --git a/pkgs/development/python-modules/readthedocs-sphinx-ext/default.nix b/pkgs/development/python-modules/readthedocs-sphinx-ext/default.nix index 74f1c05a20106..b71a675f6d8ef 100644 --- a/pkgs/development/python-modules/readthedocs-sphinx-ext/default.nix +++ b/pkgs/development/python-modules/readthedocs-sphinx-ext/default.nix @@ -9,11 +9,11 @@ buildPythonPackage rec { pname = "readthedocs-sphinx-ext"; - version = "2.1.4"; + version = "2.1.5"; src = fetchPypi { inherit pname version; - sha256 = "2ba023376057c6ba5d07b4fd016ec1d526f1b4fc5ad7a7ce7f0ed8a91dc54bbe"; + sha256 = "sha256-G/QuIOW3qUOJGnmM5cy5H9W6wiMLDBmdhTgMkhAHa3g="; }; propagatedBuildInputs = [ requests ]; diff --git a/pkgs/development/python-modules/redis/default.nix b/pkgs/development/python-modules/redis/default.nix index 0731487575b1a..b38975c9c6d67 100644 --- a/pkgs/development/python-modules/redis/default.nix +++ b/pkgs/development/python-modules/redis/default.nix @@ -4,36 +4,53 @@ , pythonOlder # propagates -, cryptography +, async-timeout , deprecated -, hiredis , importlib-metadata , packaging +, typing-extensions + +# extras: hiredis +, hiredis + +# extras: ocsp +, cryptography +, pyopenssl , requests }: buildPythonPackage rec { pname = "redis"; - version = "4.1.0"; + version = "4.2.1"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "sha256-IfCiO85weQkHbmuizgdsulm/9g0qsily4GR/32IP/kc="; + sha256 = "sha256-/kVROIEinb7mEGILnggXsfSMR7pjWHAyD9RKcSIEu90="; }; propagatedBuildInputs = [ - cryptography + async-timeout deprecated - hiredis packaging - requests + typing-extensions ] ++ lib.optionals (pythonOlder "3.8") [ importlib-metadata ]; + passthru.extras-require = { + hidredis = [ + hiredis + ]; + ocsp = [ + cryptography + pyopenssl + requests + ]; + }; + pythonImportsCheck = [ "redis" "redis.client" diff --git a/pkgs/development/python-modules/reedsolo/default.nix b/pkgs/development/python-modules/reedsolo/default.nix index d9dd54e29f433..44e2c3b9b4491 100644 --- a/pkgs/development/python-modules/reedsolo/default.nix +++ b/pkgs/development/python-modules/reedsolo/default.nix @@ -1,4 +1,10 @@ -{ lib, buildPythonPackage, fetchFromGitHub, cython, nose }: +{ lib +, buildPythonPackage +, fetchpatch +, fetchFromGitHub +, cython +, nose +}: buildPythonPackage rec { pname = "reedsolo"; @@ -8,11 +14,18 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "tomerfiliba"; repo = "reedsolomon"; - # https://github.com/tomerfiliba/reedsolomon/issues/28 - rev = "73926cdf81b39009bd6e46c8d49f3bbc0eaad4e4"; - sha256 = "03wrr0c32dsl7h9k794b8fwnyzklvmxgriy49mjvvd3val829cc1"; + rev = "v${version}"; + hash = "sha256-GUMdL5HclXxqMYasq9kUE7fCqOkjr1D20wjd/E+xPBk="; }; + patches = [ + (fetchpatch { + # python3.10 compat; https://github.com/tomerfiliba/reedsolomon/pull/38 + url = "https://github.com/tomerfiliba/reedsolomon/commit/63e5bd9fc3ca503990c212eb2c77c10589e6d6c3.patch"; + hash = "sha256-47g+jUsJEAyqGnlzRA1oSyc2XFPUOfH0EW+vcOJzsxI="; + }) + ]; + nativeBuildInputs = [ cython ]; checkInputs = [ nose ]; diff --git a/pkgs/development/python-modules/regex/default.nix b/pkgs/development/python-modules/regex/default.nix index 86e591eaf14f1..512a7162f0e3c 100644 --- a/pkgs/development/python-modules/regex/default.nix +++ b/pkgs/development/python-modules/regex/default.nix @@ -7,14 +7,14 @@ buildPythonPackage rec { pname = "regex"; - version = "2022.1.18"; + version = "2022.3.2"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-l/MtwDqAVKTEpatddh7Uhh6CiywgD+vU5GhXBppIORY="; + hash = "sha256-eeWvH/JYvA/gvdb2m8SuM5NaiY48vvu8zyLoiif6BTs="; }; checkPhase = '' diff --git a/pkgs/development/python-modules/renault-api/default.nix b/pkgs/development/python-modules/renault-api/default.nix index 2312078c5fc65..a2cfdd98d8450 100644 --- a/pkgs/development/python-modules/renault-api/default.nix +++ b/pkgs/development/python-modules/renault-api/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "renault-api"; - version = "0.1.10"; + version = "0.1.11"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "hacf-fr"; repo = pname; rev = "v${version}"; - sha256 = "sha256-PXycRRUrKIkU/MgQbW4BjvBhpEi6InY5jZHPw4Nyv2s="; + sha256 = "sha256-71UFVXfww3wgSO2qoRCuV80+33B91Bjl2+nuuCbQRLg="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/reportlab/default.nix b/pkgs/development/python-modules/reportlab/default.nix index 82d84dc26a974..35289d3b5d4bf 100644 --- a/pkgs/development/python-modules/reportlab/default.nix +++ b/pkgs/development/python-modules/reportlab/default.nix @@ -1,4 +1,5 @@ -{ buildPythonPackage +{ lib +, buildPythonPackage , fetchPypi , freetype , pillow @@ -11,11 +12,11 @@ let ft = freetype.overrideAttrs (oldArgs: { dontDisableStatic = true; }); in buildPythonPackage rec { pname = "reportlab"; - version = "3.6.5"; + version = "3.6.9"; src = fetchPypi { inherit pname version; - sha256 = "d8fe27ad312671c9347cf5997f7c1017833fac17233f33296281ba9fa0de189a"; + sha256 = "sha256-XQzDaCRWrSExUPbb/+fUfqtzfYCeUXwxYQM3a+VI+4Q="; }; checkInputs = [ glibcLocales ]; @@ -23,6 +24,9 @@ in buildPythonPackage rec { buildInputs = [ ft pillow ]; postPatch = '' + substituteInPlace setup.py \ + --replace "mif = findFile(d,'ft2build.h')" "mif = findFile('${lib.getDev ft}','ft2build.h')" + # Remove all the test files that require access to the internet to pass. rm tests/test_lib_utils.py rm tests/test_platypus_general.py diff --git a/pkgs/development/python-modules/requests-oauthlib/default.nix b/pkgs/development/python-modules/requests-oauthlib/default.nix index aed6576c90dfc..d42de957791e4 100644 --- a/pkgs/development/python-modules/requests-oauthlib/default.nix +++ b/pkgs/development/python-modules/requests-oauthlib/default.nix @@ -10,11 +10,11 @@ buildPythonPackage rec { pname = "requests-oauthlib"; - version = "1.3.0"; + version = "1.3.1"; src = fetchPypi { inherit pname version; - sha256 = "0smaxs5ixng4z0k6dsgmm6s972ka3p6a2ykdpnl23mqzlw0ic9ml"; + sha256 = "sha256-db6sSkeIHuuU1epdatMe+IhWr/4jMrmq+1LGRSzPDXo="; }; propagatedBuildInputs = [ oauthlib requests ]; diff --git a/pkgs/development/python-modules/requests/default.nix b/pkgs/development/python-modules/requests/default.nix index f5b021801f413..559ce70533ce5 100644 --- a/pkgs/development/python-modules/requests/default.nix +++ b/pkgs/development/python-modules/requests/default.nix @@ -1,4 +1,5 @@ { lib +, stdenv , brotli , brotlicffi , buildPythonPackage @@ -13,7 +14,6 @@ , pytest-mock , pytest-xdist , pytestCheckHook -, trustme , urllib3 }: @@ -31,21 +31,15 @@ buildPythonPackage rec { ./0001-Prefer-NixOS-Nix-default-CA-bundles-over-certifi.patch ]; - postPatch = '' - # Use latest idna - substituteInPlace setup.py \ - --replace ",<3" "" - ''; - propagatedBuildInputs = [ certifi idna urllib3 chardet - ] ++ lib.optionals (isPy3k) [ + ] ++ lib.optionals isPy3k [ brotlicffi charset-normalizer - ] ++ lib.optionals (isPy27) [ + ] ++ lib.optionals isPy27 [ brotli ]; @@ -54,7 +48,6 @@ buildPythonPackage rec { pytest-mock pytest-xdist pytestCheckHook - trustme ]; # AttributeError: 'KeywordMapping' object has no attribute 'get' @@ -74,6 +67,15 @@ buildPythonPackage rec { "test_use_proxy_from_environment" "TestRequests" "TestTimeout" + ] ++ lib.optionals (stdenv.isDarwin && stdenv.isAarch64) [ + # Fatal Python error: Aborted + "test_basic_response" + "test_text_response" + ]; + + disabledTestPaths = lib.optionals (stdenv.isDarwin && stdenv.isAarch64) [ + # Fatal Python error: Aborted + "tests/test_lowlevel.py" ]; pythonImportsCheck = [ diff --git a/pkgs/development/python-modules/responses/default.nix b/pkgs/development/python-modules/responses/default.nix index 95861bda181c9..7f9372dcdb719 100644 --- a/pkgs/development/python-modules/responses/default.nix +++ b/pkgs/development/python-modules/responses/default.nix @@ -1,6 +1,6 @@ { lib , buildPythonPackage -, fetchPypi +, fetchFromGitHub , pytest-localserver , pytestCheckHook , pythonOlder @@ -10,14 +10,16 @@ buildPythonPackage rec { pname = "responses"; - version = "0.18.0"; + version = "0.20.0"; format = "setuptools"; disabled = pythonOlder "3.7"; - src = fetchPypi { - inherit pname version; - hash = "sha256-OAytTBwdyULl6KjqrgtNTt9wj08BDbi3vPr60fzSVP8="; + src = fetchFromGitHub { + owner = "getsentry"; + repo = pname; + rev = version; + hash = "sha256-dhIKMQXBJfZGIanJN1bFmlr/FYL1UYgYKGYaSznKhZs="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/respx/default.nix b/pkgs/development/python-modules/respx/default.nix index 51d88446c0b5d..241f0f9e9da44 100644 --- a/pkgs/development/python-modules/respx/default.nix +++ b/pkgs/development/python-modules/respx/default.nix @@ -12,13 +12,13 @@ buildPythonPackage rec { pname = "respx"; - version = "0.19.1"; + version = "0.19.2"; src = fetchFromGitHub { owner = "lundberg"; repo = pname; rev = version; - sha256 = "134h9526md242p7ql0cpknqvkpd3fhxk2vridkvswg91f532w180"; + sha256 = "sha256-uNmSBJOQF4baq8AWzfwj0kinO19jr6Mp9Yblys/WmZs="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/restructuredtext_lint/default.nix b/pkgs/development/python-modules/restructuredtext_lint/default.nix index 01c7a5e78c62e..0033794ef4371 100644 --- a/pkgs/development/python-modules/restructuredtext_lint/default.nix +++ b/pkgs/development/python-modules/restructuredtext_lint/default.nix @@ -8,11 +8,11 @@ buildPythonPackage rec { pname = "restructuredtext_lint"; - version = "1.3.2"; + version = "1.4.0"; src = fetchPypi { inherit pname version; - sha256 = "d3b10a1fe2ecac537e51ae6d151b223b78de9fafdd50e5eb6b08c243df173c80"; + sha256 = "sha256-GyNcDJIjQatsUwOQiS656S+QubdQRgY+BHys+w8FDEU="; }; checkInputs = [ nose testtools ]; diff --git a/pkgs/development/python-modules/result/default.nix b/pkgs/development/python-modules/result/default.nix new file mode 100644 index 0000000000000..95fcc8295b224 --- /dev/null +++ b/pkgs/development/python-modules/result/default.nix @@ -0,0 +1,45 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "result"; + version = "0.7.0"; + + src = fetchFromGitHub { + owner = "rustedpy"; + repo = "result"; + rev = "v${version}"; + sha256 = "sha256-bEf3OJg6ksDvzZE7ezA58Q2FObb5V7BG8vkKtX284Jg="; + }; + + postPatch = '' + substituteInPlace pyproject.toml \ + --replace '"--flake8",' "" \ + --replace '"--tb=short",' "" \ + --replace '"--cov=result",' "" \ + --replace '"--cov=tests",' "" \ + --replace '"--cov-report=term",' "" \ + --replace '"--cov-report=xml",' "" + ''; + + checkInputs = [ + pytestCheckHook + ]; + + disabledTestPaths = [ + #TODO: figure out the failure "match o:" Invalid Syntax + "tests/test_pattern_matching.py" + ]; + + pythonImportsCheck = [ "result" ]; + + meta = with lib; { + description = "A simple Result type for Python 3 inspired by Rust, fully type annotated"; + homepage = "https://github.com/rustedpy/result"; + license = licenses.mit; + maintainers = [ maintainers.kvark ]; + }; +} diff --git a/pkgs/development/python-modules/rfc6555/default.nix b/pkgs/development/python-modules/rfc6555/default.nix index 5be65fee23951..e866df5d122e8 100644 --- a/pkgs/development/python-modules/rfc6555/default.nix +++ b/pkgs/development/python-modules/rfc6555/default.nix @@ -2,7 +2,7 @@ , buildPythonPackage , fetchFromGitHub , pytestCheckHook -, selectors2 +, pythonOlder }: buildPythonPackage rec { @@ -10,17 +10,15 @@ buildPythonPackage rec { version = "0.1.0"; format = "setuptools"; + disabled = pythonOlder "3.7"; + src = fetchFromGitHub { owner = "sethmlarson"; repo = pname; rev = "v${version}"; - sha256 = "Lmwgusc4EQlF0GHmMTUxWzUCjBk19cvurNwbOnT+1jM="; + hash = "sha256-Lmwgusc4EQlF0GHmMTUxWzUCjBk19cvurNwbOnT+1jM="; }; - propagatedBuildInputs = [ - selectors2 - ]; - checkInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/rich/default.nix b/pkgs/development/python-modules/rich/default.nix index f6194970adbd0..addc12b3637a4 100644 --- a/pkgs/development/python-modules/rich/default.nix +++ b/pkgs/development/python-modules/rich/default.nix @@ -3,7 +3,6 @@ , fetchFromGitHub , pythonOlder , CommonMark -, colorama , dataclasses , poetry-core , pygments @@ -13,26 +12,26 @@ buildPythonPackage rec { pname = "rich"; - version = "11.0.0"; + version = "12.2.0"; format = "pyproject"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { - owner = "willmcgugan"; + owner = "Textualize"; repo = pname; rev = "v${version}"; - sha256 = "0vkwar22rv1j6a3kqj3c016j0vnnha0kwi79fkd90ib1n501m7rn"; + sha256 = "02zypmnc9sijlipki0riywh82piamd3hlrl5xbg2bxlldnlnwx1d"; }; nativeBuildInputs = [ poetry-core ]; propagatedBuildInputs = [ CommonMark - colorama pygments - typing-extensions ] ++ lib.optional (pythonOlder "3.7") [ dataclasses + ] ++ lib.optional (pythonOlder "3.9") [ + typing-extensions ]; checkInputs = [ @@ -43,7 +42,7 @@ buildPythonPackage rec { meta = with lib; { description = "Render rich text, tables, progress bars, syntax highlighting, markdown and more to the terminal"; - homepage = "https://github.com/willmcgugan/rich"; + homepage = "https://github.com/Textualize/rich"; license = licenses.mit; maintainers = with maintainers; [ ris ]; }; diff --git a/pkgs/development/python-modules/ring-doorbell/default.nix b/pkgs/development/python-modules/ring-doorbell/default.nix index 968182f8535fd..bffa6fed7d122 100644 --- a/pkgs/development/python-modules/ring-doorbell/default.nix +++ b/pkgs/development/python-modules/ring-doorbell/default.nix @@ -1,31 +1,33 @@ { lib , buildPythonPackage , fetchPypi -, isPy3k , oauthlib , pytestCheckHook +, pythonOlder , pytz , requests , requests-mock -, requests_oauthlib +, requests-oauthlib }: buildPythonPackage rec { pname = "ring-doorbell"; version = "0.7.2"; - disabled = !isPy3k; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchPypi { pname = "ring_doorbell"; inherit version; - sha256 = "0a7e82abf27086843eb39c0279f5dfccea6751ff848560e67154ca6fbfa4ef2b"; + hash = "sha256-Cn6Cq/JwhoQ+s5wCefXfzOpnUf+EhWDmcVTKb7+k7ys="; }; propagatedBuildInputs = [ oauthlib pytz requests - requests_oauthlib + requests-oauthlib ]; checkInputs = [ @@ -33,11 +35,13 @@ buildPythonPackage rec { requests-mock ]; - pythonImportsCheck = [ "ring_doorbell" ]; + pythonImportsCheck = [ + "ring_doorbell" + ]; meta = with lib; { + description = "Python library to communicate with Ring Door Bell"; homepage = "https://github.com/tchellomello/python-ring-doorbell"; - description = "A Python library to communicate with Ring Door Bell (https://ring.com/)"; license = licenses.lgpl3Plus; maintainers = with maintainers; [ graham33 ]; }; diff --git a/pkgs/development/python-modules/ripser/default.nix b/pkgs/development/python-modules/ripser/default.nix index 6c510f577e466..5317b39f083af 100644 --- a/pkgs/development/python-modules/ripser/default.nix +++ b/pkgs/development/python-modules/ripser/default.nix @@ -1,5 +1,6 @@ { lib , buildPythonPackage +, fetchpatch , fetchPypi , pythonOlder , cython @@ -7,7 +8,7 @@ , scipy , scikit-learn , persim -, pytest +, pytestCheckHook }: buildPythonPackage rec { @@ -20,8 +21,11 @@ buildPythonPackage rec { sha256 = "335112a0f94532ccbe686db7826ee8d0714b32f65891abf92c0a02f3cb0fc5fd"; }; - checkInputs = [ - pytest + patches = [ + (fetchpatch { + url = "https://github.com/scikit-tda/ripser.py/commit/4baa248994cee9a65d710fac91809bad8ed4e5f1.patch"; + sha256 = "sha256-J/nxMOGOUiBueojJrUlAaXwktHDploYG/XL8/siF2kY="; + }) ]; propagatedBuildInputs = [ @@ -32,13 +36,15 @@ buildPythonPackage rec { persim ]; - checkPhase = '' + checkInputs = [ + pytestCheckHook + ]; + + preCheck = '' # specifically needed for darwin export HOME=$(mktemp -d) mkdir -p $HOME/.matplotlib echo "backend: ps" > $HOME/.matplotlib/matplotlibrc - - pytest ''; meta = with lib; { diff --git a/pkgs/development/python-modules/rjpl/default.nix b/pkgs/development/python-modules/rjpl/default.nix new file mode 100644 index 0000000000000..8d5cfbc92aae1 --- /dev/null +++ b/pkgs/development/python-modules/rjpl/default.nix @@ -0,0 +1,37 @@ +{ lib +, buildPythonPackage +, requests +, fetchPypi +, pythonOlder +}: + +buildPythonPackage rec { + pname = "rjpl"; + version = "0.3.6"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; + + src = fetchPypi { + inherit pname version; + hash = "sha256-GLNIpZuM3yuCnPyjBa8KjdaL5cFK8InluuY+LTCrimc="; + }; + + propagatedBuildInputs = [ + requests + ]; + + # Module has no tests + doCheck = false; + + pythonImportsCheck = [ + "rjpl" + ]; + + meta = with lib; { + description = "Library for interacting with the Rejseplanen API"; + homepage = "https://github.com/tomatpasser/python-rejseplanen"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/rns/default.nix b/pkgs/development/python-modules/rns/default.nix new file mode 100644 index 0000000000000..39496de24c09e --- /dev/null +++ b/pkgs/development/python-modules/rns/default.nix @@ -0,0 +1,43 @@ +{ lib +, buildPythonPackage +, cryptography +, fetchFromGitHub +, netifaces +, pyserial +, pythonOlder +}: + +buildPythonPackage rec { + pname = "rns"; + version = "0.3.4"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "markqvist"; + repo = "Reticulum"; + rev = version; + hash = "sha256-fpXbp0Tj22flco9Rg4JTWZes6oxY7FhvYD76jA3yVuE="; + }; + + propagatedBuildInputs = [ + cryptography + netifaces + pyserial + ]; + + # Module has no tests + doCheck = false; + + pythonImportsCheck = [ + "RNS" + ]; + + meta = with lib; { + description = "Cryptography-based networking stack for wide-area networks"; + homepage = "https://github.com/markqvist/Reticulum"; + license = licenses.mit; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/robotframework-tools/default.nix b/pkgs/development/python-modules/robotframework-tools/default.nix index 77a7fe13df99c..2c2fe3945b09a 100644 --- a/pkgs/development/python-modules/robotframework-tools/default.nix +++ b/pkgs/development/python-modules/robotframework-tools/default.nix @@ -3,7 +3,7 @@ , fetchPypi , robotframework , moretools -, pathpy +, path , six , zetup , modeled @@ -24,7 +24,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ robotframework moretools - pathpy + path six modeled ]; diff --git a/pkgs/development/python-modules/robotstatuschecker/default.nix b/pkgs/development/python-modules/robotstatuschecker/default.nix index 63e87609ac25b..74810c7761f53 100644 --- a/pkgs/development/python-modules/robotstatuschecker/default.nix +++ b/pkgs/development/python-modules/robotstatuschecker/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "robotframework"; repo = "statuschecker"; - rev = version; + rev = "refs/tags/v${version}"; sha256 = "0hy1390j3l4kkfna9x9xax4y5mqaa3hdndv3fiyg9wr5f7sx3wnz"; }; diff --git a/pkgs/development/python-modules/rova/default.nix b/pkgs/development/python-modules/rova/default.nix new file mode 100644 index 0000000000000..5f419615dd539 --- /dev/null +++ b/pkgs/development/python-modules/rova/default.nix @@ -0,0 +1,40 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, pytestCheckHook +, pythonOlder +, requests +}: + +buildPythonPackage rec { + pname = "rova"; + version = "0.3.0"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "GidoHakvoort"; + repo = pname; + rev = "v${version}"; + hash = "sha256-TLL9Ta+7Xd55hGTTXjc6CBMj+tW1LpFrprpsnGqZvkQ="; + }; + + propagatedBuildInputs = [ + requests + ]; + + # Module has no tests + doCheck = false; + + pythonImportsCheck = [ + "rova" + ]; + + meta = with lib; { + description = "Module to access for ROVA calendars"; + homepage = "https://github.com/GidoHakvoort/rova"; + license = licenses.mit; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/rtsp-to-webrtc/default.nix b/pkgs/development/python-modules/rtsp-to-webrtc/default.nix index 9cc4a85bee6a1..2c8fd9e40ba28 100644 --- a/pkgs/development/python-modules/rtsp-to-webrtc/default.nix +++ b/pkgs/development/python-modules/rtsp-to-webrtc/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "rtsp-to-webrtc"; - version = "0.5.0"; + version = "0.5.1"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "allenporter"; repo = "rtsp-to-webrtc-client"; rev = version; - hash = "sha256-ry6xNymWgkkvYXliVLUFOUiPz8gbCsQDrSuGmCaH4ZE="; + hash = "sha256-miMBN/8IO4v03mMoclCa3GFl6HCS3Sh6z2HOQ39MRZY="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/s3fs/default.nix b/pkgs/development/python-modules/s3fs/default.nix index d90d1052282dc..8582c0ac72923 100644 --- a/pkgs/development/python-modules/s3fs/default.nix +++ b/pkgs/development/python-modules/s3fs/default.nix @@ -8,11 +8,11 @@ buildPythonPackage rec { pname = "s3fs"; - version = "2022.1.0"; + version = "2022.2.0"; src = fetchPypi { inherit pname version; - sha256 = "6bafc1f6b4e935ea59512c0f38d5cb9c299dbbfe738e40c3d1de8f67b4ee1fd4"; + sha256 = "sha256-RhHQ9+QeW8nawwCQcOCtN9qHpC9t73W0gTwG9+QEpzg="; }; buildInputs = [ diff --git a/pkgs/development/python-modules/sabyenc3/default.nix b/pkgs/development/python-modules/sabyenc3/default.nix index 831680670d1fe..8b0b0a9e24480 100644 --- a/pkgs/development/python-modules/sabyenc3/default.nix +++ b/pkgs/development/python-modules/sabyenc3/default.nix @@ -6,14 +6,14 @@ buildPythonPackage rec { pname = "sabyenc3"; - version = "5.1.6"; + version = "5.1.7"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-DHHil9ZQsrKLgw5dje0Yo1J5FZAFrY1tn5y3mdBJHWg="; + hash = "sha256-pewB7JAQ/4KitGFrHX52Gn02my/bOcQCz79cwh6vElk="; }; # Tests are not included in pypi distribution diff --git a/pkgs/development/python-modules/sagemaker/default.nix b/pkgs/development/python-modules/sagemaker/default.nix index 80c4bd92a385a..dff960429fb15 100644 --- a/pkgs/development/python-modules/sagemaker/default.nix +++ b/pkgs/development/python-modules/sagemaker/default.nix @@ -17,14 +17,14 @@ buildPythonPackage rec { pname = "sagemaker"; - version = "2.75.1"; + version = "2.82.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "sha256-MN/F7TWaKsQpKMR7Pxx0Vam1+O+PFEJ/H5jLJh3zpe4="; + sha256 = "sha256-cQe4b5XpmaC9ZTanI9LKNTLw1HycxqaDCOuLfw/vBRY="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/samsungctl/default.nix b/pkgs/development/python-modules/samsungctl/default.nix index 174af9023512b..f917c265973af 100644 --- a/pkgs/development/python-modules/samsungctl/default.nix +++ b/pkgs/development/python-modules/samsungctl/default.nix @@ -1,4 +1,8 @@ -{ lib, buildPythonPackage, fetchPypi +{ lib +, buildPythonPackage +, fetchPypi + +# extra: websocket , websocket-client }: @@ -11,9 +15,12 @@ buildPythonPackage rec { sha256 = "0ipz3fd65rqkxlb02sql0awc3vnslrwb2pfrsnpfnf8bfgxpbh9g"; }; - propagatedBuildInputs = [ - websocket-client - ]; + passthru.extras-require = { + websocket = [ + websocket-client + ]; + # interactive_ui requires curses package + }; # no tests doCheck = false; diff --git a/pkgs/development/python-modules/samsungtvws/default.nix b/pkgs/development/python-modules/samsungtvws/default.nix index cd137b1547ea3..383841caffa43 100644 --- a/pkgs/development/python-modules/samsungtvws/default.nix +++ b/pkgs/development/python-modules/samsungtvws/default.nix @@ -1,25 +1,62 @@ -{ lib, buildPythonPackage, fetchPypi, isPy27 +{ lib +, buildPythonPackage +, fetchFromGitHub +, isPy27 + +# propagates: , requests , websocket-client + +# extras: async +, aiohttp +, websockets + +# extras: encrypted +, cryptography +, py3rijndael + +# tests +, aioresponses +, pytest-asyncio +, pytestCheckHook }: buildPythonPackage rec { pname = "samsungtvws"; version = "2.5.0"; + format = "setuptools"; disabled = isPy27; - src = fetchPypi { - inherit pname version; - sha256 = "sha256-AFCN1b80GZ24g3oWe1qqc72yWQy4+/sorL8zwOYM7vo="; + src = fetchFromGitHub { + owner = "xchwarze"; + repo = "samsung-tv-ws-api"; + rev = "v${version}"; + hash = "sha256-AimG5tyTRBETpivC2BwCuoR4o7y98YT6u5sogJlcmoo="; }; propagatedBuildInputs = [ - websocket-client requests + websocket-client ]; - # no tests - doCheck = false; + passthru.extras-require = { + async = [ + aiohttp + websockets + ]; + encrypted = [ + cryptography + py3rijndael + ]; + }; + + checkInputs = [ + aioresponses + pytest-asyncio + pytestCheckHook + ] + ++ passthru.extras-require.async + ++ passthru.extras-require.encrypted; pythonImportsCheck = [ "samsungtvws" ]; diff --git a/pkgs/development/python-modules/sanic-testing/default.nix b/pkgs/development/python-modules/sanic-testing/default.nix index 4bc446c2e1425..3fb60ebaa9e5c 100644 --- a/pkgs/development/python-modules/sanic-testing/default.nix +++ b/pkgs/development/python-modules/sanic-testing/default.nix @@ -1,11 +1,10 @@ { lib , buildPythonPackage , fetchFromGitHub -, pytestCheckHook , httpx -, pytest-asyncio , sanic , websockets +, callPackage }: buildPythonPackage rec { @@ -19,11 +18,14 @@ buildPythonPackage rec { sha256 = "17fbb78gvic5s9nlcgwj817fq1f9j9d1d7z6n2ahhinmvyzl9gc8"; }; + outputs = [ + "out" + "testsout" + ]; + postPatch = '' - # https://github.com/sanic-org/sanic-testing/issues/19 substituteInPlace setup.py \ - --replace '"websockets==8.1",' '"websockets>=9.1",' \ - --replace "httpx==0.18.*" "httpx" + --replace "httpx>=0.18,<0.22" "httpx" ''; propagatedBuildInputs = [ @@ -32,18 +34,18 @@ buildPythonPackage rec { websockets ]; - checkInputs = [ - pytest-asyncio - pytestCheckHook - ]; + postInstall = '' + mkdir $testsout + cp -R tests $testsout/tests + ''; - # `sanic` is explicitly set to null when building `sanic` itself - # to prevent infinite recursion. In that case we skip running - # the package at all. - doCheck = sanic != null; - dontUsePythonImportsCheck = sanic == null; + # check in passthru.tests.pytest to escape infinite recursion with sanic + doCheck = false; + doInstallCheck = false; - pythonImportsCheck = [ "sanic_testing" ]; + passthru.tests = { + pytest = callPackage ./tests.nix { }; + }; meta = with lib; { description = "Core testing clients for the Sanic web framework"; diff --git a/pkgs/development/python-modules/sanic-testing/tests.nix b/pkgs/development/python-modules/sanic-testing/tests.nix new file mode 100644 index 0000000000000..6a228a9823102 --- /dev/null +++ b/pkgs/development/python-modules/sanic-testing/tests.nix @@ -0,0 +1,26 @@ +{ buildPythonPackage +, sanic +, sanic-testing +, pytest-asyncio +, pytestCheckHook +}: + +buildPythonPackage { + pname = "sanic-testing-tests"; + inherit (sanic-testing) version; + + src = sanic-testing.testsout; + + dontBuild = true; + dontInstall = true; + + checkInputs = [ + pytest-asyncio + pytestCheckHook + sanic + ]; + + pythonImportsCheck = [ + "sanic_testing" + ]; +} diff --git a/pkgs/development/python-modules/sanic/default.nix b/pkgs/development/python-modules/sanic/default.nix index 63c24e9936fcb..91d8c564315c1 100644 --- a/pkgs/development/python-modules/sanic/default.nix +++ b/pkgs/development/python-modules/sanic/default.nix @@ -40,9 +40,12 @@ buildPythonPackage rec { postPatch = '' # Loosen dependency requirements. substituteInPlace setup.py \ - --replace '"pytest==6.2.5"' '"pytest"' \ - --replace '"gunicorn==20.0.4"' '"gunicorn"' \ - --replace '"pytest-sanic",' "" \ + --replace "pytest==6.2.5" "pytest" \ + --replace "gunicorn==20.0.4" "gunicorn" \ + --replace "multidict>=5.0,<6.0" "multidict" + + sed '/pytest-sanic/d' setup.py + # Patch a request headers test to allow brotli encoding # (we build httpx with brotli support, upstream doesn't). substituteInPlace tests/test_headers.py \ @@ -118,6 +121,10 @@ buildPythonPackage rec { "test_num_workers" "test_server_run" "test_version" + # Sensitive comparison of raw HTTP header fails + "test_raw_headers" + # noisy_exceptions sometimes missing from sanic stdout + "test_noisy_exceptions" ]; disabledTestPaths = [ diff --git a/pkgs/development/python-modules/sapi-python-client/default.nix b/pkgs/development/python-modules/sapi-python-client/default.nix deleted file mode 100644 index 8375c62e979f4..0000000000000 --- a/pkgs/development/python-modules/sapi-python-client/default.nix +++ /dev/null @@ -1,30 +0,0 @@ -{ lib, git, setuptools, setuptools-scm, fetchFromGitHub, requests, boto3, buildPythonPackage, responses }: - -buildPythonPackage rec { - pname = "sapi-python-client"; - version = "0.4.1"; - - src = fetchFromGitHub { - owner = "keboola"; - repo = pname; - rev = version; - sha256 = "189dzj06vzp7366h2qsfvbjmw9qgl7jbp8syhynn9yvrjqp4k8h3"; - }; - - postPatch = '' - sed -i 's|use_scm_version=True|version="${version}"|' setup.py - ''; - - doCheck = false; # requires API token and an active keboola bucket - - nativeBuildInputs = [ git setuptools-scm ]; - - propagatedBuildInputs = [ setuptools requests boto3 responses ]; - - meta = with lib; { - description = "Keboola Connection Storage API client"; - homepage = "https://github.com/keboola/sapi-python-client"; - maintainers = with maintainers; [ mrmebelman ]; - license = licenses.mit; - }; -} diff --git a/pkgs/development/python-modules/schema-salad/default.nix b/pkgs/development/python-modules/schema-salad/default.nix index bea5b766b5c91..995c7e206faf3 100644 --- a/pkgs/development/python-modules/schema-salad/default.nix +++ b/pkgs/development/python-modules/schema-salad/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "schema-salad"; - version = "8.2.20220103095339"; + version = "8.2.20220204150214"; format = "setuptools"; - disabled = pythonOlder "3.6"; + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "051690a2f89b98e35100cd2cb489406a5169a60c2f27a716f3f287a42d45be2d"; + hash = "sha256-PlPb/nE3eWueUTWSDpa7JxPe2ee+KFna5VTR3IsClwQ="; }; propagatedBuildInputs = [ @@ -37,9 +37,11 @@ buildPythonPackage rec { ]; disabledTests = [ - # setup for these tests requires network access + # Setup for these tests requires network access "test_secondaryFiles" "test_outputBinding" + # Test requires network + "test_yaml_tab_error" ]; pythonImportsCheck = [ diff --git a/pkgs/development/python-modules/scikit-build/default.nix b/pkgs/development/python-modules/scikit-build/default.nix index bc72f76bf2237..17b2ac3556702 100644 --- a/pkgs/development/python-modules/scikit-build/default.nix +++ b/pkgs/development/python-modules/scikit-build/default.nix @@ -1,22 +1,21 @@ { lib , buildPythonPackage , fetchPypi +, fetchpatch , distro , packaging +, python , setuptools +, setuptools-scm , wheel -# Test Inputs + # Test Inputs , cmake -, codecov -, coverage , cython , flake8 , ninja -, pathpy -, pytest -, pytest-cov +, path +, pytestCheckHook , pytest-mock -, pytest-runner , pytest-virtualenv , requests , six @@ -25,31 +24,36 @@ buildPythonPackage rec { pname = "scikit-build"; - version = "0.12.0"; + version = "0.14.1"; + format = "pyproject"; src = fetchPypi { inherit pname version; - sha256 = "f851382c469bcd9a8c98b1878bcfdd13b68556279d2fd9a329be41956ae5a7fe"; + sha256 = "sha256-Fwc9g3tWVRvt6Pa++utOuj2UM15ZAjmELjZg8HY6CRo="; }; + patches = [ + (fetchpatch { + url = "https://github.com/scikit-build/scikit-build/commit/59cf7a5b09a71d418947db3c9d487471c4573a24.patch"; + sha256 = "sha256-oQllX3qzwWwllczXUMObrwndCfvMdS5FulEhbBORAks="; + }) + ]; + propagatedBuildInputs = [ distro packaging setuptools + setuptools-scm wheel ]; + checkInputs = [ cmake - codecov - coverage cython - flake8 ninja - pathpy - pytest - pytest-cov + path + pytestCheckHook pytest-mock - pytest-runner pytest-virtualenv requests six @@ -58,7 +62,7 @@ buildPythonPackage rec { dontUseCmakeConfigure = true; - disabledTests = lib.concatMapStringsSep " and " (s: "not " + s) ([ + disabledTests = [ "test_hello_develop" # tries setuptools develop install "test_source_distribution" # pip has no way to install missing dependencies "test_wheel" # pip has no way to install missing dependencies @@ -66,15 +70,23 @@ buildPythonPackage rec { "test_install_command" # tries to alter out path "test_test_command" # tries to alter out path "test_setup" # tries to install using distutils - ]); - - checkPhase = '' - py.test -k '${disabledTests}' - ''; + "test_pep518" # pip exits with code 1 + "test_dual_pep518" # pip exits with code 1 + "test_isolated_env_trigger_reconfigure" # Regex pattern 'exit skbuild saving cmake spec' does not match 'exit skbuild running make'. + "test_hello_wheel" # [Errno 2] No such file or directory: '_skbuild/linux-x86_64-3.9/setuptools/bdist.linux-x86_64/wheel/helloModule.py' + # sdist contents differ, contains additional setup.py + "test_hello_sdist" + "test_manifest_in_sdist" + "test_sdist_with_symlinks" + # distutils.errors.DistutilsArgError: no commands supplied + "test_invalid_command" + "test_manifest_in_sdist" + "test_no_command" + ]; meta = with lib; { description = "Improved build system generator for CPython C/C++/Fortran/Cython extensions"; - homepage = "http://scikit-build.org/"; + homepage = "https://github.com/scikit-build/scikit-build"; license = with licenses; [ mit bsd2 ]; # BSD due to reuses of PyNE code maintainers = with maintainers; [ FlorianFranzen ]; }; diff --git a/pkgs/development/python-modules/scikit-image/default.nix b/pkgs/development/python-modules/scikit-image/default.nix index b06c1cb5db48b..45239f64fbef9 100644 --- a/pkgs/development/python-modules/scikit-image/default.nix +++ b/pkgs/development/python-modules/scikit-image/default.nix @@ -16,89 +16,98 @@ , imageio , tifffile , pytestCheckHook +, doCheck ? false }: let installedPackageRoot = "${builtins.placeholder "out"}/${python.sitePackages}"; -in buildPythonPackage rec { - pname = "scikit-image"; - version = "0.18.3"; + self = buildPythonPackage rec { + pname = "scikit-image"; + version = "0.18.3"; - src = fetchFromGitHub { - owner = pname; - repo = pname; - rev = "v${version}"; - sha256 = "0a2h3bw5rkk23k4r04qc9maccg00nddssd7lfsps8nhp5agk1vyh"; - }; + src = fetchFromGitHub { + owner = pname; + repo = pname; + rev = "v${version}"; + sha256 = "0a2h3bw5rkk23k4r04qc9maccg00nddssd7lfsps8nhp5agk1vyh"; + }; + + patches = [ ./add-testing-data.patch ]; - patches = [ ./add-testing-data.patch ]; + nativeBuildInputs = [ cython ]; - nativeBuildInputs = [ cython ]; + propagatedBuildInputs = [ + cloudpickle + dask + imageio + matplotlib + networkx + numpy + pillow + pywavelets + scipy + six + tifffile + ]; - propagatedBuildInputs = [ - cloudpickle - dask - imageio - matplotlib - networkx - numpy - pillow - pywavelets - scipy - six - tifffile - ]; + # test suite is very cpu intensive, move to passthru.tests + inherit doCheck; + checkInputs = [ pytestCheckHook ]; - checkInputs = [ pytestCheckHook ]; + # (1) The package has cythonized modules, whose .so libs will appear only in the wheel, i.e. in nix store; + # (2) To stop Python from importing the wrong directory, i.e. the one in the build dir, not the one in nix store, `skimage` dir should be removed or renamed; + # (3) Therefore, tests should be run on the installed package in nix store. - # (1) The package has cythonized modules, whose .so libs will appear only in the wheel, i.e. in nix store; - # (2) To stop Python from importing the wrong directory, i.e. the one in the build dir, not the one in nix store, `skimage` dir should be removed or renamed; - # (3) Therefore, tests should be run on the installed package in nix store. + # See e.g. https://discourse.nixos.org/t/cant-import-cythonized-modules-at-checkphase/14207 on why the following is needed. + preCheck = '' + rm -r skimage + ''; - # See e.g. https://discourse.nixos.org/t/cant-import-cythonized-modules-at-checkphase/14207 on why the following is needed. - preCheck = '' - rm -r skimage - ''; + disabledTestPaths = [ + # Requires network access (actually some data is loaded via `skimage._shared.testing.fetch` in the global scope, which calls `pytest.skip` when a network is unaccessible, leading to a pytest collection error). + "${installedPackageRoot}/skimage/filters/rank/tests/test_rank.py" + ]; + pytestFlagsArray = [ "${installedPackageRoot}" "--pyargs" "skimage" ] ++ builtins.map (testid: "--deselect=" + testid) ([ + # These tests require network access + "skimage/data/test_data.py::test_skin" + "skimage/data/tests/test_data.py::test_skin" + "skimage/io/tests/test_io.py::test_imread_http_url" + "skimage/restoration/tests/test_rolling_ball.py::test_ndim" + ] ++ lib.optionals stdenv.isDarwin [ + # Matplotlib tests are broken inside darwin sandbox + "skimage/feature/tests/test_util.py::test_plot_matches" + "skimage/filters/tests/test_thresholding.py::TestSimpleImage::test_try_all_threshold" + "skimage/io/tests/test_mpl_imshow.py::" + ]); - disabledTestPaths = [ - # Requires network access (actually some data is loaded via `skimage._shared.testing.fetch` in the global scope, which calls `pytest.skip` when a network is unaccessible, leading to a pytest collection error). - "${installedPackageRoot}/skimage/filters/rank/tests/test_rank.py" - ]; - pytestFlagsArray = [ "${installedPackageRoot}" "--pyargs" "skimage" ] ++ builtins.map (testid: "--deselect=" + testid) ([ - # These tests require network access - "skimage/data/test_data.py::test_skin" - "skimage/data/tests/test_data.py::test_skin" - "skimage/io/tests/test_io.py::test_imread_http_url" - "skimage/restoration/tests/test_rolling_ball.py::test_ndim" - ] ++ lib.optionals stdenv.isDarwin [ - # Matplotlib tests are broken inside darwin sandbox - "skimage/feature/tests/test_util.py::test_plot_matches" - "skimage/filters/tests/test_thresholding.py::TestSimpleImage::test_try_all_threshold" - "skimage/io/tests/test_mpl_imshow.py::" - ]); + # Check cythonized modules + pythonImportsCheck = [ + "skimage" + "skimage._shared" + "skimage.draw" + "skimage.feature" + "skimage.restoration" + "skimage.filters" + "skimage.future.graph" + "skimage.graph" + "skimage.io" + "skimage.measure" + "skimage.morphology" + "skimage.transform" + "skimage.util" + "skimage.segmentation" + ]; - # Check cythonized modules - pythonImportsCheck = [ - "skimage" - "skimage._shared" - "skimage.draw" - "skimage.feature" - "skimage.restoration" - "skimage.filters" - "skimage.future.graph" - "skimage.graph" - "skimage.io" - "skimage.measure" - "skimage.morphology" - "skimage.transform" - "skimage.util" - "skimage.segmentation" - ]; + passthru.tests = { + all-tests = self.override { doCheck = true; }; + }; - meta = { - description = "Image processing routines for SciPy"; - homepage = "https://scikit-image.org"; - license = lib.licenses.bsd3; - maintainers = with lib.maintainers; [ yl3dy ]; + meta = { + description = "Image processing routines for SciPy"; + homepage = "https://scikit-image.org"; + license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ yl3dy ]; + }; }; -} +in + self diff --git a/pkgs/development/python-modules/scikit-learn-extra/default.nix b/pkgs/development/python-modules/scikit-learn-extra/default.nix index a91f4ed74f178..f198b49c7ad28 100644 --- a/pkgs/development/python-modules/scikit-learn-extra/default.nix +++ b/pkgs/development/python-modules/scikit-learn-extra/default.nix @@ -38,6 +38,7 @@ buildPythonPackage rec { ]; disabledTests = [ "build" # needs network connection + "test_all_estimators" # sklearn.exceptions.NotFittedError: Estimator fails to pass `check_is_fitted` even though it has been fit. ]; # Check packages with cythonized modules diff --git a/pkgs/development/python-modules/scikit-learn/default.nix b/pkgs/development/python-modules/scikit-learn/default.nix index 7e2096c9b9ba6..82a85d7094130 100644 --- a/pkgs/development/python-modules/scikit-learn/default.nix +++ b/pkgs/development/python-modules/scikit-learn/default.nix @@ -78,8 +78,6 @@ buildPythonPackage rec { # https://github.com/scikit-learn/scikit-learn/issues/17582 # Since we are overriding '-k' we need to include the 'disabledTests' from above manually. "-k" "'not (NuSVC and memmap) ${toString (lib.forEach disabledTests (t: "and not ${t}"))}'" - - "-n" "$NIX_BUILD_CORES" ]; preCheck = '' diff --git a/pkgs/development/python-modules/scipy/default.nix b/pkgs/development/python-modules/scipy/default.nix index 9c3b28e0a9aca..85708822cc2bb 100644 --- a/pkgs/development/python-modules/scipy/default.nix +++ b/pkgs/development/python-modules/scipy/default.nix @@ -15,11 +15,11 @@ buildPythonPackage rec { pname = "scipy"; - version = "1.7.3"; + version = "1.8.0"; src = fetchPypi { inherit pname version; - sha256 = "ab5875facfdef77e0a47d5fd39ea178b58e60e454a4c85aa1e52fcb80db7babf"; + sha256 = "sha256-MdTy1rckvJqY5Se1hJuKflib8epjDDOqVj7akSyf8L0="; }; nativeBuildInputs = [ cython gfortran pythran ]; diff --git a/pkgs/development/python-modules/scmrepo/default.nix b/pkgs/development/python-modules/scmrepo/default.nix index b68d15f3cac1e..93854478853d2 100644 --- a/pkgs/development/python-modules/scmrepo/default.nix +++ b/pkgs/development/python-modules/scmrepo/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "scmrepo"; - version = "0.0.16"; + version = "0.0.18"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -22,8 +22,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "iterative"; repo = pname; - rev = version; - hash = "sha256-gaZXQFZ1Vm8ruW42IXc6+fLA5856Oc0cGgtScwIr5f8="; + rev = "refs/tags/${version}"; + hash = "sha256-eMtYVdKLiIaagDB1OEdYge6+McchOZPBcuIKGMzyvQQ="; }; propagatedBuildInputs = [ @@ -37,6 +37,11 @@ buildPythonPackage rec { pygtrie ]; + postPatch = '' + substituteInPlace setup.cfg \ + --replace "asyncssh>=2.7.1,<2.9" "asyncssh>=2.7.1" + ''; + # Requires a running Docker instance doCheck = false; diff --git a/pkgs/development/python-modules/seabreeze/default.nix b/pkgs/development/python-modules/seabreeze/default.nix index 06802a8a2ce15..6f048144dfa1f 100644 --- a/pkgs/development/python-modules/seabreeze/default.nix +++ b/pkgs/development/python-modules/seabreeze/default.nix @@ -4,7 +4,6 @@ , cython , git , pkgconfig -, pytest-runner , setuptools-scm , future , numpy @@ -31,11 +30,15 @@ buildPythonPackage rec { leaveDotGit = true; }; + postPatch = '' + substituteInPlace setup.py \ + --replace '"pytest-runner",' "" + ''; + nativeBuildInputs = [ cython git pkgconfig - pytest-runner setuptools-scm ]; diff --git a/pkgs/development/python-modules/securetar/default.nix b/pkgs/development/python-modules/securetar/default.nix new file mode 100644 index 0000000000000..68b25355744d7 --- /dev/null +++ b/pkgs/development/python-modules/securetar/default.nix @@ -0,0 +1,41 @@ +{ lib +, buildPythonPackage +, cryptography +, fetchFromGitHub +, pytestCheckHook +, pythonOlder +}: + +buildPythonPackage rec { + pname = "securetar"; + version = "2022.02.0"; + format = "setuptools"; + + disabled = pythonOlder "3.9"; + + src = fetchFromGitHub { + owner = "pvizeli"; + repo = pname; + rev = version; + hash = "sha256-FwQp08jwcGh07zpHqRNoUUmeLZJh78wI8wCXySi3Tdc="; + }; + + propagatedBuildInputs = [ + cryptography + ]; + + checkInputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ + "securetar" + ]; + + meta = with lib; { + description = "Module to handle tarfile backups"; + homepage = "https://github.com/pvizeli/securetar"; + license = licenses.asl20; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/sendgrid/default.nix b/pkgs/development/python-modules/sendgrid/default.nix index aab6ab049da56..8462b9924edab 100644 --- a/pkgs/development/python-modules/sendgrid/default.nix +++ b/pkgs/development/python-modules/sendgrid/default.nix @@ -7,6 +7,7 @@ , pythonOlder , pyyaml , starkbank-ecdsa +, six , werkzeug }: @@ -27,6 +28,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ python-http-client starkbank-ecdsa + six ]; checkInputs = [ diff --git a/pkgs/development/python-modules/sentry-sdk/default.nix b/pkgs/development/python-modules/sentry-sdk/default.nix index 51e6c76de5db2..4cd80fbed8096 100644 --- a/pkgs/development/python-modules/sentry-sdk/default.nix +++ b/pkgs/development/python-modules/sentry-sdk/default.nix @@ -28,6 +28,7 @@ , pytest-forked , pytest-localserver , pytestCheckHook +, pythonOlder , rq , sanic , sanic-testing @@ -40,14 +41,16 @@ buildPythonPackage rec { pname = "sentry-sdk"; - version = "1.5.8"; + version = "1.5.10"; format = "setuptools"; + disabled = pythonOlder "3.7"; + src = fetchFromGitHub { owner = "getsentry"; repo = "sentry-python"; rev = version; - sha256 = "sha256-28MkwQog+Abk1PSDPWbah650YATiGCBWaTbFO52KgzY="; + hash = "sha256-f5V2fMvPpyz+pU08Owzxq9xI48ZeZpH5SmUXtshqMm0="; }; propagatedBuildInputs = [ @@ -56,10 +59,12 @@ buildPythonPackage rec { ]; checkInputs = [ + aiohttp asttokens blinker botocore bottle + celery chalice django executing @@ -67,25 +72,22 @@ buildPythonPackage rec { falcon flask_login gevent + httpx jsonschema pure-eval + pyramid + pyspark pytest-django pytest-forked pytest-localserver pytestCheckHook rq + sanic + sanic-testing sqlalchemy tornado trytond werkzeug - ] ++ lib.optionals isPy3k [ - aiohttp - celery - httpx - pyramid - pyspark - sanic - sanic-testing ]; doCheck = !stdenv.isDarwin; @@ -112,6 +114,8 @@ buildPythonPackage rec { "test_auto_session_tracking_with_aggregates" # Network requests to public web "test_crumb_capture" + # TypeError: cannot unpack non-iterable TestResponse object + "test_rpc_error_page" ]; disabledTestPaths = [ @@ -126,6 +130,18 @@ buildPythonPackage rec { "tests/integrations/chalice/" # broken since rq-1.10.1: https://github.com/getsentry/sentry-python/issues/1274 "tests/integrations/rq/" + # broken since pytest 7.0.1; AssertionError: previous item was not torn down properly + "tests/utils/test_contextvars.py" + # broken since Flask and Werkzeug update to 2.1.0 (different error messages) + "tests/integrations/flask/test_flask.py" + "tests/integrations/bottle/test_bottle.py" + "tests/integrations/django/test_basic.py" + "tests/integrations/pyramid/test_pyramid.py" + ] + # test crashes on aarch64 + ++ lib.optionals (stdenv.buildPlatform != "x86_64-linux") [ + "tests/test_transport.py" + "tests/integrations/threading/test_threading.py" ]; pythonImportsCheck = [ diff --git a/pkgs/development/python-modules/servefile/default.nix b/pkgs/development/python-modules/servefile/default.nix new file mode 100644 index 0000000000000..e9d87ca912730 --- /dev/null +++ b/pkgs/development/python-modules/servefile/default.nix @@ -0,0 +1,43 @@ +{ buildPythonPackage +, fetchFromGitHub +, lib +, pyopenssl +, pytestCheckHook +, requests +}: + +buildPythonPackage rec { + pname = "servefile"; + version = "0.5.3"; + + src = fetchFromGitHub { + owner = "sebageek"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-/ZEMZIH/ImuZ2gh5bwB0FlaWnG/ELxfBGEJ2SuNSEb8="; + }; + + propagatedBuildInputs = [ pyopenssl ]; + + checkInputs = [ pytestCheckHook requests ]; + # Test attempts to connect to a port on localhost which fails in nix build + # environment. + disabledTests = [ + "test_abort_download" + "test_big_download" + "test_https_big_download" + "test_https" + "test_redirect_and_download" + "test_specify_port" + "test_upload_size_limit" + "test_upload" + ]; + pythonImportsCheck = [ "servefile" ]; + + meta = with lib; { + description = "Serve files from shell via a small HTTP server"; + homepage = "https://github.com/sebageek/servefile"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ samuela ]; + }; +} diff --git a/pkgs/development/python-modules/service_identity/default.nix b/pkgs/development/python-modules/service_identity/default.nix index d7c37e7c433bf..8ac3b52d58c79 100644 --- a/pkgs/development/python-modules/service_identity/default.nix +++ b/pkgs/development/python-modules/service_identity/default.nix @@ -7,6 +7,7 @@ , ipaddress , pyasn1 , pyasn1-modules +, six , pytestCheckHook , pythonOlder }: @@ -28,6 +29,7 @@ buildPythonPackage rec { idna pyasn1 pyasn1-modules + six ] ++ lib.optionals (pythonOlder "3.3") [ ipaddress ]; diff --git a/pkgs/development/python-modules/setupmeta/default.nix b/pkgs/development/python-modules/setupmeta/default.nix index c42565082cfd2..d24c8263e9a14 100644 --- a/pkgs/development/python-modules/setupmeta/default.nix +++ b/pkgs/development/python-modules/setupmeta/default.nix @@ -7,6 +7,7 @@ , pytestCheckHook , pythonOlder , setuptools-scm +, six }: buildPythonPackage rec { @@ -36,6 +37,7 @@ buildPythonPackage rec { mock pep440 pytestCheckHook + six ]; preCheck = '' @@ -45,6 +47,7 @@ buildPythonPackage rec { disabledTests = [ # Tests want to scan site-packages "test_check_dependencies" + "test_clean" "test_scenario" "test_git_versioning" ]; diff --git a/pkgs/development/python-modules/setuptools-rust/default.nix b/pkgs/development/python-modules/setuptools-rust/default.nix index 2ab609c7d0c1e..24c60839fe0bd 100644 --- a/pkgs/development/python-modules/setuptools-rust/default.nix +++ b/pkgs/development/python-modules/setuptools-rust/default.nix @@ -12,17 +12,17 @@ buildPythonPackage rec { pname = "setuptools-rust"; - version = "1.1.2"; + version = "1.2.0"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "a0adb9b503c0ffc4e8fe80b7c617898cefa78049983aaaea7f747e153a3e65d1"; + sha256 = "sha256-CkraR56Mfj2L18tW4aKazCsruYwjJQUbDNy1fX8Fbeg="; }; nativeBuildInputs = [ setuptools-scm ]; - propagatedBuildInputs = [ semantic-version setuptools toml typing-extensions ]; + propagatedBuildInputs = [ semantic-version setuptools typing-extensions ]; doCheck = false; pythonImportsCheck = [ "setuptools_rust" ]; diff --git a/pkgs/development/python-modules/setuptools/default.nix b/pkgs/development/python-modules/setuptools/default.nix index e748334b5ad16..1d9592022d16f 100644 --- a/pkgs/development/python-modules/setuptools/default.nix +++ b/pkgs/development/python-modules/setuptools/default.nix @@ -10,7 +10,7 @@ let pname = "setuptools"; - version = "57.2.0"; + version = "61.2.0"; # Create an sdist of setuptools sdist = stdenv.mkDerivation rec { @@ -20,12 +20,13 @@ let owner = "pypa"; repo = pname; rev = "v${version}"; - sha256 = "sha256-zFmndVoATNxfvDsacY+gj5bzIbbd/8ldbsJj4qOawTA="; + hash = "sha256-Cgz3uA8U7A1lOZNuj1EYZVViZ3aL6VjcAno8GYQUufk="; name = "${pname}-${version}-source"; }; patches = [ ./tag-date.patch + ./setuptools-distutils-C++.patch ]; buildPhase = '' diff --git a/pkgs/development/python-modules/setuptools/setuptools-distutils-C++.patch b/pkgs/development/python-modules/setuptools/setuptools-distutils-C++.patch new file mode 100644 index 0000000000000..43601d8b6eb19 --- /dev/null +++ b/pkgs/development/python-modules/setuptools/setuptools-distutils-C++.patch @@ -0,0 +1,180 @@ +diff --git a/setuptools/_distutils/cygwinccompiler.py b/setuptools/_distutils/cygwinccompiler.py +index c5c86d8f..b879e447 100644 +--- a/setuptools/_distutils/cygwinccompiler.py ++++ b/setuptools/_distutils/cygwinccompiler.py +@@ -124,14 +124,19 @@ class CygwinCCompiler(UnixCCompiler): + self.cxx = os.environ.get('CXX', 'g++') + + self.linker_dll = self.cc ++ self.linker_dll_cxx = self.cxx + shared_option = "-shared" + + self.set_executables(compiler='%s -mcygwin -O -Wall' % self.cc, + compiler_so='%s -mcygwin -mdll -O -Wall' % self.cc, + compiler_cxx='%s -mcygwin -O -Wall' % self.cxx, ++ compiler_so_cxx='%s -mcygwin -mdll -O -Wall' % self.cxx, + linker_exe='%s -mcygwin' % self.cc, + linker_so=('%s -mcygwin %s' % +- (self.linker_dll, shared_option))) ++ (self.linker_dll, shared_option)), ++ linker_exe_cxx='%s -mcygwin' % self.cxx, ++ linker_so_cxx=('%s -mcygwin %s' % ++ (self.linker_dll_cxx, shared_option))) + + # Include the appropriate MSVC runtime library if Python was built + # with MSVC 7.0 or later. +@@ -162,8 +167,12 @@ class CygwinCCompiler(UnixCCompiler): + raise CompileError(msg) + else: # for other files use the C-compiler + try: +- self.spawn(self.compiler_so + cc_args + [src, '-o', obj] + +- extra_postargs) ++ if self.detect_language(src) == 'c++': ++ self.spawn(self.compiler_so_cxx + cc_args + [src, '-o', obj] + ++ extra_postargs) ++ else: ++ self.spawn(self.compiler_so + cc_args + [src, '-o', obj] + ++ extra_postargs) + except DistutilsExecError as msg: + raise CompileError(msg) + +@@ -279,9 +288,13 @@ class Mingw32CCompiler(CygwinCCompiler): + self.set_executables(compiler='%s -O -Wall' % self.cc, + compiler_so='%s -mdll -O -Wall' % self.cc, + compiler_cxx='%s -O -Wall' % self.cxx, ++ compiler_so_cxx='%s -mdll -O -Wall' % self.cxx, + linker_exe='%s' % self.cc, + linker_so='%s %s' +- % (self.linker_dll, shared_option)) ++ % (self.linker_dll, shared_option), ++ linker_exe_cxx='%s' % self.cxx, ++ linker_so_cxx='%s %s' ++ % (self.linker_dll_cxx, shared_option)) + + # Maybe we should also append -mthreads, but then the finished + # dlls need another dll (mingwm10.dll see Mingw32 docs) +diff --git a/setuptools/_distutils/sysconfig.py b/setuptools/_distutils/sysconfig.py +index 9fad3835..889e2595 100644 +--- a/setuptools/_distutils/sysconfig.py ++++ b/setuptools/_distutils/sysconfig.py +@@ -216,9 +216,11 @@ def customize_compiler(compiler): + _osx_support.customize_compiler(_config_vars) + _config_vars['CUSTOMIZED_OSX_COMPILER'] = 'True' + +- (cc, cxx, cflags, ccshared, ldshared, shlib_suffix, ar, ar_flags) = \ +- get_config_vars('CC', 'CXX', 'CFLAGS', +- 'CCSHARED', 'LDSHARED', 'SHLIB_SUFFIX', 'AR', 'ARFLAGS') ++ (cc, cxx, cflags, ccshared, ldshared, ldcxxshared, shlib_suffix, ar, ar_flags) = \ ++ get_config_vars('CC', 'CXX', 'CFLAGS', 'CCSHARED', 'LDSHARED', 'LDCXXSHARED', ++ 'SHLIB_SUFFIX', 'AR', 'ARFLAGS') ++ ++ cxxflags = cflags + + if 'CC' in os.environ: + newcc = os.environ['CC'] +@@ -232,19 +234,27 @@ def customize_compiler(compiler): + cxx = os.environ['CXX'] + if 'LDSHARED' in os.environ: + ldshared = os.environ['LDSHARED'] ++ if 'LDCXXSHARED' in os.environ: ++ ldcxxshared = os.environ['LDCXXSHARED'] + if 'CPP' in os.environ: + cpp = os.environ['CPP'] + else: + cpp = cc + " -E" # not always + if 'LDFLAGS' in os.environ: + ldshared = ldshared + ' ' + os.environ['LDFLAGS'] ++ ldcxxshared = ldcxxshared + ' ' + os.environ['LDFLAGS'] + if 'CFLAGS' in os.environ: +- cflags = cflags + ' ' + os.environ['CFLAGS'] ++ cflags = os.environ['CFLAGS'] + ldshared = ldshared + ' ' + os.environ['CFLAGS'] ++ if 'CXXFLAGS' in os.environ: ++ cxxflags = os.environ['CXXFLAGS'] ++ ldcxxshared = ldcxxshared + ' ' + os.environ['CXXFLAGS'] + if 'CPPFLAGS' in os.environ: + cpp = cpp + ' ' + os.environ['CPPFLAGS'] + cflags = cflags + ' ' + os.environ['CPPFLAGS'] ++ cxxflags = cxxflags + ' ' + os.environ['CPPFLAGS'] + ldshared = ldshared + ' ' + os.environ['CPPFLAGS'] ++ ldcxxshared = ldcxxshared + ' ' + os.environ['CPPFLAGS'] + if 'AR' in os.environ: + ar = os.environ['AR'] + if 'ARFLAGS' in os.environ: +@@ -253,13 +263,17 @@ def customize_compiler(compiler): + archiver = ar + ' ' + ar_flags + + cc_cmd = cc + ' ' + cflags ++ cxx_cmd = cxx + ' ' + cxxflags + compiler.set_executables( + preprocessor=cpp, + compiler=cc_cmd, + compiler_so=cc_cmd + ' ' + ccshared, +- compiler_cxx=cxx, ++ compiler_cxx=cxx_cmd, ++ compiler_so_cxx=cxx_cmd + ' ' + ccshared, + linker_so=ldshared, + linker_exe=cc, ++ linker_so_cxx=ldcxxshared, ++ linker_exe_cxx=cxx, + archiver=archiver) + + if 'RANLIB' in os.environ and compiler.executables.get('ranlib', None): +diff --git a/setuptools/_distutils/unixccompiler.py b/setuptools/_distutils/unixccompiler.py +index 715408f5..6125a1eb 100644 +--- a/setuptools/_distutils/unixccompiler.py ++++ b/setuptools/_distutils/unixccompiler.py +@@ -110,14 +110,17 @@ class UnixCCompiler(CCompiler): + # are pretty generic; they will probably have to be set by an outsider + # (eg. using information discovered by the sysconfig about building + # Python extensions). +- executables = {'preprocessor' : None, +- 'compiler' : ["cc"], +- 'compiler_so' : ["cc"], +- 'compiler_cxx' : ["cc"], +- 'linker_so' : ["cc", "-shared"], +- 'linker_exe' : ["cc"], +- 'archiver' : ["ar", "-cr"], +- 'ranlib' : None, ++ executables = {'preprocessor' : None, ++ 'compiler' : ["cc"], ++ 'compiler_so' : ["cc"], ++ 'compiler_cxx' : ["c++"], ++ 'compiler_so_cxx' : ["c++"], ++ 'linker_so' : ["cc", "-shared"], ++ 'linker_exe' : ["cc"], ++ 'linker_so_cxx' : ["c++", "-shared"], ++ 'linker_exe_cxx' : ["c++"], ++ 'archiver' : ["ar", "-cr"], ++ 'ranlib' : None, + } + + if sys.platform[:6] == "darwin": +@@ -169,9 +172,15 @@ class UnixCCompiler(CCompiler): + def _compile(self, obj, src, ext, cc_args, extra_postargs, pp_opts): + compiler_so = compiler_fixup( + self.compiler_so, cc_args + extra_postargs) ++ compiler_so_cxx = compiler_fixup( ++ self.compiler_so_cxx, cc_args + extra_postargs) + try: +- self.spawn(compiler_so + cc_args + [src, '-o', obj] + +- extra_postargs) ++ if self.detect_language(src) == 'c++': ++ self.spawn(compiler_so_cxx + cc_args + [ src, '-o', obj] + ++ extra_postargs) ++ else: ++ self.spawn(compiler_so + cc_args + [src, '-o', obj] + ++ extra_postargs) + except DistutilsExecError as msg: + raise CompileError(msg) + +@@ -233,7 +242,8 @@ class UnixCCompiler(CCompiler): + # building an executable or linker_so (with shared options) + # when building a shared library. + building_exe = target_desc == CCompiler.EXECUTABLE +- linker = (self.linker_exe if building_exe else self.linker_so)[:] ++ linker = (self.linker_exe if building_exe else (self.linker_so_cxx if ++ target_lang == "c++" else self.linker_so))[:] + + if target_lang == "c++" and self.compiler_cxx: + env, linker_ne = _split_env(linker) diff --git a/pkgs/development/python-modules/seventeentrack/default.nix b/pkgs/development/python-modules/seventeentrack/default.nix new file mode 100644 index 0000000000000..8e70b4af51d4d --- /dev/null +++ b/pkgs/development/python-modules/seventeentrack/default.nix @@ -0,0 +1,61 @@ +{ lib +, aiohttp +, aresponses +, async-timeout +, attrs +, buildPythonPackage +, fetchFromGitHub +, poetry-core +, pytest-asyncio +, pytestCheckHook +, pythonOlder +, pytz +}: + +buildPythonPackage rec { + pname = "seventeentrack"; + version = "2022.04.6"; + format = "pyproject"; + + disabled = pythonOlder "3.8"; + + src = fetchFromGitHub { + owner = "McSwindler"; + repo = pname; + rev = version; + hash = "sha256-vMdRXcd0es/LjgsVyWItSLFzlSTEa3oaA6lr/NL4i8U="; + }; + + nativeBuildInputs = [ + poetry-core + ]; + + propagatedBuildInputs = [ + aiohttp + async-timeout + attrs + pytz + ]; + + checkInputs = [ + aresponses + pytest-asyncio + pytestCheckHook + ]; + + disabledTestPaths = [ + # Ignore the examples directory as the files are prefixed with test_ + "examples/" + ]; + + pythonImportsCheck = [ + "seventeentrack" + ]; + + meta = with lib; { + description = "Python library to track package info from 17track.com"; + homepage = "https://github.com/McSwindler/seventeentrack"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/shapely/default.nix b/pkgs/development/python-modules/shapely/default.nix index 818cce6a5670d..8d5d0d2aa4f5b 100644 --- a/pkgs/development/python-modules/shapely/default.nix +++ b/pkgs/development/python-modules/shapely/default.nix @@ -12,12 +12,12 @@ buildPythonPackage rec { pname = "Shapely"; - version = "1.8.0"; + version = "1.8.1.post1"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "177g8wxsgnphhhn4634n6ca1qrk462ijqlznpj5ry6d49ghpwc7m"; + sha256 = "sha256-k/8G/wX74r6EO5PHsa2CkuVuZlugG0cI91rop1eXLp8="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/shapely/library-paths.patch b/pkgs/development/python-modules/shapely/library-paths.patch index d55630be9c109..484af67ef68cc 100644 --- a/pkgs/development/python-modules/shapely/library-paths.patch +++ b/pkgs/development/python-modules/shapely/library-paths.patch @@ -1,8 +1,8 @@ diff --git a/shapely/geos.py b/shapely/geos.py -index 4619732..1abdb5e 100644 +index 13ab835..1abdb5e 100644 --- a/shapely/geos.py +++ b/shapely/geos.py -@@ -55,148 +55,21 @@ def load_dll(libname, fallbacks=None, mode=DEFAULT_MODE): +@@ -55,174 +55,21 @@ def load_dll(libname, fallbacks=None, mode=DEFAULT_MODE): "Could not find lib {} or load any of its variants {}.".format( libname, fallbacks or [])) @@ -61,16 +61,23 @@ index 4619732..1abdb5e 100644 - -elif sys.platform == 'darwin': - # Test to see if we have a delocated wheel with a GEOS dylib. -- geos_whl_dylib = os.path.abspath(os.path.join(os.path.dirname( -- __file__), '.dylibs/libgeos_c.1.dylib')) +- dylib_path = os.path.abspath( +- os.path.join(os.path.dirname(__file__), ".dylibs/*.dylib") +- ) +- LOG.debug("Formed path for globbing: dylib_path=%r", dylib_path) +- +- geos_whl_dylib = glob.glob(dylib_path) +- LOG.debug("Globbed: geos_whl_dylib=%r", geos_whl_dylib) - -- if os.path.exists(geos_whl_dylib): +- if len(geos_whl_dylib) > 0: - handle = CDLL(None) - if hasattr(handle, "initGEOS_r"): - LOG.debug("GEOS already loaded") - _lgeos = handle - else: -- _lgeos = CDLL(geos_whl_dylib) +- geos_whl_dylib = sorted(geos_whl_dylib) +- CDLL(geos_whl_dylib[0]) +- _lgeos = CDLL(geos_whl_dylib[-1]) - LOG.debug("Found GEOS DLL: %r, using it.", _lgeos) - - elif exists_conda_env(): @@ -112,25 +119,44 @@ index 4619732..1abdb5e 100644 -elif sys.platform == 'win32': - _conda_dll_path = os.path.join(sys.prefix, 'Library', 'bin', 'geos_c.dll') - if exists_conda_env() and os.path.exists(_conda_dll_path): -- # conda package. - _lgeos = CDLL(_conda_dll_path) - else: -- try: -- egg_dlls = os.path.abspath( -- os.path.join(os.path.dirname(__file__), 'DLLs')) -- if hasattr(sys, '_MEIPASS'): -- wininst_dlls = sys._MEIPASS -- elif hasattr(sys, "frozen"): -- wininst_dlls = os.path.normpath( -- os.path.abspath(sys.executable + '../../DLLS')) -- else: -- wininst_dlls = os.path.abspath(os.__file__ + "../../../DLLs") -- original_path = os.environ['PATH'] -- os.environ['PATH'] = "%s;%s;%s" % \ -- (egg_dlls, wininst_dlls, original_path) -- _lgeos = load_dll("geos_c.dll") -- except (ImportError, WindowsError, OSError): -- raise +- geos_whl_dll = glob.glob( +- os.path.abspath( +- os.path.join( +- os.path.dirname(__file__), "..", "Shapely.libs", "geos*.dll" +- ) +- ) +- ) +- +- if len(geos_whl_dll) > 0: +- geos_whl_dll = sorted(geos_whl_dll) +- # CDLL(geos_whl_so[0]) +- _lgeos = CDLL(geos_whl_dll[-1]) +- LOG.debug("Found GEOS DLL: %r, using it.", _lgeos) +- else: +- try: +- egg_dlls = os.path.abspath( +- os.path.join(os.path.dirname(__file__), "DLLs") +- ) +- if hasattr(sys, "_MEIPASS"): +- wininst_dlls = sys._MEIPASS +- elif hasattr(sys, "frozen"): +- wininst_dlls = os.path.normpath( +- os.path.abspath(sys.executable + "../../DLLS") +- ) +- else: +- wininst_dlls = os.path.abspath(os.__file__ + "../../../DLLs") +- original_path = os.environ["PATH"] +- os.environ["PATH"] = "%s;%s;%s" % ( +- egg_dlls, +- wininst_dlls, +- original_path, +- ) +- _lgeos = load_dll("geos_c.dll") +- +- except (ImportError, WindowsError, OSError): +- raise - - def free(m): - try: diff --git a/pkgs/development/python-modules/shiboken2/default.nix b/pkgs/development/python-modules/shiboken2/default.nix index 11461a9545cd2..2a7e7613dfb81 100644 --- a/pkgs/development/python-modules/shiboken2/default.nix +++ b/pkgs/development/python-modules/shiboken2/default.nix @@ -34,6 +34,6 @@ stdenv.mkDerivation { license = with licenses; [ gpl2 lgpl21 ]; homepage = "https://wiki.qt.io/Qt_for_Python"; maintainers = with maintainers; [ gebner ]; - broken = stdenv.isDarwin; + broken = stdenv.isDarwin || python.isPy310; }; } diff --git a/pkgs/development/python-modules/shiv/default.nix b/pkgs/development/python-modules/shiv/default.nix new file mode 100644 index 0000000000000..14cb688be4643 --- /dev/null +++ b/pkgs/development/python-modules/shiv/default.nix @@ -0,0 +1,34 @@ +{ stdenv +, lib +, buildPythonPackage +, fetchPypi +, click +, pip +, setuptools +, wheel +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "shiv"; + version = "1.0.1"; + format = "pyproject"; + + src = fetchPypi { + inherit pname version; + sha256 = "ec16095a0565906536af7f5e57771e9ae7a061b646ed63ad66ebbc70c30f4d2a"; + }; + + propagatedBuildInputs = [ click pip setuptools wheel ]; + + pythonImportsCheck = [ "shiv" ]; + + checkInputs = [ pytestCheckHook ]; + + meta = with lib; { + description = "Command line utility for building fully self contained Python zipapps"; + homepage = "https://github.com/linkedin/shiv"; + license = licenses.bsd2; + maintainers = with maintainers; [ prusnak ]; + }; +} diff --git a/pkgs/development/python-modules/shtab/default.nix b/pkgs/development/python-modules/shtab/default.nix index 78e160058b238..4051378d06892 100644 --- a/pkgs/development/python-modules/shtab/default.nix +++ b/pkgs/development/python-modules/shtab/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "shtab"; - version = "1.5.3"; + version = "1.5.4"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "iterative"; repo = pname; rev = "v${version}"; - hash = "sha256-Wuc4m3VdOGEcevYXUpbL4gTvyW9t13pj57zPYdqx0UY="; + hash = "sha256-MYLAQSz55913fOhRnH+Y9xugOdfO43gkavitazIgeqg="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; diff --git a/pkgs/development/python-modules/simple-salesforce/default.nix b/pkgs/development/python-modules/simple-salesforce/default.nix index d2b36af12a3ba..e9c054bdd4ec1 100644 --- a/pkgs/development/python-modules/simple-salesforce/default.nix +++ b/pkgs/development/python-modules/simple-salesforce/default.nix @@ -4,24 +4,30 @@ , authlib , requests , nose +, pythonOlder , pytz , responses +, zeep }: buildPythonPackage rec { pname = "simple-salesforce"; - version = "1.11.4"; + version = "1.11.6"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "17d6g7zfhlgd2n4mimjarl2x4hl7ww2lb4izidlns1hzqm8igg4y"; + sha256 = "sha256-/uaFEQnilcelHKjbmrnyLm5Mzj2V8P4oEH+cgJn+KvI="; }; propagatedBuildInputs = [ authlib requests + zeep ]; checkInputs = [ diff --git a/pkgs/development/python-modules/simplejson/default.nix b/pkgs/development/python-modules/simplejson/default.nix index 1e6def5ae78a6..74530b3fb830c 100644 --- a/pkgs/development/python-modules/simplejson/default.nix +++ b/pkgs/development/python-modules/simplejson/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = pname; repo = pname; - rev = "v${version}"; + rev = "refs/tags/v${version}"; sha256 = "1irlp5sakbdfcf717qmrx0r9rjlmwk0vza6zm3y55d32zw5c1cxg"; }; diff --git a/pkgs/development/python-modules/sip/default.nix b/pkgs/development/python-modules/sip/default.nix index 6904714a60c78..d6ee1e76f5480 100644 --- a/pkgs/development/python-modules/sip/default.nix +++ b/pkgs/development/python-modules/sip/default.nix @@ -2,12 +2,12 @@ buildPythonPackage rec { pname = "sip"; - version = "6.5.0"; + version = "6.5.1"; src = fetchPypi { pname = "sip"; inherit version; - sha256 = "a1cf8431a8eb9392b3ff6dc61d832d0447bfdcae5b3e4256a5fa74dbc25b0734"; + sha256 = "sha256-IE8CQNuJmadJ1jiph7NRhhhD5pI5uBHsPRiBQSw3BqY="; }; patches = [ diff --git a/pkgs/development/python-modules/slicerator/default.nix b/pkgs/development/python-modules/slicerator/default.nix index 191159a648ec0..a1240f47c4e80 100644 --- a/pkgs/development/python-modules/slicerator/default.nix +++ b/pkgs/development/python-modules/slicerator/default.nix @@ -2,20 +2,21 @@ , buildPythonPackage , fetchPypi , python -, six +, pythonOlder }: buildPythonPackage rec { - version = "1.0.0"; pname = "slicerator"; + version = "1.1.0"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "18e60393e6765ca96986f801bbae62a617a1eba6ed57784e61b165ffc7dc1848"; + hash = "sha256-RAEKf1zYdoDAchO1yr6B0ftxJSlilD5Tc+59FGBdYEY="; }; - propagatedBuildInputs = [ six ]; - checkPhase = '' ${python.interpreter} run_tests.py ''; @@ -24,9 +25,9 @@ buildPythonPackage rec { doCheck = false; meta = with lib; { - homepage = "https://github.com/soft-matter/slicerator"; description = "A lazy-loading, fancy-sliceable iterable"; + homepage = "https://github.com/soft-matter/slicerator"; license = licenses.bsdOriginal; - maintainers = [ maintainers.costrouc ]; + maintainers = with maintainers; [ costrouc ]; }; } diff --git a/pkgs/development/python-modules/slither-analyzer/default.nix b/pkgs/development/python-modules/slither-analyzer/default.nix index 8eaf442fb5de8..d3295cbb1f8b6 100644 --- a/pkgs/development/python-modules/slither-analyzer/default.nix +++ b/pkgs/development/python-modules/slither-analyzer/default.nix @@ -1,7 +1,7 @@ { lib , stdenv , buildPythonPackage -, fetchPypi +, fetchFromGitHub , makeWrapper , pythonOlder , crytic-compile @@ -13,12 +13,16 @@ buildPythonPackage rec { pname = "slither-analyzer"; - version = "0.8.2"; - disabled = pythonOlder "3.6"; + version = "0.8.3"; + format = "setuptools"; - src = fetchPypi { - inherit pname version; - sha256 = "sha256-77045eB7KvHBb0j61qz4zJTtEprg4/aH6MrPlQY1wiM="; + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "crytic"; + repo = "slither"; + rev = version; + sha256 = "sha256-Kh5owlkRB9hDlfIRiS+aNFe4YtZj38CLeE3Fe+R7diM="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/slixmpp/default.nix b/pkgs/development/python-modules/slixmpp/default.nix index 4743639c43d1c..375f910e5f844 100644 --- a/pkgs/development/python-modules/slixmpp/default.nix +++ b/pkgs/development/python-modules/slixmpp/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "slixmpp"; - version = "1.8.1"; + version = "1.8.2"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-QgTIC+4JtAD9nnS+fJKZwF0aJEIrFmPHkYg8cPgXmcA="; + hash = "sha256-U7lD2iVy2gS5Ktop4PVKg+cUbIg4MJt+m6tH5aOb1Y4="; }; propagatedBuildInputs = [ @@ -44,6 +44,7 @@ buildPythonPackage rec { disabledTestPaths = [ # Exclude live tests "tests/live_test.py" + "tests/test_xep_0454.py" ]; pythonImportsCheck = [ diff --git a/pkgs/development/python-modules/smbprotocol/default.nix b/pkgs/development/python-modules/smbprotocol/default.nix index b5d826c8f8efb..562346b1a476f 100644 --- a/pkgs/development/python-modules/smbprotocol/default.nix +++ b/pkgs/development/python-modules/smbprotocol/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "smbprotocol"; - version = "1.8.3"; + version = "1.9.0"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "jborean93"; repo = pname; rev = "v${version}"; - sha256 = "sha256-m9C+uzwrEOcbkvBQ3Z+to2BsX2i7cLnUiV/+L7hMUdE="; + sha256 = "sha256-u3brP3WsnoqRy3R0OQQkIbq+avS7nemx9GKpvTq+vxg="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/social-auth-core/default.nix b/pkgs/development/python-modules/social-auth-core/default.nix index ede138218e010..667c4ec4245a9 100644 --- a/pkgs/development/python-modules/social-auth-core/default.nix +++ b/pkgs/development/python-modules/social-auth-core/default.nix @@ -3,7 +3,7 @@ , fetchFromGitHub , requests , oauthlib -, requests_oauthlib +, requests-oauthlib , pyjwt , cryptography , defusedxml @@ -38,7 +38,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ requests oauthlib - requests_oauthlib + requests-oauthlib pyjwt cryptography defusedxml diff --git a/pkgs/development/python-modules/socksio/default.nix b/pkgs/development/python-modules/socksio/default.nix new file mode 100644 index 0000000000000..5d42ed6e8ecc5 --- /dev/null +++ b/pkgs/development/python-modules/socksio/default.nix @@ -0,0 +1,41 @@ +{ lib +, buildPythonPackage +, fetchPypi +, pythonAtLeast +, flit-core +, pytestCheckHook +}: + +let + pname = "socksio"; + version = "1.0.0"; +in +buildPythonPackage { + inherit pname version; + format = "pyproject"; + + src = fetchPypi { + inherit pname version; + hash = "sha256-+IvrPaW1w4uYkEad5n0MsPnUlLeLEGyhhF+WwQuRxKw="; + }; + + nativeBuildInputs = [ + flit-core + ]; + + # remove coverage configuration + preCheck = '' + rm pytest.ini + ''; + + checkInputs = [ + pytestCheckHook + ]; + + meta = with lib; { + description = "Sans-I/O implementation of SOCKS4, SOCKS4A, and SOCKS5"; + homepage = "https://github.com/sethmlarson/socksio"; + license = licenses.mit; + maintainers = with maintainers; [ hexa ]; + }; +} diff --git a/pkgs/development/python-modules/sortedcontainers/default.nix b/pkgs/development/python-modules/sortedcontainers/default.nix index 8920336f8db81..4edd68f1f07db 100644 --- a/pkgs/development/python-modules/sortedcontainers/default.nix +++ b/pkgs/development/python-modules/sortedcontainers/default.nix @@ -1,24 +1,39 @@ { lib , buildPythonPackage -, fetchPypi +, fetchFromGitHub +, pytestCheckHook }: -buildPythonPackage rec { - pname = "sortedcontainers"; - version = "2.4.0"; +let + sortedcontainers = buildPythonPackage rec { + pname = "sortedcontainers"; + version = "2.4.0"; - src = fetchPypi { - inherit pname version; - sha256 = "25caa5a06cc30b6b83d11423433f65d1f9d76c4c6a0c90e3379eaa43b9bfdb88"; - }; + src = fetchFromGitHub { + owner = "grantjenks"; + repo = "python-sortedcontainers"; + rev = "v${version}"; + sha256 = "sha256-YRbSM2isWi7AzfquFvuZBlpEMNUnBJTBLBn0/XYVHKQ="; + }; + + doCheck = false; + + checkInputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ "sortedcontainers" ]; - # pypi tarball does not come with tests - doCheck = false; + passthru.tests = { + pytest = sortedcontainers.overridePythonAttrs (_: { doCheck = true; }); + }; - meta = { - description = "Python Sorted Container Types: SortedList, SortedDict, and SortedSet"; - homepage = "http://www.grantjenks.com/docs/sortedcontainers/"; - license = lib.licenses.asl20; - maintainers = with lib.maintainers; [ costrouc ]; + meta = with lib; { + description = "Python Sorted Container Types: SortedList, SortedDict, and SortedSet"; + homepage = "https://grantjenks.com/docs/sortedcontainers/"; + license = licenses.asl20; + maintainers = with maintainers; [ SuperSandro2000 ]; + }; }; -} +in +sortedcontainers diff --git a/pkgs/development/python-modules/spacy-transformers/default.nix b/pkgs/development/python-modules/spacy-transformers/default.nix index 2f70732caa316..2a81a5bce083b 100644 --- a/pkgs/development/python-modules/spacy-transformers/default.nix +++ b/pkgs/development/python-modules/spacy-transformers/default.nix @@ -12,13 +12,13 @@ buildPythonPackage rec { pname = "spacy-transformers"; - version = "1.1.3"; + version = "1.1.5"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "f4f553d3d2a065147a8c1292b5d9adf050c0f78dd15bb05c9614341cf88c5574"; + sha256 = "sha256-nxbmnFyHptbe5M7rQi2ECGoBpxUuutdCtY20eHsGDPI="; }; postPatch = '' diff --git a/pkgs/development/python-modules/spacy/default.nix b/pkgs/development/python-modules/spacy/default.nix index 5e3bc6aac8b75..41e6a8cc37c9c 100644 --- a/pkgs/development/python-modules/spacy/default.nix +++ b/pkgs/development/python-modules/spacy/default.nix @@ -31,13 +31,13 @@ buildPythonPackage rec { pname = "spacy"; - version = "3.2.3"; + version = "3.2.4"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "sha256-JdAz/Ae4+/yb3Te3cLilhtxBTb1gMShEmvMldqOJFnM="; + sha256 = "sha256-PkxvKY1UBEWC2soRQrCC7jiDG7PXu5MdLuYB6Ljc5k8="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/sparqlwrapper/default.nix b/pkgs/development/python-modules/sparqlwrapper/default.nix index 41c11172d9bf0..0660b8a403ce0 100644 --- a/pkgs/development/python-modules/sparqlwrapper/default.nix +++ b/pkgs/development/python-modules/sparqlwrapper/default.nix @@ -1,31 +1,28 @@ { lib , buildPythonPackage , fetchPypi -, six -, isodate -, pyparsing -, html5lib , keepalive }: buildPythonPackage rec { - pname = "SPARQLWrapper"; - version = "1.8.5"; + pname = "sparqlwrapper"; + version = "2.0.0"; src = fetchPypi { - inherit pname version; - sha256 = "d6a66b5b8cda141660e07aeb00472db077a98d22cb588c973209c7336850fb3c"; + pname = "SPARQLWrapper"; + inherit version; + sha256 = "sha256-P+0+vMd2F6SnTSZEuG/Yjg8y5/cAOseyszTAJiAXMfE="; }; # break circular dependency loop patchPhase = '' - sed -i '/rdflib/d' requirements.txt + sed -i '/rdflib/d' setup.cfg ''; # Doesn't actually run tests doCheck = false; - propagatedBuildInputs = [ six isodate pyparsing html5lib keepalive ]; + propagatedBuildInputs = [ keepalive ]; meta = with lib; { description = "This is a wrapper around a SPARQL service. It helps in creating the query URI and, possibly, convert the result into a more manageable format"; diff --git a/pkgs/development/python-modules/sphinx-jinja/default.nix b/pkgs/development/python-modules/sphinx-jinja/default.nix index 7f5ea8c4241a1..28d575752551e 100644 --- a/pkgs/development/python-modules/sphinx-jinja/default.nix +++ b/pkgs/development/python-modules/sphinx-jinja/default.nix @@ -1,29 +1,26 @@ -{ lib, buildPythonPackage, fetchPypi, isPy27, pbr, sphinx, sphinx-testing, nose, glibcLocales }: +{ lib, buildPythonPackage, fetchPypi, pythonOlder, sphinx }: buildPythonPackage rec { pname = "sphinx-jinja"; - version = "1.4.0"; + version = "2.0.1"; + + disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "e6614d986c0289cb85b016c25eb8cb9781ceb841e70bee639c5123f39ad90b38"; + sha256 = "sha256-3lMY1InG1PaAqhIrp5kovE6t+kTTpTKS3ir+WI/+RAY="; }; - buildInputs = [ pbr ]; propagatedBuildInputs = [ sphinx ]; - checkInputs = [ sphinx-testing nose glibcLocales ]; + # upstream source is not updated to 2.0.X and pypi does not contain tests + doCheck = false; - checkPhase = lib.optionalString (!isPy27) '' - # prevent python from loading locally and breaking namespace - mv sphinxcontrib .sphinxcontrib - '' + '' - # Zip (epub) does not support files with epoch timestamp - LC_ALL="en_US.UTF-8" nosetests -e test_build_epub - ''; + pythonImportsCheck = [ "sphinx_jinja" ]; meta = with lib; { description = "Sphinx extension to include jinja templates in documentation"; + homepage = "https://github.com/tardyp/sphinx-jinja"; maintainers = with maintainers; [ ]; license = licenses.mit; }; diff --git a/pkgs/development/python-modules/sphinx/default.nix b/pkgs/development/python-modules/sphinx/default.nix index 19961cc2ec182..020cf5c143a2f 100644 --- a/pkgs/development/python-modules/sphinx/default.nix +++ b/pkgs/development/python-modules/sphinx/default.nix @@ -30,14 +30,16 @@ buildPythonPackage rec { pname = "sphinx"; - version = "4.4.0"; - disabled = pythonOlder "3.5"; + version = "4.5.0"; + format = "setuptools"; + + disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "sphinx-doc"; repo = pname; rev = "v${version}"; - sha256 = "sha256-Q4CqPO08AfR+CDB02al65A+FHRFUDUfFTba0u8YQx+8="; + sha256 = "sha256-Lw9yZWCQpt02SL/McWPcyFRfVhQHC0TejcYRbVw+VxY="; extraPostFetch = '' cd $out mv tests/roots/test-images/testimäge.png \ @@ -46,6 +48,11 @@ buildPythonPackage rec { ''; }; + postPatch = '' + substituteInPlace setup.py \ + --replace "docutils>=0.14,<0.18" "docutils>=0.14" + ''; + propagatedBuildInputs = [ Babel alabaster @@ -92,9 +99,11 @@ buildPythonPackage rec { # Due to lack of network sandboxing can't guarantee port 7777 isn't bound "test_inspect_main_url" "test_auth_header_uses_first_match" + "test_linkcheck_allowed_redirects" "test_linkcheck_request_headers" "test_linkcheck_request_headers_no_slash" "test_follows_redirects_on_HEAD" + "test_get_after_head_raises_connection_error" "test_invalid_ssl" "test_connect_to_selfsigned_with_tls_verify_false" "test_connect_to_selfsigned_with_tls_cacerts" diff --git a/pkgs/development/python-modules/sphinx_rtd_theme/default.nix b/pkgs/development/python-modules/sphinx_rtd_theme/default.nix index 1d890de94f709..d0c9a3883aff9 100644 --- a/pkgs/development/python-modules/sphinx_rtd_theme/default.nix +++ b/pkgs/development/python-modules/sphinx_rtd_theme/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { postPatch = '' substituteInPlace setup.py \ - --replace "docutils<0.17" "docutils" + --replace "docutils<0.18" "docutils" ''; preBuild = '' diff --git a/pkgs/development/python-modules/sphinxcontrib-bibtex/default.nix b/pkgs/development/python-modules/sphinxcontrib-bibtex/default.nix index f7fd32a3aff43..94c545a694ef0 100644 --- a/pkgs/development/python-modules/sphinxcontrib-bibtex/default.nix +++ b/pkgs/development/python-modules/sphinxcontrib-bibtex/default.nix @@ -1,7 +1,7 @@ { lib , buildPythonPackage , fetchPypi -, isPy3k +, pythonOlder , oset , pybtex , pybtex-docutils @@ -9,20 +9,28 @@ }: buildPythonPackage rec { - version = "2.4.1"; pname = "sphinxcontrib-bibtex"; + version = "2.4.2"; - disabled = !isPy3k; + disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "282223309bbaf34cd20a8fe1ba346fe8642f403a8930607e77a8cb08ae81fc5f"; + hash = "sha256-ZbAj7kfzXx8DrE1xyCTmfGJMfsrBuyboNiMnGgH52oY="; }; - propagatedBuildInputs = [ oset pybtex pybtex-docutils sphinx ]; + propagatedBuildInputs = [ + oset + pybtex + pybtex-docutils + sphinx + ]; doCheck = false; - pythonImportsCheck = [ "sphinxcontrib.bibtex" ]; + + pythonImportsCheck = [ + "sphinxcontrib.bibtex" + ]; meta = with lib; { description = "A Sphinx extension for BibTeX style citations"; diff --git a/pkgs/development/python-modules/sphinxext-opengraph/default.nix b/pkgs/development/python-modules/sphinxext-opengraph/default.nix index 8b68eea256681..76e5079e91637 100644 --- a/pkgs/development/python-modules/sphinxext-opengraph/default.nix +++ b/pkgs/development/python-modules/sphinxext-opengraph/default.nix @@ -8,13 +8,13 @@ buildPythonPackage rec { pname = "sphinxext-opengraph"; - version = "0.6.2"; + version = "0.6.3"; src = fetchFromGitHub { owner = "wpilibsuite"; repo = "sphinxext-opengraph"; rev = "v${version}"; - sha256 = "sha256-3bZFFtGW6j/3m/3F4+tapZujzpMZnrIcYTngDCNGylI="; + sha256 = "sha256-YR6TlsmND5IhLdbPbmtVhRN2vSZfx70g2a6Yn6y6L/M="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/spyder-kernels/default.nix b/pkgs/development/python-modules/spyder-kernels/default.nix index 4ddacc9119036..95d54e404471a 100644 --- a/pkgs/development/python-modules/spyder-kernels/default.nix +++ b/pkgs/development/python-modules/spyder-kernels/default.nix @@ -3,11 +3,11 @@ buildPythonPackage rec { pname = "spyder-kernels"; - version = "2.2.1"; + version = "2.3.0"; src = fetchPypi { inherit pname version; - sha256 = "574ee1bd03f7236b9f9dacae34936a0625cd67ccfe3df11fec69f26889a0b866"; + sha256 = "sha256-pdU20Oil53TX1hbBAqj6LWqkX9MwoLeZuY7vFYNW02w="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/spyder/default.nix b/pkgs/development/python-modules/spyder/default.nix index cfeaf08fb33f4..c117cb4990f8b 100644 --- a/pkgs/development/python-modules/spyder/default.nix +++ b/pkgs/development/python-modules/spyder/default.nix @@ -8,13 +8,13 @@ buildPythonPackage rec { pname = "spyder"; - version = "5.2.1"; + version = "5.3.0"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "b318a70a75acd200018a547d2ff2d2f55e7507054469d0c77ec6f967ac3c2d28"; + sha256 = "sha256-ggCFvYUdUm5fVSpTZoN/OhNPJAQOyehwrQprYTzprbc="; }; nativeBuildInputs = [ pyqtwebengine.wrapQtAppsHook ]; diff --git a/pkgs/development/python-modules/sqlalchemy-imageattach/default.nix b/pkgs/development/python-modules/sqlalchemy-imageattach/default.nix deleted file mode 100644 index 55026b2b55303..0000000000000 --- a/pkgs/development/python-modules/sqlalchemy-imageattach/default.nix +++ /dev/null @@ -1,42 +0,0 @@ -{ lib -, buildPythonPackage -, pytest -, Wand -, webob -, sqlalchemy -, isPyPy -, pkgs -}: - -buildPythonPackage rec { - pname = "SQLAlchemy-ImageAttach"; - version = "1.0.0"; - - src = pkgs.fetchFromGitHub { - repo = "sqlalchemy-imageattach"; - owner = "dahlia"; - rev = version; - sha256 = "0ba97pn5dh00qvxyjbr0mr3pilxqw5kb3a6jd4wwbsfcv6nngqig"; - }; - - checkInputs = [ pytest Wand.imagemagick webob ]; - propagatedBuildInputs = [ sqlalchemy Wand ]; - - checkPhase = '' - cd tests - export MAGICK_HOME="${pkgs.imagemagick.dev}" - export PYTHONPATH=$PYTHONPATH:../ - py.test - cd .. - ''; - - doCheck = !isPyPy; # failures due to sqla version mismatch - - meta = with lib; { - homepage = "https://github.com/dahlia/sqlalchemy-imageattach"; - description = "SQLAlchemy extension for attaching images to entity objects"; - license = licenses.mit; - broken = true; # Incompatible with sqlalchemy>=1.4 (https://github.com/dahlia/sqlalchemy-imageattach/issues/47) - }; - -} diff --git a/pkgs/development/python-modules/sqlalchemy/default.nix b/pkgs/development/python-modules/sqlalchemy/default.nix index 1d6406c5db13c..b6e800a7ed3d8 100644 --- a/pkgs/development/python-modules/sqlalchemy/default.nix +++ b/pkgs/development/python-modules/sqlalchemy/default.nix @@ -13,11 +13,11 @@ buildPythonPackage rec { pname = "SQLAlchemy"; - version = "1.4.31"; + version = "1.4.35"; src = fetchPypi { inherit pname version; - sha256 = "sha256-WCtZ0eV4CkR6raIrRh5QtASp3AV2jaHYc2itgZBGhBg="; + hash = "sha256-L/yBOwHcZHOZD15XXyEMpawvVGWs45CLeP/W0gBYqrU="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/sqlite-utils/default.nix b/pkgs/development/python-modules/sqlite-utils/default.nix index 5d96f8e1505c3..b3621802a0978 100644 --- a/pkgs/development/python-modules/sqlite-utils/default.nix +++ b/pkgs/development/python-modules/sqlite-utils/default.nix @@ -14,12 +14,14 @@ buildPythonPackage rec { pname = "sqlite-utils"; - version = "3.25.1"; + version = "3.26"; + format = "setuptools"; + disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "sha256-32lfUJoTbkflztLU/BDhbHbuOkW66OGpHLuiyAKFy8k="; + hash = "sha256-G2Fy9PEYtq0dIWhsgV4HZa5y+wLxcI3CYSgDL6ijkdo="; }; propagatedBuildInputs = [ @@ -35,6 +37,10 @@ buildPythonPackage rec { hypothesis ]; + pythonImportsCheck = [ + "sqlite_utils" + ]; + meta = with lib; { description = "Python CLI utility and library for manipulating SQLite databases"; homepage = "https://github.com/simonw/sqlite-utils"; diff --git a/pkgs/development/python-modules/sqlitedict/default.nix b/pkgs/development/python-modules/sqlitedict/default.nix index 178617e18dea8..5634eb41601a1 100644 --- a/pkgs/development/python-modules/sqlitedict/default.nix +++ b/pkgs/development/python-modules/sqlitedict/default.nix @@ -6,13 +6,13 @@ buildPythonPackage rec { pname = "sqlitedict"; - version = "1.7.0"; + version = "2.0.0"; src = fetchFromGitHub { owner = "RaRe-Technologies"; repo = "sqlitedict"; - rev = version; - sha256 = "08fr81rz1fz35d35kravg7vl234aqagr9wqb09x6wi9lx9zkkh28"; + rev = "refs/tags/${version}"; + sha256 = "sha256-8dmGn5h3NigCdDtnDYjpjntRpyjk7ivRp1B8x8nUgpE="; }; preCheck = '' diff --git a/pkgs/development/python-modules/sqlmap/default.nix b/pkgs/development/python-modules/sqlmap/default.nix index a435b363a0f7b..6313f413c6ab7 100644 --- a/pkgs/development/python-modules/sqlmap/default.nix +++ b/pkgs/development/python-modules/sqlmap/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "sqlmap"; - version = "1.6.3"; + version = "1.6.4"; src = fetchPypi { inherit pname version; - sha256 = "sha256-W/UdJPLcFOEHHz7VYeQ3CcXysNju5DuxqvYA+xMkb20="; + sha256 = "sha256-6RKJ5a8Yl+SnWgdfrTIwY0m1JyY6W9fhZk6pTZiBVx8="; }; postPatch = '' diff --git a/pkgs/development/python-modules/srp/default.nix b/pkgs/development/python-modules/srp/default.nix index 17a3ab51cc7a7..13820a2363469 100644 --- a/pkgs/development/python-modules/srp/default.nix +++ b/pkgs/development/python-modules/srp/default.nix @@ -1,20 +1,35 @@ -{ buildPythonPackage, fetchPypi, six, lib }: +{ lib +, buildPythonPackage +, fetchPypi +, six +, pythonOlder +}: buildPythonPackage rec { pname = "srp"; - version = "1.0.18"; + version = "1.0.19"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "1582317ccd383dc39d54f223424c588254d73d1cfb2c5c24d945e018ec9516bb"; + hash = "sha256-SOZT6MP1kJCbpAcwbrLoRgosfR+GxWvOWc9Cr1T/XSo="; }; - propagatedBuildInputs = [ six ]; + propagatedBuildInputs = [ + six + ]; # Tests ends up with libssl.so cannot load shared doCheck = false; + pythonImportsCheck = [ + "srp" + ]; + meta = with lib; { + description = "Implementation of the Secure Remote Password protocol (SRP)"; longDescription = '' This package provides an implementation of the Secure Remote Password protocol (SRP). SRP is a cryptographically strong authentication protocol for password-based, mutual authentication over an insecure network connection. diff --git a/pkgs/development/python-modules/srsly/default.nix b/pkgs/development/python-modules/srsly/default.nix index 18771886b0faa..7a2d6790b47da 100644 --- a/pkgs/development/python-modules/srsly/default.nix +++ b/pkgs/development/python-modules/srsly/default.nix @@ -12,13 +12,13 @@ buildPythonPackage rec { pname = "srsly"; - version = "2.4.2"; + version = "2.4.3"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-KrolIpJ2eHUIat9OQ4DiewJNc2VUVveW+OB+s6TfrMA="; + hash = "sha256-2+kfbdSuqegZSTYoNW3HFb2cYGSGKXu3yldI5uADhBw="; }; nativeBuildInputs = [ cython ]; diff --git a/pkgs/development/python-modules/starlette/default.nix b/pkgs/development/python-modules/starlette/default.nix index 1084a50be7707..caa841339e16c 100644 --- a/pkgs/development/python-modules/starlette/default.nix +++ b/pkgs/development/python-modules/starlette/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { pname = "starlette"; - version = "0.17.1"; + version = "0.19.0"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -30,7 +30,7 @@ buildPythonPackage rec { owner = "encode"; repo = pname; rev = version; - sha256 = "sha256-qT/w7r8PsrauLoBolwCGpxiwhDZo3z6hIqKVXeY5yqA="; + sha256 = "sha256-gjRTMzoQ8pqxjIusRwRXGs72VYo6xsp2DSUxmEr9KxU="; }; postPatch = '' diff --git a/pkgs/development/python-modules/staticjinja/default.nix b/pkgs/development/python-modules/staticjinja/default.nix index ac3c173c09a5b..0c1a698aa63c0 100644 --- a/pkgs/development/python-modules/staticjinja/default.nix +++ b/pkgs/development/python-modules/staticjinja/default.nix @@ -9,7 +9,7 @@ , pytest-check , pythonOlder , markdown -, testVersion +, testers , tomlkit , staticjinja , callPackage @@ -53,7 +53,7 @@ buildPythonPackage rec { ''; passthru.tests = { - version = testVersion { package = staticjinja; }; + version = testers.testVersion { package = staticjinja; }; minimal-template = callPackage ./test-minimal-template {}; }; diff --git a/pkgs/development/python-modules/stone/default.nix b/pkgs/development/python-modules/stone/default.nix index 8ea42d1f27953..55f74b58fb520 100644 --- a/pkgs/development/python-modules/stone/default.nix +++ b/pkgs/development/python-modules/stone/default.nix @@ -1,34 +1,31 @@ -{ lib, buildPythonPackage, fetchPypi -, coverage +{ lib +, buildPythonPackage +, fetchFromGitHub , mock , ply -, pytest-runner , pytestCheckHook , six }: buildPythonPackage rec { pname = "stone"; - version = "3.2.1"; - - src = fetchPypi { - inherit pname version; - sha256 = "0xby5mpsms7b2rv8j6mvxzmzz5i9ii01brb9ylxz6kiv2i08piwv"; + version = "3.3.1"; + + # pypi sdist misses requirements.txt + src = fetchFromGitHub { + owner = "dropbox"; + repo = pname; + rev = "v${version}"; + hash = "sha256-0FWdYbv+paVU3Wj6g9OrSNUB0pH8fLwTkhVIBPeFB/U="; }; postPatch = '' - substituteInPlace setup.py \ - --replace "pytest-runner == 5.2.0" "pytest-runner" \ - --replace "pytest < 5" "pytest" - substituteInPlace test/requirements.txt \ - --replace "coverage==5.3" "coverage" + sed -i '/pytest-runner/d' setup.py ''; - nativeBuildInputs = [ pytest-runner ]; - propagatedBuildInputs = [ ply six ]; - checkInputs = [ pytestCheckHook coverage mock ]; + checkInputs = [ pytestCheckHook mock ]; # try to import from `test` directory, which is exported by the python interpreter # and cannot be overriden without removing some py3 to py2 support diff --git a/pkgs/development/python-modules/stookalert/default.nix b/pkgs/development/python-modules/stookalert/default.nix new file mode 100644 index 0000000000000..82552ca44bb39 --- /dev/null +++ b/pkgs/development/python-modules/stookalert/default.nix @@ -0,0 +1,33 @@ +{ lib +, buildPythonPackage +, fetchPypi +, requests +}: + +buildPythonPackage rec { + pname = "stookalert"; + version = "0.1.4"; + + format = "setuptools"; + + src = fetchPypi { + inherit pname version; + sha256 = "38c479e2fb7668f9b37aff0f9ffdd7bfd1ee9393528f2d3d36b5911b40da70a1"; + }; + + propagatedBuildInputs = [ + requests + ]; + + # upstream has no tests + doCheck = false; + + pythonImportsCheck = [ "stookalert" ]; + + meta = { + description = "Python package for the RIVM Stookalert"; + homepage = "https://github.com/fwestenberg/stookalert"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ dotlambda ]; + }; +} diff --git a/pkgs/development/python-modules/stripe/default.nix b/pkgs/development/python-modules/stripe/default.nix index 6580e245866f0..27c3f84331ad2 100644 --- a/pkgs/development/python-modules/stripe/default.nix +++ b/pkgs/development/python-modules/stripe/default.nix @@ -7,14 +7,14 @@ buildPythonPackage rec { pname = "stripe"; - version = "2.70.0"; + version = "2.74.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-7YiX9o5rrDOYzJmOtWNFUYQGMNZQTAAm/P0K2RyadKQ="; + hash = "sha256-+o7StcJBv9peiYTWBnIfnDUqodiG3sVQJBbKBOALktA="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/stumpy/default.nix b/pkgs/development/python-modules/stumpy/default.nix index 68e35a1d0eca7..66a9b7e0d82ce 100644 --- a/pkgs/development/python-modules/stumpy/default.nix +++ b/pkgs/development/python-modules/stumpy/default.nix @@ -34,6 +34,12 @@ buildPythonPackage rec { pytestCheckHook ]; + pytestFlagsArray = [ + # whole testsuite is very CPU intensive, only run core tests + # TODO: move entire test suite to passthru.tests + "tests/test_core.py" + ]; + meta = with lib; { description = "A powerful and scalable library that can be used for a variety of time series data mining tasks"; homepage = "https://github.com/TDAmeritrade/stumpy"; diff --git a/pkgs/development/python-modules/suds-jurko/default.nix b/pkgs/development/python-modules/suds-jurko/default.nix index af307919387f6..f2776265b067f 100644 --- a/pkgs/development/python-modules/suds-jurko/default.nix +++ b/pkgs/development/python-modules/suds-jurko/default.nix @@ -27,6 +27,7 @@ buildPythonPackage rec { description = "Lightweight SOAP client (Jurko's fork)"; homepage = "https://bitbucket.org/jurko/suds"; license = licenses.lgpl3; + broken = true; # Uses use2to3, which has been removed in setuptools>=58 }; } diff --git a/pkgs/development/python-modules/sumo/default.nix b/pkgs/development/python-modules/sumo/default.nix index 68f298de10802..86ab922c1bfb6 100644 --- a/pkgs/development/python-modules/sumo/default.nix +++ b/pkgs/development/python-modules/sumo/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "sumo"; - version = "2.2.5"; + version = "2.3.0"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -25,8 +25,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "SMTG-UCL"; repo = "sumo"; - rev = "v${version}"; - sha256 = "1vwqyv215yf51j1278cn7l8mpqmy1grm9j7z3hxjlz4w65cff324"; + rev = "refs/tags/v${version}"; + sha256 = "sha256-apI5Qt7Wrr4FXKL48iqqIQJDX2BIf3PPz/qIgSO7nuo="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/sunpy/default.nix b/pkgs/development/python-modules/sunpy/default.nix index 4e61f8665ba6a..8f1653d91abff 100644 --- a/pkgs/development/python-modules/sunpy/default.nix +++ b/pkgs/development/python-modules/sunpy/default.nix @@ -31,14 +31,14 @@ buildPythonPackage rec { pname = "sunpy"; - version = "3.1.3"; + version = "3.1.6"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "4acb05a05c7e6a2090cd0bb426b34c7e1620be0de2bf90a95a3f48ba15a5fce2"; + sha256 = "sha256-mI5W4EDzTk3GryTQbnmvP+ks3VJDzw4drew9wD9+tIE="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/superqt/default.nix b/pkgs/development/python-modules/superqt/default.nix index 9890a7000a9af..af600f623423c 100644 --- a/pkgs/development/python-modules/superqt/default.nix +++ b/pkgs/development/python-modules/superqt/default.nix @@ -3,21 +3,25 @@ , fetchFromGitHub , setuptools-scm , pyqt5 +, qtpy , typing-extensions , pytest , pytestCheckHook -}: buildPythonPackage rec { +}: + +buildPythonPackage rec { pname = "superqt"; - version = "0.2.5-1"; + version = "0.3.1"; + src = fetchFromGitHub { owner = "napari"; repo = pname; rev = "v${version}"; - sha256 = "sha256-rkTiCJ8mIogS9SDmLPiaAyhhuBx3kk6rXjCc19zbwiM="; + sha256 = "sha256-DPjJxOgybNvZ3YvYHr48fmx59Puck61Dzm2G4M9qKo4="; }; format = "pyproject"; nativeBuildInputs = [ setuptools-scm ]; - propagatedBuildInputs = [ pyqt5 typing-extensions ]; + propagatedBuildInputs = [ pyqt5 qtpy typing-extensions ]; checkInputs = [ pytestCheckHook pytest ]; doCheck = false; # Segfaults... SETUPTOOLS_SCM_PRETEND_VERSION = version; diff --git a/pkgs/development/python-modules/svdtools/default.nix b/pkgs/development/python-modules/svdtools/default.nix index 03db4b6356e22..98b59c18bdc39 100644 --- a/pkgs/development/python-modules/svdtools/default.nix +++ b/pkgs/development/python-modules/svdtools/default.nix @@ -11,22 +11,16 @@ buildPythonPackage rec { pname = "svdtools"; - version = "0.1.21"; + version = "0.1.22"; + format = "setuptools"; disabled = pythonOlder "3.8"; src = fetchPypi { inherit version pname; - sha256 = "0qc94haqkj4dbhify1l3x0ji1dx34m79nfnsk1c7l1kl2zjvz6bz"; + hash = "sha256-5zMuCFCvh7BXr9BbyyDhWw1Lt/Fomv0SALiPJQbxJNQ="; }; - # remove upon next release - # see: https://github.com/stm32-rs/svdtools/pull/96 - prePatch = '' - substituteInPlace setup.py \ - --replace 'PyYAML ~= 5.3' 'PyYAML >= 5.3' - ''; - propagatedBuildInputs = [ braceexpand click @@ -34,9 +28,13 @@ buildPythonPackage rec { lxml ]; - checkInputs = [ pytestCheckHook ]; + checkInputs = [ + pytestCheckHook + ]; - pythonImportsCheck = [ "svdtools" ]; + pythonImportsCheck = [ + "svdtools" + ]; meta = with lib; { description = "Python package to handle vendor-supplied, often buggy SVD files"; diff --git a/pkgs/development/python-modules/svg-path/default.nix b/pkgs/development/python-modules/svg-path/default.nix index e01909fc93a8b..b5b1547632210 100644 --- a/pkgs/development/python-modules/svg-path/default.nix +++ b/pkgs/development/python-modules/svg-path/default.nix @@ -1,13 +1,37 @@ -{ lib, buildPythonPackage, fetchPypi }: +{ lib +, buildPythonPackage +, fetchPypi +, pillow +, pytestCheckHook +, pythonOlder +}: + buildPythonPackage rec { pname = "svg.path"; - version = "4.1"; + version = "6.0"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "7e6847ba690ff620e20f152818d52e1685b993aacbc41b321f8fee3d1cb427db"; + hash = "sha256-X78HaJFzywl3aA4Sl58wHQu2r1NVyjlsww0+ESx5TdU="; }; + checkInputs = [ + pillow + pytestCheckHook + ]; + + disabledTests = [ + # generated image differs from example + "test_image" + ]; + + pythonImportsCheck = [ + "svg.path" + ]; + meta = with lib; { description = "SVG path objects and parser"; homepage = "https://github.com/regebro/svg.path"; diff --git a/pkgs/development/python-modules/symengine/default.nix b/pkgs/development/python-modules/symengine/default.nix index db0f01ae51f0b..ee2a08738456f 100644 --- a/pkgs/development/python-modules/symengine/default.nix +++ b/pkgs/development/python-modules/symengine/default.nix @@ -1,5 +1,6 @@ { lib , buildPythonPackage +, fetchpatch , fetchFromGitHub , cython , cmake @@ -12,6 +13,7 @@ buildPythonPackage rec { pname = "symengine"; version = "0.9.2"; + format = "setuptools"; src = fetchFromGitHub { owner = "symengine"; @@ -20,13 +22,18 @@ buildPythonPackage rec { sha256 = "sha256-ZHplYEG97foy/unOdSokFFkDl4LK5TI4kypHSLpcCM4="; }; - postConfigure = '' + patches = [ + (fetchpatch { + # setuptools 61 compat + url = "https://github.com/symengine/symengine.py/commit/987e665e71cf92d1b021d7d573a1b9733408eecf.patch"; + hash = "sha256-2QbNdw/lKYRIRpOU5BiwF2kK+5Lh2j/Q82MKUIvl0+c="; + }) + ]; + + postPatch = '' substituteInPlace setup.py \ --replace "\"cmake\"" "\"${cmake}/bin/cmake\"" \ --replace "'cython>=0.29.24'" "'cython'" - - substituteInPlace cmake/FindCython.cmake \ - --replace "SET(CYTHON_BIN cython" "SET(CYTHON_BIN ${cython}/bin/cython" ''; nativeBuildUnputs = [ cmake ]; diff --git a/pkgs/development/python-modules/sympy/default.nix b/pkgs/development/python-modules/sympy/default.nix index 7d6206f04c805..17765a3752983 100644 --- a/pkgs/development/python-modules/sympy/default.nix +++ b/pkgs/development/python-modules/sympy/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "sympy"; - version = "1.9"; + version = "1.10.1"; src = fetchPypi { inherit pname version; - sha256 = "c7a880e229df96759f955d4f3970d4cabce79f60f5b18830c08b90ce77cd5fdc"; + sha256 = "sha256-WTnu/9+eFSFyYBRjYmwCKiwn51z2J43o1AHVDJ1YeHs="; }; checkInputs = [ glibcLocales ]; diff --git a/pkgs/development/python-modules/syslog-rfc5424-formatter/default.nix b/pkgs/development/python-modules/syslog-rfc5424-formatter/default.nix index 040db8d1e0786..50ebc91d9e81c 100644 --- a/pkgs/development/python-modules/syslog-rfc5424-formatter/default.nix +++ b/pkgs/development/python-modules/syslog-rfc5424-formatter/default.nix @@ -1,23 +1,29 @@ { lib , buildPythonPackage , fetchFromGitHub +, pythonOlder }: buildPythonPackage rec { pname = "syslog-rfc5424-formatter"; - version = "1.2.2"; + version = "1.2.3"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "easypost"; repo = pname; - rev = "v${version}"; - sha256 = "17ym5ls5r6dd9pg9frdz8myfq5fxyqlwdq1gygc9vnrxbgw2c9kb"; + rev = "refs/tags/v${version}"; + hash = "sha256-dvRSOMXRmZf0vEEyX6H7OBSfo/PgyOLKuDS8X6g4qe0="; }; # Tests are not picked up, review later again doCheck = false; - pythonImportsCheck = [ "syslog_rfc5424_formatter" ]; + pythonImportsCheck = [ + "syslog_rfc5424_formatter" + ]; meta = with lib; { description = "Python logging formatter for emitting RFC5424 Syslog messages"; diff --git a/pkgs/development/python-modules/tablib/default.nix b/pkgs/development/python-modules/tablib/default.nix index b854e09c0506a..ae0217b0ebdc6 100644 --- a/pkgs/development/python-modules/tablib/default.nix +++ b/pkgs/development/python-modules/tablib/default.nix @@ -1,9 +1,12 @@ -{ buildPythonPackage, lib, fetchPypi, isPy27 +{ buildPythonPackage +, lib +, fetchPypi +, isPy27 , odfpy , openpyxl , pandas , setuptools-scm -, pytest +, pytestCheckHook , pytest-cov , pyyaml , unicodecsv @@ -13,26 +16,27 @@ buildPythonPackage rec { pname = "tablib"; - version = "3.2.0"; + version = "3.2.1"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "12d8686454c721de88d8ca5adf07e1f419ef6dbcecedf65e8950d4a329daf3a0"; + sha256 = "sha256-pX8ncLjCJf6+wcseZQEqac8w3Si+gQ4P+Y0CR2jH0PE="; }; nativeBuildInputs = [ setuptools-scm ]; propagatedBuildInputs = [ xlwt openpyxl pyyaml xlrd odfpy ]; - checkInputs = [ pytest pytest-cov unicodecsv pandas ]; + checkInputs = [ pytestCheckHook pytest-cov unicodecsv pandas ]; # test_tablib needs MarkupPy, which isn't packaged yet - checkPhase = '' - pytest --ignore tests/test_tablib.py - ''; + pytestFlagsArray = [ "--ignore=tests/test_tablib.py" ]; + + pythonImportsCheck = [ "tablib" ]; meta = with lib; { description = "Format-agnostic tabular dataset library"; - homepage = "https://python-tablib.org"; + homepage = "https://tablib.readthedocs.io/"; + changelog = "https://github.com/jazzband/tablib/raw/v${version}/HISTORY.md"; license = licenses.mit; }; } diff --git a/pkgs/development/python-modules/teletype/default.nix b/pkgs/development/python-modules/teletype/default.nix index c3878bf3c8779..999454edf83ff 100644 --- a/pkgs/development/python-modules/teletype/default.nix +++ b/pkgs/development/python-modules/teletype/default.nix @@ -1,17 +1,27 @@ -{ buildPythonPackage, fetchPypi, lib }: +{ lib +, buildPythonPackage +, fetchPypi +, pythonOlder +}: buildPythonPackage rec { pname = "teletype"; - version = "1.1.0"; + version = "1.3.4"; + format = "pyproject"; + + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "02mg0qmdf7hljq6jw1hwaid3hvkf70dfxgrxmpqybaxrph5pfg1y"; + hash = "sha256-uBppM4w9GlMgYqKFGw1Rcjvq+mnU04K3E74jCgK9YYo="; }; # no tests doCheck = false; - pythonImportsCheck = [ "teletype" ]; + + pythonImportsCheck = [ + "teletype" + ]; meta = with lib; { description = "A high-level cross platform tty library"; diff --git a/pkgs/development/python-modules/tellduslive/default.nix b/pkgs/development/python-modules/tellduslive/default.nix index 5a6a84af8392b..f933553dcdbe7 100644 --- a/pkgs/development/python-modules/tellduslive/default.nix +++ b/pkgs/development/python-modules/tellduslive/default.nix @@ -3,12 +3,16 @@ , docopt , fetchFromGitHub , requests -, requests_oauthlib +, requests-oauthlib +, pythonOlder }: buildPythonPackage rec { pname = "tellduslive"; version = "0.10.11"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "molobrakos"; @@ -20,12 +24,15 @@ buildPythonPackage rec { propagatedBuildInputs = [ docopt requests - requests_oauthlib + requests-oauthlib ]; # Project has no tests doCheck = false; - pythonImportsCheck = [ "tellduslive" ]; + + pythonImportsCheck = [ + "tellduslive" + ]; meta = with lib; { description = "Python module to communicate with Telldus Live"; diff --git a/pkgs/development/python-modules/tempora/default.nix b/pkgs/development/python-modules/tempora/default.nix index 79b04b7ebbb2b..ff837158fc268 100644 --- a/pkgs/development/python-modules/tempora/default.nix +++ b/pkgs/development/python-modules/tempora/default.nix @@ -1,30 +1,59 @@ -{ lib, buildPythonPackage, fetchPypi -, setuptools-scm, pytestCheckHook, pytest-freezegun, freezegun, backports_unittest-mock -, six, pytz, jaraco_functools, pythonOlder +{ lib +, buildPythonPackage +, fetchPypi +, pythonOlder + +# build time +, setuptools-scm + +# runtime +, pytz +, jaraco_functools + +# tests +, freezegun +, pytest-freezegun +, pytestCheckHook }: buildPythonPackage rec { pname = "tempora"; - version = "5.0.0"; + version = "5.0.1"; + format = "pyproject"; + + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "aa21dd1956e29559ecb2f2f2e14fcdb950085222fbbf86e6c946b5e1a8c36b26"; + sha256 = "sha256-y6Dxl6ZIg78+c2V++8AyTVvxcXnndpsThbTXXSbNkSc="; }; - disabled = pythonOlder "3.2"; - - nativeBuildInputs = [ setuptools-scm ]; + nativeBuildInputs = [ + setuptools-scm + ]; - propagatedBuildInputs = [ six pytz jaraco_functools ]; + propagatedBuildInputs = [ + jaraco_functools + pytz + ]; checkInputs = [ - pytest-freezegun pytestCheckHook freezegun backports_unittest-mock + freezegun + pytest-freezegun + pytestCheckHook + ]; + + pythonImportsCheck = [ + "tempora" + "tempora.schedule" + "tempora.timing" + "tempora.utc" ]; meta = with lib; { description = "Objects and routines pertaining to date and time"; homepage = "https://github.com/jaraco/tempora"; license = licenses.mit; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/development/python-modules/tensorflow-tensorboard/default.nix b/pkgs/development/python-modules/tensorboard/default.nix index a4a04d898566a..47025bf4a28af 100644 --- a/pkgs/development/python-modules/tensorflow-tensorboard/default.nix +++ b/pkgs/development/python-modules/tensorboard/default.nix @@ -22,17 +22,16 @@ # buildBazelPackage. buildPythonPackage rec { - pname = "tensorflow-tensorboard"; - version = "2.6.0"; + pname = "tensorboard"; + version = "2.8.0"; format = "wheel"; - disabled = pythonOlder "3.6" || pythonAtLeast "3.10"; + disabled = pythonOlder "3.6" || pythonAtLeast "3.11"; src = fetchPypi { - pname = "tensorboard"; - inherit version format; + inherit pname version format; dist = "py3"; python = "py3"; - sha256 = "sha256-99rEzftS0UyeP3RYXOKq+OYgNiCoZOUfr4SYiwn3u9s="; + hash = "sha256-ZaM45EJOkHnyYEkjvb4wF5KtzirOG+aNprPd8AUXDe8="; }; postPatch = '' diff --git a/pkgs/development/python-modules/tensorboardx/default.nix b/pkgs/development/python-modules/tensorboardx/default.nix index eacb5b4cdc804..7aa29f34baa55 100644 --- a/pkgs/development/python-modules/tensorboardx/default.nix +++ b/pkgs/development/python-modules/tensorboardx/default.nix @@ -13,7 +13,7 @@ , pytorch , six , soundfile -, tensorflow-tensorboard +, tensorboard , torchvision }: @@ -56,7 +56,7 @@ buildPythonPackage rec { pillow pytestCheckHook pytorch - tensorflow-tensorboard + tensorboard torchvision ]; @@ -70,6 +70,8 @@ buildPythonPackage rec { disabledTestPaths = [ # we are not interested in linting errors "tests/test_lint.py" + # missing caffe2 dependency + "tests/test_caffe2.py" ]; meta = with lib; { diff --git a/pkgs/development/python-modules/tensorflow-datasets/default.nix b/pkgs/development/python-modules/tensorflow-datasets/default.nix index b97461394d13a..38d6458d4fd9a 100644 --- a/pkgs/development/python-modules/tensorflow-datasets/default.nix +++ b/pkgs/development/python-modules/tensorflow-datasets/default.nix @@ -9,6 +9,8 @@ , future , imagemagick , importlib-resources +, jax +, jaxlib , jinja2 , langdetect , lib @@ -39,13 +41,13 @@ buildPythonPackage rec { pname = "tensorflow-datasets"; - version = "4.4.0"; + version = "4.5.2"; src = fetchFromGitHub { owner = "tensorflow"; repo = "datasets"; rev = "v${version}"; - sha256 = "11kbpv54nwr0xf7z5mkj2lmrfqfmcdq8qcpapnqck1kiawr3yad6"; + sha256 = "sha256-OZpaY/6BMISq5IeDXyuyu5L/yG+DwlFliw4BsipPOLg="; }; patches = [ @@ -78,6 +80,8 @@ buildPythonPackage rec { beautifulsoup4 ffmpeg imagemagick + jax + jaxlib jinja2 langdetect matplotlib @@ -96,7 +100,6 @@ buildPythonPackage rec { tensorflow tifffile ]; - pytestFlagsArray = [ "-n $NIX_BUILD_CORES" ]; disabledTestPaths = [ # Sandbox violations: network access, filesystem write attempts outside of build dir, ... @@ -119,6 +122,9 @@ buildPythonPackage rec { # Requires `tensorflow_io` which is not packaged in `nixpkgs`. "tensorflow_datasets/image/lsun_test.py" + # Requires `envlogger` which is not packaged in `nixpkgs`. + "tensorflow_datasets/rlds/robosuite_panda_pick_place_can/robosuite_panda_pick_place_can_test.py" + # Fails with `TypeError: Constant constructor takes either 0 or 2 positional arguments` # deep in TF AutoGraph. Doesn't reproduce in Docker with Ubuntu 22.04 => might be related # to the differences in some of the dependencies? diff --git a/pkgs/development/python-modules/tensorflow-estimator/default.nix b/pkgs/development/python-modules/tensorflow-estimator/default.nix index 5ad6d0ab6e555..7c7f155adb09b 100644 --- a/pkgs/development/python-modules/tensorflow-estimator/default.nix +++ b/pkgs/development/python-modules/tensorflow-estimator/default.nix @@ -6,13 +6,13 @@ buildPythonPackage rec { pname = "tensorflow-estimator"; - version = "2.7.0"; + version = "2.8.0"; format = "wheel"; src = fetchPypi { pname = "tensorflow_estimator"; inherit version format; - hash = "sha256-MltaIkhkN5JCt7dsaYfKVEI5voJXnTPmjsfCvaV6vJ0="; + hash = "sha256-vujgUgxgrn6vbKjLRsWp9LRXJVMTgNuPvjj8tIR4trs="; }; propagatedBuildInputs = [ mock numpy absl-py ]; diff --git a/pkgs/development/python-modules/tensorflow-metadata/build.patch b/pkgs/development/python-modules/tensorflow-metadata/build.patch index ff81c5d1e86cf..5b570bf72062d 100644 --- a/pkgs/development/python-modules/tensorflow-metadata/build.patch +++ b/pkgs/development/python-modules/tensorflow-metadata/build.patch @@ -2,15 +2,6 @@ diff --git a/setup.py b/setup.py index 7a09b2f..94c5aa6 100644 --- a/setup.py +++ b/setup.py -@@ -125,7 +125,7 @@ setup( - ], - namespace_packages=[], - install_requires=[ -- 'absl-py>=0.9,<0.13', -+ 'absl-py>=0.9', - 'googleapis-common-protos>=1.52.0,<2', - 'protobuf>=3.13,<4', - ], @@ -137,8 +137,5 @@ setup( long_description_content_type='text/markdown', keywords='tensorflow metadata tfx', diff --git a/pkgs/development/python-modules/tensorflow-metadata/default.nix b/pkgs/development/python-modules/tensorflow-metadata/default.nix index 2a80155c4cd9e..b39f1211d0cac 100644 --- a/pkgs/development/python-modules/tensorflow-metadata/default.nix +++ b/pkgs/development/python-modules/tensorflow-metadata/default.nix @@ -2,18 +2,19 @@ , buildPythonPackage , fetchFromGitHub , googleapis-common-protos +, protobuf , lib }: buildPythonPackage rec { pname = "tensorflow-metadata"; - version = "1.5.0"; + version = "1.7.0"; src = fetchFromGitHub { owner = "tensorflow"; repo = "metadata"; rev = "v${version}"; - sha256 = "17p74k6rwswpmj7m16cw9hdam6b4m7v5bahirmc2l1kwfvrn4w33"; + sha256 = "sha256-CQlLEVNcD9u2pojz8r1eLzYzc9i2hjdZfzfYSQ/8Q4k="; }; patches = [ @@ -31,8 +32,12 @@ buildPythonPackage rec { propagatedBuildInputs = [ absl-py googleapis-common-protos + protobuf ]; + # has no tests + doCheck = false; + pythonImportsCheck = [ "tensorflow_metadata" ]; diff --git a/pkgs/development/python-modules/tensorflow-tensorboard/1/default.nix b/pkgs/development/python-modules/tensorflow-tensorboard/1/default.nix deleted file mode 100644 index f58b1a207719a..0000000000000 --- a/pkgs/development/python-modules/tensorflow-tensorboard/1/default.nix +++ /dev/null @@ -1,65 +0,0 @@ -{ lib, fetchPypi, buildPythonPackage, isPy3k -, numpy -, wheel -, werkzeug -, protobuf -, grpcio -, markdown -, futures -, absl-py -}: - -# tensorflow/tensorboard is built from a downloaded wheel, because -# https://github.com/tensorflow/tensorboard/issues/719 blocks -# buildBazelPackage. - -buildPythonPackage rec { - pname = "tensorflow-tensorboard"; - version = "1.15.0"; - format = "wheel"; - - src = fetchPypi ({ - pname = "tensorboard"; - inherit version format; - } // (if isPy3k then { - python = "py3"; - sha256 = "1g62i3nrgp8q9wfsyqqjkkfnsz7x2k018c26kdh527h1yrjjrbac"; - } else { - python = "py2"; - sha256 = "0l3zc8j2sh7h1z4qpy8kfvclv3kzndri55p10i42q6xahs9phav1"; - })); - - propagatedBuildInputs = [ - numpy - werkzeug - protobuf - markdown - grpcio - absl-py - # not declared in install_requires, but used at runtime - # https://github.com/NixOS/nixpkgs/issues/73840 - wheel - ] ++ lib.optional (!isPy3k) futures; - - # in the absence of a real test suite, run cli and imports - checkPhase = '' - $out/bin/tensorboard --help > /dev/null - ''; - - pythonImportsCheck = [ - "tensorboard" - "tensorboard.backend" - "tensorboard.compat" - "tensorboard.data" - "tensorboard.plugins" - "tensorboard.summary" - "tensorboard.util" - ]; - - meta = with lib; { - description = "TensorFlow's Visualization Toolkit"; - homepage = "http://tensorflow.org"; - license = licenses.asl20; - maintainers = with maintainers; [ abbradar ]; - }; -} diff --git a/pkgs/development/python-modules/tensorflow/bin.nix b/pkgs/development/python-modules/tensorflow/bin.nix index 2556a8039c1b7..f5044a360f08b 100644 --- a/pkgs/development/python-modules/tensorflow/bin.nix +++ b/pkgs/development/python-modules/tensorflow/bin.nix @@ -18,10 +18,9 @@ , opt-einsum , backports_weakref , tensorflow-estimator -, tensorflow-tensorboard +, tensorboard , cudaSupport ? false -, cudatoolkit -, cudnn +, cudaPackages ? {} , patchelfUnstable , zlib , python @@ -43,12 +42,14 @@ assert ! (stdenv.isDarwin && cudaSupport); let packages = import ./binary-hashes.nix; + inherit (cudaPackages) cudatoolkit cudnn; in buildPythonPackage { pname = "tensorflow" + lib.optionalString cudaSupport "-gpu"; inherit (packages) version; format = "wheel"; - disabled = pythonAtLeast "3.10"; + # See https://github.com/tensorflow/tensorflow/issues/55581#issuecomment-1101890383 + disabled = pythonAtLeast "3.10" && !cudaSupport; src = let pyVerNoDot = lib.strings.stringAsChars (x: if x == "." then "" else x) python.pythonVersion; @@ -74,7 +75,7 @@ in buildPythonPackage { google-pasta wrapt tensorflow-estimator - tensorflow-tensorboard + tensorboard keras-applications keras-preprocessing h5py @@ -97,11 +98,11 @@ in buildPythonPackage { ( cd unpacked/tensorflow* # Adjust dependency requirements: - # - Relax gast version requirement that doesn't match what we have packaged + # - Relax tensorflow-estimator version requirement that doesn't match what we have packaged # - The purpose of python3Packages.libclang is not clear at the moment and we don't have it packaged yet # - keras and tensorlow-io-gcs-filesystem will be considered as optional for now. sed -i *.dist-info/METADATA \ - -e "s/Requires-Dist: gast.*/Requires-Dist: gast/" \ + -e "s/Requires-Dist: tf-estimator-nightly.*/Requires-Dist: tensorflow-estimator/" \ -e "/Requires-Dist: libclang/d" \ -e "/Requires-Dist: keras/d" \ -e "/Requires-Dist: tensorflow-io-gcs-filesystem/d" @@ -168,7 +169,7 @@ in buildPythonPackage { ''; # Upstream has a pip hack that results in bin/tensorboard being in both tensorflow - # and the propagated input tensorflow-tensorboard, which causes environment collisions. + # and the propagated input tensorboard, which causes environment collisions. # Another possibility would be to have tensorboard only in the buildInputs # See https://github.com/NixOS/nixpkgs/pull/44381 for more information. postInstall = '' @@ -177,11 +178,14 @@ in buildPythonPackage { pythonImportsCheck = [ "tensorflow" - "tensorflow.keras" "tensorflow.python" "tensorflow.python.framework" ]; + passthru = { + inherit cudaPackages; + }; + meta = with lib; { description = "Computation using data flow graphs for scalable machine learning"; homepage = "http://tensorflow.org"; diff --git a/pkgs/development/python-modules/tensorflow/binary-hashes.nix b/pkgs/development/python-modules/tensorflow/binary-hashes.nix index 4b2f9d5284077..0d221452bb72b 100644 --- a/pkgs/development/python-modules/tensorflow/binary-hashes.nix +++ b/pkgs/development/python-modules/tensorflow/binary-hashes.nix @@ -1,39 +1,51 @@ { -version = "2.7.0"; +version = "2.8.0"; linux_py_37_cpu = { - url = "https://storage.googleapis.com/tensorflow/linux/cpu/tensorflow_cpu-2.7.0-cp37-cp37m-manylinux2010_x86_64.whl"; - sha256 = "1irw4ri1fbxbj251cnjbr12gxsyj2k30asxjfxjpxhc9b0cchhx0"; + url = "https://storage.googleapis.com/tensorflow/linux/cpu/tensorflow_cpu-2.8.0-cp37-cp37m-manylinux2010_x86_64.whl"; + sha256 = "1nza8i0nvqgrcwj2yy74a3wgpgf52svf0yrz9xd6l18gsifkmkx0"; }; linux_py_38_cpu = { - url = "https://storage.googleapis.com/tensorflow/linux/cpu/tensorflow_cpu-2.7.0-cp38-cp38-manylinux2010_x86_64.whl"; - sha256 = "11a1rimr998lvvjdg03rqr8h2h7x6bbd4gyv74biwgaxmjczvjdj"; + url = "https://storage.googleapis.com/tensorflow/linux/cpu/tensorflow_cpu-2.8.0-cp38-cp38-manylinux2010_x86_64.whl"; + sha256 = "1li2gllznd5w3hh2w9ibh5lkvvssnwh5vhk7i873dxjjdl1w8sqy"; }; linux_py_39_cpu = { - url = "https://storage.googleapis.com/tensorflow/linux/cpu/tensorflow_cpu-2.7.0-cp39-cp39-manylinux2010_x86_64.whl"; - sha256 = "0x1zzmgq7hl2k98p8870h0yhaik39nc1ckvxirjx8simpj8ghsbp"; + url = "https://storage.googleapis.com/tensorflow/linux/cpu/tensorflow_cpu-2.8.0-cp39-cp39-manylinux2010_x86_64.whl"; + sha256 = "03swmyak1hb0k6b2fi9a8g76fi57jz30ym015a576iwp42pqcgkq"; +}; +linux_py_310_cpu = { + url = "https://storage.googleapis.com/tensorflow/linux/cpu/tensorflow_cpu-2.8.0-cp310-cp310-manylinux2010_x86_64.whl"; + sha256 = ""; }; linux_py_37_gpu = { - url = "https://storage.googleapis.com/tensorflow/linux/gpu/tensorflow_gpu-2.7.0-cp37-cp37m-manylinux2010_x86_64.whl"; - sha256 = "1x5yyxzkly9gdyhcfq4x7w7sqqxh6cw5qnfwbvzj5349xwrm63wi"; + url = "https://storage.googleapis.com/tensorflow/linux/gpu/tensorflow_gpu-2.8.0-cp37-cp37m-manylinux2010_x86_64.whl"; + sha256 = "06q3vjrlqfkqa5r18hla3d8ms1sqa897g7fpnqizgh4k8skhm9fq"; }; linux_py_38_gpu = { - url = "https://storage.googleapis.com/tensorflow/linux/gpu/tensorflow_gpu-2.7.0-cp38-cp38-manylinux2010_x86_64.whl"; - sha256 = "0prxa8yc6lbq62vnh8cw6dhcrnkdjih62kbg6pbw4gmgcbf6v6fg"; + url = "https://storage.googleapis.com/tensorflow/linux/gpu/tensorflow_gpu-2.8.0-cp38-cp38-manylinux2010_x86_64.whl"; + sha256 = "0099aa5g19zi74n6bamhmmcgp096m41fhr61swkwnh92myz1ylgb"; }; linux_py_39_gpu = { - url = "https://storage.googleapis.com/tensorflow/linux/gpu/tensorflow_gpu-2.7.0-cp39-cp39-manylinux2010_x86_64.whl"; - sha256 = "0jjv8vm20d0airml68bxhassp4yg09rcz2a39aa511cz8mavj0l6"; + url = "https://storage.googleapis.com/tensorflow/linux/gpu/tensorflow_gpu-2.8.0-cp39-cp39-manylinux2010_x86_64.whl"; + sha256 = "0zw20yvlqga7znr13pa10qxww42mj64209syiicgvhs74ji1zdca"; +}; +linux_py_310_gpu = { + url = "https://storage.googleapis.com/tensorflow/linux/gpu/tensorflow_gpu-2.8.0-cp310-cp310-manylinux2010_x86_64.whl"; + sha256 = "06kwjlhzl46jhjcg836crys2aw39x0g8s1s9qfscm1kbwzbww1hq"; }; mac_py_37_cpu = { - url = "https://storage.googleapis.com/tensorflow/mac/cpu/tensorflow-2.7.0-cp37-cp37m-macosx_10_11_x86_64.whl"; - sha256 = "1gr95ck0h4wzhdacjfhkzxdw4zglm85fc54swqhyzzv1f5n9vw8j"; + url = "https://storage.googleapis.com/tensorflow/mac/cpu/tensorflow-2.8.0-cp37-cp37m-macosx_10_14_x86_64.whl"; + sha256 = "1z5w6wx3h45fz0ji9kn2m2kf963bqbvmqc7cyjv4ixymd0rp4jps"; }; mac_py_38_cpu = { - url = "https://storage.googleapis.com/tensorflow/mac/cpu/tensorflow-2.7.0-cp38-cp38-macosx_10_11_x86_64.whl"; - sha256 = "1h3qlvlrwyvxynh5flvyqk7grbvyqc21ljqhlvds436hpn2kqrgb"; + url = "https://storage.googleapis.com/tensorflow/mac/cpu/tensorflow-2.8.0-cp38-cp38-macosx_10_14_x86_64.whl"; + sha256 = "1h5v8flhc5zb038ld0av7638cyqqkrib379lrlzvf8dw7q8ry3yx"; }; mac_py_39_cpu = { - url = "https://storage.googleapis.com/tensorflow/mac/cpu/tensorflow-2.7.0-cp39-cp39-macosx_10_11_x86_64.whl"; - sha256 = "0pyj1p2yik6ysdqn8n6cz1nqni0s9xx51ifmvdx4dl3hrzp86jz2"; + url = "https://storage.googleapis.com/tensorflow/mac/cpu/tensorflow-2.8.0-cp39-cp39-macosx_10_14_x86_64.whl"; + sha256 = "0qsmlrf8h2gxkimniyrz9bniaqpdsd92pficmsrq30k8rkz2bwjj"; +}; +mac_py_310_cpu = { + url = "https://storage.googleapis.com/tensorflow/mac/cpu/tensorflow-2.8.0-cp310-cp310-macosx_10_14_x86_64.whl"; + sha256 = "0lnwbvil6c6ai10lcaj9ay9pya207s9g204273msjalm1hpbmhvq"; }; } diff --git a/pkgs/development/python-modules/tensorflow/default.nix b/pkgs/development/python-modules/tensorflow/default.nix index 517faef3f8fc7..3a8eba3ba97fc 100644 --- a/pkgs/development/python-modules/tensorflow/default.nix +++ b/pkgs/development/python-modules/tensorflow/default.nix @@ -1,23 +1,23 @@ -{ stdenv, bazel_3, buildBazelPackage, isPy3k, lib, fetchFromGitHub, symlinkJoin +{ stdenv, bazel_4, buildBazelPackage, isPy3k, lib, fetchFromGitHub, symlinkJoin , addOpenGLRunpath, fetchpatch, patchelfUnstable # Python deps , buildPythonPackage, pythonOlder, python # Python libraries -, numpy, tensorflow-tensorboard, absl-py +, numpy, tensorboard, absl-py , setuptools, wheel, keras, keras-preprocessing, google-pasta , opt-einsum, astunparse, h5py , termcolor, grpcio, six, wrapt, protobuf-python, tensorflow-estimator -, dill, flatbuffers-python, tblib, typing-extensions +, dill, flatbuffers-python, portpicker, tblib, typing-extensions # Common deps , git, pybind11, which, binutils, glibcLocales, cython, perl # Common libraries -, jemalloc, mpi, gast, grpc, sqlite, boringssl, jsoncpp +, jemalloc, mpi, gast, grpc, sqlite, boringssl, jsoncpp, nsync , curl, snappy, flatbuffers-core, lmdb-core, icu, double-conversion, libpng, libjpeg_turbo, giflib, protobuf-core -# Upsteam by default includes cuda support since tensorflow 1.15. We could do +# Upstream by default includes cuda support since tensorflow 1.15. We could do # that in nix as well. It would make some things easier and less confusing, but # it would also make the default tensorflow package unfree. See # https://groups.google.com/a/tensorflow.org/forum/#!topic/developers/iRCt5m4qUz0 -, cudaSupport ? false, cudatoolkit ? null, cudnn ? null, nccl ? null +, cudaSupport ? false, cudaPackages ? {} , mklSupport ? false, mkl ? null , tensorboardSupport ? true # XLA without CUDA is broken @@ -31,6 +31,10 @@ , Foundation, Security, cctools, llvmPackages_11 }: +let + inherit (cudaPackages) cudatoolkit cudnn nccl; +in + assert cudaSupport -> cudatoolkit != null && cudnn != null; @@ -72,7 +76,7 @@ let tfFeature = x: if x then "1" else "0"; - version = "2.7.1"; + version = "2.8.0"; variant = if cudaSupport then "-gpu" else ""; pname = "tensorflow${variant}"; @@ -94,8 +98,8 @@ let setuptools six tblib + tensorboard tensorflow-estimator - tensorflow-tensorboard termcolor typing-extensions wheel @@ -179,20 +183,15 @@ let stdenv = llvmPackages_11.stdenv; })) { name = "${pname}-${version}"; - bazel = bazel_3; + bazel = bazel_4; src = fetchFromGitHub { owner = "tensorflow"; repo = "tensorflow"; rev = "v${version}"; - sha256 = "1qwzbqq899swrwrwmm6z7mq9sc55gyh0r4ca0mcnchbvn7w0qbkh"; + hash = "sha256-w78ehpsnXElIyYftgZEq3b/+TSrRN1gyWVUVlSZpGFM="; }; - patches = [ - # Patch the sources to compile with protobuf >= 3.16. - ./system-protobuf.patch - ]; - # On update, it can be useful to steal the changes from gentoo # https://gitweb.gentoo.org/repo/gentoo.git/tree/sci-libs/tensorflow @@ -207,20 +206,20 @@ let git # libs taken from system through the TF_SYS_LIBS mechanism - grpc - sqlite boringssl - jsoncpp curl - pybind11 - snappy + double-conversion flatbuffers-core + giflib + grpc icu - double-conversion - libpng + jsoncpp libjpeg_turbo - giflib + libpng lmdb-core + pybind11 + snappy + sqlite ] ++ lib.optionals cudaSupport [ cudatoolkit cudnn @@ -229,6 +228,8 @@ let ] ++ lib.optionals stdenv.isDarwin [ Foundation Security + ] ++ lib.optionals (!stdenv.isDarwin) [ + nsync ]; # arbitrarily set to the current latest bazel version, overly careful @@ -237,7 +238,7 @@ let # Take as many libraries from the system as possible. Keep in sync with # list of valid syslibs in # https://github.com/tensorflow/tensorflow/blob/master/third_party/systemlibs/syslibs_configure.bzl - TF_SYSTEM_LIBS = lib.concatStringsSep "," [ + TF_SYSTEM_LIBS = lib.concatStringsSep "," ([ "absl_py" "astor_archive" "astunparse_archive" @@ -253,7 +254,6 @@ let "cython" "dill_archive" "double_conversion" - "enum34_archive" "flatbuffers" "functools32_archive" "gast_archive" @@ -264,7 +264,6 @@ let "libjpeg_turbo" "lmdb" "nasm" - # "nsync" # not packaged in nixpkgs "opt_einsum_archive" "org_sqlite" "pasta" @@ -277,7 +276,9 @@ let "typing_extensions_archive" "wrapt" "zlib" - ]; + ] ++ lib.optionals (!stdenv.isDarwin) [ + "nsync" # fails to build on darwin + ]); INCLUDEDIR = "${includes_joined}/include"; @@ -361,12 +362,12 @@ let fetchAttrs = { # cudaSupport causes fetch of ncclArchive, resulting in different hashes sha256 = if cudaSupport then - "sha256-+szc2mRoImwijzbj3nw6HmZp3DeRjjPRU5yC+5AEbkg=" + "sha256-dQEyfueuQPcGvbhuh8Al45np3nRLDw2PCfC2lEqAH50=" else if stdenv.isDarwin then - "sha256-+bwIzp6t7gRJPcI8B5oyuf9z0AjCAyggUR7x+vv5kFs=" + "sha256-yfnZVtKWqNQGvlfq2owXhem0LmzDYriVfYgf1ZRlaDo=" else - "sha256-5yOYmeGpJq4Chi55H7iblxyRXVktgnePtpYTPvBs538="; + "sha256:12i1ix2xwq77f3h8qr4h57g0aazrdsjjqa536cpwx3n1mvl5p6qi"; }; buildAttrs = { @@ -428,18 +429,20 @@ in buildPythonPackage { # Adjust dependency requirements: # - Relax gast version requirement that doesn't match what we have packaged + # - Relax tf-estimator, that would require a nightly version # - The purpose of python3Packages.libclang is not clear at the moment and we don't have it packaged yet # - keras and tensorlow-io-gcs-filesystem will be considered as optional for now. postPatch = '' sed -i setup.py \ -e "s/'gast[^']*',/'gast',/" \ + -e "s/'tf-estimator-nightly[^']*',/'tensorflow-estimator',/" \ -e "/'libclang[^']*',/d" \ -e "/'keras[^']*',/d" \ -e "/'tensorflow-io-gcs-filesystem[^']*',/d" ''; # Upstream has a pip hack that results in bin/tensorboard being in both tensorflow - # and the propagated input tensorflow-tensorboard, which causes environment collisions. + # and the propagated input tensorboard, which causes environment collisions. # Another possibility would be to have tensorboard only in the buildInputs # https://github.com/tensorflow/tensorflow/blob/v1.7.1/tensorflow/tools/pip_package/setup.py#L79 postInstall = '' @@ -452,7 +455,6 @@ in buildPythonPackage { propagatedBuildInputs = [ absl-py astunparse - dill flatbuffers-python gast google-pasta @@ -463,13 +465,12 @@ in buildPythonPackage { opt-einsum protobuf-python six - tblib tensorflow-estimator termcolor typing-extensions wrapt ] ++ lib.optionals withTensorboard [ - tensorflow-tensorboard + tensorboard ]; # remove patchelfUnstable once patchelf 0.14 with https://github.com/NixOS/patchelf/pull/256 becomes the default @@ -486,7 +487,13 @@ in buildPythonPackage { # Actual tests are slow and impure. # TODO try to run them anyway # TODO better test (files in tensorflow/tools/ci_build/builds/*test) - checkInputs = [ keras ]; + # TEST_PACKAGES in tensorflow/tools/pip_package/setup.py + checkInputs = [ + dill + keras + portpicker + tblib + ]; checkPhase = '' ${python.interpreter} <<EOF # A simple "Hello world" @@ -511,6 +518,7 @@ in buildPythonPackage { # Regression test for #77626 removed because not more `tensorflow.contrib`. passthru = { + inherit cudaPackages; deps = bazel-build.deps; libtensorflow = bazel-build.out; }; diff --git a/pkgs/development/python-modules/tensorflow/prefetcher.sh b/pkgs/development/python-modules/tensorflow/prefetcher.sh index bb189bb06d656..3edc671582710 100755 --- a/pkgs/development/python-modules/tensorflow/prefetcher.sh +++ b/pkgs/development/python-modules/tensorflow/prefetcher.sh @@ -1,6 +1,6 @@ #!/usr/bin/env bash -version="2.7.0" +version="2.8.0" bucket="https://storage.googleapis.com/tensorflow" @@ -11,12 +11,15 @@ url_and_key_list=( "linux_py_37_cpu $bucket/linux/cpu/tensorflow_cpu-${version}-cp37-cp37m-manylinux2010_x86_64.whl" "linux_py_38_cpu $bucket/linux/cpu/tensorflow_cpu-${version}-cp38-cp38-manylinux2010_x86_64.whl" "linux_py_39_cpu $bucket/linux/cpu/tensorflow_cpu-${version}-cp39-cp39-manylinux2010_x86_64.whl" +"linux_py_310_cpu $bucket/linux/cpu/tensorflow_cpu-${version}-cp310-cp310-manylinux2010_x86_64.whl" "linux_py_37_gpu $bucket/linux/gpu/tensorflow_gpu-${version}-cp37-cp37m-manylinux2010_x86_64.whl" "linux_py_38_gpu $bucket/linux/gpu/tensorflow_gpu-${version}-cp38-cp38-manylinux2010_x86_64.whl" "linux_py_39_gpu $bucket/linux/gpu/tensorflow_gpu-${version}-cp39-cp39-manylinux2010_x86_64.whl" -"mac_py_37_cpu $bucket/mac/cpu/tensorflow-${version}-cp37-cp37m-macosx_10_11_x86_64.whl" -"mac_py_38_cpu $bucket/mac/cpu/tensorflow-${version}-cp38-cp38-macosx_10_11_x86_64.whl" -"mac_py_39_cpu $bucket/mac/cpu/tensorflow-${version}-cp39-cp39-macosx_10_11_x86_64.whl" +"linux_py_310_gpu $bucket/linux/gpu/tensorflow_gpu-${version}-cp310-cp310-manylinux2010_x86_64.whl" +"mac_py_37_cpu $bucket/mac/cpu/tensorflow-${version}-cp37-cp37m-macosx_10_14_x86_64.whl" +"mac_py_38_cpu $bucket/mac/cpu/tensorflow-${version}-cp38-cp38-macosx_10_14_x86_64.whl" +"mac_py_39_cpu $bucket/mac/cpu/tensorflow-${version}-cp39-cp39-macosx_10_14_x86_64.whl" +"mac_py_310_cpu $bucket/mac/cpu/tensorflow-${version}-cp310-cp310-macosx_10_14_x86_64.whl" ) hashfile=binary-hashes.nix diff --git a/pkgs/development/python-modules/tensorflow/system-protobuf.patch b/pkgs/development/python-modules/tensorflow/system-protobuf.patch deleted file mode 100644 index dce6df810464f..0000000000000 --- a/pkgs/development/python-modules/tensorflow/system-protobuf.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/tensorflow/core/kernels/example_parsing_ops.cc b/tensorflow/core/kernels/example_parsing_ops.cc -index a1265cfb5c6..ada919bbd7b 100644 ---- a/tensorflow/core/kernels/example_parsing_ops.cc -+++ b/tensorflow/core/kernels/example_parsing_ops.cc -@@ -1218,7 +1218,7 @@ class DecodeJSONExampleOp : public OpKernel { - resolver_.get(), "type.googleapis.com/tensorflow.Example", &in, &out); - OP_REQUIRES(ctx, status.ok(), - errors::InvalidArgument("Error while parsing JSON: ", -- string(status.error_message()))); -+ string(status.message()))); - } - } - diff --git a/pkgs/development/python-modules/terminado/default.nix b/pkgs/development/python-modules/terminado/default.nix index 28b0eb09dbed5..30673971a1641 100644 --- a/pkgs/development/python-modules/terminado/default.nix +++ b/pkgs/development/python-modules/terminado/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "terminado"; - version = "0.12.1"; + version = "0.13.3"; src = fetchPypi { inherit pname version; - sha256 = "b20fd93cc57c1678c799799d117874367cc07a3d2d55be95205b1a88fa08393f"; + sha256 = "sha256-lNHPq2NSWZP31cm0aaUKGNDN85Q1tZeFcVU53UHjbA0="; }; propagatedBuildInputs = [ ptyprocess tornado ]; diff --git a/pkgs/development/python-modules/teslajsonpy/default.nix b/pkgs/development/python-modules/teslajsonpy/default.nix index 5cdc1dafc0345..5cd0044bb5947 100644 --- a/pkgs/development/python-modules/teslajsonpy/default.nix +++ b/pkgs/development/python-modules/teslajsonpy/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "teslajsonpy"; - version = "1.9.0"; + version = "2.0.3"; format = "pyproject"; disabled = pythonOlder "3.6"; @@ -23,8 +23,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "zabuldon"; repo = pname; - rev = "v${version}"; - sha256 = "sha256-Q/ltNdr2Huvfj1RmKFopJbaR4FSM7ziWadmDKPS26vc="; + rev = "refs/tags/v${version}"; + sha256 = "sha256-EVSKBsIhYm5UqFEZ3snKF1aEW3+JjE0Kzs3gYnFQsUc="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/test-tube/default.nix b/pkgs/development/python-modules/test-tube/default.nix index 1cc20cc2cca7f..5eac0d60b6cff 100644 --- a/pkgs/development/python-modules/test-tube/default.nix +++ b/pkgs/development/python-modules/test-tube/default.nix @@ -8,7 +8,7 @@ , numpy , pandas , pytorch -, tensorflow-tensorboard +, tensorboard }: buildPythonPackage rec { @@ -34,7 +34,7 @@ buildPythonPackage rec { numpy pandas pytorch - tensorflow-tensorboard + tensorboard ]; meta = with lib; { diff --git a/pkgs/development/python-modules/testing-common-database/default.nix b/pkgs/development/python-modules/testing-common-database/default.nix index 1d50ed1ec49d9..ff323b85e720f 100644 --- a/pkgs/development/python-modules/testing-common-database/default.nix +++ b/pkgs/development/python-modules/testing-common-database/default.nix @@ -9,6 +9,11 @@ buildPythonPackage rec { sha256 = "0wvdv0frl7xib05sixjv9m6jywaa2wdhdhsqqdfk45akk2r80pcn"; }; + postPatch = '' + substituteInPlace src/testing/common/database.py \ + --replace "collections.Callable" "collections.abc.Callable" + ''; + # There are no unit tests doCheck = false; diff --git a/pkgs/development/python-modules/testpath/default.nix b/pkgs/development/python-modules/testpath/default.nix index e11ddeed50a6f..4db5aa362f4a0 100644 --- a/pkgs/development/python-modules/testpath/default.nix +++ b/pkgs/development/python-modules/testpath/default.nix @@ -2,18 +2,24 @@ , stdenv , buildPythonPackage , fetchPypi +, flit-core , pytestCheckHook }: buildPythonPackage rec { pname = "testpath"; - version = "0.5.0"; + version = "0.6.0"; + format = "pyproject"; src = fetchPypi { inherit pname version; - sha256 = "05z4s4d5i1ja16hiv4jhqv63fvg1a4vw77s0ay1sw11hrl5pmkqs"; + sha256 = "sha256-LxuX5kQsAmgevgG9hPUxAop8rqGvOCUAD1I0XDAoXg8="; }; + nativeBuildInputs = [ + flit-core + ]; + checkInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/tifffile/default.nix b/pkgs/development/python-modules/tifffile/default.nix index 01294ff5007f0..0faea93ebdeb7 100644 --- a/pkgs/development/python-modules/tifffile/default.nix +++ b/pkgs/development/python-modules/tifffile/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "tifffile"; - version = "2022.2.9"; + version = "2022.3.25"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-ftp0EXZDaBuyyqaVtI854iQ7SIf3z5kdWt/9gT5cg3M="; + hash = "sha256-bZQ/LAGxo0pHbJY9EZVl+6EI9VngYUJsY6UVeEaVntk="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/tiledb/default.nix b/pkgs/development/python-modules/tiledb/default.nix index b310defa45d19..eabb2aff006ae 100644 --- a/pkgs/development/python-modules/tiledb/default.nix +++ b/pkgs/development/python-modules/tiledb/default.nix @@ -15,14 +15,14 @@ buildPythonPackage rec { pname = "tiledb"; - version = "0.12.0"; + version = "0.13.0"; format = "setuptools"; src = fetchFromGitHub { owner = "TileDB-Inc"; repo = "TileDB-Py"; rev = version; - sha256 = "0iz16sgr5dpwc1jvb6brcmgvvg0npjdd98q4wgkqmvg7qif92zls"; + sha256 = "sha256-ku+9kMXXrlPy4teV5KpTXAwExhIoPpAsGAHIBvsl9KI="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/tldextract/default.nix b/pkgs/development/python-modules/tldextract/default.nix index f2f15c8bb7fa9..139f58660c4cd 100644 --- a/pkgs/development/python-modules/tldextract/default.nix +++ b/pkgs/development/python-modules/tldextract/default.nix @@ -14,14 +14,14 @@ buildPythonPackage rec { pname = "tldextract"; - version = "3.2.0"; + version = "3.2.1"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "sha256-PUtqIQVgC30CkOoje/MLaw3HY+UPy+QOhJoBm9bby/8="; + sha256 = "sha256-rJMEzfgLCcN+6pZXmeDZrAqhzLZTH65Uiqvgm68aJUk="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/toggl-cli/default.nix b/pkgs/development/python-modules/toggl-cli/default.nix index 30c3f08f52e7c..af6132cd2771b 100644 --- a/pkgs/development/python-modules/toggl-cli/default.nix +++ b/pkgs/development/python-modules/toggl-cli/default.nix @@ -58,8 +58,9 @@ buildPythonPackage rec { postPatch = '' substituteInPlace requirements.txt \ --replace "notify-py==0.3.1" "notify-py>=0.3.1" \ - --replace "click==7.1.2" "click>=7.1.2" \ - --replace "pbr==5.5.1" "pbr>=5.5.1" + --replace "click==8.0.3" "click>=8.0.3" \ + --replace "pbr==5.8.0" "pbr>=5.8.0" \ + --replace "inquirer==2.9.1" "inquirer>=2.9.1" substituteInPlace pytest.ini \ --replace ' --cov toggl -m "not premium"' "" ''; diff --git a/pkgs/development/python-modules/tomli/default.nix b/pkgs/development/python-modules/tomli/default.nix index 551655eebf0d0..c9c9cb46b2c75 100644 --- a/pkgs/development/python-modules/tomli/default.nix +++ b/pkgs/development/python-modules/tomli/default.nix @@ -3,6 +3,7 @@ , callPackage , fetchFromGitHub , flit-core +, python # important downstream dependencies , flit @@ -13,40 +14,28 @@ buildPythonPackage rec { pname = "tomli"; - version = "1.2.2"; + version = "2.0.1"; format = "pyproject"; - outputs = [ - "out" - "testsout" - ]; - src = fetchFromGitHub { owner = "hukkin"; repo = pname; rev = version; - sha256 = "sha256-oDjpNzWxTaCC1+WyBKrkR6kp90ZomcZQfyW+xKddDoM="; + sha256 = "sha256-v0ZMrHIIaGeORwD4JiBeLthmnKZODK5odZVL0SY4etA="; }; - patches = [ - # required for mypy - ./fix-backwards-compatibility-load.patch - ]; - nativeBuildInputs = [ flit-core ]; - postInstall = '' - mkdir $testsout - cp -R benchmark/ pyproject.toml tests/ $testsout/ - ''; - pythonImportsCheck = [ "tomli" ]; - # check in passthru.tests.pytest to escape infinite recursion with setuptools-scm - doCheck = false; + checkPhase = '' + runHook preCheck + ${python.interpreter} -m unittest discover + runHook postCheck + ''; passthru.tests = { - pytest = callPackage ./tests.nix { }; + # test downstream dependencies inherit flit black mypy setuptools-scm; }; diff --git a/pkgs/development/python-modules/tomli/fix-backwards-compatibility-load.patch b/pkgs/development/python-modules/tomli/fix-backwards-compatibility-load.patch deleted file mode 100644 index edfc2f3834956..0000000000000 --- a/pkgs/development/python-modules/tomli/fix-backwards-compatibility-load.patch +++ /dev/null @@ -1,21 +0,0 @@ -diff --git a/tomli/_parser.py b/tomli/_parser.py -index 89e81c3..6fb1bfd 100644 ---- a/tomli/_parser.py -+++ b/tomli/_parser.py -@@ -1,6 +1,6 @@ - import string - from types import MappingProxyType --from typing import Any, BinaryIO, Dict, FrozenSet, Iterable, NamedTuple, Optional, Tuple -+from typing import IO, Union, Any, BinaryIO, Dict, FrozenSet, Iterable, NamedTuple, Optional, Tuple - import warnings - - from tomli._re import ( -@@ -48,7 +48,7 @@ class TOMLDecodeError(ValueError): - """An error raised if a document is not valid TOML.""" - - --def load(fp: BinaryIO, *, parse_float: ParseFloat = float) -> Dict[str, Any]: -+def load(fp: Union[IO, BinaryIO], *, parse_float: ParseFloat = float) -> Dict[str, Any]: - """Parse TOML from a binary file object.""" - s_bytes = fp.read() - try: diff --git a/pkgs/development/python-modules/tomli/tests.nix b/pkgs/development/python-modules/tomli/tests.nix deleted file mode 100644 index 5d3d67dbd128c..0000000000000 --- a/pkgs/development/python-modules/tomli/tests.nix +++ /dev/null @@ -1,21 +0,0 @@ -{ buildPythonPackage -, tomli -, pytestCheckHook -, python-dateutil -}: - -buildPythonPackage rec { - pname = "tomli-tests"; - inherit (tomli) version; - - src = tomli.testsout; - - dontBuild = true; - dontInstall = true; - - checkInputs = [ - pytestCheckHook - python-dateutil - tomli - ]; -} diff --git a/pkgs/development/python-modules/tomlkit/default.nix b/pkgs/development/python-modules/tomlkit/default.nix index 6c8455f060ec0..fbe6c7be4d12c 100644 --- a/pkgs/development/python-modules/tomlkit/default.nix +++ b/pkgs/development/python-modules/tomlkit/default.nix @@ -4,11 +4,11 @@ buildPythonPackage rec { pname = "tomlkit"; - version = "0.8.0"; + version = "0.10.1"; src = fetchPypi { inherit pname version; - sha256 = "29e84a855712dfe0e88a48f6d05c21118dbafb283bb2eed614d46f80deb8e9a1"; + sha256 = "sha256-PFF4lOre9T6QctND035EJ7jwtiAKcLfJoZsuvR9TuVE="; }; propagatedBuildInputs = diff --git a/pkgs/development/python-modules/torch-tb-profiler/default.nix b/pkgs/development/python-modules/torch-tb-profiler/default.nix index fc53c5ba8232c..2843910613672 100644 --- a/pkgs/development/python-modules/torch-tb-profiler/default.nix +++ b/pkgs/development/python-modules/torch-tb-profiler/default.nix @@ -4,7 +4,7 @@ , pandas , pytestCheckHook , pytorch -, tensorflow-tensorboard +, tensorboard , torchvision }: @@ -25,7 +25,7 @@ buildPythonPackage rec { # See https://discourse.nixos.org/t/extracting-sub-directory-from-fetchgit-or-fetchurl-or-any-derivation/8830. src = "${repo}/tb_plugin"; - propagatedBuildInputs = [ pandas tensorflow-tensorboard ]; + propagatedBuildInputs = [ pandas tensorboard ]; checkInputs = [ pytestCheckHook pytorch torchvision ]; diff --git a/pkgs/development/python-modules/torchinfo/default.nix b/pkgs/development/python-modules/torchinfo/default.nix index 331729e25c581..da0544c299cd4 100644 --- a/pkgs/development/python-modules/torchinfo/default.nix +++ b/pkgs/development/python-modules/torchinfo/default.nix @@ -10,12 +10,12 @@ buildPythonPackage rec { pname = "torchinfo"; - version = "1.6.3"; + version = "1.6.5"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "sha256-g1xhtdwygzPTTswP8iZ364ynBQE7D+aAsZ3d9EpyvIA="; + sha256 = "sha256-Vg/TXD+/VMIv1wHywaOuEj4MDTq90lUo99n+Nppu0uI="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/torchvision/default.nix b/pkgs/development/python-modules/torchvision/default.nix index 7b6384966ab1c..0cb280af67483 100644 --- a/pkgs/development/python-modules/torchvision/default.nix +++ b/pkgs/development/python-modules/torchvision/default.nix @@ -11,12 +11,12 @@ , pillow , pytorch , pytest -, cudatoolkit -, cudnn , cudaSupport ? pytorch.cudaSupport or false # by default uses the value from pytorch }: let + inherit (pytorch.cudaPackages) cudatoolkit cudnn; + cudatoolkit_joined = symlinkJoin { name = "${cudatoolkit.name}-unsplit"; paths = [ cudatoolkit.out cudatoolkit.lib ]; diff --git a/pkgs/development/python-modules/tornado/5.nix b/pkgs/development/python-modules/tornado/5.nix index 2f3ba5c1c2aae..f0dc14b5fa2ab 100644 --- a/pkgs/development/python-modules/tornado/5.nix +++ b/pkgs/development/python-modules/tornado/5.nix @@ -3,12 +3,13 @@ , buildPythonPackage , fetchPypi , isPy27 +, pythonAtLeast }: buildPythonPackage rec { pname = "tornado"; version = "5.1.1"; - disabled = isPy27; + disabled = isPy27 || pythonAtLeast "3.10"; # We specify the name of the test files to prevent # https://github.com/NixOS/nixpkgs/issues/14634 diff --git a/pkgs/development/python-modules/tornado/default.nix b/pkgs/development/python-modules/tornado/default.nix index 893943cbc7201..4519641c4820e 100644 --- a/pkgs/development/python-modules/tornado/default.nix +++ b/pkgs/development/python-modules/tornado/default.nix @@ -2,28 +2,34 @@ , python , buildPythonPackage , fetchPypi +, pycares +, pycurl +, twisted }: buildPythonPackage rec { pname = "tornado"; version = "6.1"; - # We specify the name of the test files to prevent - # https://github.com/NixOS/nixpkgs/issues/14634 - checkPhase = '' - ${python.interpreter} -m unittest discover *_test.py - ''; - src = fetchPypi { inherit pname version; sha256 = "33c6e81d7bd55b468d2e793517c909b139960b6c790a60b7991b9b6b76fb9791"; }; + checkInputs = [ + pycares + pycurl + twisted + ]; + + pythonImportsCheck = [ "tornado" ]; + __darwinAllowLocalNetworking = true; - meta = { + meta = with lib; { description = "A web framework and asynchronous networking library"; homepage = "https://www.tornadoweb.org/"; - license = lib.licenses.asl20; + license = licenses.asl20; + maintainers = with maintainers; [ SuperSandro2000 ]; }; } diff --git a/pkgs/development/python-modules/towncrier/default.nix b/pkgs/development/python-modules/towncrier/default.nix index b039277f20199..9953e2c17be57 100644 --- a/pkgs/development/python-modules/towncrier/default.nix +++ b/pkgs/development/python-modules/towncrier/default.nix @@ -13,11 +13,11 @@ buildPythonPackage rec { pname = "towncrier"; - version = "21.3.0"; + version = "21.9.0"; src = fetchPypi { inherit pname version; - sha256 = "6eed0bc924d72c98c000cb8a64de3bd566e5cb0d11032b73fcccf8a8f956ddfe"; + sha256 = "sha256-nLb0XBbhoe7J0OdlEWXnvmDNCrgdE6XJbKl6SYrof0g="; }; propagatedBuildInputs = [ @@ -31,12 +31,18 @@ buildPythonPackage rec { # zope.interface collision doCheck = !isPy27; + + preCheck = '' + export PATH=$out/bin:$PATH + ''; + checkInputs = [ git mock twisted pytestCheckHook ]; + pythonImportsCheck = [ "towncrier" ]; meta = with lib; { diff --git a/pkgs/development/python-modules/tpm2-pytss/default.nix b/pkgs/development/python-modules/tpm2-pytss/default.nix index 544c1a3084a6e..e003d075a1582 100644 --- a/pkgs/development/python-modules/tpm2-pytss/default.nix +++ b/pkgs/development/python-modules/tpm2-pytss/default.nix @@ -1,37 +1,58 @@ -{ lib, buildPythonPackage, fetchPypi, pythonOlder -, pkg-config, swig +{ lib +, buildPythonPackage +, fetchPypi +, pythonOlder +, asn1crypto +, cffi +, cryptography +, ibm-sw-tpm2 +, pkg-config +, pkgconfig +, pycparser +, pytestCheckHook +, python +, setuptools-scm , tpm2-tss -, cryptography, ibm-sw-tpm2 }: buildPythonPackage rec { pname = "tpm2-pytss"; - - # Last version on github is 0.2.4, but it looks - # like a mistake (it's missing commits from 0.1.9) - version = "0.1.9"; - disabled = pythonOlder "3.5"; + version = "1.1.0"; + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "sha256-v5Xth0A3tFnLFg54nvWYL2TD201e/GWv+2y5Qc60CmU="; + sha256 = "sha256-O0d1b99/V8b3embg8veerTrJGSVb/prlPVb7qSHErdQ="; }; - postPatch = '' - substituteInPlace tpm2_pytss/config.py --replace \ - 'SYSCONFDIR = CONFIG.get("sysconfdir", "/etc")' \ - 'SYSCONFDIR = "${tpm2-tss}/etc"' - ''; - nativeBuildInputs = [ pkg-config swig ]; - # The TCTI is dynamically loaded from tpm2-tss, we have to provide the library to the end-user - propagatedBuildInputs = [ tpm2-tss ]; + nativeBuildInputs = [ + cffi + pkgconfig + # somehow propagating from pkgconfig does not work + pkg-config + setuptools-scm + ]; - checkInputs = [ + buildInputs = [ + tpm2-tss + ]; + + propagatedBuildInputs = [ + cffi + asn1crypto cryptography - # provide tpm_server used as simulator for the tests + ]; + + # https://github.com/tpm2-software/tpm2-pytss/issues/341 + doCheck = false; + + checkInputs = [ ibm-sw-tpm2 + pytestCheckHook ]; + pythonImportsCheck = [ "tpm2_pytss" ]; + meta = with lib; { homepage = "https://github.com/tpm2-software/tpm2-pytss"; description = "TPM2 TSS Python bindings for Enhanced System API (ESYS)"; diff --git a/pkgs/development/python-modules/tqdm/default.nix b/pkgs/development/python-modules/tqdm/default.nix index 3973d68b6c381..40b6b47a946d2 100644 --- a/pkgs/development/python-modules/tqdm/default.nix +++ b/pkgs/development/python-modules/tqdm/default.nix @@ -14,11 +14,11 @@ buildPythonPackage rec { pname = "tqdm"; - version = "4.62.3"; + version = "4.63.1"; src = fetchPypi { inherit pname version; - sha256 = "d359de7217506c9851b7869f3708d8ee53ed70a1b8edbba4dbcb47442592920d"; + sha256 = "sha256-QjCkkRmkFsiMxH0NLTLV2Q8aKC1eSX1JgBlQcE5Jhj0="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/trimesh/default.nix b/pkgs/development/python-modules/trimesh/default.nix index 54e2da8e4ed19..0810acd1ea470 100644 --- a/pkgs/development/python-modules/trimesh/default.nix +++ b/pkgs/development/python-modules/trimesh/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "trimesh"; - version = "3.10.7"; + version = "3.10.8"; src = fetchPypi { inherit pname version; - sha256 = "sha256-OYor+DQJkkQx8C5E0pmeGaymiYEyKkuKBLp12jkrhS8="; + sha256 = "sha256-SFG3wGGFxzZKfNyIQrpDGblL2vC0pQguWIYdwF0Mg5A="; }; propagatedBuildInputs = [ numpy ]; diff --git a/pkgs/development/python-modules/trio/default.nix b/pkgs/development/python-modules/trio/default.nix index e667f146afc04..f9b325ecc2956 100644 --- a/pkgs/development/python-modules/trio/default.nix +++ b/pkgs/development/python-modules/trio/default.nix @@ -13,19 +13,45 @@ , jedi , astor , yapf +, coreutils }: buildPythonPackage rec { pname = "trio"; - version = "0.19.0"; + version = "0.20.0"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "895e318e5ec5e8cea9f60b473b6edb95b215e82d99556a03eb2d20c5e027efe1"; + sha256 = "sha256-ZwpS0xFdDoeeGsg4pOuZmvMvhYFj46cE/kg53ipnYHA="; }; - checkInputs = [ astor pytestCheckHook pyopenssl trustme jedi yapf ]; + propagatedBuildInputs = [ + attrs + sortedcontainers + async_generator + idna + outcome + sniffio + ] ++ lib.optionals (pythonOlder "3.7") [ contextvars ]; + + # tests are failing on Darwin + doCheck = !stdenv.isDarwin; + + checkInputs = [ + astor + jedi + pyopenssl + pytestCheckHook + trustme + yapf + ]; + + preCheck = '' + substituteInPlace trio/tests/test_subprocess.py \ + --replace "/bin/sleep" "${coreutils}/bin/sleep" + ''; + # It appears that the build sandbox doesn't include /etc/services, and these tests try to use it. disabledTests = [ "getnameinfo" @@ -41,18 +67,6 @@ buildPythonPackage rec { "-W" "ignore::DeprecationWarning" ]; - propagatedBuildInputs = [ - attrs - sortedcontainers - async_generator - idna - outcome - sniffio - ] ++ lib.optionals (pythonOlder "3.7") [ contextvars ]; - - # tests are failing on Darwin - doCheck = !stdenv.isDarwin; - meta = { description = "An async/await-native I/O library for humans and snake people"; homepage = "https://github.com/python-trio/trio"; diff --git a/pkgs/development/python-modules/trytond/default.nix b/pkgs/development/python-modules/trytond/default.nix index c332a067a76be..c2509c662d3d8 100644 --- a/pkgs/development/python-modules/trytond/default.nix +++ b/pkgs/development/python-modules/trytond/default.nix @@ -1,5 +1,6 @@ { lib , buildPythonApplication +, fetchpatch , fetchPypi , pythonOlder , mock @@ -24,16 +25,24 @@ buildPythonApplication rec { pname = "trytond"; - version = "6.2.3"; + version = "6.2.6"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "9be5d27aff9ae9b0ab73a8805145b2cc89900b9b513e6d5bfce89e9b7167f8f4"; + sha256 = "sha256-Sof6A9lxU70YnCbboJr56CAdTL0cRbaRNxdvG5Tnqnw="; }; + patches = [ + (fetchpatch { + # werkzeug 2.1 compatibility for the tests + url = "https://github.com/tryton/trytond/commit/86a50ca06cf0d79404dbd731141ed29f8e9fcb9d.patch"; + hash = "sha256-xY5Sdhkd0lEgscV7NHwX2YWxobWqQFElY5BJvDT+we8="; + }) + ]; + # Tells the tests which database to use DB_NAME = ":memory:"; diff --git a/pkgs/development/python-modules/tubeup/default.nix b/pkgs/development/python-modules/tubeup/default.nix index 65553dc18834a..e11aaa7d55596 100644 --- a/pkgs/development/python-modules/tubeup/default.nix +++ b/pkgs/development/python-modules/tubeup/default.nix @@ -9,13 +9,13 @@ buildPythonPackage rec { pname = "tubeup"; - version = "0.0.27"; + version = "0.0.28"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "77affb4105fc319d82c56aa5706151a4976b8b504dd252fe3db01443e27cba50"; + sha256 = "sha256-+RvDwOHL+zwpM/nOWWS7pZIFEOx+jMrgt3FLYSshANo="; }; postPatch = '' diff --git a/pkgs/development/python-modules/tweepy/default.nix b/pkgs/development/python-modules/tweepy/default.nix index a3526eb707be9..a2c815b45e258 100644 --- a/pkgs/development/python-modules/tweepy/default.nix +++ b/pkgs/development/python-modules/tweepy/default.nix @@ -3,16 +3,16 @@ , buildPythonPackage , fetchFromGitHub , oauthlib -, requests +, pytestCheckHook , pythonOlder +, requests +, requests-oauthlib , vcrpy -, pytestCheckHook -, requests_oauthlib }: buildPythonPackage rec { pname = "tweepy"; - version = "4.5.0"; + version = "4.8.0"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -21,14 +21,14 @@ buildPythonPackage rec { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "sha256-mRpYPuj2B/kEaaeZlNYYnViGxWiK1xtWfDObHNduIK8="; + hash = "sha256-RaM2JN2WOHyZY+AxzgQLvhXg6UnevDbSFSR4jFLsYrc="; }; propagatedBuildInputs = [ aiohttp oauthlib requests - requests_oauthlib + requests-oauthlib ]; checkInputs = [ diff --git a/pkgs/development/python-modules/twilio/default.nix b/pkgs/development/python-modules/twilio/default.nix index ddc94541422c3..13bbff916cff9 100644 --- a/pkgs/development/python-modules/twilio/default.nix +++ b/pkgs/development/python-modules/twilio/default.nix @@ -1,17 +1,19 @@ { lib , buildPythonPackage , fetchFromGitHub -, mock -, nose -, pyjwt , pythonOlder + +, pyjwt , pytz , requests + +, mock +, pytestCheckHook }: buildPythonPackage rec { pname = "twilio"; - version = "7.5.0"; + version = "7.8.0"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -19,8 +21,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "twilio"; repo = "twilio-python"; - rev = version; - sha256 = "0h6r9nz7dcvagrjhzvnirpnjazcy9r64cwlr2bnmlrbjhwdni9rq"; + rev = "refs/tags/${version}"; + sha256 = "sha256-r28iKUv+i8D6JLvsJA7x8T2KFzK26limIwqsXC5jjSE="; }; propagatedBuildInputs = [ @@ -31,7 +33,7 @@ buildPythonPackage rec { checkInputs = [ mock - nose + pytestCheckHook ]; pythonImportsCheck = [ diff --git a/pkgs/development/python-modules/twill/default.nix b/pkgs/development/python-modules/twill/default.nix index 2ae36cd5408df..f68ec91e1cbb5 100644 --- a/pkgs/development/python-modules/twill/default.nix +++ b/pkgs/development/python-modules/twill/default.nix @@ -1,31 +1,41 @@ -{ lib, buildPythonPackage, fetchPypi, nose +{ lib +, buildPythonPackage +, fetchPypi , lxml , requests , pyparsing +, pythonOlder }: + buildPythonPackage rec { pname = "twill"; - version = "3.0.1"; + version = "3.0.2"; + format = "setuptools"; + + disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "57cde4c3a2265f1a14d80007aa4f66c2135d509555499e9b156d2b4cf5048c2c"; + hash = "sha256-dWtrdkiR1+IBfeF9jwbOjKE2UMXDJji0iOb+USbY7zk="; }; - checkInputs = [ nose ]; - propagatedBuildInputs = [ lxml requests pyparsing ]; - doCheck = false; # pypi package comes without tests, other homepage does not provide all verisons + pythonImportsCheck = [ + "twill" + ]; + + # pypi package comes without tests, other homepage does not provide all verisons + doCheck = false; meta = with lib; { - homepage = "https://twill-tools.github.io/twill/"; description = "A simple scripting language for Web browsing"; - license = licenses.mit; + homepage = "https://twill-tools.github.io/twill/"; + license = licenses.mit; maintainers = with maintainers; [ mic92 ]; }; } diff --git a/pkgs/development/python-modules/twine/default.nix b/pkgs/development/python-modules/twine/default.nix index 82c157722d285..6cfb7f3604768 100644 --- a/pkgs/development/python-modules/twine/default.nix +++ b/pkgs/development/python-modules/twine/default.nix @@ -1,40 +1,42 @@ -{ lib, buildPythonPackage, fetchPypi, pythonOlder +{ lib +, buildPythonPackage +, fetchPypi +, pythonOlder , importlib-metadata , keyring , pkginfo -, pyblake2 , readme_renderer , requests , requests-toolbelt -, setuptools-scm -, tqdm -, colorama +, rich , rfc3986 +, setuptools-scm +, urllib3 }: buildPythonPackage rec { pname = "twine"; - version = "3.7.1"; + version = "4.0.0"; format = "pyproject"; - disabled = pythonOlder "3.6"; + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "28460a3db6b4532bde6a5db6755cf2dce6c5020bada8a641bb2c5c7a9b1f35b8"; + sha256 = "sha256-gXqgwL3AKl6+MgUeFo4jxxoGCDNOYkx5MBHxINu8Bbc="; }; nativeBuildInputs = [ setuptools-scm ]; + propagatedBuildInputs = [ importlib-metadata keyring pkginfo - pyblake2 readme_renderer requests requests-toolbelt - tqdm - colorama rfc3986 + rich + urllib3 ]; # Requires network diff --git a/pkgs/development/python-modules/twisted/default.nix b/pkgs/development/python-modules/twisted/default.nix index 4641e4af40464..02a993fdf1398 100644 --- a/pkgs/development/python-modules/twisted/default.nix +++ b/pkgs/development/python-modules/twisted/default.nix @@ -17,12 +17,12 @@ }: buildPythonPackage rec { pname = "Twisted"; - version = "22.2.0"; + version = "22.4.0"; src = fetchPypi { inherit pname version; extension = "tar.gz"; - sha256 = "1wml02jxni8k15984pskks7d6yin81w4d2ac026cpyiqd0gjpwsp"; + sha256 = "sha256-oEeZD1ffrh4L0rffJSbU8W3NyEN3TcEIt4xS8qXxNoA="; }; propagatedBuildInputs = [ zope_interface incremental automat constantly hyperlink pyhamcrest attrs setuptools typing-extensions ]; @@ -31,7 +31,7 @@ buildPythonPackage rec { # Patch t.p._inotify to point to libc. Without this, # twisted.python.runtime.platform.supportsINotify() == False - patchPhase = lib.optionalString stdenv.isLinux '' + postPatch = lib.optionalString stdenv.isLinux '' substituteInPlace src/twisted/python/_inotify.py --replace \ "ctypes.util.find_library(\"c\")" "'${stdenv.glibc.out}/lib/libc.so.6'" ''; @@ -45,13 +45,13 @@ buildPythonPackage rec { ''; checkPhase = '' - ${python.interpreter} -m unittest discover -s twisted/test + ${python.interpreter} -m unittest discover -s src/twisted/test ''; # Tests require network doCheck = false; meta = with lib; { - homepage = "https://twistedmatrix.com/"; + homepage = "https://github.com/twisted/twisted"; description = "Twisted, an event-driven networking engine written in Python"; longDescription = '' Twisted is an event-driven networking engine written in Python diff --git a/pkgs/development/python-modules/twitterapi/default.nix b/pkgs/development/python-modules/twitterapi/default.nix index acaf3bf640e5f..313249e50d9cf 100644 --- a/pkgs/development/python-modules/twitterapi/default.nix +++ b/pkgs/development/python-modules/twitterapi/default.nix @@ -2,7 +2,7 @@ , buildPythonPackage , fetchFromGitHub , requests -, requests_oauthlib +, requests-oauthlib , pythonOlder }: @@ -17,12 +17,12 @@ buildPythonPackage rec { owner = "geduldig"; repo = "TwitterAPI"; rev = "v${version}"; - sha256 = "sha256-WqeoIZt2OGDXKPAbjm3cHI1kgiCEJC6+ROXXx4TR4b4="; + hash = "sha256-WqeoIZt2OGDXKPAbjm3cHI1kgiCEJC6+ROXXx4TR4b4="; }; propagatedBuildInputs = [ requests - requests_oauthlib + requests-oauthlib ]; # Tests are interacting with the Twitter API diff --git a/pkgs/development/python-modules/txaio/default.nix b/pkgs/development/python-modules/txaio/default.nix index 074e7b8d50915..23c24f3e514a7 100644 --- a/pkgs/development/python-modules/txaio/default.nix +++ b/pkgs/development/python-modules/txaio/default.nix @@ -12,12 +12,12 @@ buildPythonPackage rec { pname = "txaio"; - version = "21.2.1"; + version = "22.2.1"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "sha256-fW+JdFaAIz8cTbndt0jfXojSp6N5Yr4XTA/QTI26Hcg="; + sha256 = "sha256-LkWCtw8EsjRZCCVGhKmEIGwNm1DjB0okpMVauiHSTQE="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/txtorcon/default.nix b/pkgs/development/python-modules/txtorcon/default.nix index c5fc7e1c6a441..167e090fca064 100644 --- a/pkgs/development/python-modules/txtorcon/default.nix +++ b/pkgs/development/python-modules/txtorcon/default.nix @@ -1,31 +1,24 @@ { lib, stdenv, python, buildPythonPackage, pythonOlder, fetchPypi, isPy3k, incremental, ipaddress, twisted -, automat, zope_interface, idna, pyopenssl, service-identity, pytest, mock, lsof -, GeoIP}: +, automat, zope_interface, idna, pyopenssl, service-identity, pytestCheckHook, mock, lsof +, GeoIP }: buildPythonPackage rec { pname = "txtorcon"; version = "22.0.0"; - checkInputs = [ pytest mock lsof GeoIP ]; - propagatedBuildInputs = [ - incremental twisted automat zope_interface - # extra dependencies required by twisted[tls] - idna pyopenssl service-identity - ] ++ lib.optionals (!isPy3k) [ ipaddress ]; - src = fetchPypi { inherit pname version; sha256 = "sha256-iaG2XjKks2nWfmwWY4f7xGjMXQUidEjSOaXn6XGKoFM="; }; - # Based on what txtorcon tox.ini will automatically test, allow back as far - # as Python 3.5. - disabled = pythonOlder "3.5"; + propagatedBuildInputs = [ + incremental twisted automat zope_interface + ] ++ twisted.extras.tls + ++ lib.optionals (!isPy3k) [ ipaddress ]; + + checkInputs = [ pytestCheckHook mock lsof GeoIP ]; doCheck = !(stdenv.isDarwin && stdenv.isAarch64); - checkPhase = '' - ${python.interpreter} -m twisted.trial -j $NIX_BUILD_CORES ./test - ''; meta = { description = "Twisted-based Tor controller client, with state-tracking and configuration abstractions"; diff --git a/pkgs/development/python-modules/typed-settings/default.nix b/pkgs/development/python-modules/typed-settings/default.nix index 6e903b6840772..d9696122f151a 100644 --- a/pkgs/development/python-modules/typed-settings/default.nix +++ b/pkgs/development/python-modules/typed-settings/default.nix @@ -12,13 +12,13 @@ buildPythonPackage rec { pname = "typed-settings"; - version = "1.0.0"; + version = "1.0.1"; format = "pyproject"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "sha256-c+iOb1F8+9IoRbwpMTdyDfOPW2ZEo4xDAlbzLAxgSfk="; + sha256 = "sha256-xrIJgQiAaSXcANMnyXMnqEkLNUP+VyxjRoi9DkX+SLA="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/typeguard/default.nix b/pkgs/development/python-modules/typeguard/default.nix index 8b2ff2de5129d..dd3f62527aa23 100644 --- a/pkgs/development/python-modules/typeguard/default.nix +++ b/pkgs/development/python-modules/typeguard/default.nix @@ -3,7 +3,7 @@ , pythonOlder , lib , setuptools-scm -, pytest +, pytestCheckHook , typing-extensions , glibcLocales }: @@ -26,12 +26,17 @@ buildPythonPackage rec { substituteInPlace setup.cfg --replace " --cov" "" ''; - checkInputs = [ pytest typing-extensions ]; + checkInputs = [ pytestCheckHook typing-extensions ]; - # mypy tests aren't passing with latest mypy - checkPhase = '' - py.test . --ignore=tests/mypy - ''; + disabledTestPaths = [ + # mypy tests aren't passing with latest mypy + "tests/mypy" + ]; + + disabledTests = [ + # not compatible with python3.10 + "test_typed_dict" + ]; disabled = pythonOlder "3.3"; diff --git a/pkgs/development/python-modules/typer/default.nix b/pkgs/development/python-modules/typer/default.nix index 17008eafc1baf..9ef2b53b94705 100644 --- a/pkgs/development/python-modules/typer/default.nix +++ b/pkgs/development/python-modules/typer/default.nix @@ -1,30 +1,34 @@ { lib , stdenv , buildPythonPackage +, fetchpatch , fetchPypi +, flit-core , click , pytestCheckHook , shellingham , pytest-xdist , pytest-sugar , coverage -, mypy -, black -, isort , pythonOlder }: buildPythonPackage rec { pname = "typer"; - version = "0.4.0"; + version = "0.4.1"; + format = "pyproject"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "1pgm0zsylbmz1r96q4n3rfi0h3pn4jss2yfs83z0yxa90nmsxhv3"; + sha256 = "sha256-Vkau8Nk2ssdhoQOT8DhO5rXH/guz5c1xCxcTTKHZnP8="; }; + nativeBuildInputs = [ + flit-core + ]; + propagatedBuildInputs = [ click ]; @@ -34,10 +38,7 @@ buildPythonPackage rec { pytest-xdist pytest-sugar shellingham - coverage - mypy - black - isort + coverage # execs coverage in tests ]; preCheck = '' diff --git a/pkgs/development/python-modules/types-cryptography/default.nix b/pkgs/development/python-modules/types-cryptography/default.nix index dd68bfddef7b5..449ab50117cc7 100644 --- a/pkgs/development/python-modules/types-cryptography/default.nix +++ b/pkgs/development/python-modules/types-cryptography/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "types-cryptography"; - version = "3.3.18"; + version = "3.3.20"; src = fetchPypi { inherit pname version; - sha256 = "sha256-RI/q+a4xImFJvGvOHPj/9U2mYe8Eg398DDFoKYhcNig="; + sha256 = "sha256-u+9bZpcllvPNYbMJFxn8k14IHzu6h+zqVhvA27Fnh1M="; }; pythonImportsCheck = [ diff --git a/pkgs/development/python-modules/types-dateutil/default.nix b/pkgs/development/python-modules/types-dateutil/default.nix index 4cefc57ed594d..5a1e7220ec44b 100644 --- a/pkgs/development/python-modules/types-dateutil/default.nix +++ b/pkgs/development/python-modules/types-dateutil/default.nix @@ -5,12 +5,12 @@ buildPythonPackage rec { pname = "types-python-dateutil"; - version = "2.8.10"; + version = "2.8.12"; format = "setuptools"; src = fetchPypi { inherit pname version; - sha256 = "sha256-a886rnJC5Xk7r9eyvPtOJV63srMUSs0N8OGC3OWMytM="; + sha256 = "sha256-7zBTt0XwHERDtRK2s9WwT7ry1HaqUDtsyTIEah7fpWo="; }; pythonImportsCheck = [ "dateutil-stubs" ]; diff --git a/pkgs/development/python-modules/types-decorator/default.nix b/pkgs/development/python-modules/types-decorator/default.nix index f8dc74c00f982..114ceade047af 100644 --- a/pkgs/development/python-modules/types-decorator/default.nix +++ b/pkgs/development/python-modules/types-decorator/default.nix @@ -5,12 +5,12 @@ buildPythonPackage rec { pname = "types-decorator"; - version = "5.1.4"; + version = "5.1.6"; format = "setuptools"; src = fetchPypi { inherit pname version; - sha256 = "463c04b192108e2b3f409df8a3eaaf8d44e3e98965c11e473ed2a97da591798b"; + sha256 = "sha256-OZ+qczvJMstRtQ08odfpV7KuAvPE1xGcdpYxKCo4aKY="; }; # Modules doesn't have tests diff --git a/pkgs/development/python-modules/types-freezegun/default.nix b/pkgs/development/python-modules/types-freezegun/default.nix index f1559fb27d4f9..d34bac65a92df 100644 --- a/pkgs/development/python-modules/types-freezegun/default.nix +++ b/pkgs/development/python-modules/types-freezegun/default.nix @@ -5,12 +5,12 @@ buildPythonPackage rec { pname = "types-freezegun"; - version = "1.1.8"; + version = "1.1.9"; format = "setuptools"; src = fetchPypi { inherit pname version; - hash = "sha256-9LsIxUqkaBbHehtceipU9Tk8POWOfUAC5n+QgbQR6SE="; + hash = "sha256-bwUQjUaLrsrfmZhzvTfleyXOs1010/g+enQvJdb+iw4="; }; # Module doesn't have tests diff --git a/pkgs/development/python-modules/types-paramiko/default.nix b/pkgs/development/python-modules/types-paramiko/default.nix index 5b87e8079a5e9..4405a02770a2d 100644 --- a/pkgs/development/python-modules/types-paramiko/default.nix +++ b/pkgs/development/python-modules/types-paramiko/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "types-paramiko"; - version = "2.8.17"; + version = "2.8.19"; src = fetchPypi { inherit pname version; - sha256 = "sha256-1toFPkau9cYpvE6lvatWZwhlNerg/P2N6EBpQ7g00uY="; + sha256 = "sha256-UhkthDZk73wfh7n+Bpe7u1qPgS5DAWlEz+q+x93spCM="; }; pythonImportsCheck = [ diff --git a/pkgs/development/python-modules/types-requests/default.nix b/pkgs/development/python-modules/types-requests/default.nix index b29a0792ae8f6..59f8d50fcb123 100644 --- a/pkgs/development/python-modules/types-requests/default.nix +++ b/pkgs/development/python-modules/types-requests/default.nix @@ -6,12 +6,12 @@ buildPythonPackage rec { pname = "types-requests"; - version = "2.27.16"; + version = "2.27.20"; format = "setuptools"; src = fetchPypi { inherit pname version; - sha256 = "sha256-yAEMGLKRp++2CxRS2+ElMLwlaT3WV+cMYoA/zcS//ps="; + sha256 = "sha256-YzRFc83mxO/UTYZ8AVjZ+35r65VyHL6YgvP4V+6KU5g="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/types-setuptools/default.nix b/pkgs/development/python-modules/types-setuptools/default.nix index c59baea3c6e3e..ee2489df8c48c 100644 --- a/pkgs/development/python-modules/types-setuptools/default.nix +++ b/pkgs/development/python-modules/types-setuptools/default.nix @@ -5,12 +5,12 @@ buildPythonPackage rec { pname = "types-setuptools"; - version = "57.4.11"; + version = "57.4.14"; format = "setuptools"; src = fetchPypi { inherit pname version; - sha256 = "sha256-Ji90BuDH1wWta7RSa1t2H6UAv5nqt03oWsNZIYfWKTU="; + sha256 = "sha256-3wL+HdJE9Yz05nz8PQqXkwotYact2J8h2BxxAXzYP5o="; }; # Module doesn't have tests diff --git a/pkgs/development/python-modules/types-tabulate/default.nix b/pkgs/development/python-modules/types-tabulate/default.nix index 6d7ceade85c9f..1fc11aeede949 100644 --- a/pkgs/development/python-modules/types-tabulate/default.nix +++ b/pkgs/development/python-modules/types-tabulate/default.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { pname = "types-tabulate"; - version = "0.8.6"; + version = "0.8.7"; src = fetchPypi { inherit pname version; - hash = "sha256-P037eVRJwheO1cIU7FEUwESx7t1xrQoQA7xnDwnYcQo="; + hash = "sha256-Cs0ClYZuXy3i6Qc4/wvBIBdR4d0Ci9MMv6Qap6Zpkp4="; }; # Module doesn't have tests diff --git a/pkgs/development/python-modules/types-toml/default.nix b/pkgs/development/python-modules/types-toml/default.nix index affdbbb2b4479..263fc0edd7baa 100644 --- a/pkgs/development/python-modules/types-toml/default.nix +++ b/pkgs/development/python-modules/types-toml/default.nix @@ -5,12 +5,12 @@ buildPythonPackage rec { pname = "types-toml"; - version = "0.10.4"; + version = "0.10.5"; format = "setuptools"; src = fetchPypi { inherit pname version; - sha256 = "sha256-k0DnwVh3FVgbsTkFs68wt5/mivrM/KN3Zl1eY7aUEpo="; + sha256 = "sha256-+UlGOjiCAL45Lvk5nbrT4eO75tRUPYStk9lsP9oCgIA="; }; # Module doesn't have tests diff --git a/pkgs/development/python-modules/types-urllib3/default.nix b/pkgs/development/python-modules/types-urllib3/default.nix index 235535ce97164..45b6dd97c2d81 100644 --- a/pkgs/development/python-modules/types-urllib3/default.nix +++ b/pkgs/development/python-modules/types-urllib3/default.nix @@ -5,12 +5,12 @@ buildPythonPackage rec { pname = "types-urllib3"; - version = "1.26.11"; + version = "1.26.13"; format = "setuptools"; src = fetchPypi { inherit pname version; - hash = "sha256-JNZORBFohR6wXx0CLeGK4xVY9WScjxEX44TC6F4xMVs="; + hash = "sha256-QPj7XozX1X6K797j/dXpMKoaG7QXnNrdVSJs6liK95A="; }; # Module doesn't have tests diff --git a/pkgs/development/python-modules/typing-extensions/default.nix b/pkgs/development/python-modules/typing-extensions/default.nix index 1e29bc9a6160c..97f0d48cecc2a 100644 --- a/pkgs/development/python-modules/typing-extensions/default.nix +++ b/pkgs/development/python-modules/typing-extensions/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "typing-extensions"; - version = "4.0.1"; + version = "4.1.1"; format = "pyproject"; disabled = pythonOlder "3.6"; @@ -16,7 +16,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "typing_extensions"; inherit version; - hash = "sha256-TKCR3qFJ+UXsVq+0ja5xTyHoaS7yKjlSI7zTKJYbag4="; + hash = "sha256-GpRi3MM0enmx8cAnH7556ERYC7WYuvoe0gi5TaPNzUI="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/typing-inspect/default.nix b/pkgs/development/python-modules/typing-inspect/default.nix index 1e5303b7b09e5..d540160493643 100644 --- a/pkgs/development/python-modules/typing-inspect/default.nix +++ b/pkgs/development/python-modules/typing-inspect/default.nix @@ -3,6 +3,7 @@ , fetchPypi , typing-extensions , mypy-extensions +, pytestCheckHook }: buildPythonPackage rec { @@ -20,6 +21,19 @@ buildPythonPackage rec { mypy-extensions ]; + checkInputs = [ + pytestCheckHook + ]; + + disabledTests = [ + # https://github.com/ilevkivskyi/typing_inspect/issues/84 + "test_typed_dict_typing_extension" + ]; + + pythonImportsCheck = [ + "typing_inspect" + ]; + meta = with lib; { description = "Runtime inspection utilities for Python typing module"; homepage = "https://github.com/ilevkivskyi/typing_inspect"; diff --git a/pkgs/development/python-modules/tzdata/default.nix b/pkgs/development/python-modules/tzdata/default.nix index cfc46a658d347..ee8166abb9463 100644 --- a/pkgs/development/python-modules/tzdata/default.nix +++ b/pkgs/development/python-modules/tzdata/default.nix @@ -9,12 +9,12 @@ buildPythonPackage rec { pname = "tzdata"; - version = "2021.5"; + version = "2022.1"; format = "pyproject"; src = fetchPypi { inherit pname version; - hash = "sha256-aNvkGv0BuGeJS739VPoD9GjPpPAIa/tK3NjejyTz7iE="; + hash = "sha256-i1NqjsY9wHUTQrOYQZOjEY+Pyir+JXUrubf//TmFUtM="; }; checkInputs = [ diff --git a/pkgs/development/python-modules/tzlocal/default.nix b/pkgs/development/python-modules/tzlocal/default.nix index 7079392e4f668..bb51abb1822c5 100644 --- a/pkgs/development/python-modules/tzlocal/default.nix +++ b/pkgs/development/python-modules/tzlocal/default.nix @@ -10,13 +10,13 @@ buildPythonPackage rec { pname = "tzlocal"; - version = "4.1"; # version needs to be compatible with APScheduler + version = "4.2"; # version needs to be compatible with APScheduler disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "sha256-DygBWsaKXAZyEEAKkZf8XTa6m8P46vHaPL1ZrN/tngk="; + sha256 = "ee5842fa3a795f023514ac2d801c4a81d1743bbe642e3940143326b3a00addd7"; }; propagatedBuildInputs = [ @@ -39,6 +39,7 @@ buildPythonPackage rec { meta = with lib; { description = "Tzinfo object for the local timezone"; homepage = "https://github.com/regebro/tzlocal"; + changelog = "https://github.com/regebro/tzlocal/blob/${version}/CHANGES.txt"; license = licenses.cddl; maintainers = with maintainers; [ dotlambda ]; }; diff --git a/pkgs/development/python-modules/uamqp/default.nix b/pkgs/development/python-modules/uamqp/default.nix index f3c8792e569cc..a838f44eb9577 100644 --- a/pkgs/development/python-modules/uamqp/default.nix +++ b/pkgs/development/python-modules/uamqp/default.nix @@ -16,11 +16,11 @@ buildPythonPackage rec { pname = "uamqp"; - version = "1.5.1"; + version = "1.5.3"; src = fetchPypi { inherit pname version; - sha256 = "sha256-VevtbXtOTKQEqVYpNKFrDhvyDBJY+uQMhld6in+EroE="; + sha256 = "sha256-guhfOMvddC4E+oOmvpeG8GsXEfqLcSHVdtj3w8fF2Vs="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/ufo2ft/default.nix b/pkgs/development/python-modules/ufo2ft/default.nix index a3458b2f332fe..8f700107bceb6 100644 --- a/pkgs/development/python-modules/ufo2ft/default.nix +++ b/pkgs/development/python-modules/ufo2ft/default.nix @@ -12,13 +12,13 @@ buildPythonPackage rec { pname = "ufo2ft"; - version = "2.25.2"; + version = "2.26.0"; format = "setuptools"; src = fetchPypi { inherit pname version; - sha256 = "ooWIHvyMtrht4WcGPiacY8dfjPSb5uitHnTRTKvf2AA="; + sha256 = "sha256-1WQAs1ypWtLObgBzPtqtvHjkKnDWohu3PbI3bF7B0Sg="; }; patches = [ diff --git a/pkgs/development/python-modules/uharfbuzz/default.nix b/pkgs/development/python-modules/uharfbuzz/default.nix new file mode 100644 index 0000000000000..f39aa12152a14 --- /dev/null +++ b/pkgs/development/python-modules/uharfbuzz/default.nix @@ -0,0 +1,45 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, pythonOlder +, cython +, setuptools-scm +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "uharfbuzz"; + version = "0.24.1"; + format = "setuptools"; + + disabled = pythonOlder "3.5"; + + # Fetching from GitHub as Pypi contains different versions + src = fetchFromGitHub { + owner = "harfbuzz"; + repo = "uharfbuzz"; + rev = "v${version}"; + sha256 = "sha256-DyFXbwB28JH2lvmWDezRh49tjCvleviUNSE5LHG3kUg="; + fetchSubmodules = true; + }; + + SETUPTOOLS_SCM_PRETEND_VERSION = version; + + nativeBuildInputs = [ + cython + setuptools-scm + ]; + + checkInputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ "uharfbuzz" ]; + + meta = with lib; { + description = "Streamlined Cython bindings for the harfbuzz shaping engine"; + homepage = "https://github.com/harfbuzz/uharfbuzz"; + license = licenses.asl20; + maintainers = with maintainers; [ wolfangaukang ]; + }; +} diff --git a/pkgs/development/python-modules/umap-learn/default.nix b/pkgs/development/python-modules/umap-learn/default.nix index 91e8512d18d12..1281d90cdaf59 100644 --- a/pkgs/development/python-modules/umap-learn/default.nix +++ b/pkgs/development/python-modules/umap-learn/default.nix @@ -15,13 +15,13 @@ buildPythonPackage rec { pname = "umap-learn"; - version = "0.5.2"; + version = "0.5.3"; src = fetchFromGitHub { owner = "lmcinnes"; repo = "umap"; rev = version; - sha256 = "sha256-JfYuuE1BP+HdiEl7l01sZ/XXlEwHyAsLjK9nqhRd/3o="; + sha256 = "sha256-S2+k7Ec4AxsN6d0GUGnU81oLnBgmlZp8OmUFCNaUJYw="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/unittest-xml-reporting/default.nix b/pkgs/development/python-modules/unittest-xml-reporting/default.nix index c8d1edc421094..c4ee1f955e440 100644 --- a/pkgs/development/python-modules/unittest-xml-reporting/default.nix +++ b/pkgs/development/python-modules/unittest-xml-reporting/default.nix @@ -1,18 +1,21 @@ -{lib, fetchPypi, buildPythonPackage, isPy27, six}: +{lib, fetchPypi, buildPythonPackage, isPy27, six, lxml }: buildPythonPackage rec { pname = "unittest-xml-reporting"; - version = "3.0.4"; + version = "3.2.0"; disabled = isPy27; - propagatedBuildInputs = [six]; + propagatedBuildInputs = [ + lxml + six + ]; # The tarball from Pypi doesn't actually contain the unit tests doCheck = false; src = fetchPypi { inherit pname version; - sha256 = "984cebba69e889401bfe3adb9088ca376b3a1f923f0590d005126c1bffd1a695"; + sha256 = "sha256-7djTFwtAw6gbjPkQ9GxqMErihH7AEDbQLpwPm4V2LSg="; }; meta = with lib; { homepage = "https://github.com/xmlrunner/unittest-xml-reporting/tree/master/"; diff --git a/pkgs/development/python-modules/update-dotdee/default.nix b/pkgs/development/python-modules/update-dotdee/default.nix index 1532fca78c4ce..a89f0df403c33 100644 --- a/pkgs/development/python-modules/update-dotdee/default.nix +++ b/pkgs/development/python-modules/update-dotdee/default.nix @@ -1,17 +1,56 @@ -{ lib, buildPythonPackage, fetchFromGitHub, executor, naturalsort }: +{ lib +, buildPythonPackage +, coloredlogs +, executor +, fetchFromGitHub +, humanfriendly +, naturalsort +, property-manager +, pytestCheckHook +, pythonOlder +, six +}: buildPythonPackage rec { pname = "update-dotdee"; version = "6.0"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "xolox"; repo = "python-update-dotdee"; rev = version; - sha256 = "sha256-2k7FdgWM0ESHQb2za87yhXGaR/rbMYLVcv10QexUH1A="; + hash = "sha256-2k7FdgWM0ESHQb2za87yhXGaR/rbMYLVcv10QexUH1A="; }; - propagatedBuildInputs = [ executor naturalsort ]; + propagatedBuildInputs = [ + coloredlogs + executor + humanfriendly + naturalsort + property-manager + six + ]; + + checkInputs = [ + pytestCheckHook + ]; + + postPatch = '' + substituteInPlace tox.ini \ + --replace " --cov --showlocals --verbose" "" + ''; + + pythonImportsCheck = [ + "update_dotdee" + ]; + + disabledTests = [ + # TypeError: %o format: an integer is required, not str + "test_executable" + ]; meta = with lib; { description = "Generic modularized configuration file manager"; diff --git a/pkgs/development/python-modules/uproot/default.nix b/pkgs/development/python-modules/uproot/default.nix index bf523046c6166..8bf8e67b8e465 100644 --- a/pkgs/development/python-modules/uproot/default.nix +++ b/pkgs/development/python-modules/uproot/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "uproot"; - version = "4.1.9"; + version = "4.2.0"; # fetch from github for tests src = fetchFromGitHub { owner = "scikit-hep"; repo = "uproot4"; rev = version; - sha256 = "035gljxm18hvpfvc7nsd7lhawwq3np5sg1y86pzcxc680c6rj6lx"; + sha256 = "sha256-ft2VXYGb+iPqRUrtOBvl7SgTPfPR4+IOdYFVTNbQAEw="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/uri-template/default.nix b/pkgs/development/python-modules/uri-template/default.nix new file mode 100644 index 0000000000000..19f61989e5c2e --- /dev/null +++ b/pkgs/development/python-modules/uri-template/default.nix @@ -0,0 +1,30 @@ +{ lib, buildPythonPackage, fetchFromGitHub, python }: + +buildPythonPackage rec { + pname = "uri-template"; + version = "1.2.0"; + + src = fetchFromGitHub { + owner = "plinss"; + repo = "uri_template"; + rev = "v${version}"; + sha256 = "sha256-IAq6GpEwimq45FU0QugLZLSOhwAmC1KbpZKD0zyxsUs="; + }; + + postPatch = '' + sed -i -e 's/0.0.0/${version}/' setup.py + ''; + + checkPhase = '' + ${python.interpreter} test.py + ''; + + pythonImportsCheck = [ "uri_template" ]; + + meta = with lib; { + description = "An implementation of RFC 6570 URI Templates"; + homepage = "https://github.com/plinss/uri_template/"; + license = licenses.mit; + maintainers = [ maintainers.kvark ]; + }; +} diff --git a/pkgs/development/python-modules/urllib3/default.nix b/pkgs/development/python-modules/urllib3/default.nix index 4c1a61b09fc64..6d29a107f0045 100644 --- a/pkgs/development/python-modules/urllib3/default.nix +++ b/pkgs/development/python-modules/urllib3/default.nix @@ -18,12 +18,12 @@ buildPythonPackage rec { pname = "urllib3"; - version = "1.26.8"; + version = "1.26.9"; format = "setuptools"; src = fetchPypi { inherit pname version; - hash = "sha256-Dnwz2aY+fd/LhngKrIe+/C+930bFjbtIfghV987sKDw="; + hash = "sha256-qrrxZHeAal4d0ZqkH4wreVDdPHRjYtfjIj2+beasRI4="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/ush/default.nix b/pkgs/development/python-modules/ush/default.nix index d7a90bcb9e8d5..3e7773fb2fd92 100644 --- a/pkgs/development/python-modules/ush/default.nix +++ b/pkgs/development/python-modules/ush/default.nix @@ -1,4 +1,9 @@ -{ lib, buildPythonPackage, fetchFromGitHub, pytestCheckHook}: +{ lib +, buildPythonPackage +, fetchFromGitHub +, pytestCheckHook +, six +}: buildPythonPackage rec { pname = "ush"; @@ -11,7 +16,10 @@ buildPythonPackage rec { sha256 = "sha256-eL3vG3yS02enbLYorKvvYKbju9HInffUhrZgkodwhvo="; }; - checkInputs = [ pytestCheckHook ]; + checkInputs = [ + pytestCheckHook + six + ]; disabledTestPaths = [ # seems to be outdated? diff --git a/pkgs/development/python-modules/uvicorn/default.nix b/pkgs/development/python-modules/uvicorn/default.nix index 4ce9228efee88..a3238d4c5484e 100644 --- a/pkgs/development/python-modules/uvicorn/default.nix +++ b/pkgs/development/python-modules/uvicorn/default.nix @@ -19,14 +19,14 @@ buildPythonPackage rec { pname = "uvicorn"; - version = "0.16.0"; + version = "0.17.5"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "encode"; repo = pname; rev = version; - sha256 = "14jih6j4q2qp5c9rgl798i5p51b4y6zkkj434q2l1naw0csphk4s"; + sha256 = "sha256-66wPVnBLy2HK4p0m/b/DRxy12sk8AsVFZoFVcWRkL4s="; }; outputs = [ diff --git a/pkgs/development/python-modules/uvloop/default.nix b/pkgs/development/python-modules/uvloop/default.nix index 72ede5dc1716f..b4b75dbb19411 100644 --- a/pkgs/development/python-modules/uvloop/default.nix +++ b/pkgs/development/python-modules/uvloop/default.nix @@ -62,8 +62,12 @@ buildPythonPackage rec { "tests/test_sourcecode.py" ]; - # force using installed/compiled uvloop vs source by moving tests to temp dir - preCheck = '' + preCheck = lib.optionalString stdenv.isDarwin '' + # Work around "OSError: AF_UNIX path too long" + # https://github.com/MagicStack/uvloop/issues/463 + export TMPDIR="/tmp" + '' + '' + # force using installed/compiled uvloop vs source by moving tests to temp dir export TEST_DIR=$(mktemp -d) cp -r tests $TEST_DIR pushd $TEST_DIR diff --git a/pkgs/development/python-modules/validators/default.nix b/pkgs/development/python-modules/validators/default.nix index 29ec9cd73d73b..f83fe801a2a2f 100644 --- a/pkgs/development/python-modules/validators/default.nix +++ b/pkgs/development/python-modules/validators/default.nix @@ -3,6 +3,7 @@ , fetchPypi , isPy27 , decorator +, six , pytestCheckHook }: @@ -18,6 +19,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ decorator + six ]; checkInputs = [ diff --git a/pkgs/development/python-modules/validictory/default.nix b/pkgs/development/python-modules/validictory/default.nix index 29ffb76591eff..c4172079a6077 100644 --- a/pkgs/development/python-modules/validictory/default.nix +++ b/pkgs/development/python-modules/validictory/default.nix @@ -1,5 +1,6 @@ { lib , buildPythonPackage +, pythonAtLeast , fetchPypi }: @@ -7,6 +8,8 @@ buildPythonPackage rec { pname = "validictory"; version = "1.1.2"; + disabled = pythonAtLeast "3.10"; # abandoned, should be removed when we move to py310/311 + src = fetchPypi { inherit pname version; sha256 = "1fim11vj990rmn59qd67knccjx1p4an7gavbgprpabsrb13bi1rs"; diff --git a/pkgs/development/python-modules/variants/default.nix b/pkgs/development/python-modules/variants/default.nix index e23407ab06b36..2b5dccec558a0 100644 --- a/pkgs/development/python-modules/variants/default.nix +++ b/pkgs/development/python-modules/variants/default.nix @@ -4,6 +4,7 @@ , pytest-runner , setuptools-scm , pytestCheckHook +, six , lib }: @@ -17,12 +18,12 @@ buildPythonPackage rec { }; nativeBuildInputs = [ - pytest-runner setuptools-scm ]; checkInputs = [ pytestCheckHook + six ]; meta = with lib; { diff --git a/pkgs/development/python-modules/vdirsyncer/default.nix b/pkgs/development/python-modules/vdirsyncer/default.nix index edb61ccb70341..b51246739518b 100644 --- a/pkgs/development/python-modules/vdirsyncer/default.nix +++ b/pkgs/development/python-modules/vdirsyncer/default.nix @@ -7,7 +7,7 @@ , click-threading , requests-toolbelt , requests -, requests_oauthlib # required for google oauth sync +, requests-oauthlib , atomicwrites , hypothesis , pytestCheckHook @@ -17,22 +17,31 @@ }: buildPythonPackage rec { - version = "0.18.0"; pname = "vdirsyncer"; + version = "0.18.0"; + format = "setuptools"; + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "sha256-J7w+1R93STX7ujkpFcjI1M9jmuUaRLZ0aGtJoQJfwgE="; + hash = "sha256-J7w+1R93STX7ujkpFcjI1M9jmuUaRLZ0aGtJoQJfwgE="; }; + postPatch = '' + substituteInPlace setup.py \ + --replace "click-log>=0.3.0, <0.4.0" "click-log>=0.3.0, <0.5.0" + + sed -i -e '/--cov/d' -e '/--no-cov/d' setup.cfg + ''; + propagatedBuildInputs = [ atomicwrites click click-log click-threading requests - requests_oauthlib # required for google oauth sync + requests-oauthlib requests-toolbelt ]; @@ -47,10 +56,6 @@ buildPythonPackage rec { pytest-subtesthack ]; - postPatch = '' - sed -i -e '/--cov/d' -e '/--no-cov/d' setup.cfg - ''; - preCheck = '' export DETERMINISTIC_TESTS=true ''; diff --git a/pkgs/development/python-modules/vehicle/default.nix b/pkgs/development/python-modules/vehicle/default.nix index a56cc4ca8b43e..7328494a61ff1 100644 --- a/pkgs/development/python-modules/vehicle/default.nix +++ b/pkgs/development/python-modules/vehicle/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "vehicle"; - version = "0.3.1"; + version = "0.4.0"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "frenck"; repo = "python-vehicle"; rev = "v${version}"; - sha256 = "04xcs5bfjd49j870gyyznc8hkaadsa9gm9pz0w9qvzlphnxvv5h4"; + sha256 = "sha256-dvSdYrONUEe+bdZ+9nALrOQ6gJwq9e1dLvuq08xP5tQ="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/vertica-python/default.nix b/pkgs/development/python-modules/vertica-python/default.nix index cd6186e574f30..0fdd4ed6d9625 100644 --- a/pkgs/development/python-modules/vertica-python/default.nix +++ b/pkgs/development/python-modules/vertica-python/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "vertica-python"; - version = "1.0.4"; + version = "1.0.5"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-IpdrR9mDG+8cNnXgSXkmXahSEP4EGnEBJqZk5SNu9pA="; + hash = "sha256-m9r6P8GTehx33QO/aCuKArrpJ/ycVHWPkQ9sPc3tmeo="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/virtualenv/default.nix b/pkgs/development/python-modules/virtualenv/default.nix index c463c37747eaa..a739ab2fd6ce8 100644 --- a/pkgs/development/python-modules/virtualenv/default.nix +++ b/pkgs/development/python-modules/virtualenv/default.nix @@ -23,11 +23,11 @@ buildPythonPackage rec { pname = "virtualenv"; - version = "20.13.0"; + version = "20.14.0"; src = fetchPypi { inherit pname version; - sha256 = "d8458cf8d59d0ea495ad9b34c2599487f8a7772d796f9910858376d1600dd2dd"; + sha256 = "sha256-jltAIDcocSboHM3pQyuVqL5bGdNlhPZJVwYKNIjBHKg="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/vispy/default.nix b/pkgs/development/python-modules/vispy/default.nix index 47a966332548c..c17f372873847 100644 --- a/pkgs/development/python-modules/vispy/default.nix +++ b/pkgs/development/python-modules/vispy/default.nix @@ -16,11 +16,11 @@ buildPythonPackage rec { pname = "vispy"; - version = "0.9.6"; + version = "0.10.0"; src = fetchPypi { inherit pname version; - sha256 = "sha256-ISzVtQgkSZu84+LXQaray3nAt3GsVm+THGE1WXYCi8s="; + sha256 = "sha256-t2rW8+rK2/xJRM+4IR6ttuqEF6WQmT7OWqfKrAgs/8I="; }; patches = [ diff --git a/pkgs/development/python-modules/vivisect/default.nix b/pkgs/development/python-modules/vivisect/default.nix index ddf6ce54b25ea..8eddde2b65b72 100644 --- a/pkgs/development/python-modules/vivisect/default.nix +++ b/pkgs/development/python-modules/vivisect/default.nix @@ -2,32 +2,56 @@ , buildPythonPackage , isPy3k , fetchPypi +, wrapQtAppsHook + +# propagates , pyasn1 , pyasn1-modules , cxxfilt , msgpack , pycparser + +# extras: gui +, pyqt5 +, pyqtwebengine + +# knobs +, withGui ? false }: + buildPythonPackage rec { pname = "vivisect"; version = "1.0.7"; - disabled = isPy3k; src = fetchPypi { inherit pname version; sha256 = "727a27ac1eb95d5a41f4430f6912e79940525551314fe68a2811fc9d51eaf2e9"; }; + postPatch = '' + substituteInPlace setup.py \ + --replace 'cxxfilt>=0.2.1,<0.3.0' 'cxxfilt' + ''; + + nativeBuildInputs = [ + wrapQtAppsHook + ]; + propagatedBuildInputs = [ pyasn1 pyasn1-modules cxxfilt msgpack pycparser + ] ++ lib.optionals (withGui) passthru.extras-require.gui; + + passthru.extras-require.gui = [ + pyqt5 + pyqtwebengine ]; - preBuild = '' - sed "s@==.*'@'@" -i setup.py + postFixup = '' + wrapQtApp $out/bin/vivbin ''; # requires another repo for test files diff --git a/pkgs/development/python-modules/waitress/default.nix b/pkgs/development/python-modules/waitress/default.nix index aa09b0068d9ab..e2cbe59ab2864 100644 --- a/pkgs/development/python-modules/waitress/default.nix +++ b/pkgs/development/python-modules/waitress/default.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { pname = "waitress"; - version = "2.0.0"; + version = "2.1.1"; src = fetchPypi { inherit pname version; - sha256 = "69e1f242c7f80273490d3403c3976f3ac3b26e289856936d1f620ed48f321897"; + sha256 = "sha256-4uYFds8UoVOdp597fuHnmnHmTzZqC0fbVKFelx9XuxY="; }; doCheck = false; diff --git a/pkgs/development/python-modules/wallbox/default.nix b/pkgs/development/python-modules/wallbox/default.nix index a1136d89342e7..53ccd00a75f5b 100644 --- a/pkgs/development/python-modules/wallbox/default.nix +++ b/pkgs/development/python-modules/wallbox/default.nix @@ -2,22 +2,24 @@ , buildPythonPackage , pythonOlder , fetchPypi +, aenum , requests , simplejson }: buildPythonPackage rec { pname = "wallbox"; - version = "0.4.6"; + version = "0.4.8"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "651c61e2264258382d1f54c4f0bf6bcd198482a744d8f1db3dd73084c240d9bb"; + sha256 = "f8965b0ae3a873f570986e712a4e667d0b6634c9e3afb51fbd5596856412878c"; }; propagatedBuildInputs = [ + aenum requests simplejson ]; diff --git a/pkgs/development/python-modules/wandb/default.nix b/pkgs/development/python-modules/wandb/default.nix index ef8e6cfd247ec..f31708baef8b6 100644 --- a/pkgs/development/python-modules/wandb/default.nix +++ b/pkgs/development/python-modules/wandb/default.nix @@ -1,8 +1,9 @@ -{ azure-core +{ lib +, stdenv +, azure-core , bokeh , buildPythonPackage , click -, configparser , docker_pycreds , fetchFromGitHub , flask @@ -10,7 +11,6 @@ , GitPython , jsonref , jsonschema -, lib , matplotlib , nbformat , pandas @@ -22,8 +22,8 @@ , pytest-mock , pytest-xdist , pytestCheckHook -, python , python-dateutil +, pythonOlder , pyyaml , requests , scikit-learn @@ -31,37 +31,27 @@ , setproctitle , setuptools , shortuuid -, stdenv , tqdm -, yaspin }: buildPythonPackage rec { pname = "wandb"; - version = "0.12.11"; + version = "0.12.15"; + format = "setuptools"; + + disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = pname; repo = "client"; rev = "v${version}"; - sha256 = "0av4vv4llan40678bw0vlah0gn6hjg5pdqwq0c5cv15lqrdb8g32"; + hash = "sha256-Fq+JwUEZP1QDFKYVyiR8DUU0GQV6fK50FW78qaWh+Mo="; }; - # The wandb requirements.txt does not distinguish python2/3 dependencies. We - # need to drop the subprocess32 dependency when building for python3. - patchPhase = '' - substituteInPlace requirements.txt --replace "subprocess32>=3.5.3" "" - ''; - - # git is not a setup.py dependency of wandb, but wandb does expect git to be - # in PATH. See https://gist.github.com/samuela/57aeee710e41ab2bf361b7ed8fbbeabf - # for the error message, and an example usage here: https://github.com/wandb/client/blob/master/wandb/sdk/internal/meta.py#L139-L141. # setuptools is necessary since pkg_resources is required at runtime. propagatedBuildInputs = [ click - configparser docker_pycreds - git GitPython pathtools promise @@ -74,9 +64,35 @@ buildPythonPackage rec { setproctitle setuptools shortuuid - yaspin ]; + checkInputs = [ + azure-core + bokeh + flask + jsonref + jsonschema + matplotlib + nbformat + pandas + pydantic + pytest-mock + pytest-xdist + pytestCheckHook + scikit-learn + tqdm + ]; + + # wandb expects git to be in PATH. See https://gist.github.com/samuela/57aeee710e41ab2bf361b7ed8fbbeabf + # for the error message, and an example usage here: https://github.com/wandb/client/blob/d5f655b7ca7e3eac2f3a67a84bc5c2a664a31baf/wandb/sdk/internal/meta.py#L128. + # See https://github.com/NixOS/nixpkgs/pull/164176#discussion_r828801621 as to + # why we don't put it in propagatedBuildInputs. Note that this is difficult to + # test offline due to https://github.com/wandb/client/issues/3519. + postInstall = '' + mkdir -p $out/bin + ln -s ${git}/bin/git $out/bin/git + ''; + disabledTestPaths = [ # Tests that try to get chatty over sockets or spin up servers, not possible in the nix build environment. "tests/test_cli.py" @@ -106,6 +122,7 @@ buildPythonPackage rec { "tests/wandb_settings_test.py" "tests/wandb_sweep_test.py" "tests/wandb_verify_test.py" + "tests/test_model_workflows.py" # Fails and borks the pytest runner as well. "tests/wandb_test.py" @@ -114,24 +131,15 @@ buildPythonPackage rec { "tests/test_tables.py" ]; - checkInputs = [ - azure-core - bokeh - flask - jsonref - jsonschema - matplotlib - nbformat - pandas - pydantic - pytest-mock - pytest-xdist - pytestCheckHook - scikit-learn - tqdm + # Disable test that fails on darwin due to issue with python3Packages.psutil: + # https://github.com/giampaolo/psutil/issues/1219 + disabledTests = lib.optional stdenv.isDarwin [ + "test_tpu_system_stats" ]; - pythonImportsCheck = [ "wandb" ]; + pythonImportsCheck = [ + "wandb" + ]; meta = with lib; { description = "A CLI and library for interacting with the Weights and Biases API"; diff --git a/pkgs/development/python-modules/wasabi/default.nix b/pkgs/development/python-modules/wasabi/default.nix index fca3f5480dcf5..16c89ae63a0d6 100644 --- a/pkgs/development/python-modules/wasabi/default.nix +++ b/pkgs/development/python-modules/wasabi/default.nix @@ -2,23 +2,34 @@ , buildPythonPackage , fetchPypi , pytestCheckHook +, pythonOlder }: buildPythonPackage rec { pname = "wasabi"; - version = "0.9.0"; + version = "0.9.1"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "152245d892030a3a7b511038e9472acff6d0e237cfe4123fef0d147f2d3274fc"; + sha256 = "sha256-rabxPptw7ya/lfrQ/r396+IAXimgitWPS7rjg6lymM8="; }; - checkInputs = [ pytestCheckHook ]; + checkInputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ + "wasabi" + ]; meta = with lib; { description = "A lightweight console printing and formatting toolkit"; homepage = "https://github.com/ines/wasabi"; changelog = "https://github.com/ines/wasabi/releases/tag/v${version}"; license = licenses.mit; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/development/python-modules/wasm/default.nix b/pkgs/development/python-modules/wasm/default.nix index f6c2cc42e387b..adc3c958bee13 100644 --- a/pkgs/development/python-modules/wasm/default.nix +++ b/pkgs/development/python-modules/wasm/default.nix @@ -1,5 +1,6 @@ { buildPythonPackage , fetchPypi +, pythonAtLeast , lib }: @@ -7,6 +8,8 @@ buildPythonPackage rec { pname = "wasm"; version = "1.2"; + disabled = pythonAtLeast "3.10"; # project is abandoned, remove we whe move to py310/311 + src = fetchPypi { inherit pname version; sha256 = "179xcinfc35xgk0bf9y58kwxzymzk7c1p58w6khmqfiqvb91j3r8"; diff --git a/pkgs/development/python-modules/watchdog/default.nix b/pkgs/development/python-modules/watchdog/default.nix index 9fba5785c4478..9afd0f032fc3c 100644 --- a/pkgs/development/python-modules/watchdog/default.nix +++ b/pkgs/development/python-modules/watchdog/default.nix @@ -12,12 +12,12 @@ buildPythonPackage rec { pname = "watchdog"; - version = "2.1.6"; + version = "2.1.7"; format = "setuptools"; src = fetchPypi { inherit pname version; - sha256 = "sha256-o25132x2fL9G9hqRxws7pxgR36CspKMk2UB6Bqi3ouc="; + sha256 = "sha256-P9R4FTU76cRO68lMwo/iaysMW9iJ2vxKWny9+SQUNIA="; }; buildInputs = lib.optionals stdenv.isDarwin [ CoreServices ]; @@ -39,6 +39,11 @@ buildPythonPackage rec { --replace "--cov-report=term-missing" "" ''; + disabledTests = [ + # probably failing because of an encoding related issue + "test_create_wrong_encoding" + ]; + disabledTestPaths = [ # Tests are flaky "tests/test_inotify_buffer.py" diff --git a/pkgs/development/python-modules/watchgod/default.nix b/pkgs/development/python-modules/watchgod/default.nix index 5bb8425864226..70e93f1a20906 100644 --- a/pkgs/development/python-modules/watchgod/default.nix +++ b/pkgs/development/python-modules/watchgod/default.nix @@ -1,17 +1,22 @@ { lib , buildPythonPackage , fetchPypi +, anyio }: buildPythonPackage rec { pname = "watchgod"; - version = "0.7"; + version = "0.8.1"; src = fetchPypi { inherit pname version; - sha256 = "0aagm0n5fkpzdsfgl0r21gkz5qaicgq3f4rqz2fdvsgbn1i0s528"; + sha256 = "sha256-wS0V8999EedAcE5FOYJ3918dePRq1Zyp11Bb/YuNMIY="; }; + propagatedBuildInputs = [ + anyio + ]; + # no tests in release doCheck = false; diff --git a/pkgs/development/python-modules/weasyprint/default.nix b/pkgs/development/python-modules/weasyprint/default.nix index 3d752596dec3b..a1a7470b8b5d6 100644 --- a/pkgs/development/python-modules/weasyprint/default.nix +++ b/pkgs/development/python-modules/weasyprint/default.nix @@ -27,7 +27,7 @@ buildPythonPackage rec { pname = "weasyprint"; - version = "54.2"; + version = "54.3"; disabled = !isPy3k; format = "pyproject"; @@ -35,7 +35,7 @@ buildPythonPackage rec { src = fetchPypi { inherit version; pname = "weasyprint"; - sha256 = "sha256-1eiqguPiokd6RUPwZG2fsUCAybo0oIWXUesjdXzABGY="; + sha256 = "sha256-4E2gQGMFZsRMqiAgM/B/hYdl9TZwkEWoCXOfPQSOidY="; }; patches = [ diff --git a/pkgs/development/python-modules/websocket-client/default.nix b/pkgs/development/python-modules/websocket-client/default.nix index 116f45f16dd34..a1c0cfa82e1d0 100644 --- a/pkgs/development/python-modules/websocket-client/default.nix +++ b/pkgs/development/python-modules/websocket-client/default.nix @@ -4,20 +4,22 @@ , pythonOlder , pytestCheckHook , python-socks +, six }: buildPythonPackage rec { pname = "websocket-client"; - version = "1.2.3"; + version = "1.3.2"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "1315816c0acc508997eb3ae03b9d3ff619c9d12d544c9a9b553704b1cc4f6af5"; + sha256 = "sha256-ULIdsAWPepU9Z8wERb5LlI1/wZbsvrgIPWjZRijkq/Y="; }; propagatedBuildInputs = [ python-socks + six ]; checkInputs = [ diff --git a/pkgs/development/python-modules/webssh/default.nix b/pkgs/development/python-modules/webssh/default.nix index 49b7097549d6a..ff26a9f1711e5 100644 --- a/pkgs/development/python-modules/webssh/default.nix +++ b/pkgs/development/python-modules/webssh/default.nix @@ -29,6 +29,11 @@ buildPythonPackage rec { "webssh" ]; + disabledTests = [ + # Test fails with AttributeError (possibly related to paramiko update) + "test_app_with_bad_host_key" + ]; + meta = with lib; { description = "Web based SSH client"; homepage = "https://github.com/huashengdun/webssh/"; diff --git a/pkgs/development/python-modules/webthing/default.nix b/pkgs/development/python-modules/webthing/default.nix index 92e4ea5a8fb5f..aea123bc78c16 100644 --- a/pkgs/development/python-modules/webthing/default.nix +++ b/pkgs/development/python-modules/webthing/default.nix @@ -4,6 +4,7 @@ , ifaddr , jsonschema , pyee +, pythonOlder , tornado , zeroconf }: @@ -11,12 +12,15 @@ buildPythonPackage rec { pname = "webthing"; version = "0.15.0"; + format = "setuptools"; + + disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "WebThingsIO"; repo = "webthing-python"; rev = "v${version}"; - sha256 = "06264rwchy4qmbn7lv7m00qg864y7aw3rngcqqcr9nvaqz4rb0fg"; + hash = "sha256-z4GVycdq25QZxuzZPLg6nhj0MAD1bHrsqph4yHgmRhg="; }; propagatedBuildInputs = [ @@ -27,9 +31,12 @@ buildPythonPackage rec { zeroconf ]; - # no tests are present + # No tests are present doCheck = false; - pythonImportsCheck = [ "webthing" ]; + + pythonImportsCheck = [ + "webthing" + ]; meta = with lib; { description = "Python implementation of a Web Thing server"; diff --git a/pkgs/development/python-modules/weconnect-mqtt/default.nix b/pkgs/development/python-modules/weconnect-mqtt/default.nix index 42a3877cffc15..646702befbb37 100644 --- a/pkgs/development/python-modules/weconnect-mqtt/default.nix +++ b/pkgs/development/python-modules/weconnect-mqtt/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "weconnect-mqtt"; - version = "0.30.0"; + version = "0.33.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "tillsteinbach"; repo = "WeConnect-mqtt"; rev = "v${version}"; - sha256 = "sha256-/mlN9gEEy8DJSFef0Pp2PLjHhwStKwANKSzw4nT19eM="; + sha256 = "sha256-m8T1ngTcqwrel4EW8jvXg7RH+TtYyZRvIR33kzgda7E="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/weconnect/default.nix b/pkgs/development/python-modules/weconnect/default.nix index f5af3e5aa5048..1dab5c8c92808 100644 --- a/pkgs/development/python-modules/weconnect/default.nix +++ b/pkgs/development/python-modules/weconnect/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "weconnect"; - version = "0.37.0"; + version = "0.39.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "tillsteinbach"; repo = "WeConnect-python"; rev = "v${version}"; - sha256 = "sha256-h6jKtQt9vCh5bnhIqWLniUIJ41GxCs0uSi4vBVNs8tE="; + sha256 = "sha256-O5Dh0RWvSXCIF0savyNG5XDhGqCTJZHQpJM4VEX+S9w="; }; propagatedBuildInputs = [ @@ -42,8 +42,8 @@ buildPythonPackage rec { substituteInPlace setup.py \ --replace "setup_requires=SETUP_REQUIRED," "setup_requires=[]," \ --replace "tests_require=TEST_REQUIRED," "tests_require=[]," - substituteInPlace requirements.txt \ - --replace "pillow~=9.0.0" "pillow" + substituteInPlace image_extra_requirements.txt \ + --replace "pillow~=9.0.1" "pillow" substituteInPlace pytest.ini \ --replace "--cov=weconnect --cov-config=.coveragerc --cov-report html" "" \ --replace "pytest-cov" "" diff --git a/pkgs/development/python-modules/werkzeug/default.nix b/pkgs/development/python-modules/werkzeug/default.nix index c75c59ac1c9c5..f961d0359db4f 100644 --- a/pkgs/development/python-modules/werkzeug/default.nix +++ b/pkgs/development/python-modules/werkzeug/default.nix @@ -5,6 +5,7 @@ , fetchPypi , watchdog , dataclasses +, ephemeral-port-reserve , pytest-timeout , pytest-xprocess , pytestCheckHook @@ -12,15 +13,15 @@ buildPythonPackage rec { pname = "werkzeug"; - version = "2.0.2"; + version = "2.1.0"; format = "setuptools"; - disabled = pythonOlder "3.6"; + disabled = pythonOlder "3.7"; src = fetchPypi { pname = "Werkzeug"; inherit version; - sha256 = "sha256-qiu2/I3ujWxQTArB5/X33FgQqZA+eTtvcVqfAVva25o="; + sha256 = "sha256-m1VGaj6Z4TsfBoamYRfTm9qFqZIWbgp5rt/PNYYyj3o="; }; propagatedBuildInputs = lib.optionals (!stdenv.isDarwin) [ @@ -31,6 +32,7 @@ buildPythonPackage rec { ]; checkInputs = [ + ephemeral-port-reserve pytest-timeout pytest-xprocess pytestCheckHook @@ -40,6 +42,11 @@ buildPythonPackage rec { "test_get_machine_id" ]; + disabledTestPaths = [ + # ConnectionRefusedError: [Errno 111] Connection refused + "tests/test_serving.py" + ]; + pytestFlagsArray = [ # don't run tests that are marked with filterwarnings, they fail with # warnings._OptionError: unknown warning category: 'pytest.PytestUnraisableExceptionWarning' diff --git a/pkgs/development/python-modules/west/default.nix b/pkgs/development/python-modules/west/default.nix index 1f9aad67f19db..eb934fde11292 100644 --- a/pkgs/development/python-modules/west/default.nix +++ b/pkgs/development/python-modules/west/default.nix @@ -1,16 +1,24 @@ -{ lib, fetchPypi, buildPythonPackage, isPy3k -, colorama, configobj, packaging, pyyaml, pykwalify +{ lib +, buildPythonPackage +, colorama +, configobj +, fetchPypi +, packaging +, pykwalify +, pythonOlder +, pyyaml }: buildPythonPackage rec { - version = "0.12.0"; pname = "west"; + version = "0.13.1"; + format = "setuptools"; - disabled = !isPy3k; + disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "d7ce0d719fd218fee5983442fe93a33a21a6be6a736915a7ffbe75369714e9ce"; + hash = "sha256-B6B7shZ8FM5pyXzXknJv9mwr+ERq4kiEzRf5jLTCicM="; }; propagatedBuildInputs = [ @@ -24,12 +32,12 @@ buildPythonPackage rec { # pypi package does not include tests (and for good reason): # tests run under 'tox' and have west try to git clone repos (not sandboxable) doCheck = false; + pythonImportsCheck = [ "west" ]; meta = with lib; { - homepage = "https://github.com/zephyrproject-rtos/west"; description = "Zephyr RTOS meta tool"; longDescription = '' West lets you manage multiple Git repositories under a single directory using a single file, @@ -47,6 +55,7 @@ buildPythonPackage rec { For more details, see Multiple Repository Management in the west documentation (https://docs.zephyrproject.org/latest/guides/west/repo-tool.html). ''; + homepage = "https://github.com/zephyrproject-rtos/west"; license = licenses.asl20; maintainers = with maintainers; [ siriobalmelli ]; }; diff --git a/pkgs/development/python-modules/whodap/default.nix b/pkgs/development/python-modules/whodap/default.nix index d4f6913105f21..60affb0cd5c61 100644 --- a/pkgs/development/python-modules/whodap/default.nix +++ b/pkgs/development/python-modules/whodap/default.nix @@ -10,15 +10,15 @@ buildPythonPackage rec { pname = "whodap"; - version = "0.1.4"; + version = "0.1.5"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "pogzyb"; repo = pname; - rev = "v${version}"; - sha256 = "sha256-L8fSf9AhmWbRvLKvf0aowKoal+5dG1SJXcA7Ssrhj6o="; + rev = "refs/tags/v${version}"; + sha256 = "sha256-Jm3+WMGuYc910TNDVzHjYcbNcts668D3xYORXxozWqA="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/widgetsnbextension/default.nix b/pkgs/development/python-modules/widgetsnbextension/default.nix index 8f6cb6ad1867c..5b4f535563c22 100644 --- a/pkgs/development/python-modules/widgetsnbextension/default.nix +++ b/pkgs/development/python-modules/widgetsnbextension/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "widgetsnbextension"; - version = "3.5.2"; + version = "3.6.0"; src = fetchPypi { inherit pname version; - sha256 = "e0731a60ba540cd19bbbefe771a9076dcd2dde90713a8f87f27f53f2d1db7727"; + sha256 = "sha256-6Ep6n8ubrz1XEG4YSnOJqPjrk1v3QaXrnWCqGMwCmoA="; }; propagatedBuildInputs = [ notebook ]; diff --git a/pkgs/development/python-modules/widlparser/default.nix b/pkgs/development/python-modules/widlparser/default.nix new file mode 100644 index 0000000000000..d11fa492ca57a --- /dev/null +++ b/pkgs/development/python-modules/widlparser/default.nix @@ -0,0 +1,38 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, pythonOlder +# build inputs +, typing-extensions +}: + +buildPythonPackage rec { + pname = "widlparser"; + version = "1.0.12"; + + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "plinss"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-T17fDWYd1naza/ao7kXWGcRIl2fzL1/Z9SaJiutZzqk="; + }; + + postPatch = '' + sed -i -e 's/0.0.0/${version}/' setup.py + ''; + + propagatedBuildInputs = [ + typing-extensions + ]; + + pythonImportsCheck = [ "widlparser" ]; + + meta = with lib; { + description = "Stand-alone WebIDL Parser in Python"; + homepage = "https://github.com/plinss/widlparser"; + license = licenses.mit; + maintainers = [ maintainers.kvark ]; + }; +} diff --git a/pkgs/development/python-modules/wifi/default.nix b/pkgs/development/python-modules/wifi/default.nix new file mode 100644 index 0000000000000..0b5a9444dbfdf --- /dev/null +++ b/pkgs/development/python-modules/wifi/default.nix @@ -0,0 +1,45 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, pbkdf2 +, pytestCheckHook +, pythonOlder +, substituteAll +, wirelesstools +}: + +buildPythonPackage rec { + pname = "wifi"; + version = "0.3.5"; + + src = fetchFromGitHub { + owner = "rockymeza"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-scg/DvApvyQZtzDgkHFJzf9gCRfJgBvZ64CG/c2Cx8E="; + }; + + disabled = pythonOlder "2.6"; + + postPatch = '' + substituteInPlace wifi/scan.py \ + --replace "/sbin/iwlist" "${wirelesstools}/bin/iwlist" + ''; + + checkInputs = [ + pytestCheckHook + ]; + + propagatedBuildInputs = [ + pbkdf2 + ]; + + pythonImportsCheck = [ "wifi" ]; + + meta = with lib; { + description = "Provides a command line wrapper for iwlist and /etc/network/interfaces"; + homepage = "https://github.com/rockymeza/wifi"; + maintainers = with maintainers; [ rhoriguchi ]; + license = licenses.bsd2; + }; +} diff --git a/pkgs/development/python-modules/winacl/default.nix b/pkgs/development/python-modules/winacl/default.nix index 76d6d71c0b63c..52ae843d42606 100644 --- a/pkgs/development/python-modules/winacl/default.nix +++ b/pkgs/development/python-modules/winacl/default.nix @@ -1,15 +1,19 @@ { lib , buildPythonPackage , fetchPypi +, pythonOlder }: buildPythonPackage rec { pname = "winacl"; - version = "0.1.2"; + version = "0.1.3"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "187b4394ef247806f50e1d8320bdb9e33ad1f759d9e61e2e391b97b9adf5f58a"; + hash = "sha256-G6xWep0hMACCqiJGuw+UpZH8qOIY4WO6sY3w4y7v6gY="; }; # Project doesn't have tests diff --git a/pkgs/development/python-modules/winsspi/default.nix b/pkgs/development/python-modules/winsspi/default.nix index ea880234c0bf3..6869c9f0b08a2 100644 --- a/pkgs/development/python-modules/winsspi/default.nix +++ b/pkgs/development/python-modules/winsspi/default.nix @@ -2,21 +2,31 @@ , buildPythonPackage , fetchPypi , minikerberos +, pythonOlder }: buildPythonPackage rec { pname = "winsspi"; - version = "0.0.9"; + version = "0.0.10"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "1q8hr8l8d9jxyp55qsrlkyhdhqjc0n18ajzms7hf1xkhdl7rrbd2"; + hash = "sha256-L1qNLEufRZFEQmkJ4mp05VBRLiO2z5r1LCoAADx8P9s="; }; - propagatedBuildInputs = [ minikerberos ]; - # Project doesn't have tests + propagatedBuildInputs = [ + minikerberos + ]; + + # Module doesn't have tests doCheck = false; - pythonImportsCheck = [ "winsspi" ]; + + pythonImportsCheck = [ + "winsspi" + ]; meta = with lib; { description = "Python module for ACL/ACE/Security descriptor manipulation"; diff --git a/pkgs/development/python-modules/wsproto/default.nix b/pkgs/development/python-modules/wsproto/default.nix index d4dd7d0899976..bcc9428b460bd 100644 --- a/pkgs/development/python-modules/wsproto/default.nix +++ b/pkgs/development/python-modules/wsproto/default.nix @@ -1,30 +1,31 @@ -{ lib, buildPythonPackage, fetchPypi, pythonOlder, isPy36 -, dataclasses +{ lib +, buildPythonPackage +, fetchPypi +, pythonOlder , h11 -, pytest +, pytestCheckHook }: buildPythonPackage rec { pname = "wsproto"; - version = "1.0.0"; - disabled = pythonOlder "3.6"; # python versions <3.6 + version = "1.1.0"; + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "868776f8456997ad0d9720f7322b746bbe9193751b5b290b7f924659377c8c38"; + sha256 = "sha256-ouVr/Vx82DwTadg7X+zNbTd5i3SHKGbmJhbg7PERvag="; }; - propagatedBuildInputs = [ h11 ] ++ lib.optional isPy36 dataclasses; + propagatedBuildInputs = [ h11 ]; - checkInputs = [ pytest ]; + checkInputs = [ pytestCheckHook ]; - checkPhase = '' - py.test - ''; + pythonImportsCheck = [ "wsproto" ]; meta = with lib; { description = "Pure Python, pure state-machine WebSocket implementation"; homepage = "https://github.com/python-hyper/wsproto/"; license = licenses.mit; + maintainers = with maintainers; [ SuperSandro2000 ]; }; } diff --git a/pkgs/development/python-modules/wxPython/4.1.nix b/pkgs/development/python-modules/wxPython/4.1.nix index 71f8b2847e3be..e5942c17d4c24 100644 --- a/pkgs/development/python-modules/wxPython/4.1.nix +++ b/pkgs/development/python-modules/wxPython/4.1.nix @@ -48,12 +48,14 @@ buildPythonPackage rec { doxygen wxGTK.gtk pkg-config + ] ++ lib.optionals stdenv.isLinux [ autoPatchelfHook ]; buildInputs = [ wxGTK.gtk ncurses + ] ++ lib.optionals stdenv.isLinux [ libXinerama libSM libXxf86vm diff --git a/pkgs/development/python-modules/xarray/default.nix b/pkgs/development/python-modules/xarray/default.nix index 5f780a61ffc56..85b8ac799c739 100644 --- a/pkgs/development/python-modules/xarray/default.nix +++ b/pkgs/development/python-modules/xarray/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "xarray"; - version = "0.20.2"; + version = "2022.3.0"; format = "pyproject"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "sha256-wuvoDKgbEKAkH2h23MNKyWluXFzc30dY2nz0vXMsQfc="; + sha256 = "sha256-OYNEv30XBHeqzv9wIQ4R69aa9rFW/hOXgFTSXEhylEA="; }; SETUPTOOLS_SCM_PRETEND_VERSION="${version}"; diff --git a/pkgs/development/python-modules/xdis/default.nix b/pkgs/development/python-modules/xdis/default.nix index ca339b7a4438b..291da467e9ed3 100644 --- a/pkgs/development/python-modules/xdis/default.nix +++ b/pkgs/development/python-modules/xdis/default.nix @@ -1,32 +1,55 @@ -{ lib, buildPythonPackage, fetchFromGitHub, isPy27 +{ lib +, buildPythonPackage , click -, pytest +, fetchFromGitHub +, fetchpatch +, pytestCheckHook +, pythonOlder , six }: buildPythonPackage rec { pname = "xdis"; - version = "6.0.3"; - disabled = isPy27; + version = "unstable-2022-04-13"; + format = "setuptools"; + + disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "rocky"; repo = "python-xdis"; - rev = version; - sha256 = "1qvg3bwqzqxlzlixz2di3si7siy0ismq93wd57r8cqmxl54gva6h"; + # Support for later Python releases is missing in 6.0.3 + rev = "f888df7df5cb8839927e9187c258769cc77fb7a3"; + hash = "sha256-V1ws5GibRkutFRNcjlP7aW+AshSyWavXIxuwznVbRlU="; }; - checkInputs = [ pytest ]; - propagatedBuildInputs = [ six click ]; + propagatedBuildInputs = [ + click + six + ]; + + checkInputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ + "xdis" + ]; + + disabledTestPaths = [ + # Our Python release is not in the test matrix + "test_unit/test_disasm.py" + ]; - checkPhase = '' - make check - ''; - pythonImportsCheck = [ "xdis" ]; + disabledTests = [ + "test_big_linenos" + "test_basic" + ]; meta = with lib; { description = "Python cross-version byte-code disassembler and marshal routines"; homepage = "https://github.com/rocky/python-xdis/"; license = licenses.gpl2Plus; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/development/python-modules/xgboost/default.nix b/pkgs/development/python-modules/xgboost/default.nix index 3717ca2473c39..f6c63db450517 100644 --- a/pkgs/development/python-modules/xgboost/default.nix +++ b/pkgs/development/python-modules/xgboost/default.nix @@ -48,7 +48,8 @@ buildPythonPackage { ln -s ${xgboost}/bin/xgboost ../xgboost ''; - pytestFlagsArray = ["../tests/python"]; + # tests are extremely cpu intensive, only run basic tests to ensure package is working + pytestFlagsArray = ["../tests/python/test_basic.py"]; disabledTestPaths = [ # Requires internet access: https://github.com/dmlc/xgboost/blob/03cd087da180b7dff21bd8ef34997bf747016025/tests/python/test_ranking.py#L81 "../tests/python/test_ranking.py" diff --git a/pkgs/development/python-modules/xhtml2pdf/default.nix b/pkgs/development/python-modules/xhtml2pdf/default.nix index 5a47fc90f67fd..230e57a06430e 100644 --- a/pkgs/development/python-modules/xhtml2pdf/default.nix +++ b/pkgs/development/python-modules/xhtml2pdf/default.nix @@ -4,6 +4,7 @@ , fetchFromGitHub , html5lib , pillow +, pyhanko , pypdf3 , pytestCheckHook , python-bidi @@ -14,22 +15,25 @@ buildPythonPackage rec { pname = "xhtml2pdf"; - version = "0.2.6"; + version = "0.2.7"; format = "setuptools"; disabled = pythonOlder "3.7"; + # Tests are only available on GitHub src = fetchFromGitHub { owner = pname; repo = pname; - rev = "v${version}"; - hash = "sha256-EyIERvAC98LqPTMCdwWqTkm1RiMhikscL0tnMZUHIT8="; + # Currently it is not possible to fetch from version as there is a branch with the same name + rev = "afa72cdbbdaf7d459261c1605263101ffcd999af"; + sha256 = "sha256-plyIM7Ohnp5UBWz/UDTJa1UeWK9yckSZR16wxmLrpnc="; }; propagatedBuildInputs = [ arabic-reshaper html5lib pillow + pyhanko pypdf3 python-bidi reportlab diff --git a/pkgs/development/python-modules/xknx/default.nix b/pkgs/development/python-modules/xknx/default.nix index b2bfeea8f7a93..88bf7541428bb 100644 --- a/pkgs/development/python-modules/xknx/default.nix +++ b/pkgs/development/python-modules/xknx/default.nix @@ -1,6 +1,7 @@ { lib , buildPythonPackage , fetchFromGitHub +, cryptography , netifaces , voluptuous , pyyaml @@ -11,7 +12,7 @@ buildPythonPackage rec { pname = "xknx"; - version = "0.19.2"; + version = "0.20.4"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -19,14 +20,13 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "XKNX"; repo = pname; - rev = version; - sha256 = "sha256-LJ7MmKCWx+n7caud0pN4+7f9H4XzwuAAn9u86X/FACo="; + rev = "refs/tags/${version}"; + sha256 = "sha256-uqFS/kveWLEmu+8L9dOprcQcO+Odq9lzfTI9lqIhaSw="; }; propagatedBuildInputs = [ - voluptuous + cryptography netifaces - pyyaml ]; checkInputs = [ diff --git a/pkgs/development/python-modules/xml2rfc/default.nix b/pkgs/development/python-modules/xml2rfc/default.nix index c9cf286b6cce4..be9323c774d8f 100644 --- a/pkgs/development/python-modules/xml2rfc/default.nix +++ b/pkgs/development/python-modules/xml2rfc/default.nix @@ -1,6 +1,6 @@ { lib -, fetchPypi , buildPythonPackage +, fetchFromGitHub , pythonOlder , intervaltree , pyflakes @@ -18,19 +18,37 @@ , jinja2 , configargparse , appdirs +, decorator +, pycairo +, pytestCheckHook +, python-fontconfig }: buildPythonPackage rec { pname = "xml2rfc"; - version = "3.12.3"; + version = "3.12.4"; disabled = pythonOlder "3.6"; - src = fetchPypi { - inherit pname version; - sha256 = "sha256-YUrcD3Q1fkDW+nwf6k2T/aBL8+W9iWkPYW/TqdTiuA0="; + src = fetchFromGitHub { + owner = "ietf-tools"; + repo = "xml2rfc"; + rev = "v${version}"; + sha256 = "sha256-TAu2Ls553t7wJ/Jhgu+Ff+H4P6az0Du8OL00JjZyCDs="; }; + postPatch = '' + substituteInPlace Makefile \ + --replace "SHELL := /bin/bash" "SHELL := bash" \ + --replace "test flaketest" "test" \ + --replace "python setup.py --quiet install" "" + substituteInPlace setup.py \ + --replace "'tox'," "" + substituteInPlace requirements.txt \ + --replace "jinja2>=2.11,<3.0" "jinja2" \ + --replace "markupsafe==2.0.1" "markupsafe" + ''; + propagatedBuildInputs = [ intervaltree jinja2 @@ -50,23 +68,25 @@ buildPythonPackage rec { appdirs ]; - postPatch = '' - substituteInPlace requirements.txt \ - --replace "jinja2>=2.11,<3.0" "jinja2>=2.11" - ''; - - preCheck = '' - export HOME=$(mktemp -d) - ''; + checkInputs = [ + decorator + pycairo + pytestCheckHook + python-fontconfig + ]; - # lxml tries to fetch from the internet + # requires Noto Serif and Roboto Mono font doCheck = false; + checkPhase = '' + make tests-no-network + ''; + pythonImportsCheck = [ "xml2rfc" ]; meta = with lib; { description = "Tool generating IETF RFCs and drafts from XML sources"; - homepage = "https://tools.ietf.org/tools/xml2rfc/trac/"; + homepage = "https://github.com/ietf-tools/xml2rfc"; # Well, parts might be considered unfree, if being strict; see: # http://metadata.ftp-master.debian.org/changelogs/non-free/x/xml2rfc/xml2rfc_2.9.6-1_copyright license = licenses.bsd3; diff --git a/pkgs/development/python-modules/xmlsec/default.nix b/pkgs/development/python-modules/xmlsec/default.nix index 0a9a0af0e543f..76ce32e5e8f38 100644 --- a/pkgs/development/python-modules/xmlsec/default.nix +++ b/pkgs/development/python-modules/xmlsec/default.nix @@ -16,6 +16,7 @@ buildPythonPackage rec { pname = "xmlsec"; version = "1.3.12"; + format = "pyproject"; src = fetchPypi { inherit pname version; @@ -35,7 +36,14 @@ buildPythonPackage rec { # Full git clone required for test_doc_examples checkInputs = [ pytestCheckHook hypothesis ]; - disabledTestPaths = [ "tests/test_doc_examples.py" ]; + + disabledTestPaths = [ + "tests/test_doc_examples.py" + # test_reinitialize_module segfaults python + # https://github.com/mehcode/python-xmlsec/issues/203 + "tests/test_xmlsec.py" + ]; + pythonImportsCheck = [ "xmlsec" ]; diff --git a/pkgs/development/python-modules/xmltodict/default.nix b/pkgs/development/python-modules/xmltodict/default.nix index 13cc5b89c2a21..5e0733b6256e7 100644 --- a/pkgs/development/python-modules/xmltodict/default.nix +++ b/pkgs/development/python-modules/xmltodict/default.nix @@ -1,30 +1,27 @@ { lib , buildPythonPackage , fetchPypi -, coverage , pytestCheckHook }: buildPythonPackage rec { pname = "xmltodict"; version = "0.12.0"; + format = "setuptools"; src = fetchPypi { inherit pname version; sha256 = "50d8c638ed7ecb88d90561beedbf720c9b4e851a9fa6c47ebd64e99d166d8a21"; }; - checkInputs = [ coverage pytestCheckHook ]; - - disabledTests = [ - # incompatibilities with security fixes: https://github.com/martinblech/xmltodict/issues/289 - "test_namespace_collapse" - "test_namespace_support" + checkInputs = [ + pytestCheckHook ]; - meta = { + meta = with lib; { description = "Makes working with XML feel like you are working with JSON"; homepage = "https://github.com/martinblech/xmltodict"; - license = lib.licenses.mit; + license = licenses.mit; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/development/python-modules/xxhash/default.nix b/pkgs/development/python-modules/xxhash/default.nix index df3c0c852696d..ff4eeff354594 100644 --- a/pkgs/development/python-modules/xxhash/default.nix +++ b/pkgs/development/python-modules/xxhash/default.nix @@ -1,17 +1,22 @@ { lib , buildPythonPackage , fetchPypi +, setuptools-scm }: buildPythonPackage rec { - version = "2.0.2"; + version = "3.0.0"; pname = "xxhash"; src = fetchPypi { inherit pname version; - sha256 = "b7bead8cf6210eadf9cecf356e17af794f57c0939a3d420a00d87ea652f87b49"; + sha256 = "sha256-MLLZeq8R+xIgI/a0TruXxpVengDXRhqWQVygMLXOucc="; }; + nativeBuildInputs = [ + setuptools-scm + ]; + meta = with lib; { homepage = "https://github.com/ifduyue/python-xxhash"; description = "Python Binding for xxHash https://pypi.org/project/xxhash/"; diff --git a/pkgs/development/python-modules/yamlfix/default.nix b/pkgs/development/python-modules/yamlfix/default.nix index 7243b3891f403..b789aab03701d 100644 --- a/pkgs/development/python-modules/yamlfix/default.nix +++ b/pkgs/development/python-modules/yamlfix/default.nix @@ -37,11 +37,6 @@ buildPythonPackage rec { --replace 'python_paths = "."' "" ''; - pytestFlagsArray = [ - "-n" - "$NIX_BUILD_CORES" - ]; - pythonImportsCheck = [ "yamlfix" ]; diff --git a/pkgs/development/python-modules/yanc/default.nix b/pkgs/development/python-modules/yanc/default.nix index 925276c0ad62a..37e7d91a80981 100644 --- a/pkgs/development/python-modules/yanc/default.nix +++ b/pkgs/development/python-modules/yanc/default.nix @@ -4,16 +4,16 @@ buildPythonPackage rec { pname = "yanc"; version = "0.3.3"; - # Tests fail on Python>=3.5. See: https://github.com/0compute/yanc/issues/10 - disabled = !(pythonOlder "3.5"); - - checkInputs = [ nose ]; - src = fetchPypi { inherit pname version; sha256 = "0z35bkk9phs40lf5061k1plhjdl5fskm0dmdikrsqi1bjihnxp8w"; }; + # Tests fail on Python>=3.5. See: https://github.com/0compute/yanc/issues/10 + doCheck = pythonOlder "3.5"; + + checkInputs = [ nose ]; + checkPhase = '' nosetests . ''; diff --git a/pkgs/development/python-modules/yeelight/default.nix b/pkgs/development/python-modules/yeelight/default.nix index b64bd929f13f4..b2c0198894835 100644 --- a/pkgs/development/python-modules/yeelight/default.nix +++ b/pkgs/development/python-modules/yeelight/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "yeelight"; - version = "0.7.9"; + version = "0.7.10"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "stavros"; repo = "python-yeelight"; rev = "v${version}"; - sha256 = "sha256-8N+HOhUX3BXecS/kaAfLoge+NYzKLKPyoTthu+useJA="; + sha256 = "sha256-vUsL1CvhYRtv75gkmiPe/UkAtBDZPy1iK2BPUupMXz8="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/youtube-search-python/default.nix b/pkgs/development/python-modules/youtube-search-python/default.nix index 6795ba5812731..361966ef458f1 100644 --- a/pkgs/development/python-modules/youtube-search-python/default.nix +++ b/pkgs/development/python-modules/youtube-search-python/default.nix @@ -7,14 +7,14 @@ buildPythonPackage rec { pname = "youtube-search-python"; - version = "1.6.3"; + version = "1.6.4"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-zAza1XMKLIMZFFS0v/4ATqh6j7aEB2Y+eliE/hNPORw="; + hash = "sha256-9ZAZaLkJb2mEg0rstBxOvs9/L4wtbLuCTdFDOuxMqN0="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/yoyo-migrations/default.nix b/pkgs/development/python-modules/yoyo-migrations/default.nix new file mode 100644 index 0000000000000..14c90dbd5f288 --- /dev/null +++ b/pkgs/development/python-modules/yoyo-migrations/default.nix @@ -0,0 +1,30 @@ +{ lib +, buildPythonPackage +, fetchPypi +, setuptools +, sqlparse +, tabulate +}: + +buildPythonPackage rec { + pname = "yoyo-migrations"; + version = "7.3.2"; + + src = fetchPypi { + inherit pname version; + sha256 = "sha256-RIQIKOGgFp9UHnAtWu3KgYWtpoCH57rUhQpvxdced6Q="; + }; + + propagatedBuildInputs = [ setuptools sqlparse tabulate ]; + + doCheck = false; # pypi tarball does not contain tests + + pythonImportsCheck = [ "yoyo" ]; + + meta = with lib; { + description = "Database schema migration tool"; + homepage = "https://ollycope.com/software/yoyo"; + license = licenses.asl20; + maintainers = with maintainers; [ prusnak ]; + }; +} diff --git a/pkgs/development/python-modules/yq/default.nix b/pkgs/development/python-modules/yq/default.nix index b87982b20b65c..4792f38d7ce17 100644 --- a/pkgs/development/python-modules/yq/default.nix +++ b/pkgs/development/python-modules/yq/default.nix @@ -4,18 +4,20 @@ , substituteAll , argcomplete , pyyaml +, toml , xmltodict , jq +, setuptools-scm , pytestCheckHook }: buildPythonPackage rec { pname = "yq"; - version = "2.13.0"; + version = "2.14.0"; src = fetchPypi { inherit pname version; - sha256 = "sha256-/RMf2x9WcWrY1EzZ6q99OyLTm6iGHqZKQJzD9K4mPbg="; + sha256 = "sha256-9L8rKZ0eXH69dM+yXR9dm2QBBjusB6LQmhVhRMHWROE="; }; patches = [ @@ -25,14 +27,14 @@ buildPythonPackage rec { }) ]; - postPatch = '' - substituteInPlace test/test.py \ - --replace "expect_exit_codes={0} if sys.stdin.isatty() else {2}" "expect_exit_codes={0}" - ''; + nativeBuildInputs = [ + setuptools-scm + ]; propagatedBuildInputs = [ pyyaml xmltodict + toml argcomplete ]; @@ -44,13 +46,8 @@ buildPythonPackage rec { pythonImportsCheck = [ "yq" ]; - doInstallCheck = true; - installCheckPhase = '' - echo '{"hello":{"foo":"bar"}}' | $out/bin/yq -y . | grep 'foo: bar' - ''; - meta = with lib; { - description = "Command-line YAML processor - jq wrapper for YAML documents"; + description = "Command-line YAML/XML/TOML processor - jq wrapper for YAML, XML, TOML documents"; homepage = "https://github.com/kislyuk/yq"; license = licenses.asl20; maintainers = with maintainers; [ womfoo SuperSandro2000 ]; diff --git a/pkgs/development/python-modules/zarr/default.nix b/pkgs/development/python-modules/zarr/default.nix index 11c6f84850bd5..972bd527ad0fc 100644 --- a/pkgs/development/python-modules/zarr/default.nix +++ b/pkgs/development/python-modules/zarr/default.nix @@ -12,12 +12,12 @@ buildPythonPackage rec { pname = "zarr"; - version = "2.10.3"; + version = "2.11.1"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "76932665c2146ebdf15f6dba254f9e0030552fbfcf9322dea822bff96fbce693"; + sha256 = "sha256-EbYo9C3sNuAUeHnovUcVJLWbI4CUubIePDW+eDmcEV4="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/zeep/default.nix b/pkgs/development/python-modules/zeep/default.nix index 1b3e0c5fcdf0c..83ee3f37f7e4e 100644 --- a/pkgs/development/python-modules/zeep/default.nix +++ b/pkgs/development/python-modules/zeep/default.nix @@ -6,6 +6,7 @@ , cached-property , defusedxml , fetchFromGitHub +, fetchpatch , freezegun , httpx , isodate @@ -38,6 +39,14 @@ buildPythonPackage rec { sha256 = "sha256-fJLr2LJpbNQTl183R56G7sJILfm04R39qpJxLogQLoo="; }; + patches = [ + (fetchpatch { + # fixes pytest_httpx test case; https://github.com/mvantellingen/python-zeep/pull/1293 + url = "https://github.com/mvantellingen/python-zeep/commit/2907848185adcb4e6d8c093db6c617c64cb8c8bf.patch"; + hash = "sha256-hpksgMfrBLvYtI1QIs1aHBtFq7C1PWpnAj8BW5ak1/4="; + }) + ]; + propagatedBuildInputs = [ attrs cached-property diff --git a/pkgs/development/python-modules/zetup/default.nix b/pkgs/development/python-modules/zetup/default.nix index c2e707347b330..41b5f05cfeb2a 100644 --- a/pkgs/development/python-modules/zetup/default.nix +++ b/pkgs/development/python-modules/zetup/default.nix @@ -2,7 +2,7 @@ , buildPythonPackage , fetchPypi , nbconvert -, pathpy +, path , pytestCheckHook , setuptools-scm , pythonAtLeast @@ -33,7 +33,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ setuptools-scm ]; checkInputs = [ - pathpy + path nbconvert pytestCheckHook ]; diff --git a/pkgs/development/python-modules/zha-quirks/default.nix b/pkgs/development/python-modules/zha-quirks/default.nix index 56d2704fcc194..541eda6185e79 100644 --- a/pkgs/development/python-modules/zha-quirks/default.nix +++ b/pkgs/development/python-modules/zha-quirks/default.nix @@ -9,13 +9,13 @@ buildPythonPackage rec { pname = "zha-quirks"; - version = "0.0.67"; + version = "0.0.72"; src = fetchFromGitHub { owner = "zigpy"; repo = "zha-device-handlers"; rev = version; - sha256 = "sha256-qkXXrwqMEtfafHsXtlyy6HFwuo/8sOZuQ9SvGRJkGtA="; + sha256 = "sha256-tVCvmQR9tGhSDB4OztNaSCj2BTxPdrX3Gw9WZopRo8k="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/zigpy-cc/default.nix b/pkgs/development/python-modules/zigpy-cc/default.nix index 79b9d910053aa..376b74c266cb0 100644 --- a/pkgs/development/python-modules/zigpy-cc/default.nix +++ b/pkgs/development/python-modules/zigpy-cc/default.nix @@ -25,7 +25,6 @@ buildPythonPackage rec { }; propagatedBuildInputs = [ - pyserial pyserial-asyncio zigpy ]; @@ -36,6 +35,12 @@ buildPythonPackage rec { pytestCheckHook ]; + disabledTests = [ + "test_incoming_msg" + "test_incoming_msg2" + "test_deser" + ]; + meta = with lib; { description = "A library which communicates with Texas Instruments CC2531 radios for zigpy"; homepage = "https://github.com/zigpy/zigpy-cc"; diff --git a/pkgs/development/python-modules/zigpy/default.nix b/pkgs/development/python-modules/zigpy/default.nix index 20d5237f76e8b..a10e9ae65c791 100644 --- a/pkgs/development/python-modules/zigpy/default.nix +++ b/pkgs/development/python-modules/zigpy/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "zigpy"; - version = "0.43.0"; + version = "0.44.2"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "zigpy"; repo = "zigpy"; rev = version; - sha256 = "1740cv99ny6xy7wfpz754h4wj2cm874b8vnddvff90ajk07qgdia"; + sha256 = "sha256-E6SeuVu5UdWL5Tx39UQymNhABltR+qVHANYWuCh+h6I="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/zimports/default.nix b/pkgs/development/python-modules/zimports/default.nix index d350e2040891b..dc9a618924058 100644 --- a/pkgs/development/python-modules/zimports/default.nix +++ b/pkgs/development/python-modules/zimports/default.nix @@ -4,27 +4,29 @@ , buildPythonPackage , flake8-import-order , pyflakes -, mock +, tomli , setuptools +, mock }: buildPythonPackage rec { pname = "zimports"; - version = "0.4.1"; + version = "0.5.0"; src = fetchFromGitHub { owner = "sqlalchemyorg"; repo = "zimports"; rev = "v${version}"; - sha256 = "11mg7j7xiypv9hki4qbnp9jsgwgfdrgdzfqyrzk5x0s4hycgi4q0"; + sha256 = "sha256-O8MHUt9yswL9fK9pEddkvnNS2E4vWA/S1BTs1OD1VbU="; }; disabled = !isPy3k; propagatedBuildInputs = [ - pyflakes flake8-import-order + pyflakes setuptools + tomli ]; checkInputs = [ diff --git a/pkgs/development/python-modules/zodb/default.nix b/pkgs/development/python-modules/zodb/default.nix index e4f1e403cd970..7c788f7a9f8f8 100644 --- a/pkgs/development/python-modules/zodb/default.nix +++ b/pkgs/development/python-modules/zodb/default.nix @@ -16,11 +16,11 @@ buildPythonPackage rec { pname = "ZODB"; - version = "5.6.0"; + version = "5.7.0"; src = fetchPypi { inherit pname version; - sha256 = "1zh7rd182l15swkbkm3ib0wgyn16xasdz2mzry8k4lwk6dagnm26"; + sha256 = "sha256-+kC7wF7NoewkNc0MbdAqE7dphGBVikYENm9qCmhAHNM="; }; # remove broken test diff --git a/pkgs/development/python-modules/zodbpickle/default.nix b/pkgs/development/python-modules/zodbpickle/default.nix index 864155c2a2053..de1f8dfd3aafe 100644 --- a/pkgs/development/python-modules/zodbpickle/default.nix +++ b/pkgs/development/python-modules/zodbpickle/default.nix @@ -5,12 +5,12 @@ buildPythonPackage rec { pname = "zodbpickle"; - version = "2.2.0"; + version = "2.3"; disabled = isPyPy; # https://github.com/zopefoundation/zodbpickle/issues/10 src = fetchPypi { inherit pname version; - sha256 = "584127173db0a2647af0fc8cb935130b1594398c611e94fb09a719e09e1ed4bd"; + sha256 = "sha256-5MtccZcF6Lseju5Kok4gcaMJTs8ng9h0B6uCLxZto6I="; }; # fails.. diff --git a/pkgs/development/python-modules/zope_exceptions/default.nix b/pkgs/development/python-modules/zope_exceptions/default.nix index 0586227c61c54..fb1eb07154a08 100644 --- a/pkgs/development/python-modules/zope_exceptions/default.nix +++ b/pkgs/development/python-modules/zope_exceptions/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "zope.exceptions"; - version = "4.4"; + version = "4.5"; src = fetchPypi { inherit pname version; - sha256 = "0d72886b1bb8af4c346a117a540f28ab122577f5e3a105a261be72cd15776fda"; + sha256 = "sha256-TjW7oEiJxdEU3KpVKXQl1fM/YYqF7323Ehs7dxEAeE4="; }; propagatedBuildInputs = [ zope_interface ]; diff --git a/pkgs/development/python-modules/zope_testing/default.nix b/pkgs/development/python-modules/zope_testing/default.nix index ea2d531f76320..f8ea4e83b15c9 100644 --- a/pkgs/development/python-modules/zope_testing/default.nix +++ b/pkgs/development/python-modules/zope_testing/default.nix @@ -9,11 +9,11 @@ buildPythonPackage rec { pname = "zope.testing"; - version = "4.9"; + version = "4.10"; src = fetchPypi { inherit pname version; - sha256 = "475cb847a7af9d547313ee93f5d0b8800bf627e6d0d9a51d11967984083cb54e"; + sha256 = "sha256-O25ZBsrd0UjCP+lY5qrj+tyKCKilP3R9l5HC2BNe5W4="; }; doCheck = !isPyPy; diff --git a/pkgs/development/python-modules/zopfli/default.nix b/pkgs/development/python-modules/zopfli/default.nix index d7e9cf507f031..dc2b14bdc62be 100644 --- a/pkgs/development/python-modules/zopfli/default.nix +++ b/pkgs/development/python-modules/zopfli/default.nix @@ -1,12 +1,14 @@ -{ lib, buildPythonPackage, fetchPypi, setuptools-scm, zopfli, pytest }: +{ lib, buildPythonPackage, fetchPypi, pythonOlder, setuptools-scm, zopfli, pytestCheckHook }: buildPythonPackage rec { pname = "zopfli"; - version = "0.1.9"; + version = "0.2.1"; + + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "78de3cc08a8efaa8013d61528907d91ac4d6cc014ffd8a41cc10ee75e9e60d7b"; + sha256 = "1ipjkcgdbplsrhr31ypk48px8cax4cm9gcjj7yrcrhg20ql3s9p5"; extension = "zip"; }; @@ -15,8 +17,7 @@ buildPythonPackage rec { buildInputs = [ zopfli ]; USE_SYSTEM_ZOPFLI = "True"; - # doesn't work with pytestCheckHook - checkInputs = [ pytest ]; + checkInputs = [ pytestCheckHook ]; meta = with lib; { description = "cPython bindings for zopfli"; diff --git a/pkgs/development/python-modules/zulip/default.nix b/pkgs/development/python-modules/zulip/default.nix index 55f2180ebf448..fc0a49687e347 100644 --- a/pkgs/development/python-modules/zulip/default.nix +++ b/pkgs/development/python-modules/zulip/default.nix @@ -1,28 +1,27 @@ { lib , buildPythonPackage -, isPy3k +, pythonOlder , fetchFromGitHub , requests , matrix-client , distro , click -, cryptography -, pyopenssl +, typing-extensions , pytestCheckHook }: buildPythonPackage rec { pname = "zulip"; - version = "0.8.1"; + version = "0.8.2"; - disabled = !isPy3k; + disabled = pythonOlder "3.6"; # no sdist on PyPI src = fetchFromGitHub { owner = "zulip"; repo = "python-zulip-api"; rev = version; - sha256 = "sha256-vYeZEz8nuZYL1stHLa595IbhyNbqqxH4mx7ISbqRAlA="; + hash = "sha256-Z5WrV/RDQwdKUBF86M5/xWhXn3fGNqJtqO5PTd7s5ME="; }; sourceRoot = "${src.name}/zulip"; @@ -31,20 +30,13 @@ buildPythonPackage rec { matrix-client distro click - - # from requests[security] - cryptography - pyopenssl + typing-extensions ]; checkInputs = [ pytestCheckHook ]; - preCheck = '' - export COLUMNS=80 - ''; - pythonImportsCheck = [ "zulip" ]; meta = with lib; { diff --git a/pkgs/development/python-modules/zwave-js-server-python/default.nix b/pkgs/development/python-modules/zwave-js-server-python/default.nix index 5f4203634acb0..028e30f4cb740 100644 --- a/pkgs/development/python-modules/zwave-js-server-python/default.nix +++ b/pkgs/development/python-modules/zwave-js-server-python/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "zwave-js-server-python"; - version = "0.35.2"; + version = "0.35.3"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "home-assistant-libs"; repo = pname; rev = version; - sha256 = "sha256-Bte4pAi+atdkMvxYlzdN/UOrHB2WKfl44U9m/vKFMoA="; + sha256 = "sha256-vM5GEqq32VdC5UjGVlnrN8/LRcCHHkJFzEbaA2Snte8="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/zwave-me-ws/default.nix b/pkgs/development/python-modules/zwave-me-ws/default.nix new file mode 100644 index 0000000000000..479b2d5193ed4 --- /dev/null +++ b/pkgs/development/python-modules/zwave-me-ws/default.nix @@ -0,0 +1,52 @@ +{ lib +, aiohttp +, aresponses +, asynctest +, buildPythonPackage +, fetchFromGitHub +, poetry-core +, pytest-aiohttp +, pytest-asyncio +, pytestCheckHook +, python-engineio +, python-socketio +, pythonOlder +, websocket-client +}: + +buildPythonPackage rec { + pname = "zwave-me-ws"; + version = "0.2.4"; + format = "pyproject"; + + disabled = pythonOlder "3.8"; + + src = fetchFromGitHub { + owner = "Z-Wave-Me"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-x7P6fOYTe/u0GKUsO62cNVz2i/hVjUb8t8Bigijxgk0="; + }; + + nativeBuildInputs = [ + poetry-core + ]; + + propagatedBuildInputs = [ + websocket-client + ]; + + # Module has no tests + doCheck = false; + + pythonImportsCheck = [ + "zwave_me_ws" + ]; + + meta = with lib; { + description = "Library to connect to a ZWave-Me instance"; + homepage = "https://github.com/Z-Wave-Me/zwave-me-ws"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ fab ]; + }; +} |