diff options
Diffstat (limited to 'pkgs/development/python-modules')
133 files changed, 1416 insertions, 484 deletions
diff --git a/pkgs/development/python-modules/adb-shell/default.nix b/pkgs/development/python-modules/adb-shell/default.nix index bc10948f070fb..f117167c8df00 100644 --- a/pkgs/development/python-modules/adb-shell/default.nix +++ b/pkgs/development/python-modules/adb-shell/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "adb-shell"; - version = "0.4.2"; + version = "0.4.3"; format = "setuptools"; disabled = !isPy3k; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "JeffLIrion"; repo = "adb_shell"; rev = "v${version}"; - hash = "sha256-8tclSjmLlTAIeq6t7YPGtJwvSwtlzQ7sRAQatcQRzeY="; + hash = "sha256-+RU3nyJpHq0r/9erEbjUILpwIPWq14HdOX7LkSxySs4="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/aeppl/default.nix b/pkgs/development/python-modules/aeppl/default.nix index bf7f4b8d02aa7..5457da46677e6 100644 --- a/pkgs/development/python-modules/aeppl/default.nix +++ b/pkgs/development/python-modules/aeppl/default.nix @@ -42,6 +42,11 @@ buildPythonPackage rec { "aeppl" ]; + disabledTests = [ + # Compute issue + "test_initial_values" + ]; + meta = with lib; { description = "Library for an Aesara-based PPL"; homepage = "https://github.com/aesara-devs/aeppl"; diff --git a/pkgs/development/python-modules/aesara/default.nix b/pkgs/development/python-modules/aesara/default.nix index d7d51c2582d1c..56d298f6ed11e 100644 --- a/pkgs/development/python-modules/aesara/default.nix +++ b/pkgs/development/python-modules/aesara/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { pname = "aesara"; - version = "2.6.6"; + version = "2.7.1"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -28,7 +28,7 @@ buildPythonPackage rec { owner = "aesara-devs"; repo = "aesara"; rev = "refs/tags/rel-${version}"; - hash = "sha256-ChLMQCXw9EBR0hnNYGdkUbiLF+4oCqOxzsKsnsf22Jk="; + hash = "sha256-qjAaW7YYmzGBNpc8T5RyOdP5evkKOdzUGzQ9JXKioxw="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/aioairzone/default.nix b/pkgs/development/python-modules/aioairzone/default.nix index 5c12501723dfb..1862c3e6a3172 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.4.4"; + version = "0.4.5"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -16,7 +16,7 @@ buildPythonPackage rec { owner = "Noltari"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-fYhYqBnwvnfu2GbWUlmMmW/Xon3OE3fh+gGlnQRsCyA="; + hash = "sha256-sNlqG5A8a8AIgKc9xDAEwxBeKJ/HaW847BZR4WdcsrQ="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/aiolookin/default.nix b/pkgs/development/python-modules/aiolookin/default.nix index 2de513e6fbcbd..f0b5e145d8ba2 100644 --- a/pkgs/development/python-modules/aiolookin/default.nix +++ b/pkgs/development/python-modules/aiolookin/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "aiolookin"; - version = "0.1.0"; + version = "0.1.1"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "ANMalko"; repo = pname; rev = "v${version}"; - sha256 = "sha256-l3A1fOydAUQ4arR7Zl/PDYksp53C/56fVVcz35q1hjY="; + sha256 = "sha256-xFxkhKM/lX/kSg709wID7HlkfNKDlOcL3STUZOrHZJ8="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/aioskybell/default.nix b/pkgs/development/python-modules/aioskybell/default.nix new file mode 100644 index 0000000000000..67ef3c83db794 --- /dev/null +++ b/pkgs/development/python-modules/aioskybell/default.nix @@ -0,0 +1,47 @@ +{ lib +, aiofiles +, aiohttp +, aresponses +, buildPythonPackage +, fetchFromGitHub +, pytest-asyncio +, pytestCheckHook +, pythonOlder +}: + +buildPythonPackage rec { + pname = "aioskybell"; + version = "22.6.0"; + format = "setuptools"; + + disabled = pythonOlder "3.9"; + + src = fetchFromGitHub { + owner = "tkdrob"; + repo = pname; + rev = version; + hash = "sha256-2AsEVGZ4cA1GeoxtGFuvjZ05W4FjQ5GFSM8euu9iY4s=="; + }; + + propagatedBuildInputs = [ + aiohttp + aiofiles + ]; + + checkInputs = [ + aresponses + pytest-asyncio + pytestCheckHook + ]; + + pythonImportsCheck = [ + "aioskybell" + ]; + + meta = with lib; { + description = "API client for Skybell doorbells"; + homepage = "https://github.com/tkdrob/aioskybell"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/asdf/default.nix b/pkgs/development/python-modules/asdf/default.nix index 658ec10a0ae23..b34001d866ebf 100644 --- a/pkgs/development/python-modules/asdf/default.nix +++ b/pkgs/development/python-modules/asdf/default.nix @@ -20,14 +20,14 @@ buildPythonPackage rec { pname = "asdf"; - version = "2.11.1"; + version = "2.12.0"; format = "pyproject"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-1uDRoS9nyZCLPdbiAQBADoiwqaVBzj1NMpZXdJQYoxQ="; + hash = "sha256-WRSDTQd7o79ouar9xka58nzl5W4cJBFn1GHe5DsQI+k="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/asn1tools/default.nix b/pkgs/development/python-modules/asn1tools/default.nix new file mode 100644 index 0000000000000..bba82425cc053 --- /dev/null +++ b/pkgs/development/python-modules/asn1tools/default.nix @@ -0,0 +1,41 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, bitstruct +, diskcache +, prompt-toolkit +, pyparsing +, python +}: + +buildPythonPackage rec { + pname = "asn1tools"; + version = "0.163.0"; + + src = fetchFromGitHub { + owner = "eerimoq"; + repo = "asn1tools"; + rev = "v${version}"; + sha256 = "sha256-sbwwbwkhlZvCb2emuw1FTBj5pnv9SOtHpAcYPSQqIvM="; + }; + + propagatedBuildInputs = [ + bitstruct + diskcache + prompt-toolkit + pyparsing + ]; + + checkPhase = '' + ${python.interpreter} setup.py test + ''; + + pythonImportsCheck = [ "asn1tools" ]; + + meta = with lib; { + description = "ASN.1 parsing, encoding and decoding"; + homepage = "https://github.com/eerimoq/asn1tools"; + license = licenses.mit; + maintainers = with maintainers; [ SuperSandro2000 ]; + }; +} diff --git a/pkgs/development/python-modules/asyncssh/default.nix b/pkgs/development/python-modules/asyncssh/default.nix index 51faed7373f93..1bb5096084616 100644 --- a/pkgs/development/python-modules/asyncssh/default.nix +++ b/pkgs/development/python-modules/asyncssh/default.nix @@ -20,14 +20,14 @@ buildPythonPackage rec { pname = "asyncssh"; - version = "2.10.1"; + version = "2.11.0"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "sha256-SZuDbPWKnxknrStaQMPL0N042+CNLfj6is1TjCj8j6k="; + sha256 = "sha256-WcNs53up3ajdV62HV3bnEF3bH6hRvAObs66t6sT2e1Y="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/atenpdu/default.nix b/pkgs/development/python-modules/atenpdu/default.nix index 4a8c0ff0f31ad..4eed27b3cfd5f 100644 --- a/pkgs/development/python-modules/atenpdu/default.nix +++ b/pkgs/development/python-modules/atenpdu/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "atenpdu"; - version = "0.3.2"; + version = "0.3.3"; src = fetchPypi { inherit pname version; - sha256 = "sha256-hlbrjx6WKVJYaxrMT4fiRXlxKRcQU4AIQUVgA8mbWa8="; + sha256 = "sha256-/duY1hS+RU/UAdcQoHF1+c99XaN74jj/0Hj/86U0kmo="; }; propagatedBuildInputs = [ pysnmp ]; diff --git a/pkgs/development/python-modules/autobahn/default.nix b/pkgs/development/python-modules/autobahn/default.nix index 5fd6f1a3b8f9d..10925ebac25e3 100644 --- a/pkgs/development/python-modules/autobahn/default.nix +++ b/pkgs/development/python-modules/autobahn/default.nix @@ -9,7 +9,8 @@ , click , cryptography , ecdsa - # , eth-abi +, eth-abi +, eth-account , flatbuffers , jinja2 , hkdf @@ -18,14 +19,14 @@ , mock , msgpack , passlib - # , py-ecc - # , py-eth-sig-utils +, py-ecc +, py-eth-sig-utils , py-multihash , py-ubjson , pynacl , pygobject3 , pyopenssl -, pyqrcode +, qrcode , pytest-asyncio , python-snappy , pytestCheckHook @@ -47,16 +48,21 @@ buildPythonPackage rec { pname = "autobahn"; - version = "22.3.2"; + version = "22.5.1"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "sha256-WKiHx6GWuwjYtmJMs2lfSTqeXJ8A/TUNjW+Cm0f/kDY="; + sha256 = "sha256-NKpVabC0QZ+MJ3eSxgDcJRjEkwkox04iee+LiNi4o+o="; }; + postPatch = '' + substituteInPlace setup.py \ + --replace "pytest>=2.8.6,<3.3.0" "pytest" + ''; + propagatedBuildInputs = [ cryptography hyperlink @@ -68,13 +74,11 @@ buildPythonPackage rec { mock pytest-asyncio pytestCheckHook + # FIXME: remove the following dependencies when web3 gets added + eth-account ] ++ passthru.optional-dependencies.scram - ++ passthru.optional-dependencies.serialization; - - postPatch = '' - substituteInPlace setup.py \ - --replace "pytest>=2.8.6,<3.3.0" "pytest" - ''; + ++ passthru.optional-dependencies.serialization + ++ passthru.optional-dependencies.xbr; preCheck = '' # Run asyncio tests (requires twisted) @@ -93,13 +97,13 @@ buildPythonPackage rec { all = accelerate ++ compress ++ encryption ++ nvx ++ serialization ++ scram ++ twisted ++ ui ++ xbr; accelerate = [ /* wsaccel */ ]; compress = [ python-snappy ]; - encryption = [ pynacl pyopenssl pyqrcode /* pytrie */ service-identity ]; + encryption = [ pynacl pyopenssl qrcode /* pytrie */ service-identity ]; nvx = [ cffi ]; scram = [ argon2-cffi cffi passlib ]; serialization = [ cbor2 flatbuffers msgpack ujson py-ubjson ]; twisted = [ attrs args.twisted zope_interface ]; ui = [ pygobject3 ]; - xbr = [ base58 cbor2 click ecdsa /* eth-abi */ jinja2 hkdf mnemonic /* py-ecc py-eth-sig-utils */ py-multihash rlp spake2 twisted /* web3 xbr */ yapf /* zlmdb */ ]; + xbr = [ base58 cbor2 click ecdsa eth-abi jinja2 hkdf mnemonic py-ecc py-eth-sig-utils py-multihash rlp spake2 twisted /* web3 xbr */ yapf /* zlmdb */ ]; }; meta = with lib; { diff --git a/pkgs/development/python-modules/azure-mgmt-batch/default.nix b/pkgs/development/python-modules/azure-mgmt-batch/default.nix index 421f068aa13ec..796c65bcd0777 100644 --- a/pkgs/development/python-modules/azure-mgmt-batch/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-batch/default.nix @@ -5,18 +5,20 @@ , msrestazure , azure-common , azure-mgmt-core -, azure-mgmt-nspkg -, isPy3k +, pythonOlder }: buildPythonPackage rec { pname = "azure-mgmt-batch"; - version = "16.1.0"; + version = "16.2.0"; + format = "setuptools"; + + disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "sha256-9J0VQ3uAsi4kuEe9UG4xpcEV1Sc+nkjECgVfzG7j5jk="; + hash = "sha256-aWkQZs1aLIbo/arvu4DilAOBrO38gFPfGTtSFNLs5oI="; }; propagatedBuildInputs = [ @@ -24,11 +26,9 @@ buildPythonPackage rec { msrestazure azure-common azure-mgmt-core - ] ++ lib.optionals (!isPy3k) [ - azure-mgmt-nspkg ]; - # has no tests + # Module has no tests doCheck = false; meta = with lib; { diff --git a/pkgs/development/python-modules/black/default.nix b/pkgs/development/python-modules/black/default.nix index 884629da0ffe5..dd0a4662ce7cb 100644 --- a/pkgs/development/python-modules/black/default.nix +++ b/pkgs/development/python-modules/black/default.nix @@ -60,6 +60,9 @@ buildPythonPackage rec { # Fail on Hydra, see https://github.com/NixOS/nixpkgs/pull/130785 "test_bpo_2142_workaround" "test_skip_magic_trailing_comma" + ] ++ lib.optionals (stdenv.isLinux && stdenv.isAarch64) [ + # exceeds max open files on hydra builders + "test_blackd_supported_version" ]; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/bravado-core/default.nix b/pkgs/development/python-modules/bravado-core/default.nix index 19d3791bed593..eb0e03653e591 100644 --- a/pkgs/development/python-modules/bravado-core/default.nix +++ b/pkgs/development/python-modules/bravado-core/default.nix @@ -1,47 +1,107 @@ -{ stdenv, lib, buildPythonPackage, fetchFromGitHub, python-dateutil, jsonref, jsonschema, - pyyaml, simplejson, six, pytz, msgpack, swagger-spec-validator, rfc3987, - strict-rfc3339, webcolors, mypy-extensions, jsonpointer, idna, pytest, mock, - pytest-benchmark, isPy27, enum34 }: +{ lib +, stdenv +, buildPythonPackage +, fetchFromGitHub +, fqdn +, idna +, isoduration +, jsonpointer +, jsonref +, jsonschema +, mock +, msgpack +, mypy-extensions +, pytest-benchmark +, pytestCheckHook +, python-dateutil +, pythonOlder +, pytz +, pyyaml +, rfc3987 +, rfc3339-validator +, simplejson +, six +, strict-rfc3339 +, swagger-spec-validator +, uri-template +, webcolors +}: buildPythonPackage rec { pname = "bravado-core"; version = "5.17.0"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "Yelp"; repo = pname; rev = "v${version}"; - sha256 = "sha256-okQA4YJq0lyVJuDzD8mMRlOS/K3gf1qRUpw/5M0LlZE="; + hash = "sha256-okQA4YJq0lyVJuDzD8mMRlOS/K3gf1qRUpw/5M0LlZE="; }; - checkInputs = [ - mypy-extensions - pytest - mock - pytest-benchmark - ]; - - checkPhase = "pytest --benchmark-skip"; - propagatedBuildInputs = [ - python-dateutil jsonref jsonschema + msgpack + python-dateutil + pytz pyyaml simplejson six - pytz - msgpack swagger-spec-validator - # the following 3 packages are included when jsonschema (3.2) is installed + # the following packages are included when jsonschema (3.2) is installed # as jsonschema[format], which reflects what happens in setup.py + fqdn + idna + isoduration + jsonpointer rfc3987 + rfc3339-validator strict-rfc3339 + uri-template webcolors - jsonpointer - idna - ] ++ lib.optionals isPy27 [ enum34 ]; + ]; + + checkInputs = [ + mypy-extensions + pytestCheckHook + mock + pytest-benchmark + ]; + + pythonImportsCheck = [ + "bravado_core" + ]; + + pytestFlagsArray = [ + "--benchmark-skip" + ]; + + disabledTestPaths = [ + # Tests are out-dated (not supporting later modules releases, e.g., jsonschema) + "tests/_decorators_test.py" + "tests/formatter" + "tests/marshal" + "tests/model" + "tests/operation" + "tests/param" + "tests/request" + "tests/resource" + "tests/response" + "tests/schema" + "tests/security_test.py" + "tests/spec" + "tests/swagger20_validator" + "tests/unmarshal" + "tests/validate" + ]; + + disabledTests = [ + "test_petstore_spec" + ]; meta = with lib; { broken = (stdenv.isLinux && stdenv.isAarch64) || stdenv.isDarwin; diff --git a/pkgs/development/python-modules/browser-cookie3/default.nix b/pkgs/development/python-modules/browser-cookie3/default.nix index fd0d21cc616a2..a8b5d4e014414 100644 --- a/pkgs/development/python-modules/browser-cookie3/default.nix +++ b/pkgs/development/python-modules/browser-cookie3/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "browser-cookie3"; - version = "0.14.1"; + version = "0.14.2"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-2cMWFyHK+7M99Z9O7PiKue37c5XVBe/n88AF5ax7A2s="; + hash = "sha256-YR5NcDmbLlnhxcDuyM6hjjuL/Ozw79ytbCF4/nmSZmQ="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/buildbot/default.nix b/pkgs/development/python-modules/buildbot/default.nix index acbfb15cfca52..4e9ccaf237017 100644 --- a/pkgs/development/python-modules/buildbot/default.nix +++ b/pkgs/development/python-modules/buildbot/default.nix @@ -1,7 +1,7 @@ -{ stdenv, lib, buildPythonPackage, fetchPypi, makeWrapper, isPy3k +{ stdenv, lib, buildPythonPackage, fetchpatch, fetchPypi, makeWrapper, isPy3k , python, twisted, jinja2, msgpack, zope_interface, sqlalchemy, alembic , python-dateutil, txaio, autobahn, pyjwt, pyyaml, treq, txrequests, pypugjs -, boto3, moto, mock, lz4, setuptoolsTrial, isort, pylint, flake8 +, boto3, moto, mock, lz4, setuptoolsTrial , buildbot-worker, buildbot-pkg, buildbot-plugins, parameterized, git, openssh , glibcLocales , nixosTests @@ -65,9 +65,6 @@ let mock lz4 setuptoolsTrial - isort - pylint - flake8 buildbot-worker buildbot-pkg buildbot-plugins.www @@ -81,6 +78,11 @@ let # This patch disables the test that tries to read /etc/os-release which # is not accessible in sandboxed builds. ./skip_test_linux_distro.patch + (fetchpatch{ + url = "https://github.com/buildbot/buildbot/commit/54b8f62902122b0091319a96d0f9edd4195ab4c6.patch"; + stripLen = 1; + sha256 = "sha256-OqW3ZQK0bfqPG3YlrBbrSEEKsM/XqY2NO862ZD/DgHs="; + }) ]; postPatch = '' diff --git a/pkgs/development/python-modules/cfscrape/default.nix b/pkgs/development/python-modules/cfscrape/default.nix new file mode 100644 index 0000000000000..3fd98b7e1e2a4 --- /dev/null +++ b/pkgs/development/python-modules/cfscrape/default.nix @@ -0,0 +1,28 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, requests +}: + +buildPythonPackage rec { + pname = "cfscrape"; + version = "2.1.1"; + src = fetchFromGitHub ({ + owner = "Anorov"; + repo = "cloudflare-scrape"; + rev = "9692fe7ff3c17b76ddf0f4d50d3dba7d1791c9c6"; + sha256 = "sha256-uO8lBZonjk+mlFYoNSaz+GIN/W9yf8VL9OQ7MKfsMgI="; + }); + + propagatedBuildInputs = [ requests ]; + + doCheck = false; + + meta = with lib; { + homepage = "https://github.com/Anorov/cloudflare-scrape"; + description = "A Python module to bypass Cloudflare's anti-bot page"; + license = licenses.mit; + platforms = platforms.linux; + maintainers = with maintainers; [ WeebSorceress ]; + }; +} diff --git a/pkgs/development/python-modules/coincurve/default.nix b/pkgs/development/python-modules/coincurve/default.nix new file mode 100644 index 0000000000000..5d259f250b5ff --- /dev/null +++ b/pkgs/development/python-modules/coincurve/default.nix @@ -0,0 +1,72 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, asn1crypto +, autoconf +, automake +, cffi +, libtool +, pkg-config +, pytestCheckHook +, python +, pythonOlder +, secp256k1 +}: + +buildPythonPackage rec { + pname = "coincurve"; + version = "17.0.0"; + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "ofek"; + repo = "coincurve"; + rev = "v${version}"; + sha256 = "sha256-7H4/TDxteuMTrj1PdfpA5rc7CegJAOjqn1PteImfGiQ="; + }; + + postPatch = '' + substituteInPlace setup.py \ + --replace ", 'requests'" "" + + # don't try to load .dll files + rm coincurve/_windows_libsecp256k1.py + cp -r --no-preserve=mode ${secp256k1.src} libsecp256k1 + patchShebangs secp256k1/autogen.sh + ''; + + nativeBuildInputs = [ + autoconf + automake + libtool + pkg-config + ]; + + propagatedBuildInputs = [ + asn1crypto + cffi + ]; + + preCheck = '' + # https://github.com/ofek/coincurve/blob/master/tox.ini#L20-L22= + rm -rf coincurve + + # don't run benchmark tests + rm tests/test_bench.py + ''; + + checkInputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ + "coincurve" + ]; + + meta = with lib; { + description = "Cross-platform bindings for libsecp256k1"; + homepage = "https://github.com/ofek/coincurve"; + license = with licenses; [ asl20 mit ]; + maintainers = with maintainers; [ SuperSandro2000 ]; + }; +} diff --git a/pkgs/development/python-modules/dash/default.nix b/pkgs/development/python-modules/dash/default.nix index 6aaabe3c744a5..eb2e641910915 100644 --- a/pkgs/development/python-modules/dash/default.nix +++ b/pkgs/development/python-modules/dash/default.nix @@ -1,22 +1,27 @@ { lib , buildPythonPackage -, fetchFromGitHub -, plotly -, flask -, flask-compress +, celery , dash-core-components , dash-html-components , dash-table -, pytest-mock +, diskcache +, fetchFromGitHub +, flask +, flask-compress , mock -, pyyaml +, multiprocess +, plotly +, psutil +, pytest-mock , pytestCheckHook , pythonOlder +, pyyaml +, redis }: buildPythonPackage rec { pname = "dash"; - version = "2.4.1"; + version = "2.5.0"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -25,7 +30,7 @@ buildPythonPackage rec { owner = "plotly"; repo = pname; rev = "refs/tags/v${version}"; - sha256 = "sha256-7B1LEcEgUGJ/gDCDD4oURqli8I5YTJo9jl7l4E1aLVQ="; + hash = "sha256-Qh5oOkTxEbxXXDX+g9TDa5DiYBlMpnx0yKsn/XMfMF0="; }; propagatedBuildInputs = [ @@ -37,6 +42,18 @@ buildPythonPackage rec { dash-table ]; + passthru.optional-dependencies = { + celery = [ + celery + redis + ]; + diskcache = [ + diskcache + multiprocess + psutil + ]; + }; + checkInputs = [ pytestCheckHook pytest-mock @@ -50,12 +67,14 @@ buildPythonPackage rec { "tests/integration" ]; - pythonImportsCheck = [ "dash" ]; + pythonImportsCheck = [ + "dash" + ]; meta = with lib; { description = "Python framework for building analytical web applications"; homepage = "https://dash.plot.ly/"; license = licenses.mit; - maintainers = [ maintainers.antoinerg ]; + maintainers = with maintainers; [ antoinerg ]; }; } diff --git a/pkgs/development/python-modules/databricks-connect/default.nix b/pkgs/development/python-modules/databricks-connect/default.nix index 2a67ef167c540..b271861e27897 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.16"; + version = "9.1.17"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "sha256-agdky7AhRuObU9GT8IpdgB3SWdHDBRnuoaAtYAlCv/4="; + sha256 = "sha256-QBGeXZ8zvRRjmKGs0vyBWTvcug3PF/BFV2asYTqsScw="; }; sourceRoot = "."; diff --git a/pkgs/development/python-modules/deezer-python/default.nix b/pkgs/development/python-modules/deezer-python/default.nix index ef8b091b0c4e6..c94f3d205ce84 100644 --- a/pkgs/development/python-modules/deezer-python/default.nix +++ b/pkgs/development/python-modules/deezer-python/default.nix @@ -13,16 +13,16 @@ buildPythonPackage rec { pname = "deezer-python"; - version = "5.3.2"; + version = "5.3.3"; format = "pyproject"; - disabled = pythonOlder "3.6"; + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "browniebroke"; repo = pname; rev = "refs/tags/v${version}"; - sha256 = "sha256-lOVHSYL57hwzvdC+pJFDkDGFuu29jdZ36BYscw82uDE="; + hash = "sha256-eiznL23Pt7bwBLxNG8V3ITSNMnwMBjFdiGgu0cSoSw0="; }; nativeBuildInputs = [ @@ -46,7 +46,9 @@ buildPythonPackage rec { --replace " --cov=deezer" "" ''; - pythonImportsCheck = [ "deezer" ]; + pythonImportsCheck = [ + "deezer" + ]; meta = with lib; { description = "Python wrapper around the Deezer API"; diff --git a/pkgs/development/python-modules/dulwich/default.nix b/pkgs/development/python-modules/dulwich/default.nix index 570598e1a993a..ccd816753a9ac 100644 --- a/pkgs/development/python-modules/dulwich/default.nix +++ b/pkgs/development/python-modules/dulwich/default.nix @@ -17,7 +17,7 @@ }: buildPythonPackage rec { - version = "0.20.42"; + version = "0.20.43"; pname = "dulwich"; format = "setuptools"; @@ -25,7 +25,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - hash = "sha256-cro7YK5qVU0TMrO0CjRf6+FuxGnPYBS7RDtxmQLjPvA="; + hash = "sha256-/MIWTgE7OQqe46EJ1+97ldjeKDsueJuwfpSqMRXjKeo="; }; LC_ALL = "en_US.UTF-8"; diff --git a/pkgs/development/python-modules/entry-points-txt/default.nix b/pkgs/development/python-modules/entry-points-txt/default.nix index d52e9ea0d3bed..0e73f9768115e 100644 --- a/pkgs/development/python-modules/entry-points-txt/default.nix +++ b/pkgs/development/python-modules/entry-points-txt/default.nix @@ -1,22 +1,41 @@ { lib , buildPythonPackage -, fetchurl +, fetchFromGitHub +, pytestCheckHook +, pythonOlder }: buildPythonPackage rec { pname = "entry-points-txt"; - version = "0.1.0"; - format = "wheel"; + version = "0.2.0"; + format = "pyproject"; - src = fetchurl { - url = "https://github.com/jwodder/entry-points-txt/releases/download/v0.1.0/entry_points_txt-0.1.0-py3-none-any.whl"; - sha256 = "29773bed3d9d337766a394e19d6f7ab0be3ed7d6f3ebb753ff0f7f48f056aa8e"; + disabled = pythonOlder "3.6"; + + src = fetchFromGitHub { + owner = "jwodder"; + repo = pname; + rev = "v${version}"; + hash = "sha256-klFSt3Od7xYgenpMP4DBFoZeQanGrmtJxDm5qeZ1Psc="; }; + checkInputs = [ + pytestCheckHook + ]; + + postPatch = '' + substituteInPlace tox.ini \ + --replace " --cov=entry_points_txt --no-cov-on-fail" "" + ''; + + pythonImportsCheck = [ + "entry_points_txt" + ]; + meta = with lib; { - homepage = "https://github.com/jwodder/entry-points-txt"; description = "Read & write entry_points.txt files"; + homepage = "https://github.com/jwodder/entry-points-txt"; license = with licenses; [ mit ]; - maintainers = with lib.maintainers; [ ayazhafiz ]; + maintainers = with maintainers; [ ayazhafiz ]; }; } diff --git a/pkgs/development/python-modules/eth-abi/default.nix b/pkgs/development/python-modules/eth-abi/default.nix new file mode 100644 index 0000000000000..1e81450764f0b --- /dev/null +++ b/pkgs/development/python-modules/eth-abi/default.nix @@ -0,0 +1,57 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, eth-hash +, eth-typing +, eth-utils +, hypothesis +, parsimonious +, pytestCheckHook +, pythonOlder +}: + +buildPythonPackage rec { + pname = "eth-abi"; + version = "3.0.0"; + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "ethereum"; + repo = "eth-abi"; + rev = "v${version}"; + sha256 = "sha256-qiuyGVOy+n8l3jSqwMGnBXcDrOxIiJ0lNP4lq/EQEhU="; + }; + + postPatch = '' + substituteInPlace setup.py \ + --replace "parsimonious>=0.8.0,<0.9.0" "parsimonious" + ''; + + propagatedBuildInputs = [ + eth-typing + eth-utils + parsimonious + ]; + + checkInputs = [ + hypothesis + pytestCheckHook + ] ++ eth-hash.optional-dependencies.pycryptodome; + + disabledTests = [ + # boolean list representation changed + "test_get_abi_strategy_returns_certain_strategies_for_known_type_strings" + # hypothesis.errors.Flaky + "test_has_arrlist_has_expected_behavior_for_parsable_types" + "test_is_base_tuple_has_expected_behavior_for_parsable_types" + ]; + + pythonImportsCheck = [ "eth_abi" ]; + + meta = with lib; { + description = "Ethereum ABI utilities"; + homepage = "https://github.com/ethereum/eth-abi"; + license = licenses.mit; + maintainers = with maintainers; [ SuperSandro2000 ]; + }; +} diff --git a/pkgs/development/python-modules/eth-account/default.nix b/pkgs/development/python-modules/eth-account/default.nix new file mode 100644 index 0000000000000..1a929ca9099ff --- /dev/null +++ b/pkgs/development/python-modules/eth-account/default.nix @@ -0,0 +1,54 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, bitarray +, eth-abi +, eth-keyfile +, eth-keys +, eth-rlp +, eth-utils +, hexbytes +, pythonOlder +, rlp +}: + +buildPythonPackage rec { + pname = "eth-account"; + version = "0.6.1"; + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "ethereum"; + repo = "eth-account"; + rev = "v${version}"; + sha256 = "sha256-cjQvTKC4lDbKnAvbmnTGHQiJZsZFhXc/+UH5rUdlGxs="; + }; + + postPatch = '' + substituteInPlace setup.py \ + --replace "bitarray>=1.2.1,<1.3.0" "bitarray>=2.4.0,<3" + ''; + + propagatedBuildInputs = [ + bitarray + eth-abi + eth-keyfile + eth-keys + eth-rlp + eth-utils + hexbytes + rlp + ]; + + # require buildinga npm project + doCheck = false; + + pythonImportsCheck = [ "eth_account" ]; + + meta = with lib; { + description = "Account abstraction library for web3.py"; + homepage = "https://github.com/ethereum/eth-account"; + license = licenses.mit; + maintainers = with maintainers; [ SuperSandro2000 ]; + }; +} diff --git a/pkgs/development/python-modules/eth-hash/default.nix b/pkgs/development/python-modules/eth-hash/default.nix index 622dd0b373538..1c60a2d594896 100644 --- a/pkgs/development/python-modules/eth-hash/default.nix +++ b/pkgs/development/python-modules/eth-hash/default.nix @@ -1,55 +1,43 @@ -{ lib, fetchPypi, buildPythonPackage, pythonOlder, pytest, pysha3, pycrypto +{ lib +, fetchFromGitHub +, buildPythonPackage +, pythonOlder +, pytest +, pysha3 , pycryptodome }: buildPythonPackage rec { pname = "eth-hash"; version = "0.3.2"; + disabled = pythonOlder "3.5"; - src = fetchPypi { - inherit pname version; - sha256 = "3f40cecd5ead88184aa9550afc19d057f103728108c5102f592f8415949b5a76"; + src = fetchFromGitHub { + owner = "ethereum"; + repo = "eth-hash"; + rev = "v${version}"; + sha256 = "sha256-LMDtFUrsPYgj/Fl9aBW1todlj1D3LlFxAkzNFAzCGLQ="; }; - checkInputs = [ pytest ]; - - propagatedBuildInputs = [ - pysha3 - pycrypto - pycryptodome - ]; + checkInputs = [ + pytest + ] ++ passthru.optional-dependencies.pycryptodome + ++ passthru.optional-dependencies.pysha3; - pipInstallFlags = [ - # Circular dependency on eth-utils - "--no-dependencies" - ]; - - # setuptools-markdown uses pypandoc which is broken at the moment - preConfigure = '' - substituteInPlace setup.py --replace \'setuptools-markdown\' "" - ''; - - # Run tests separately because we don't want to run tests on tests/backends/ - # but only on its selected subdirectories. Also, the directories under - # tests/backends/ must be run separately because they have identically named - # test files so pytest would raise errors because of that. - # - # Also, tests in tests/core/test_import.py are broken so just ignore them: - # https://github.com/ethereum/eth-hash/issues/25 - # There is a pull request to fix the tests: - # https://github.com/ethereum/eth-hash/pull/26 checkPhase = '' pytest tests/backends/pycryptodome/ pytest tests/backends/pysha3/ - # pytest tests/core/ ''; - disabled = pythonOlder "3.5"; + passthru.optional-dependencies = { + pycryptodome = [ pycryptodome ]; + pysha3 = [ pysha3 ]; + }; - meta = { + meta = with lib; { description = "The Ethereum hashing function keccak256"; homepage = "https://github.com/ethereum/eth-hash"; - license = lib.licenses.mit; - maintainers = with lib.maintainers; [ jluttine ]; + license = licenses.mit; + maintainers = with maintainers; [ SuperSandro2000 ]; }; } diff --git a/pkgs/development/python-modules/eth-keyfile/default.nix b/pkgs/development/python-modules/eth-keyfile/default.nix new file mode 100644 index 0000000000000..fd62501b81d20 --- /dev/null +++ b/pkgs/development/python-modules/eth-keyfile/default.nix @@ -0,0 +1,47 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, eth-keys +, eth-utils +, pycryptodome +, pytestCheckHook +, pythonOlder +}: + +buildPythonPackage rec { + pname = "eth-keyfile"; + version = "0.6.0"; + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "ethereum"; + repo = "eth-keyfile"; + rev = "v${version}"; + fetchSubmodules = true; + sha256 = "sha256-JD4bRoD9L0JXcd+bTZrq/BkWw5QGzOi1RvoyLJC77kk="; + }; + + postPatch = '' + substituteInPlace setup.py \ + --replace "'setuptools-markdown'" "" + ''; + + propagatedBuildInputs = [ + eth-keys + eth-utils + pycryptodome + ]; + + checkInputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ "eth_keyfile" ]; + + meta = with lib; { + description = "Tools for handling the encrypted keyfile format used to store private keys"; + homepage = "https://github.com/ethereum/eth-keyfile"; + license = licenses.mit; + maintainers = with maintainers; [ SuperSandro2000 ]; + }; +} diff --git a/pkgs/development/python-modules/eth-keys/default.nix b/pkgs/development/python-modules/eth-keys/default.nix new file mode 100644 index 0000000000000..efdde22b8b90a --- /dev/null +++ b/pkgs/development/python-modules/eth-keys/default.nix @@ -0,0 +1,56 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, asn1tools +, coincurve +, eth-hash +, eth-typing +, eth-utils +, factory_boy +, hypothesis +, isPyPy +, pyasn1 +, pytestCheckHook +, pythonOlder +}: + +buildPythonPackage rec { + pname = "eth-keys"; + version = "0.4.0"; + disabled = pythonOlder "3.6"; + + src = fetchFromGitHub { + owner = "ethereum"; + repo = "eth-keys"; + rev = "v${version}"; + sha256 = "sha256-jG/jJPM4t3z6UQIdc8L6y0DxZiGx5pVuGL8XwbIt60o="; + }; + + propagatedBuildInputs = [ + eth-typing + eth-utils + ]; + + checkInputs = [ + asn1tools + factory_boy + hypothesis + pyasn1 + pytestCheckHook + ] ++ passthru.optional-dependencies.coincurve + ++ lib.optional (!isPyPy) eth-hash.optional-dependencies.pysha3 + ++ lib.optional isPyPy eth-hash.optional-dependencies.pycryptodome; + + pythonImportsCheck = [ "eth_keys" ]; + + passthru.optional-dependencies = { + coincurve = [ coincurve ]; + }; + + meta = with lib; { + description = "Common API for Ethereum key operations"; + homepage = "https://github.com/ethereum/eth-keys"; + license = licenses.mit; + maintainers = with maintainers; [ SuperSandro2000 ]; + }; +} diff --git a/pkgs/development/python-modules/eth-rlp/default.nix b/pkgs/development/python-modules/eth-rlp/default.nix new file mode 100644 index 0000000000000..72cd3c1e84088 --- /dev/null +++ b/pkgs/development/python-modules/eth-rlp/default.nix @@ -0,0 +1,42 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, eth-hash +, eth-utils +, hexbytes +, pytestCheckHook +, pythonOlder +, rlp +}: + +buildPythonPackage rec { + pname = "eth-rlp"; + version = "0.3.0"; + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "ethereum"; + repo = "eth-rlp"; + rev = "v${version}"; + sha256 = "sha256-wfmRjHFu6H3J6hNin8ZA2454xXrLgcUdeR8iGXFomRE="; + }; + + propagatedBuildInputs = [ + hexbytes + eth-utils + rlp + ]; + + checkInputs = [ + pytestCheckHook + ] ++ eth-hash.optional-dependencies.pycryptodome; + + pythonImportsCheck = [ "eth_rlp" ]; + + meta = with lib; { + description = "RLP definitions for common Ethereum objects"; + homepage = "https://github.com/ethereum/eth-rlp"; + license = licenses.mit; + maintainers = with maintainers; [ SuperSandro2000 ]; + }; +} diff --git a/pkgs/development/python-modules/eth-typing/default.nix b/pkgs/development/python-modules/eth-typing/default.nix index c98a0fc515295..a2f3103be47d7 100644 --- a/pkgs/development/python-modules/eth-typing/default.nix +++ b/pkgs/development/python-modules/eth-typing/default.nix @@ -1,35 +1,32 @@ -{ lib, fetchFromGitHub, buildPythonPackage, pythonOlder, pytest }: +{ lib +, fetchFromGitHub +, buildPythonPackage +, pythonOlder +, pytestCheckHook +}: buildPythonPackage rec { pname = "eth-typing"; version = "3.0.0"; + disabled = pythonOlder "3.6"; - # Tests are missing from the PyPI source tarball so let's use GitHub - # https://github.com/ethereum/eth-typing/issues/8 src = fetchFromGitHub { owner = "ethereum"; - repo = pname; + repo = "eth-typing"; rev = "v${version}"; sha256 = "sha256-9rrnDFPWAmrUkr2mVTVi/8DTJdg4hzGaU0UbpwG5mtY="; }; - # setuptools-markdown uses pypandoc which is broken at the moment - preConfigure = '' - substituteInPlace setup.py --replace \'setuptools-markdown\' "" - ''; + checkInputs = [ + pytestCheckHook + ]; - disabled = pythonOlder "3.5"; - - checkInputs = [ pytest ]; - - checkPhase = '' - pytest . - ''; + pythonImportsCheck = [ "eth_typing" ]; meta = { description = "Common type annotations for Ethereum Python packages"; homepage = "https://github.com/ethereum/eth-typing"; license = lib.licenses.mit; - maintainers = with lib.maintainers; [ jluttine ]; + maintainers = with lib.maintainers; [ SuperSandro2000 ]; }; } diff --git a/pkgs/development/python-modules/eth-utils/default.nix b/pkgs/development/python-modules/eth-utils/default.nix index 9b26fb7024c06..a5b19123c1ecf 100644 --- a/pkgs/development/python-modules/eth-utils/default.nix +++ b/pkgs/development/python-modules/eth-utils/default.nix @@ -1,12 +1,21 @@ -{ lib, fetchFromGitHub, buildPythonPackage, pytestCheckHook, eth-hash, eth-typing, - cytoolz, hypothesis }: +{ lib +, fetchFromGitHub +, buildPythonPackage +, eth-hash +, eth-typing +, cytoolz +, hypothesis +, isPyPy +, pytestCheckHook +, pythonOlder +, toolz +}: buildPythonPackage rec { pname = "eth-utils"; version = "2.0.0"; + disabled = pythonOlder "3.6"; - # Tests are missing from the PyPI source tarball so let's use GitHub - # https://github.com/ethereum/eth-utils/issues/130 src = fetchFromGitHub { owner = "ethereum"; repo = pname; @@ -14,8 +23,17 @@ buildPythonPackage rec { sha256 = "sha256-E2vUROc2FcAv00k50YpdxaaYIRDk1yGSPB8cHHw+7Yw="; }; - checkInputs = [ pytestCheckHook hypothesis ]; - propagatedBuildInputs = [ eth-hash eth-typing cytoolz ]; + propagatedBuildInputs = [ + eth-hash + eth-typing + ] ++ lib.optional (!isPyPy) cytoolz + ++ lib.optional isPyPy toolz; + + + checkInputs = [ + hypothesis + pytestCheckHook + ] ++ eth-hash.optional-dependencies.pycryptodome; pythonImportsCheck = [ "eth_utils" ]; @@ -23,6 +41,6 @@ buildPythonPackage rec { description = "Common utility functions for codebases which interact with ethereum"; homepage = "https://github.com/ethereum/eth-utils"; license = lib.licenses.mit; - maintainers = with lib.maintainers; [ jluttine ]; + maintainers = with lib.maintainers; [ SuperSandro2000 ]; }; } diff --git a/pkgs/development/python-modules/fakeredis/default.nix b/pkgs/development/python-modules/fakeredis/default.nix index b42ecc5bd2619..02f0d49279511 100644 --- a/pkgs/development/python-modules/fakeredis/default.nix +++ b/pkgs/development/python-modules/fakeredis/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "fakeredis"; - version = "1.8"; + version = "1.8.1"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -24,8 +24,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "dsoftwareinc"; repo = "fakeredis-py"; - rev = "v${version}"; - hash = "sha256-HWt2EE25h8zUarknrNMBJmizP3rNM9W8IEUMxLyUii8="; + rev = "refs/tags/v${version}"; + hash = "sha256-gmQuQIlpE4PdgZ1J5aucSQkJpfrh1qTJNLfyI+cMCJU="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/fastcore/default.nix b/pkgs/development/python-modules/fastcore/default.nix index a9781b3aea150..54a006d78422a 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.3"; + version = "1.4.4"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "fastai"; repo = pname; rev = "refs/tags/${version}"; - sha256 = "sha256-3l5bELb5f/cvh4gF2kJZEX6kAK9achTerIIplMuesTk="; + sha256 = "sha256-2lV96QOlXfQ8PjSW45u9ZyXpssDgLyiUgmIC0VLOGus="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/flask-restful/default.nix b/pkgs/development/python-modules/flask-restful/default.nix index 9770d2d2b4fab..cefedfe7fc371 100644 --- a/pkgs/development/python-modules/flask-restful/default.nix +++ b/pkgs/development/python-modules/flask-restful/default.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { hash = "sha256-zOxlC4NdSBkhOMhTKa4Dc15s7VjpstnCFG1shMBvpT4="; }; - patches = [ + patches = lib.optionals (lib.versionAtLeast werkzeug.version "2.1.0") [ ./werkzeug-2.1.0-compat.patch ]; diff --git a/pkgs/development/python-modules/google-cloud-asset/default.nix b/pkgs/development/python-modules/google-cloud-asset/default.nix index 0e8281f41847c..63b989f4faf0e 100644 --- a/pkgs/development/python-modules/google-cloud-asset/default.nix +++ b/pkgs/development/python-modules/google-cloud-asset/default.nix @@ -17,14 +17,14 @@ buildPythonPackage rec { pname = "google-cloud-asset"; - version = "3.9.0"; + version = "3.9.1"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-DMRBAzGlByjcdLr/HnVxFxbNWK1TbYFpYKEjDdzfEeg="; + hash = "sha256-rGN3P4EfSs7bLLca4Y2J1jF1/wPR5Oc1d6iZFjeQHTM="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/google-cloud-bigquery-datatransfer/default.nix b/pkgs/development/python-modules/google-cloud-bigquery-datatransfer/default.nix index 2717af605ef3c..e67b32272e54e 100644 --- a/pkgs/development/python-modules/google-cloud-bigquery-datatransfer/default.nix +++ b/pkgs/development/python-modules/google-cloud-bigquery-datatransfer/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "google-cloud-bigquery-datatransfer"; - version = "3.6.1"; + version = "3.6.2"; format = "setuptools"; disabled = pythonOlder "3.6"; - + src = fetchPypi { inherit pname version; - hash = "sha256-hR5qHucBpq1LS9pIZeovcPMiVbw3dhSeeJxkYH8xuMk="; + hash = "sha256-y8W0qwm4rTHlDO8L+/fhIJlfW5PonUhAYBU5wLIZJ94="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/google-cloud-bigquery-logging/default.nix b/pkgs/development/python-modules/google-cloud-bigquery-logging/default.nix index c26d7582c23d1..59859e4ccea78 100644 --- a/pkgs/development/python-modules/google-cloud-bigquery-logging/default.nix +++ b/pkgs/development/python-modules/google-cloud-bigquery-logging/default.nix @@ -11,11 +11,11 @@ buildPythonPackage rec { pname = "google-cloud-bigquery-logging"; - version = "1.0.2"; + version = "1.0.3"; src = fetchPypi { inherit pname version; - sha256 = "sha256-i8Bh39MnQRQtE4WwDNhHdxFX2bGL6txT+sV8RcvXiZw="; + sha256 = "sha256-hIwKcQNPG6AHudqjy2dotACk51IeivwRbJZZaiFweqs="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/google-cloud-bigquery-storage/default.nix b/pkgs/development/python-modules/google-cloud-bigquery-storage/default.nix index 1b59bc8ddbf81..e013cac9f610e 100644 --- a/pkgs/development/python-modules/google-cloud-bigquery-storage/default.nix +++ b/pkgs/development/python-modules/google-cloud-bigquery-storage/default.nix @@ -9,11 +9,11 @@ buildPythonPackage rec { pname = "google-cloud-bigquery-storage"; - version = "2.13.1"; + version = "2.13.2"; src = fetchPypi { inherit pname version; - sha256 = "7a25148f635a04ca9ff568d47e64be275d3a4a3c90772524879e8f88f270d92d"; + sha256 = "sha256-rEznNOgFrKfnOmlhexTTHmkKETRGE26SKSp04diz47I="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/google-cloud-container/default.nix b/pkgs/development/python-modules/google-cloud-container/default.nix index ae3c6a8be74a0..41b85f50a43ee 100644 --- a/pkgs/development/python-modules/google-cloud-container/default.nix +++ b/pkgs/development/python-modules/google-cloud-container/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "google-cloud-container"; - version = "2.10.7"; + version = "2.10.8"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-I3oYldj915GBCX5VLEZRqGS7jMHWasQGVIvj50EUTK4="; + hash = "sha256-cQ5wFAwgqT2NT+jTfsg13wA7OOq8bk/QIRiIsK2ZyJ0="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/google-cloud-datacatalog/default.nix b/pkgs/development/python-modules/google-cloud-datacatalog/default.nix index 304899f0c8aec..f38b604ddb391 100644 --- a/pkgs/development/python-modules/google-cloud-datacatalog/default.nix +++ b/pkgs/development/python-modules/google-cloud-datacatalog/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "google-cloud-datacatalog"; - version = "3.8.0"; + version = "3.8.1"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-kGYfdvAnvdFm/1u0CS+n6rGKhV5GtGhW1zF7SVUu8PY="; + hash = "sha256-t7kFCkyH3/MNGFX8S4OzgWnW/NSomAFDbDPCx9hV40g="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/google-cloud-dataproc/default.nix b/pkgs/development/python-modules/google-cloud-dataproc/default.nix index 88d4e0bd6620c..05b61dd958d2a 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.2"; + version = "4.0.3"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "sha256-C2hAkWSb3h+lFC3pUIHlttme44Ugfae8opmFQbVWYTE="; + sha256 = "sha256-9PqMYqZpcy+Lv/3sh5Ru0X0wQWW5VW7CDsFGgHvErpU="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/google-cloud-datastore/default.nix b/pkgs/development/python-modules/google-cloud-datastore/default.nix index 73c887748a04a..2a04cca972f98 100644 --- a/pkgs/development/python-modules/google-cloud-datastore/default.nix +++ b/pkgs/development/python-modules/google-cloud-datastore/default.nix @@ -13,11 +13,11 @@ buildPythonPackage rec { pname = "google-cloud-datastore"; - version = "2.6.1"; + version = "2.6.2"; src = fetchPypi { inherit pname version; - sha256 = "sha256-2ItUrY5oMTtWig2UIC2IEOKgaaYsVuy9ralDitzQzdc="; + sha256 = "sha256-Ie/SyTY8AkmDXRKWwZiukD76HpwJEtp7IBusWj+Y4HE="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/google-cloud-dlp/default.nix b/pkgs/development/python-modules/google-cloud-dlp/default.nix index 5dfc976865308..279893faf33ec 100644 --- a/pkgs/development/python-modules/google-cloud-dlp/default.nix +++ b/pkgs/development/python-modules/google-cloud-dlp/default.nix @@ -14,14 +14,14 @@ buildPythonPackage rec { pname = "google-cloud-dlp"; - version = "3.7.0"; + version = "3.7.1"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-aUabWEz+ou12Lgys7PZnldjHnifPWPPqO8iJqkDgx9U="; + hash = "sha256-q2I3ku8f55rSJQE5oiDttQOJFYtGPjmrW7htrZ+BMPU="; }; 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 7ae7babaebf54..67351536ad7c1 100644 --- a/pkgs/development/python-modules/google-cloud-error-reporting/default.nix +++ b/pkgs/development/python-modules/google-cloud-error-reporting/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "google-cloud-error-reporting"; - version = "1.5.2"; + version = "1.5.3"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-wjRUPBZwyGP+2528vZ/x4EqiZwqH+9ZvK5rx4ISklHE="; + hash = "sha256-J+MzM6aaVy4xmlNUFhSOgAomT007p3ODYVXN71UmZJA="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/google-cloud-iam-logging/default.nix b/pkgs/development/python-modules/google-cloud-iam-logging/default.nix index 017634fd52738..b867c40140ba6 100644 --- a/pkgs/development/python-modules/google-cloud-iam-logging/default.nix +++ b/pkgs/development/python-modules/google-cloud-iam-logging/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "google-cloud-iam-logging"; - version = "1.0.1"; + version = "1.0.2"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-ZmoBaY0OM2pQcqasGCJQIeN6Rmbo4xlYK7LtH7SecgY="; + hash = "sha256-f5ZETn1zLrC+1Gil47zzJGanx7cFBisdoFPoDe1FFwo="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/google-cloud-iam/default.nix b/pkgs/development/python-modules/google-cloud-iam/default.nix index 26c89af2addbf..c1d6152297fb9 100644 --- a/pkgs/development/python-modules/google-cloud-iam/default.nix +++ b/pkgs/development/python-modules/google-cloud-iam/default.nix @@ -12,12 +12,12 @@ buildPythonPackage rec { pname = "google-cloud-iam"; - version = "2.6.1"; + version = "2.6.2"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "sha256-c1XPE5PBDXRgpiKGBfAhHB6yTPyvby3aZ5nF40+qFiQ="; + sha256 = "sha256-IOl5ZWekpiikOOMQ/afryiP+0lPLt4idSmVARRJj8LE="; }; propagatedBuildInputs = [ google-api-core libcst proto-plus ]; diff --git a/pkgs/development/python-modules/google-cloud-iot/default.nix b/pkgs/development/python-modules/google-cloud-iot/default.nix index d00d05f5431ed..77dd863f2b52a 100644 --- a/pkgs/development/python-modules/google-cloud-iot/default.nix +++ b/pkgs/development/python-modules/google-cloud-iot/default.nix @@ -12,11 +12,11 @@ buildPythonPackage rec { pname = "google-cloud-iot"; - version = "2.5.0"; + version = "2.5.1"; src = fetchPypi { inherit pname version; - sha256 = "sha256-bZ2Zn4r+hQ2MfkgXmJPYWbKy3tYlTkYh6ohmWQA/75U="; + sha256 = "sha256-Y71v505bwXEV1u28WFAHs12Qx0tKY7BDjFCc+oBgZcw="; }; propagatedBuildInputs = [ grpc-google-iam-v1 google-api-core libcst proto-plus ]; diff --git a/pkgs/development/python-modules/google-cloud-kms/default.nix b/pkgs/development/python-modules/google-cloud-kms/default.nix index 6317d621a0b9a..6a55519f79e96 100644 --- a/pkgs/development/python-modules/google-cloud-kms/default.nix +++ b/pkgs/development/python-modules/google-cloud-kms/default.nix @@ -12,11 +12,11 @@ buildPythonPackage rec { pname = "google-cloud-kms"; - version = "2.11.1"; + version = "2.11.2"; src = fetchPypi { inherit pname version; - sha256 = "sha256-n0alfJIsaqhQ4Wr4/d2JRXTCE24JTrRJBsYOnRhpV00="; + sha256 = "sha256-X95xD/L18dXPYxCbvxIPjaOolMSDr7vpyQnzb5oMFEQ="; }; propagatedBuildInputs = [ grpc-google-iam-v1 google-api-core libcst proto-plus ]; diff --git a/pkgs/development/python-modules/google-cloud-language/default.nix b/pkgs/development/python-modules/google-cloud-language/default.nix index 2eb6869492f51..366341dc153d6 100644 --- a/pkgs/development/python-modules/google-cloud-language/default.nix +++ b/pkgs/development/python-modules/google-cloud-language/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "google-cloud-language"; - version = "2.4.2"; + version = "2.4.3"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "sha256-kxJySGikHdichitekEiPjzs48bDqWaXMBhmI6IAwKRM="; + sha256 = "sha256-1N5nnT22ILyaubDrpj2bS260AP4YrjrMQ0tgBA3OChg="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/google-cloud-org-policy/default.nix b/pkgs/development/python-modules/google-cloud-org-policy/default.nix index 495623b3342a4..d270a1efe72ac 100644 --- a/pkgs/development/python-modules/google-cloud-org-policy/default.nix +++ b/pkgs/development/python-modules/google-cloud-org-policy/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "google-cloud-org-policy"; - version = "1.3.2"; + version = "1.3.3"; src = fetchPypi { inherit pname version; - sha256 = "sha256-i60DIRtWtB1MEB2/MuNycy7T9MFPnlRtJ7lnFhDVJbE="; + sha256 = "sha256-hZzujuHtj5g/dBJUhZBV4h8zJjtI1xitfjkcVzURfKU="; }; propagatedBuildInputs = [ google-api-core proto-plus ]; diff --git a/pkgs/development/python-modules/google-cloud-os-config/default.nix b/pkgs/development/python-modules/google-cloud-os-config/default.nix index 6f6223f1be984..d2235b44cf606 100644 --- a/pkgs/development/python-modules/google-cloud-os-config/default.nix +++ b/pkgs/development/python-modules/google-cloud-os-config/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "google-cloud-os-config"; - version = "1.11.1"; + version = "1.11.2"; src = fetchPypi { inherit pname version; - sha256 = "sha256-i4STXwnFyfXauRx4zvYMO1uWMechvNUOxolOcY3Z5us="; + sha256 = "sha256-n3bCKr+fszqHsi6uDmOXSfzoPP8JfpZRAGXIzE3gOVU="; }; propagatedBuildInputs = [ google-api-core libcst proto-plus ]; diff --git a/pkgs/development/python-modules/google-cloud-pubsub/default.nix b/pkgs/development/python-modules/google-cloud-pubsub/default.nix index 6871296a763de..aac222df0ac34 100644 --- a/pkgs/development/python-modules/google-cloud-pubsub/default.nix +++ b/pkgs/development/python-modules/google-cloud-pubsub/default.nix @@ -15,14 +15,14 @@ buildPythonPackage rec { pname = "google-cloud-pubsub"; - version = "2.12.1"; + version = "2.13.0"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-mTphUjL61NwaE7vKDgeCv+0WeA15FNQzvnY/6fHZ/QU="; + hash = "sha256-pcLgXIPWC7F6FS5Znn9DJMn/tsjNpE/7YlCxYoDDg+Y="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/google-cloud-redis/default.nix b/pkgs/development/python-modules/google-cloud-redis/default.nix index ab432454bbafc..4a4e0e9a555f3 100644 --- a/pkgs/development/python-modules/google-cloud-redis/default.nix +++ b/pkgs/development/python-modules/google-cloud-redis/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "google-cloud-redis"; - version = "2.8.0"; + version = "2.8.1"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-7L3SjViQmzTp//5LWWG9VG+TQuPay70KZdUuzhy7HS0="; + hash = "sha256-qI7bGk+BkLIfhrJHAfk2DVBp8vRc5dPLKjdKH0FPj8s="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/google-cloud-runtimeconfig/default.nix b/pkgs/development/python-modules/google-cloud-runtimeconfig/default.nix index fb581ee0c604a..0ff3e076f2e94 100644 --- a/pkgs/development/python-modules/google-cloud-runtimeconfig/default.nix +++ b/pkgs/development/python-modules/google-cloud-runtimeconfig/default.nix @@ -9,11 +9,11 @@ buildPythonPackage rec { pname = "google-cloud-runtimeconfig"; - version = "0.33.0"; + version = "0.33.1"; src = fetchPypi { inherit pname version; - sha256 = "cc85e5de7cdb58a27561885021ee6fcf1d9f89e0f0db7c371bdca9c54788dd15"; + sha256 = "sha256-SKinB6fiBh+oe+lb2IGMD6248DDOrG7g3kiFpMGX4BU="; }; propagatedBuildInputs = [ google-api-core google-cloud-core ]; 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 b5c9f186fe559..edb73853cacec 100644 --- a/pkgs/development/python-modules/google-cloud-secret-manager/default.nix +++ b/pkgs/development/python-modules/google-cloud-secret-manager/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "google-cloud-secret-manager"; - version = "2.11.0"; + version = "2.11.1"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-naE1e7T1E0P3MxJCMYc3YZ79v/3VTW19D/LhzRie7jk="; + hash = "sha256-tSy0d8kdyDSE+/gcg4B+fplnLJ4ipoa+TZvUoExaYVU="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/google-cloud-securitycenter/default.nix b/pkgs/development/python-modules/google-cloud-securitycenter/default.nix index 1df89058a6f59..5be79fd38fa50 100644 --- a/pkgs/development/python-modules/google-cloud-securitycenter/default.nix +++ b/pkgs/development/python-modules/google-cloud-securitycenter/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "google-cloud-securitycenter"; - version = "1.11.0"; + version = "1.11.1"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-+etRN3Q7Y1oYtQy0Fkoj6ujhx4gD5y+fUriu/eitIQM="; + hash = "sha256-XvjxdrGgdXaJqbArwdEWT31one+I43cpZ97PciM8yIA="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/google-cloud-speech/default.nix b/pkgs/development/python-modules/google-cloud-speech/default.nix index cd797240cc768..8c46aec477e02 100644 --- a/pkgs/development/python-modules/google-cloud-speech/default.nix +++ b/pkgs/development/python-modules/google-cloud-speech/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "google-cloud-speech"; - version = "2.14.0"; + version = "2.14.1"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-D8t8+rscImUvpHCEFGTzLU5FpAMZ62iHhRfLzUXqGV8="; + hash = "sha256-ImE08djcrhhC0VQJmL69hbfUDBALPUyW9IaSh1CIJqs="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/google-cloud-tasks/default.nix b/pkgs/development/python-modules/google-cloud-tasks/default.nix index 6bc9353262fab..7f4c314198396 100644 --- a/pkgs/development/python-modules/google-cloud-tasks/default.nix +++ b/pkgs/development/python-modules/google-cloud-tasks/default.nix @@ -12,11 +12,11 @@ buildPythonPackage rec { pname = "google-cloud-tasks"; - version = "2.9.0"; + version = "2.9.1"; src = fetchPypi { inherit pname version; - sha256 = "sha256-MjXGDlqRDFn2whxnEm1lf0G+vU9U/S3BmNvi47aEJro="; + sha256 = "sha256-wIO22BScrDJdbia6oOEuuXptedxrCehqWKLXmxTJmKE="; }; propagatedBuildInputs = [ google-api-core grpc-google-iam-v1 libcst proto-plus ]; diff --git a/pkgs/development/python-modules/google-cloud-texttospeech/default.nix b/pkgs/development/python-modules/google-cloud-texttospeech/default.nix index a7c49f0cabe96..92d2272440e9f 100644 --- a/pkgs/development/python-modules/google-cloud-texttospeech/default.nix +++ b/pkgs/development/python-modules/google-cloud-texttospeech/default.nix @@ -11,11 +11,11 @@ buildPythonPackage rec { pname = "google-cloud-texttospeech"; - version = "2.11.0"; + version = "2.11.1"; src = fetchPypi { inherit pname version; - sha256 = "sha256-UJSP3a9G6k1arMpoh4/rWrnR4gYtPW6d6LGwWuk5WGg="; + sha256 = "sha256-4I7zmjZMjXjkxjEtwWNbev0ryTOIyOWsVkC46tgRyqc="; }; propagatedBuildInputs = [ libcst google-api-core proto-plus ]; diff --git a/pkgs/development/python-modules/google-cloud-trace/default.nix b/pkgs/development/python-modules/google-cloud-trace/default.nix index bb9eb5f477acf..8665718fb00f6 100644 --- a/pkgs/development/python-modules/google-cloud-trace/default.nix +++ b/pkgs/development/python-modules/google-cloud-trace/default.nix @@ -12,11 +12,11 @@ buildPythonPackage rec { pname = "google-cloud-trace"; - version = "1.6.1"; + version = "1.6.2"; src = fetchPypi { inherit pname version; - sha256 = "sha256-JkKW9vJAAkw3sHYDapRvu5jjunV8oWSg/ykDmd1wpyA="; + sha256 = "sha256-nxyd8zE8PEQupVutLWhLD4I1jNhhJ0ARpTi52f21iBE="; }; propagatedBuildInputs = [ google-api-core google-cloud-core proto-plus ]; diff --git a/pkgs/development/python-modules/google-cloud-translate/default.nix b/pkgs/development/python-modules/google-cloud-translate/default.nix index 4a9398ac4b42a..ca961844a027a 100644 --- a/pkgs/development/python-modules/google-cloud-translate/default.nix +++ b/pkgs/development/python-modules/google-cloud-translate/default.nix @@ -14,14 +14,14 @@ buildPythonPackage rec { pname = "google-cloud-translate"; - version = "3.7.3"; + version = "3.7.4"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-c++DP97IhMKHKZqXWpVO/9Rw1q8eYs1ybNZDhviwB/A="; + hash = "sha256-B5MBpdcS6NN7rwvjLwbY55rV0dLDwWtnAadWsH2AwXE="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/google-cloud-websecurityscanner/default.nix b/pkgs/development/python-modules/google-cloud-websecurityscanner/default.nix index 2ea8de6f139fd..b1d7c8d5da19a 100644 --- a/pkgs/development/python-modules/google-cloud-websecurityscanner/default.nix +++ b/pkgs/development/python-modules/google-cloud-websecurityscanner/default.nix @@ -11,11 +11,11 @@ buildPythonPackage rec { pname = "google-cloud-websecurityscanner"; - version = "1.7.1"; + version = "1.7.2"; src = fetchPypi { inherit pname version; - sha256 = "sha256-yK4xEu9rfFkA6RDNDjul0V+Xjc8TehJ6f8lv1k2WULc="; + sha256 = "sha256-JDuMhyk1018pMYNOhRVmP7XyF2wsK5temDTP5033Dxk="; }; propagatedBuildInputs = [ google-api-core libcst proto-plus ]; diff --git a/pkgs/development/python-modules/greeneye-monitor/default.nix b/pkgs/development/python-modules/greeneye-monitor/default.nix index fbc8f62fc0c5f..76da49a9ee6d5 100644 --- a/pkgs/development/python-modules/greeneye-monitor/default.nix +++ b/pkgs/development/python-modules/greeneye-monitor/default.nix @@ -22,6 +22,11 @@ buildPythonPackage rec { hash = "sha256-weZTOVFBlB6TxFs8pLWfyB7WD/bn3ljBjX2tVi1Zc/I="; }; + postPatch = '' + substituteInPlace setup.py \ + --replace "siobrultech_protocols==" "siobrultech_protocols>=" + ''; + propagatedBuildInputs = [ aiohttp siobrultech-protocols diff --git a/pkgs/development/python-modules/headerparser/default.nix b/pkgs/development/python-modules/headerparser/default.nix index b1a38170162b7..6a07f1f07ca7c 100644 --- a/pkgs/development/python-modules/headerparser/default.nix +++ b/pkgs/development/python-modules/headerparser/default.nix @@ -1,27 +1,50 @@ { lib , buildPythonPackage -, fetchPypi +, fetchFromGitHub +, pytest-mock +, pytestCheckHook +, pythonOlder , six }: buildPythonPackage rec { pname = "headerparser"; version = "0.4.0"; + format = "pyproject"; - src = fetchPypi{ - inherit pname; - inherit version; - sha256 = "b8ceae4c5e6133fda666d022684e93f9b3d45815c2c7881018123c71ff28c5cc"; + disabled = pythonOlder "3.6"; + + src = fetchFromGitHub { + owner = "jwodder"; + repo = pname; + rev = "v${version}"; + hash = "sha256-KJJt85iC/4oBoIelB2zUJVyHSppFem/22v6F30P5nYM="; }; - buildInputs = [ + propagatedBuildInputs = [ six ]; + checkInputs = [ + pytest-mock + pytestCheckHook + ]; + + postPatch = '' + substituteInPlace tox.ini \ + --replace "--cov=headerparser" "" \ + --replace "--no-cov-on-fail" "" \ + --replace "--flakes" "" + ''; + + pythonImportsCheck = [ + "headerparser" + ]; + meta = with lib; { + description = "Module to parse key-value pairs in the style of RFC 822 (e-mail) headers"; homepage = "https://github.com/jwodder/headerparser"; - description = "argparse for mail-style headers"; license = with licenses; [ mit ]; - maintainers = with lib.maintainers; [ ayazhafiz ]; + maintainers = with maintainers; [ ayazhafiz ]; }; } diff --git a/pkgs/development/python-modules/hexbytes/default.nix b/pkgs/development/python-modules/hexbytes/default.nix new file mode 100644 index 0000000000000..79fc42ae3d02a --- /dev/null +++ b/pkgs/development/python-modules/hexbytes/default.nix @@ -0,0 +1,36 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, eth-utils +, hypothesis +, pytestCheckHook +, pythonOlder +}: + +buildPythonPackage rec { + pname = "hexbytes"; + version = "0.2.2"; + disabled = pythonOlder "3.6"; + + src = fetchFromGitHub { + owner = "ethereum"; + repo = "hexbytes"; + rev = "v${version}"; + sha256 = "sha256-SZscM6ze9yY+iRDx/5F4XbrLXIbp6QkFnzxN7zvP9CQ="; + }; + + checkInputs = [ + eth-utils + hypothesis + pytestCheckHook + ]; + + pythonImportsCheck = [ "hexbytes" ]; + + meta = with lib; { + description = "`bytes` subclass that decodes hex, with a readable console output"; + homepage = "https://github.com/ethereum/hexbytes"; + license = licenses.mit; + maintainers = with maintainers; [ SuperSandro2000 ]; + }; +} diff --git a/pkgs/development/python-modules/holidays/default.nix b/pkgs/development/python-modules/holidays/default.nix index dd97b47007560..446774de681e4 100644 --- a/pkgs/development/python-modules/holidays/default.nix +++ b/pkgs/development/python-modules/holidays/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "holidays"; - version = "0.13"; + version = "0.14.2"; format = "setuptools"; - disabled = pythonOlder "3.6"; + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "sha256-xvfDq4ralIBnAtqTHZTTfNYbz6kstNOdNRtqnFIQZ1w="; + hash = "sha256-DnD9F0gErqHIcLFRMZ+uvNXNsNlVt4IwQ04a/Rd4SY4="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/inkex/default.nix b/pkgs/development/python-modules/inkex/default.nix index c1c5479dfd8ff..3f8bc99eeb6b7 100644 --- a/pkgs/development/python-modules/inkex/default.nix +++ b/pkgs/development/python-modules/inkex/default.nix @@ -1,6 +1,9 @@ { buildPythonPackage , inkscape +, cssselect , lxml +, numpy +, pygobject3 , python }: @@ -11,7 +14,10 @@ buildPythonPackage { format = "other"; propagatedBuildInputs = [ + cssselect lxml + numpy + pygobject3 ]; # We just copy the files. 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 6be5da3fda55a..49f05cd545e5a 100644 --- a/pkgs/development/python-modules/json-schema-for-humans/default.nix +++ b/pkgs/development/python-modules/json-schema-for-humans/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { pname = "json-schema-for-humans"; - version = "0.40.2"; + version = "0.41.1"; format = "pyproject"; disabled = pythonOlder "3.6"; @@ -28,7 +28,7 @@ buildPythonPackage rec { owner = "coveooss"; repo = pname; rev = "v${version}"; - hash = "sha256-9bHylNG+YT+tZmqE8DJMbhpPPaany29+0sIt1jKmFLg="; + hash = "sha256-JQqoQiug4n1o4PbGT/Ry/Qib11KmaTmkhPtZjhwmpc4="; }; postPatch = '' diff --git a/pkgs/development/python-modules/jsonrpc-async/default.nix b/pkgs/development/python-modules/jsonrpc-async/default.nix index 622c84988a4a9..2c66779e01960 100644 --- a/pkgs/development/python-modules/jsonrpc-async/default.nix +++ b/pkgs/development/python-modules/jsonrpc-async/default.nix @@ -2,7 +2,6 @@ , aiohttp , buildPythonPackage , fetchFromGitHub -, fetchpatch , jsonrpc-base , pytest-aiohttp , pytestCheckHook @@ -11,7 +10,7 @@ buildPythonPackage rec { pname = "jsonrpc-async"; - version = "2.1.0"; + version = "2.1.1"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -20,7 +19,7 @@ buildPythonPackage rec { owner = "emlove"; repo = pname; rev = version; - hash = "sha256-Lr8gvQR0Q46b/e1K/XyvqtJo18nBpHjlDdNq4vjCMyU="; + hash = "sha256-HhesXzxVjhWJkubiBi6sMoXi/zicqn99dqT5bilycS8="; }; propagatedBuildInputs = [ @@ -33,15 +32,6 @@ buildPythonPackage rec { pytestCheckHook ]; - patches = [ - # Fix tests with later pytest-aiohttp, https://github.com/emlove/jsonrpc-async/pull/9 - (fetchpatch { - name = "support-later-pytest-aiohttp.patch"; - url = "https://github.com/emlove/jsonrpc-async/commit/8b790f23af0d898df90460029d5ba3bcfb0423ed.patch"; - sha256 = "sha256-rthHRF90hywMIbvIHo3Do/uzXKe+STPOoZIa80H4b/g="; - }) - ]; - pytestFlagsArray = [ "tests.py" ]; diff --git a/pkgs/development/python-modules/jsonrpc-base/default.nix b/pkgs/development/python-modules/jsonrpc-base/default.nix index bdcdda0f41eb8..f10fc3f1237be 100644 --- a/pkgs/development/python-modules/jsonrpc-base/default.nix +++ b/pkgs/development/python-modules/jsonrpc-base/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "jsonrpc-base"; - version = "2.1.0"; + version = "2.1.1"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "emlove"; repo = pname; rev = version; - hash = "sha256-fliyJmVmG1DgoePE92LKm/wknlgXgYq2mOzZMFAdqLE="; + hash = "sha256-C03m/zeLIFqsmEMSzt84LMOWAHUcpdEHhaa5hx2NsoQ="; }; checkInputs = [ diff --git a/pkgs/development/python-modules/jsonrpc-websocket/default.nix b/pkgs/development/python-modules/jsonrpc-websocket/default.nix index ba72370229685..c3d68f77d859e 100644 --- a/pkgs/development/python-modules/jsonrpc-websocket/default.nix +++ b/pkgs/development/python-modules/jsonrpc-websocket/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "jsonrpc-websocket"; - version = "3.1.1"; + version = "3.1.4"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "emlove"; repo = "jsonrpc-websocket"; rev = version; - sha256 = "aAXY1OUsF83rGQ1sg1lDrbWmxWqJJ+ZnuvHR1Y+ZDs4="; + sha256 = "sha256-xSOITOVtsNMEDrq610l8LNipLdyMWzKOQDedQEGaNOQ="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/luxtronik/default.nix b/pkgs/development/python-modules/luxtronik/default.nix index e8c72a5cf4cbe..b1e74c9ba6065 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.13"; + version = "0.3.14"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "Bouni"; repo = "python-luxtronik"; rev = version; - sha256 = "sha256-ULpi3oNJJe8H9z1C1nCNsR5eMmXQnXtbonrV9Ec2NyY="; + sha256 = "sha256-7TuvqOAb/MUumOF6BKTRLOJuvteqZPmFUXXsuwEpmOM="; }; # Project has no tests diff --git a/pkgs/development/python-modules/meross-iot/default.nix b/pkgs/development/python-modules/meross-iot/default.nix index bcc914a8eb45e..5bc7953e39ff9 100644 --- a/pkgs/development/python-modules/meross-iot/default.nix +++ b/pkgs/development/python-modules/meross-iot/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "meross-iot"; - version = "0.4.4.5"; + version = "0.4.4.7"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "albertogeniola"; repo = "MerossIot"; rev = "refs/tags/${version}"; - sha256 = "sha256-PBf8uHEeHXoYZcFD9KCWg1I5QRAILjVMl3oglWsEsag="; + sha256 = "sha256-9kRiBYlOX+TcI8+fk+cQ3ehbrV8NnptWa+HN62sKscA="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/mkdocs-material/default.nix b/pkgs/development/python-modules/mkdocs-material/default.nix index fa003128c0d47..1cdf9d883a7dc 100644 --- a/pkgs/development/python-modules/mkdocs-material/default.nix +++ b/pkgs/development/python-modules/mkdocs-material/default.nix @@ -13,7 +13,7 @@ buildPythonApplication rec { pname = "mkdocs-material"; - version = "8.3.1"; + version = "8.3.3"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -22,7 +22,7 @@ buildPythonApplication rec { owner = "squidfunk"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-p7pnacr3nw/UEavzVxt0QBpSjFazdWtbm3bFj9FIH1g="; + hash = "sha256-4rJ1fKYIQli4j6x1/xipQeCXMfbILyroxrwbpcPGYiU="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/mypy/extensions.nix b/pkgs/development/python-modules/mypy/extensions.nix index e62fa4230fff4..04b22e2c54387 100644 --- a/pkgs/development/python-modules/mypy/extensions.nix +++ b/pkgs/development/python-modules/mypy/extensions.nix @@ -1,20 +1,30 @@ -{ lib, fetchPypi, buildPythonPackage, typing, pythonOlder }: +{ lib +, fetchFromGitHub +, buildPythonPackage +, typing +, python +, pythonOlder +}: buildPythonPackage rec { pname = "mypy-extensions"; version = "0.4.3"; - # Tests not included in pip package. - doCheck = false; - - src = fetchPypi { - inherit version; - pname = "mypy_extensions"; - sha256 = "2d82818f5bb3e369420cb3c4060a7970edba416647068eb4c5343488a6c604a8"; + src = fetchFromGitHub { + owner = "python"; + repo = "mypy_extensions"; + rev = version; + sha256 = "sha256-JjhbxX5DBAbcs1o2fSWywz9tot792q491POXiId+NyI="; }; propagatedBuildInputs = lib.optional (pythonOlder "3.5") typing; + checkPhase = '' + ${python.interpreter} -m unittest discover tests + ''; + + pythonImportsCheck = [ "mypy_extensions" ]; + meta = with lib; { description = "Experimental type system extensions for programs checked with the mypy typechecker"; homepage = "http://www.mypy-lang.org"; diff --git a/pkgs/development/python-modules/nextcord/default.nix b/pkgs/development/python-modules/nextcord/default.nix index 5f4997259136e..a47aa3d513a14 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.0a10"; + version = "2.0.0b2"; format = "setuptools"; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = "nextcord"; repo = "nextcord"; rev = version; - hash = "sha256-p99WJ4y2iJQTI3wHbh+jwJyLnE3aBXnHxrehDYYek/4="; + hash = "sha256-yp24eOmwdi5X2Y20jqq88CDFvmc6P5omOsSWFr2MWGI="; }; patches = [ diff --git a/pkgs/development/python-modules/nextcord/paths.patch b/pkgs/development/python-modules/nextcord/paths.patch index 389637a18878c..8e6b58897f55e 100644 --- a/pkgs/development/python-modules/nextcord/paths.patch +++ b/pkgs/development/python-modules/nextcord/paths.patch @@ -1,26 +1,71 @@ diff --git a/nextcord/opus.py b/nextcord/opus.py -index 97d437a3..755e1a5c 100644 +index 52e4ddbd..d8b8090b 100644 --- a/nextcord/opus.py +++ b/nextcord/opus.py -@@ -213,7 +213,7 @@ def _load_default() -> bool: - _filename = os.path.join(_basedir, 'bin', f'libopus-0.{_target}.dll') +@@ -255,7 +255,7 @@ def _load_default() -> bool: + _filename = os.path.join(_basedir, "bin", f"libopus-0.{_target}.dll") _lib = libopus_loader(_filename) else: -- _lib = libopus_loader(ctypes.util.find_library('opus')) -+ _lib = libopus_loader('@libopus@') - except Exception: - _lib = None +- opus = ctypes.util.find_library("opus") ++ opus = ctypes.util.find_library("@opus@") + if opus is None: + _lib = None diff --git a/nextcord/player.py b/nextcord/player.py -index bedefc5a..34de0459 100644 +index 5d0674cc..fd1c20ef 100644 --- a/nextcord/player.py +++ b/nextcord/player.py -@@ -140,7 +140,7 @@ class FFmpegAudio(AudioSource): - .. versionadded:: 1.3 - """ +@@ -148,7 +148,7 @@ class FFmpegAudio(AudioSource): + self, + source: Union[str, io.BufferedIOBase], + *, +- executable: str = "ffmpeg", ++ executable: str = "@ffmpeg@", + args: Any, + **subprocess_kwargs: Any, + ): +@@ -275,7 +275,7 @@ class FFmpegPCMAudio(FFmpegAudio): + self, + source: Union[str, io.BufferedIOBase], + *, +- executable: str = "ffmpeg", ++ executable: str = "@ffmpeg@", + pipe: bool = False, + stderr: Optional[IO[str]] = None, + before_options: Optional[str] = None, +@@ -378,7 +378,7 @@ class FFmpegOpusAudio(FFmpegAudio): + *, + bitrate: int = 128, + codec: Optional[str] = None, +- executable: str = "ffmpeg", ++ executable: str = "@ffmpeg@", + pipe=False, + stderr=None, + before_options=None, +@@ -532,7 +532,7 @@ class FFmpegOpusAudio(FFmpegAudio): + """ -- def __init__(self, source: Union[str, io.BufferedIOBase], *, executable: str = 'ffmpeg', args: Any, **subprocess_kwargs: Any): -+ def __init__(self, source: Union[str, io.BufferedIOBase], *, executable: str = '@ffmpeg@', args: Any, **subprocess_kwargs: Any): - piping = subprocess_kwargs.get('stdin') == subprocess.PIPE - if piping and isinstance(source, str): - raise TypeError("parameter conflict: 'source' parameter cannot be a string when piping to stdin") + method = method or "native" +- executable = executable or "ffmpeg" ++ executable = executable or "@ffmpeg@" + probefunc = fallback = None + + if isinstance(method, str): +@@ -577,7 +577,7 @@ class FFmpegOpusAudio(FFmpegAudio): + + @staticmethod + def _probe_codec_native( +- source, executable: str = "ffmpeg" ++ source, executable: str = "@ffmpeg@" + ) -> Tuple[Optional[str], Optional[int]]: + exe = executable[:2] + "probe" if executable in ("ffmpeg", "avconv") else executable + args = [ +@@ -606,7 +606,7 @@ class FFmpegOpusAudio(FFmpegAudio): + + @staticmethod + def _probe_codec_fallback( +- source, executable: str = "ffmpeg" ++ source, executable: str = "@ffmpeg@" + ) -> Tuple[Optional[str], Optional[int]]: + args = [executable, "-hide_banner", "-i", source] + proc = subprocess.Popen( diff --git a/pkgs/development/python-modules/oauthenticator/default.nix b/pkgs/development/python-modules/oauthenticator/default.nix index 738f7fafca2a4..b3a4c5db7a0ef 100644 --- a/pkgs/development/python-modules/oauthenticator/default.nix +++ b/pkgs/development/python-modules/oauthenticator/default.nix @@ -14,12 +14,14 @@ buildPythonPackage rec { pname = "oauthenticator"; - version = "14.2.0"; + version = "15.0.0"; + format = "setuptools"; + disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "4baa02ff2c159cbba06f8d07fe11a6e624285ca2f813b1258b4c68766c0ee46b"; + hash = "sha256-d1toYgrufnVd10QhJ4nhQqyDRaq4CjWLDjC+7ABNp6Y="; }; propagatedBuildInputs = [ @@ -37,12 +39,14 @@ buildPythonPackage rec { ]; disabledTests = [ - # Test are outdated, https://github.com/jupyterhub/oauthenticator/issues/432 + # Tests are outdated, https://github.com/jupyterhub/oauthenticator/issues/432 "test_azuread" "test_mediawiki" ]; - pythonImportsCheck = [ "oauthenticator" ]; + pythonImportsCheck = [ + "oauthenticator" + ]; meta = with lib; { description = "Authenticate JupyterHub users with common OAuth providers, including GitHub, Bitbucket, and more."; diff --git a/pkgs/development/python-modules/omnilogic/default.nix b/pkgs/development/python-modules/omnilogic/default.nix index 96d0d7e19c6f3..daa95fa964508 100644 --- a/pkgs/development/python-modules/omnilogic/default.nix +++ b/pkgs/development/python-modules/omnilogic/default.nix @@ -2,18 +2,23 @@ , aiohttp , xmltodict , buildPythonPackage +, pythonOlder , fetchFromGitHub }: buildPythonPackage rec { pname = "omnilogic"; - version = "0.4.5"; + version = "0.4.6"; + + disabled = pythonOlder "3.4"; + + format = "setuptools"; src = fetchFromGitHub { owner = "djtimca"; repo = "omnilogic-api"; rev = version; - sha256 = "081awb0fl40b5ighc9yxfq1xkgxz7l5dvz5544hx965q2r20wvsg"; + hash = "sha256-XyAniuUr/Kt8VfBtovD4kKLG+ehOqE26egEG7j8q9LY="; }; propagatedBuildInputs = [ @@ -21,11 +26,6 @@ buildPythonPackage rec { xmltodict ]; - postPatch = '' - # Is not used but still present in setup.py - substituteInPlace setup.py --replace "'config'," "" - ''; - # Project has no tests doCheck = false; pythonImportsCheck = [ "omnilogic" ]; diff --git a/pkgs/development/python-modules/openai/default.nix b/pkgs/development/python-modules/openai/default.nix index b137050ebff88..3854ed1c76048 100644 --- a/pkgs/development/python-modules/openai/default.nix +++ b/pkgs/development/python-modules/openai/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { pname = "openai"; - version = "0.18.1"; + version = "0.19.0"; disabled = pythonOlder "3.7.1"; @@ -27,7 +27,7 @@ buildPythonPackage rec { owner = "openai"; repo = "openai-python"; rev = "v${version}"; - sha256 = "sha256-ii/w29aRGhuzR6E+kbknsSrVZlOurpy/tTVGeAYKkXo="; + sha256 = "sha256-v/EBmKIzHGPR2KGLUqyWlTSZjV2MqALYRRofCXRjH24="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/plugwise/default.nix b/pkgs/development/python-modules/plugwise/default.nix index cf5b79fb7114c..b8900b0f55067 100644 --- a/pkgs/development/python-modules/plugwise/default.nix +++ b/pkgs/development/python-modules/plugwise/default.nix @@ -1,10 +1,11 @@ -{ lib + { lib , aiohttp , async-timeout , buildPythonPackage , crcmod , defusedxml , fetchFromGitHub +, freezegun , jsonpickle , munch , mypy @@ -20,7 +21,7 @@ buildPythonPackage rec { pname = "plugwise"; - version = "0.18.5"; + version = "0.19.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -29,7 +30,7 @@ buildPythonPackage rec { owner = pname; repo = "python-plugwise"; rev = "refs/tags/v${version}"; - sha256 = "sha256-J6RwPkObcoXIQ93nD8FNNjwllHoID4nFzqilArBS1C8="; + sha256 = "sha256-ST7eC7IXW47b1AlX25ubUPTi6Hkcjd+7L0tzht3fz9s="; }; propagatedBuildInputs = [ @@ -45,6 +46,7 @@ buildPythonPackage rec { ]; checkInputs = [ + freezegun jsonpickle mypy pytest-aiohttp diff --git a/pkgs/development/python-modules/py-ecc/default.nix b/pkgs/development/python-modules/py-ecc/default.nix new file mode 100644 index 0000000000000..8060ab45cae13 --- /dev/null +++ b/pkgs/development/python-modules/py-ecc/default.nix @@ -0,0 +1,43 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, cached-property +, eth-typing +, eth-utils +, mypy-extensions +, pytestCheckHook +, pythonOlder +}: + +buildPythonPackage rec { + pname = "py-ecc"; + version = "6.0.0"; + disabled = pythonOlder "3.6"; + + src = fetchFromGitHub { + owner = "ethereum"; + repo = "py_ecc"; + rev = "v${version}"; + sha256 = "sha256-638otYA3e/Ld4mcM69yrqHQnGoK/Sfl/UA9FWnjgO/U="; + }; + + propagatedBuildInputs = [ + cached-property + eth-typing + eth-utils + mypy-extensions + ]; + + checkInputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ "py_ecc" ]; + + meta = with lib; { + description = "ECC pairing and bn_128 and bls12_381 curve operations"; + homepage = "https://github.com/ethereum/py_ecc"; + license = licenses.mit; + maintainers = with maintainers; [ SuperSandro2000 ]; + }; +} diff --git a/pkgs/development/python-modules/py-eth-sig-utils/default.nix b/pkgs/development/python-modules/py-eth-sig-utils/default.nix new file mode 100644 index 0000000000000..1dfc8904fe00f --- /dev/null +++ b/pkgs/development/python-modules/py-eth-sig-utils/default.nix @@ -0,0 +1,41 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, eth-abi +, py-ecc +, pycryptodome +, python +, rlp +}: + +buildPythonPackage rec { + pname = "py-eth-sig-utils"; + version = "0.4.0"; + + src = fetchFromGitHub { + owner = "rmeissner"; + repo = "py-eth-sig-utils"; + rev = "v${version}"; + sha256 = "sha256-PNvEHH5w2ptntRGzqWrqlbIzJJsT60OXg/Dh5f6Wq9k="; + }; + + propagatedBuildInputs = [ + eth-abi + py-ecc + pycryptodome + rlp + ]; + + checkPhase = '' + ${python.interpreter} -m unittest + ''; + + pythonImportsCheck = [ "py_eth_sig_utils" ]; + + meta = with lib; { + description = "Collection of functions to generate hashes for signing on Ethereum"; + homepage = "https://github.com/rmeissner/py-eth-sig-utils"; + license = licenses.mit; + maintainers = with maintainers; [ SuperSandro2000 ]; + }; +} diff --git a/pkgs/development/python-modules/pySmartDL/default.nix b/pkgs/development/python-modules/pySmartDL/default.nix new file mode 100644 index 0000000000000..5c43fb756ce88 --- /dev/null +++ b/pkgs/development/python-modules/pySmartDL/default.nix @@ -0,0 +1,25 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +}: + +buildPythonPackage rec { + pname = "pySmartDL"; + version = "1.3.4"; + src = fetchFromGitHub ({ + owner = "iTaybb"; + repo = pname; + rev = "b93df794e1e60017c42d9520ac097b6fd38c2e8b"; + sha256 = "sha256-Etyv3xCB1cGozWDsskygwcTHJfC+V5hvqBNQAF8SIMM="; + }); + + doCheck = false; + + meta = with lib; { + homepage = "https://github.com/iTaybb/pySmartDL"; + description = "A Smart Download Manager for Python"; + license = licenses.unlicense; + platforms = platforms.linux; + maintainers = with maintainers; [ WeebSorceress ]; + }; +} diff --git a/pkgs/development/python-modules/pyasn/default.nix b/pkgs/development/python-modules/pyasn/default.nix index b180226ec46c4..3054af1b4e09c 100644 --- a/pkgs/development/python-modules/pyasn/default.nix +++ b/pkgs/development/python-modules/pyasn/default.nix @@ -1,4 +1,4 @@ -{ lib, buildPythonPackage, fetchPypi, }: +{ lib, buildPythonPackage, fetchPypi, fetchFromGitHub, python, }: buildPythonPackage rec { pname = "pyasn"; @@ -9,6 +9,18 @@ buildPythonPackage rec { sha256 = "sha256-6UK1SRY2Pse4tw6urs0OtOQe8bz0ojl7KabXFfzN+SU="; }; + datasrc = fetchFromGitHub { + owner = "hadiasghari"; + repo = "pyasn"; + rev = "${version}"; + sha256 = "sha256-R7Vi1Mn44Mg3HQLDk9O43MkXXwbLRr/jjVKSHJvgYj0"; + }; + + postInstall = '' + install -dm755 $out/${python.sitePackages}/pyasn/data + cp $datasrc/data/* $out/${python.sitePackages}/pyasn/data + ''; + doCheck = false; # Tests require internet connection which wont work pythonImportsCheck = [ "pyasn" ]; diff --git a/pkgs/development/python-modules/pycep-parser/default.nix b/pkgs/development/python-modules/pycep-parser/default.nix index 417b2b1ed32a8..d13a141e7e5e0 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.6"; + version = "0.3.7"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "gruebel"; repo = "pycep"; rev = "refs/tags/${version}"; - hash = "sha256-v8GJHwkY4FFmqPzEfFdvYhxj9G/H74KkhyM40K+mQ3A="; + hash = "sha256-5XivzmwcJi+DrrskM0u3XBXtC5j0pjXbWHI+8mciMXM="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/pyeight/default.nix b/pkgs/development/python-modules/pyeight/default.nix index f846127169753..66cd3ac70c8bd 100644 --- a/pkgs/development/python-modules/pyeight/default.nix +++ b/pkgs/development/python-modules/pyeight/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "pyeight"; - version = "0.2.0"; + version = "0.3.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "mezz64"; repo = "pyEight"; rev = version; - sha256 = "sha256-ERilZWroFaBCYjTfU7W0vegJaGibmJYVcgt0z84TPEI="; + sha256 = "sha256-H8f7990+ZKoOEzPgeYt4vMHCrcWwIa0X1gMh2qXBAoo="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pyfxa/default.nix b/pkgs/development/python-modules/pyfxa/default.nix index eb5403c2b9685..46a25e2c6bba3 100644 --- a/pkgs/development/python-modules/pyfxa/default.nix +++ b/pkgs/development/python-modules/pyfxa/default.nix @@ -1,37 +1,64 @@ -{ lib, buildPythonPackage, fetchPypi -, requests, cryptography, pybrowserid, hawkauthlib, six -, grequests, mock, responses, pytest, pyjwt }: +{ lib +, buildPythonPackage +, cryptography +, fetchPypi +, grequests +, hawkauthlib +, mock +, pybrowserid +, pyjwt +, pytestCheckHook +, pythonOlder +, requests +, responses +, setuptools +, six +}: buildPythonPackage rec { - pname = "PyFxA"; + pname = "pyfxa"; version = "0.7.7"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchPypi { - inherit pname version; - sha256 = "6c85cd08cf05f7138dee1cf2a8a1d68fd428b7b5ad488917c70a2a763d651cdb"; + pname = "PyFxA"; + inherit version; + hash = "sha256-bIXNCM8F9xON7hzyqKHWj9Qot7WtSIkXxwoqdj1lHNs="; }; - postPatch = '' - # Requires network access - rm fxa/tests/test_core.py - ''; - propagatedBuildInputs = [ - pyjwt requests cryptography pybrowserid hawkauthlib six + cryptography + hawkauthlib + pybrowserid + pyjwt + requests + setuptools # imports pkg_resources + six ]; checkInputs = [ - grequests mock responses pytest + grequests + mock + responses + pytestCheckHook ]; - # test_oath is mostly network calls - checkPhase = '' - pytest --ignore=fxa/tests/test_oauth.py - ''; + pythonImportsCheck = [ + "fxa" + ]; + + disabledTestPaths = [ + # Requires network access + "fxa/tests/test_core.py" + "fxa/tests/test_oauth.py" + ]; meta = with lib; { - description = "Firefox Accounts client library for Python"; + description = "Firefox Accounts client library"; homepage = "https://github.com/mozilla/PyFxA"; license = licenses.mpl20; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/development/python-modules/pyialarmxr/default.nix b/pkgs/development/python-modules/pyialarmxr-homeassistant/default.nix index 0110411a193d3..fea638f7a5f82 100644 --- a/pkgs/development/python-modules/pyialarmxr/default.nix +++ b/pkgs/development/python-modules/pyialarmxr-homeassistant/default.nix @@ -1,24 +1,23 @@ { lib , buildPythonPackage -, fetchFromGitHub +, fetchPypi , lxml , pythonOlder , xmltodict }: buildPythonPackage rec { - pname = "pyialarmxr"; + pname = "pyialarmxr-homeassistant"; version = "1.0.18"; format = "setuptools"; disabled = pythonOlder "3.7"; - src = fetchFromGitHub { - owner = "bigmoby"; - repo = pname; - rev = version; - hash = "sha256-Q1NsPLA1W4nxSG/9jlMf6BkC3ZrUrhl8oDX7U4aAjxM="; + src = fetchPypi { + inherit pname version; + hash = "sha256-aQHJiSmaGyABHP17oFH+6JQ9zNJ6pj2+PcE+gsRuhaQ="; }; + propagatedBuildInputs = [ lxml xmltodict @@ -33,7 +32,7 @@ buildPythonPackage rec { meta = with lib; { description = "Library to interface with Antifurto365 iAlarmXR systems"; - homepage = "https://github.com/bigmoby/pyialarmxr"; + homepage = "https://pypi.org/project/pyialarmxr-homeassistant/"; license = licenses.mit; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/pymc3/default.nix b/pkgs/development/python-modules/pymc/default.nix index 1d31188c9c89f..4fce3800ef1f9 100644 --- a/pkgs/development/python-modules/pymc3/default.nix +++ b/pkgs/development/python-modules/pymc/default.nix @@ -9,24 +9,29 @@ , fetchFromGitHub , numpy , pythonOlder +, pythonRelaxDepsHook , scipy , typing-extensions }: buildPythonPackage rec { - pname = "pymc3"; - version = "unstable-2022-05-23"; + pname = "pymc"; + version = "4.0.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "pymc-devs"; - repo = "pymc3"; - rev = "b5a5b569779673914c9420c1cc0135b118505ff5"; - hash = "sha256-vkIFwdjX2Rex8oqscVMP4xh0K4bjmN/RL7aQmOI//Dw="; + repo = "pymc"; + rev = "v${version}"; + hash = "sha256-ZMuDQJ+bmrQlrem/OqU/hIie3ZQkAqayU3N8ZtaW7xo="; }; + nativeBuildInputs = [ + pythonRelaxDepsHook + ]; + propagatedBuildInputs = [ aeppl aesara @@ -42,11 +47,13 @@ buildPythonPackage rec { postPatch = '' substituteInPlace setup.py \ --replace ', "pytest-cov"' "" - substituteInPlace requirements.txt \ - --replace "aesara==2.6.2" "aesara" \ - --replace "aeppl==0.0.28" "aeppl" ''; + pythonRelaxDeps = [ + "aesara" + "aeppl" + ]; + # The test suite is computationally intensive and test failures are not # indicative for package usability hence tests are disabled by default. doCheck = false; diff --git a/pkgs/development/python-modules/pynx584/default.nix b/pkgs/development/python-modules/pynx584/default.nix index 0b2583201a96d..0b7ca74468a04 100644 --- a/pkgs/development/python-modules/pynx584/default.nix +++ b/pkgs/development/python-modules/pynx584/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "pynx584"; - version = "0.7"; + version = "0.8"; disabled = pythonOlder "3.6"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "kk7ds"; repo = pname; rev = version; - sha256 = "sha256-44JFq19fpJmpZzLeVcBILs8c9bOfWyMrb2jA4Yx8+Co="; + sha256 = "sha256-aTwAQnz3my58MgXNe61lStLth6PZXLVLLDI2HUJiNm8="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pyroute2-core/default.nix b/pkgs/development/python-modules/pyroute2-core/default.nix index 7a13dc79aa991..096085a271036 100644 --- a/pkgs/development/python-modules/pyroute2-core/default.nix +++ b/pkgs/development/python-modules/pyroute2-core/default.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { pname = "pyroute2-core"; - version = "0.6.9"; + version = "0.6.11"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "pyroute2.core"; inherit version; - hash = "sha256-lH0Mi2nR4jqawvpvVfn79U0AflxE8lU1VLKvqAEXDOo="; + hash = "sha256-9Odxls1lje7pUCu0UkhfQIgbL2dOZQkiV1J/kgfgxGw="; }; # pyroute2 sub-modules have no tests diff --git a/pkgs/development/python-modules/pyroute2-ethtool/default.nix b/pkgs/development/python-modules/pyroute2-ethtool/default.nix index dae025618b7ae..ba0f2a054e119 100644 --- a/pkgs/development/python-modules/pyroute2-ethtool/default.nix +++ b/pkgs/development/python-modules/pyroute2-ethtool/default.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { pname = "pyroute2-ethtool"; - version = "0.6.9"; + version = "0.6.11"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "pyroute2.ethtool"; inherit version; - hash = "sha256-6o75plLeSle6ZFgoIZGKLCjx1hg4Z2okOq2RqAT2g8E="; + hash = "sha256-3xFsK50WtnRS8ImEWU4Hke9Ndp1Asm4wPEBfQT1rYXU="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pyroute2-ipdb/default.nix b/pkgs/development/python-modules/pyroute2-ipdb/default.nix index 22991fe202683..944b1ab4cfc17 100644 --- a/pkgs/development/python-modules/pyroute2-ipdb/default.nix +++ b/pkgs/development/python-modules/pyroute2-ipdb/default.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { pname = "pyroute2-ipdb"; - version = "0.6.9"; + version = "0.6.11"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "pyroute2.ipdb"; inherit version; - hash = "sha256-sJ9Zzlrh9FWVWL7StyHpPPuXo6TtNLz2/lQBCl53Wrk="; + hash = "sha256-UTP5LuZbBukfDpQPJ+N5ZFtKGFJppZfpsISnsm9eabs="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pyroute2-ipset/default.nix b/pkgs/development/python-modules/pyroute2-ipset/default.nix index 7bf625c088641..967b232cd2345 100644 --- a/pkgs/development/python-modules/pyroute2-ipset/default.nix +++ b/pkgs/development/python-modules/pyroute2-ipset/default.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { pname = "pyroute2-ipset"; - version = "0.6.9"; + version = "0.6.11"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "pyroute2.ipset"; inherit version; - hash = "sha256-icEMJno03WKUdIYTZ6BIAo9lm43RwMjxNXcoSkYF81M="; + hash = "sha256-uIfclrm1tujUickd5R4uyDHvPExyC2M9mpm5NLF1rts="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pyroute2-ndb/default.nix b/pkgs/development/python-modules/pyroute2-ndb/default.nix index 47c309cbc3219..9bf7414c79ffd 100644 --- a/pkgs/development/python-modules/pyroute2-ndb/default.nix +++ b/pkgs/development/python-modules/pyroute2-ndb/default.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { pname = "pyroute2-ndb"; - version = "0.6.9"; + version = "0.6.11"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "pyroute2.ndb"; inherit version; - hash = "sha256-ASk6ycw3dQNMV4xmaxPAHDL1KtrY1JGQ5yJYcJ+OgUE="; + hash = "sha256-jz956VgO9Z9ZPlMQobB34wd04Og/XV7IP+J58htdk+Y="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pyroute2-nftables/default.nix b/pkgs/development/python-modules/pyroute2-nftables/default.nix index 3c76692016d9c..a251c34a8b282 100644 --- a/pkgs/development/python-modules/pyroute2-nftables/default.nix +++ b/pkgs/development/python-modules/pyroute2-nftables/default.nix @@ -6,12 +6,12 @@ buildPythonPackage rec { pname = "pyroute2-nftables"; - version = "0.6.9"; + version = "0.6.11"; src = fetchPypi { pname = "pyroute2.nftables"; inherit version; - sha256 = "sha256-8BLz8IIobmrGb64PhXz1XWfl3KJTOhOL+j1C4/jlXuI="; + sha256 = "sha256-2SHAH4HBcXknCa2rdHk1s+ju+IN5ndcLPD8dgSGagqU="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pyroute2-nslink/default.nix b/pkgs/development/python-modules/pyroute2-nslink/default.nix index 387a9b403df5e..af4d6a7a01d1d 100644 --- a/pkgs/development/python-modules/pyroute2-nslink/default.nix +++ b/pkgs/development/python-modules/pyroute2-nslink/default.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { pname = "pyroute2-nslink"; - version = "0.6.9"; + version = "0.6.11"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "pyroute2.nslink"; inherit version; - hash = "sha256-WZjRexKn1FWXj+5KZxqZXB0aZmnd0ECKWt3hvVDdz4w="; + hash = "sha256-R94n1UEceOMmXXbCCkgq6N2JLnp2eqAW4qweIpNI2CI="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pyroute2-protocols/default.nix b/pkgs/development/python-modules/pyroute2-protocols/default.nix index 99c146d41e4db..9cf62994c3a1e 100644 --- a/pkgs/development/python-modules/pyroute2-protocols/default.nix +++ b/pkgs/development/python-modules/pyroute2-protocols/default.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { pname = "pyroute2-protocols"; - version = "0.6.9"; + version = "0.6.11"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "pyroute2.protocols"; inherit version; - hash = "sha256-7vP4rbid2cVGKlYUM5qsmYXQhUfvIWoaDXYnxSUnSJY="; + hash = "sha256-AnmW9ILlcZh2mwO5fbhY4ZazWSAy2wHJgLp5Anlmxk4="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pyroute2/default.nix b/pkgs/development/python-modules/pyroute2/default.nix index 9b15711ef0f25..a95356d581992 100644 --- a/pkgs/development/python-modules/pyroute2/default.nix +++ b/pkgs/development/python-modules/pyroute2/default.nix @@ -15,14 +15,14 @@ buildPythonPackage rec { pname = "pyroute2"; - version = "0.6.9"; + version = "0.6.11"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-PRxNGnH7VpyrV49V9xNO8C1I6LMYK05+ZrKndWKO2vs="; + hash = "sha256-E2NGvmbVUuRUHQZ52/+say4SN9/TnuGpUGL4UCRJF70="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pysensibo/default.nix b/pkgs/development/python-modules/pysensibo/default.nix index 5a215352af8d9..8093bfac263a4 100644 --- a/pkgs/development/python-modules/pysensibo/default.nix +++ b/pkgs/development/python-modules/pysensibo/default.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { pname = "pysensibo"; - version = "1.0.15"; + version = "1.0.17"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -16,7 +16,7 @@ buildPythonPackage rec { owner = "andrey-git"; repo = pname; rev = version; - hash = "sha256-TZjlMry9Ek/13gRKg54aCif/xbx9IEg+rsYnuOzwxRo="; + hash = "sha256-ZOJIsl6Ic4wSTpoylXGwQphPDV1yPw0mXbyiVKiDcVk="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pysigma-backend-insightidr/default.nix b/pkgs/development/python-modules/pysigma-backend-insightidr/default.nix index 46346f466b20d..b9d82584a503c 100644 --- a/pkgs/development/python-modules/pysigma-backend-insightidr/default.nix +++ b/pkgs/development/python-modules/pysigma-backend-insightidr/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "pysigma-backend-insightidr"; - version = "0.1.5"; + version = "0.1.6"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "SigmaHQ"; repo = "pySigma-backend-insightidr"; rev = "refs/tags/v${version}"; - hash = "sha256-RjBRFNMIpjW/x5vShXUgi25oOmvRlD2zP6mNQJ7sG8M="; + hash = "sha256-Sg+AYoEbCmcqxw5dl8wmQcI+lFrAfFgDnQjiQh6r9Yc="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/pysigma-backend-splunk/default.nix b/pkgs/development/python-modules/pysigma-backend-splunk/default.nix index a8c0b3d6ea67c..b270fa79c88d2 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.3.2"; + version = "0.3.3"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "SigmaHQ"; repo = "pySigma-backend-splunk"; rev = "v${version}"; - hash = "sha256-wcAqXFou20V2ZPOXCsF1Nky008q2xkfuI0RbTsatC6k="; + hash = "sha256-VRHrlcty3EpGnQkVJvsNWOJSW6rNE97Lqt36HmMR53A="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/pysigma-pipeline-crowdstrike/default.nix b/pkgs/development/python-modules/pysigma-pipeline-crowdstrike/default.nix index 5ed92014fc2e9..14129f148b19c 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.5"; + version = "0.1.6"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "SigmaHQ"; repo = "pySigma-pipeline-crowdstrike"; rev = "v${version}"; - hash = "sha256-TmvEWrkNu8gJ8rPFoRWd+uYob2rmmdasqxH1CYmz4Rk="; + hash = "sha256-5xX7NwM+Us0ToJa2miAw9KsCt2T+TqBnqHtwphZNxJI="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/pysigma-pipeline-sysmon/default.nix b/pkgs/development/python-modules/pysigma-pipeline-sysmon/default.nix index 26f058c3e197a..d308d72d805f5 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.5"; + version = "0.1.6"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "SigmaHQ"; repo = "pySigma-pipeline-sysmon"; rev = "v${version}"; - hash = "sha256-Bh0Qh+pY22lm/0vtJC4tFIl1KRF3zFQ8vcH0JEfYGAc="; + hash = "sha256-hKXnM3iqt6PnV+cMV3gEleBChd263sy2DovpIKg22fs="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/pysigma-pipeline-windows/default.nix b/pkgs/development/python-modules/pysigma-pipeline-windows/default.nix index ef8595fa873cd..a9eda723eb2cd 100644 --- a/pkgs/development/python-modules/pysigma-pipeline-windows/default.nix +++ b/pkgs/development/python-modules/pysigma-pipeline-windows/default.nix @@ -29,6 +29,11 @@ buildPythonPackage rec { pysigma ]; + postPatch = '' + substituteInPlace pyproject.toml \ + --replace 'pysigma = "^0.5.0"' 'pysigma = "^0.6.0"' + ''; + checkInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/pysigma/default.nix b/pkgs/development/python-modules/pysigma/default.nix index 210e90405817c..17e6a27ea57db 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.5.2"; + version = "0.6.2"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "SigmaHQ"; repo = "pySigma"; rev = "v${version}"; - hash = "sha256-U5jBFnWC73W9tFco5faiqGmk8K+Ig18f9HhXJ4vhhGs="; + hash = "sha256-/SZe4pzlhlkzW84WOjPOibfdznf5uLHL5RsNnT/EL9M="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/pysptk/default.nix b/pkgs/development/python-modules/pysptk/default.nix index a9333603057b0..e229648bc75da 100644 --- a/pkgs/development/python-modules/pysptk/default.nix +++ b/pkgs/development/python-modules/pysptk/default.nix @@ -1,16 +1,26 @@ -{ stdenv -, lib -, buildPythonPackage, fetchPypi -, numpy, scipy, cython, six, decorator +{ lib +, stdenv +, buildPythonPackage +, cython +, decorator +, fetchPypi +, numpy +, pytestCheckHook +, pythonOlder +, scipy +, six }: buildPythonPackage rec { pname = "pysptk"; - version = "0.1.20"; + version = "0.1.21"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "29e8e6a76243f3be728d23450982bd9f916530634079252a490ba7182bef30ca"; + hash = "sha256-AZUDI9AL57tXz7VzPGF9uEeKW4/6JsaBUiFkigl640Q="; }; PYSPTK_BUILD_VERSION = 0; @@ -20,19 +30,23 @@ buildPythonPackage rec { ]; propagatedBuildInputs = [ + decorator numpy scipy six - decorator ]; - # No tests in the PyPI tarball + # Tests are not part of the PyPI releases doCheck = false; + pythonImportsCheck = [ + "pysptk" + ]; + meta = with lib; { broken = stdenv.isDarwin; - description = "A python wrapper for Speech Signal Processing Toolkit (SPTK)"; - homepage = "https://pysptk.readthedocs.io/en/latest/"; + description = "Wrapper for Speech Signal Processing Toolkit (SPTK)"; + homepage = "https://pysptk.readthedocs.io/"; license = licenses.mit; maintainers = with maintainers; [ hyphon81 ]; }; diff --git a/pkgs/development/python-modules/pywemo/default.nix b/pkgs/development/python-modules/pywemo/default.nix index cd6e31a0193fa..6f7456480638d 100644 --- a/pkgs/development/python-modules/pywemo/default.nix +++ b/pkgs/development/python-modules/pywemo/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "pywemo"; - version = "0.8.1"; + version = "0.9.0"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = pname; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-kkZmn+rGRZGh9WmrHAmpqxTjw6MyCSWCeesJ0JGarKM="; + hash = "sha256-x4wIn+X70z5cCIhOfpQCj7qy0kEagnMcscxUls1697o="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/quantum-gateway/default.nix b/pkgs/development/python-modules/quantum-gateway/default.nix index 19b9ae22264a3..272899a6bbbde 100644 --- a/pkgs/development/python-modules/quantum-gateway/default.nix +++ b/pkgs/development/python-modules/quantum-gateway/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "quantum-gateway"; - version = "0.0.6"; + version = "0.0.8"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "cisasteelersfan"; repo = "quantum_gateway"; rev = version; - sha256 = "f2LYOr9xJSfbA/1aHfll5lg7r05o855Zkkk9HuRamP8="; + hash = "sha256-jwLfth+UaisPR0p+UHfm6qMXT2eSYWnsYEp0BqyeI9U="; }; propagatedBuildInputs = [ @@ -39,6 +39,11 @@ buildPythonPackage rec { "quantum_gateway" ]; + disabledTests = [ + # Tests require network features + "TestGateway3100" + ]; + meta = with lib; { description = "Python library for interacting with Verizon Fios Quantum gateway devices"; homepage = "https://github.com/cisasteelersfan/quantum_gateway"; diff --git a/pkgs/development/python-modules/questionary/default.nix b/pkgs/development/python-modules/questionary/default.nix index 5e750bbc195d5..35257708ae056 100644 --- a/pkgs/development/python-modules/questionary/default.nix +++ b/pkgs/development/python-modules/questionary/default.nix @@ -44,7 +44,6 @@ buildPythonPackage rec { ]; meta = with lib; { - broken = stdenv.isDarwin; description = "Python library to build command line user prompts"; homepage = "https://github.com/tmbo/questionary"; license = with licenses; [ mit ]; diff --git a/pkgs/development/python-modules/r2pipe/default.nix b/pkgs/development/python-modules/r2pipe/default.nix index f485e542f6532..00f856df03a01 100644 --- a/pkgs/development/python-modules/r2pipe/default.nix +++ b/pkgs/development/python-modules/r2pipe/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "r2pipe"; - version = "1.7.0"; + version = "1.7.1"; postPatch = let r2lib = "${lib.getOutput "lib" radare2}/lib"; @@ -27,7 +27,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-VUYJm3tFyv/ws4nDHLuDgPQSGbB09hi8zrpAPDqoVbA="; + sha256 = "sha256-7Qa8Jl7vX/acMhGSqWfaqvN9emA05RSubpseAwRSpG4="; }; # Tiny sanity check to make sure r2pipe finds radare2 (since r2pipe doesn't diff --git a/pkgs/development/python-modules/regenmaschine/default.nix b/pkgs/development/python-modules/regenmaschine/default.nix index a18e8cb2e8b52..2ce16013ce49c 100644 --- a/pkgs/development/python-modules/regenmaschine/default.nix +++ b/pkgs/development/python-modules/regenmaschine/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "regenmaschine"; - version = "2022.05.1"; + version = "2022.06.0"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "bachya"; repo = pname; rev = "refs/tags/${version}"; - sha256 = "sha256-E66qs8EC5o2WNMlv8ITK98De639wwhscbSFjljDzrks="; + sha256 = "sha256-fmoq0mOhD8Y3P9IgghxiTuS9b3gMUUyCCXmYnqN9ue0="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/rlp/default.nix b/pkgs/development/python-modules/rlp/default.nix index ec735c057abf7..e0736cdf0506d 100644 --- a/pkgs/development/python-modules/rlp/default.nix +++ b/pkgs/development/python-modules/rlp/default.nix @@ -1,31 +1,42 @@ -{ lib, fetchPypi, buildPythonPackage, pytest, hypothesis, eth-utils }: +{ lib +, fetchFromGitHub +, buildPythonPackage +, eth-utils +, hypothesis +, pytestCheckHook +}: buildPythonPackage rec { pname = "rlp"; version = "3.0.0"; - src = fetchPypi { - inherit pname version; - sha256 = "63b0465d2948cd9f01de449d7adfb92d207c1aef3982f20310f8009be4a507e8"; + src = fetchFromGitHub { + owner = "ethereum"; + repo = "pyrlp"; + rev = "v${version}"; + sha256 = "sha256-GRCq4FU38e08fREg5fweig5Y60jLT2k3Yj1Jk8OA6XY="; }; - checkInputs = [ pytest hypothesis ]; - propagatedBuildInputs = [ eth-utils ]; - - # setuptools-markdown uses pypandoc which is broken at the moment - preConfigure = '' - substituteInPlace setup.py --replace \'setuptools-markdown\' "" - substituteInPlace setup.py --replace "long_description_markdown_filename='README.md'," "" + postPatch = '' + substituteInPlace setup.py \ + --replace "'setuptools-markdown'" "" ''; - checkPhase = '' - pytest . - ''; + propagatedBuildInputs = [ + eth-utils + ]; + + checkInputs = [ + hypothesis + pytestCheckHook + ]; + + pythonImportsCheck = [ "rlp" ]; - meta = { - description = "A package for encoding and decoding data in and from Recursive Length Prefix notation"; + meta = with lib; { + description = "RLP serialization library"; homepage = "https://github.com/ethereum/pyrlp"; - license = lib.licenses.mit; - maintainers = with lib.maintainers; [ gebner ]; + license = licenses.mit; + maintainers = with maintainers; [ SuperSandro2000 ]; }; } diff --git a/pkgs/development/python-modules/safety/default.nix b/pkgs/development/python-modules/safety/default.nix index dd840c3389cad..60c23e3c6a2b9 100644 --- a/pkgs/development/python-modules/safety/default.nix +++ b/pkgs/development/python-modules/safety/default.nix @@ -1,19 +1,41 @@ -{ lib, buildPythonPackage, fetchPypi, requests, dparse, click, setuptools, pytestCheckHook }: +{ lib +, buildPythonPackage +, pythonOlder +, fetchPypi +, setuptools +, click +, requests +, packaging +, dparse +, pytestCheckHook +}: buildPythonPackage rec { pname = "safety"; version = "1.10.3"; + disabled = pythonOlder "3.5"; + + format = "setuptools"; + src = fetchPypi { inherit pname version; sha256 = "sha256-MOOU0CogrEm39lKS0Z04+pJ6j5WCzf060a27xmxkGtU="; }; - propagatedBuildInputs = [ requests dparse click setuptools ]; + propagatedBuildInputs = [ + setuptools + click + requests + packaging + dparse + ]; + + checkInputs = [ + pytestCheckHook + ]; # Disable tests depending on online services - checkInputs = [ pytestCheckHook ]; - dontUseSetuptoolsCheck = true; disabledTests = [ "test_check_live" "test_check_live_cached" @@ -24,10 +46,9 @@ buildPythonPackage rec { ''; meta = with lib; { - description = - "Safety checks your installed dependencies for known security vulnerabilities"; + description = "Checks installed dependencies for known vulnerabilities"; homepage = "https://github.com/pyupio/safety"; license = licenses.mit; - maintainers = with maintainers; [ thomasdesr ]; + maintainers = with maintainers; [ thomasdesr dotlambda ]; }; } diff --git a/pkgs/development/python-modules/sagemaker/default.nix b/pkgs/development/python-modules/sagemaker/default.nix index 979eb71d7c4a3..2976f89e9c6e1 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.93.0"; + version = "2.93.1"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-rVEYiX0e7dP2CQK4ceEPZu395vas69aZkQzJCana53c="; + hash = "sha256-EzIJ9+eo5eaXu4TdsvktHtA/wuqr8HUMqsl2pGyvs40="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/sfepy/default.nix b/pkgs/development/python-modules/sfepy/default.nix index 1748962853faa..5bd399713dbdd 100644 --- a/pkgs/development/python-modules/sfepy/default.nix +++ b/pkgs/development/python-modules/sfepy/default.nix @@ -19,14 +19,14 @@ buildPythonPackage rec { pname = "sfepy"; - version = "2021.4"; + version = "2022.1"; disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "sfepy"; repo = "sfepy"; rev = "release_${version}"; - sha256 = "sha256-+wvFcME02la5JwzD5bvPgBBlkQKF5LWz5MC3+0s5jSs="; + sha256 = "sha256-OayULh/dGI5sEynYMc+JLwUd67zEGdIGEKo6CTOdZS8="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/simplisafe-python/default.nix b/pkgs/development/python-modules/simplisafe-python/default.nix index 2f488d3cd80f2..68cfa0035c6aa 100644 --- a/pkgs/development/python-modules/simplisafe-python/default.nix +++ b/pkgs/development/python-modules/simplisafe-python/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { pname = "simplisafe-python"; - version = "2022.05.2"; + version = "2022.06.0"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -29,7 +29,7 @@ buildPythonPackage rec { owner = "bachya"; repo = pname; rev = "refs/tags/${version}"; - sha256 = "sha256-DWhXNn5KNs06oKJbWTCI/vuX2oruERAgb/1f4Au8na0="; + sha256 = "sha256-rYWtq56Gjbw5zs2ZqZkNqIP7wEzVziN3VQQfoyF5fJk="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/siobrultech-protocols/default.nix b/pkgs/development/python-modules/siobrultech-protocols/default.nix index 169f7edef5b9e..3da681dd97c74 100644 --- a/pkgs/development/python-modules/siobrultech-protocols/default.nix +++ b/pkgs/development/python-modules/siobrultech-protocols/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "siobrultech-protocols"; - version = "0.5.0"; + version = "0.6.0"; disabled = pythonOlder "3.8"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "sdwilsh"; repo = "siobrultech-protocols"; rev = "v${version}"; - hash = "sha256-bpWOfdwNHJXfKcANSu69YgXsxsfUhaH63/fXF6H+MNg="; + hash = "sha256-d4zAwcSCyC78dJZtxFkpdYurxDRon2cRgzInllP2qJQ="; }; checkInputs = [ diff --git a/pkgs/development/python-modules/smart-meter-texas/default.nix b/pkgs/development/python-modules/smart-meter-texas/default.nix index dbe24923bbf63..d7d568602358a 100644 --- a/pkgs/development/python-modules/smart-meter-texas/default.nix +++ b/pkgs/development/python-modules/smart-meter-texas/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "smart-meter-texas"; - version = "0.5.0"; + version = "0.5.1"; disabled = pythonOlder "3.6"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "grahamwetzler"; repo = "smart-meter-texas"; rev = "v${version}"; - sha256 = "1f5blmz3w549qjqn5xmdk1fx2pqd76hnlc9p439r7yc473nhw69w"; + hash = "sha256-rjMRV5MekwRkipes2nWos/1zi3sD+Ls8LyD3+t5FOZc="; }; postPatch = '' diff --git a/pkgs/development/python-modules/smbus2/default.nix b/pkgs/development/python-modules/smbus2/default.nix index b3116bd3182e7..262e765ad0dac 100644 --- a/pkgs/development/python-modules/smbus2/default.nix +++ b/pkgs/development/python-modules/smbus2/default.nix @@ -7,15 +7,15 @@ buildPythonPackage rec { pname = "smbus2"; - version = "0.4.1"; + version = "0.4.2"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "kplindegaard"; repo = pname; - rev = version; - sha256 = "0xgqs7bzhr8y3irc9gq3dnw1l3f5gc1yv4r2v4qxj95i3vvzpg5s"; + rev = "refs/tags/${version}"; + sha256 = "sha256-6JzFbhUq8XR1nYkadPeYqItcLZDIFAwTe3BriEW2nVI="; }; checkInputs = [ diff --git a/pkgs/development/python-modules/snowflake-connector-python/default.nix b/pkgs/development/python-modules/snowflake-connector-python/default.nix index 9cf24997d8915..5077bbd2d1750 100644 --- a/pkgs/development/python-modules/snowflake-connector-python/default.nix +++ b/pkgs/development/python-modules/snowflake-connector-python/default.nix @@ -13,6 +13,7 @@ , pythonOlder , pytz , requests +, setuptools }: buildPythonPackage rec { @@ -39,6 +40,7 @@ buildPythonPackage rec { pyopenssl pytz requests + setuptools ]; postPatch = '' diff --git a/pkgs/development/python-modules/spacy/default.nix b/pkgs/development/python-modules/spacy/default.nix index 40bd609520f6a..ee8b773c8b853 100644 --- a/pkgs/development/python-modules/spacy/default.nix +++ b/pkgs/development/python-modules/spacy/default.nix @@ -31,14 +31,14 @@ buildPythonPackage rec { pname = "spacy"; - version = "3.3.0"; + version = "3.3.1"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-xJ1Q++NxWtxXQUGTZ7OaRo0lVmSEIvELb8Tt846uLLM="; + hash = "sha256-f4fb2xBNhRrmul/Tp2ouFOIuBIE1kD6YuvCFcaOqgcA="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/twitchapi/default.nix b/pkgs/development/python-modules/twitchapi/default.nix index ce4ae1a8874d4..5d46ea9e04456 100644 --- a/pkgs/development/python-modules/twitchapi/default.nix +++ b/pkgs/development/python-modules/twitchapi/default.nix @@ -1,5 +1,6 @@ { lib , buildPythonPackage +, pythonOlder , fetchPypi , aiohttp , python-dateutil @@ -10,14 +11,16 @@ buildPythonPackage rec { pname = "twitchapi"; - version = "2.5.3"; + version = "2.5.4"; + + disabled = pythonOlder "3.7"; format = "setuptools"; src = fetchPypi { pname = "twitchAPI"; inherit version; - sha256 = "e7987dd8c3d1a3d25fe85ff0c0b0bad492f916c920f618dca8efd6baad3ac704"; + hash = "sha256-uNXET3V3r3f6c72IF3DEdXfQlrgkn2w5f4ksKBOsihg="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/twitterapi/default.nix b/pkgs/development/python-modules/twitterapi/default.nix index 313249e50d9cf..ce123e5afc41d 100644 --- a/pkgs/development/python-modules/twitterapi/default.nix +++ b/pkgs/development/python-modules/twitterapi/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "twitterapi"; - version = "2.7.12"; + version = "2.7.13"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "geduldig"; repo = "TwitterAPI"; rev = "v${version}"; - hash = "sha256-WqeoIZt2OGDXKPAbjm3cHI1kgiCEJC6+ROXXx4TR4b4="; + hash = "sha256-48Gphpo3tPcVEGNOSEb8mQaSQARQDCOGFyhGJ+i4BWI="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/validphys2/default.nix b/pkgs/development/python-modules/validphys2/default.nix index d434cbcc621c1..c417cb47e2d31 100644 --- a/pkgs/development/python-modules/validphys2/default.nix +++ b/pkgs/development/python-modules/validphys2/default.nix @@ -1,7 +1,12 @@ { lib , buildPythonPackage +, lhapdf , nnpdf +, prompt-toolkit , reportengine +, requests +, seaborn +, validobj }: buildPythonPackage rec { @@ -21,8 +26,13 @@ buildPythonPackage rec { ''; propagatedBuildInputs = [ + lhapdf nnpdf + prompt-toolkit reportengine + requests + seaborn + validobj ]; doCheck = false; # no tests diff --git a/pkgs/development/python-modules/venstarcolortouch/default.nix b/pkgs/development/python-modules/venstarcolortouch/default.nix index f2ac0266ce19a..082db8b90ab4d 100644 --- a/pkgs/development/python-modules/venstarcolortouch/default.nix +++ b/pkgs/development/python-modules/venstarcolortouch/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "venstarcolortouch"; - version = "0.15"; + version = "0.16"; src = fetchPypi { inherit pname version; - sha256 = "sha256-7JUqXHk/yL+/EvfQoGLaKmPPy4DkljT9olqK0a/Nmkk="; + sha256 = "sha256-kV/fPxvJPMZVmRyyKJnmHgDMsD5tvxcolPSdO13GV90="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/wallbox/default.nix b/pkgs/development/python-modules/wallbox/default.nix index 53ccd00a75f5b..20896da9d2227 100644 --- a/pkgs/development/python-modules/wallbox/default.nix +++ b/pkgs/development/python-modules/wallbox/default.nix @@ -9,13 +9,13 @@ buildPythonPackage rec { pname = "wallbox"; - version = "0.4.8"; + version = "0.4.9"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "f8965b0ae3a873f570986e712a4e667d0b6634c9e3afb51fbd5596856412878c"; + sha256 = "90e664cf7d99eb1baf20a9ff5fd415dfa14ddafabcefd606e15b5bcd25f969e9"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/webexteamssdk/default.nix b/pkgs/development/python-modules/webexteamssdk/default.nix index e70cdfd96c864..1e81e90af9a60 100644 --- a/pkgs/development/python-modules/webexteamssdk/default.nix +++ b/pkgs/development/python-modules/webexteamssdk/default.nix @@ -3,19 +3,23 @@ , fetchFromGitHub , future , pyjwt +, pythonOlder , requests , requests-toolbelt }: buildPythonPackage rec { pname = "webexteamssdk"; - version = "1.6"; + version = "1.6.1"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "CiscoDevNet"; repo = pname; rev = "v${version}"; - sha256 = "0bw28ag1iqyqlxz83m4qb3r94kipv5mpf3bsvc8zv5vh4dv52bp2"; + hash = "sha256-xlkmXl4tVm48drXmkUijv9GNXzJcDnfSKbOMciPIRRo="; }; propagatedBuildInputs = [ @@ -27,7 +31,10 @@ buildPythonPackage rec { # Tests require a Webex Teams test domain doCheck = false; - pythonImportsCheck = [ "webexteamssdk" ]; + + pythonImportsCheck = [ + "webexteamssdk" + ]; meta = with lib; { description = "Python module for Webex Teams APIs"; diff --git a/pkgs/development/python-modules/wheel-filename/default.nix b/pkgs/development/python-modules/wheel-filename/default.nix index 351bc86686a3f..3140870289d8f 100644 --- a/pkgs/development/python-modules/wheel-filename/default.nix +++ b/pkgs/development/python-modules/wheel-filename/default.nix @@ -1,26 +1,45 @@ { lib -, buildPythonPackage -, fetchurl , attrs +, buildPythonPackage +, fetchFromGitHub +, pytestCheckHook +, pythonOlder }: buildPythonPackage rec { pname = "wheel-filename"; - version = "1.3.0"; - format = "wheel"; + version = "1.4.1"; + format = "pyproject"; + + disabled = pythonOlder "3.6"; - src = fetchurl { - url = "https://github.com/jwodder/wheel-filename/releases/download/v1.1.0/wheel_filename-1.1.0-py3-none-any.whl"; - sha256 = "0aee45553f34e3a1b8a5db64aa832326f13c138b7f925a53daf96f984f9e6a38"; + src = fetchFromGitHub { + owner = "jwodder"; + repo = pname; + rev = "v${version}"; + hash = "sha256-M3XGHG733X5qKuMS6mvFSFHYOwWPaBMXw+w0eYo6ByE="; }; buildInputs = [ attrs ]; + checkInputs = [ + pytestCheckHook + ]; + + postPatch = '' + substituteInPlace tox.ini \ + --replace " --cov=wheel_filename --no-cov-on-fail" "" + ''; + + pythonImportsCheck = [ + "wheel_filename" + ]; + meta = with lib; { - homepage = "https://github.com/jwodder/wheel-filename"; description = "Parse wheel filenames"; + homepage = "https://github.com/jwodder/wheel-filename"; license = with licenses; [ mit ]; maintainers = with lib.maintainers; [ ayazhafiz ]; }; diff --git a/pkgs/development/python-modules/wheel-inspect/default.nix b/pkgs/development/python-modules/wheel-inspect/default.nix index 88fd592da8fb9..438084e6c058b 100644 --- a/pkgs/development/python-modules/wheel-inspect/default.nix +++ b/pkgs/development/python-modules/wheel-inspect/default.nix @@ -1,65 +1,65 @@ { lib +, attrs , buildPythonPackage -, fetchurl -, bleach, docutils, pygments, six -, attrs, entry-points-txt, headerparser, packaging, wheel-filename +, entry-points-txt +, fetchFromGitHub +, headerparser +, jsonschema +, packaging +, pytestCheckHook +, pythonOlder +, readme_renderer +, wheel-filename }: -# wheel-filename is stuck on readme_renderer~=24.0.0, but the upstream is at a -# future version. -let readme_renderer_24 = buildPythonPackage rec { - pname = "readme_renderer"; - version = "24.0.0"; - format = "wheel"; - - src = fetchurl { - url = "https://files.pythonhosted.org/packages/c3/7e/d1aae793900f36b097cbfcc5e70eef82b5b56423a6c52a36dce51fedd8f0/readme_renderer-24.0-py2.py3-none-any.whl"; - sha256 = "c8532b79afc0375a85f10433eca157d6b50f7d6990f337fa498c96cd4bfc203d"; - }; - - doCheck = false; - - buildInputs = [ - bleach - docutils - pygments - six - ]; - - meta = with lib; { - description = "Python library for rendering readme descriptions"; - homepage = "https://github.com/pypa/readme_renderer"; - license = with licenses; [ asl20 ]; - maintainers = with lib.maintainers; [ ayazhafiz ]; - }; -}; - -in buildPythonPackage rec { - version = "1.7.0"; +buildPythonPackage rec { pname = "wheel-inspect"; - format = "wheel"; + version = "1.7.1"; + format = "pyproject"; + + disabled = pythonOlder "3.6"; - src = fetchurl { - url = "https://github.com/jwodder/wheel-inspect/releases/download/v1.7.0/wheel_inspect-1.7.0-py3-none-any.whl"; - sha256 = "69b34de1f4464ddfc76280c4563e4afc644de2c88e3ae6882f030afdad3d73e4"; + src = fetchFromGitHub { + owner = "jwodder"; + repo = pname; + rev = "v${version}"; + hash = "sha256-pB9Rh+A7GlxnYuka2mTSBoxpoyYCzoaMPVgsHDlpos0="; }; propagatedBuildInputs = [ attrs - bleach - docutils entry-points-txt headerparser packaging - pygments - readme_renderer_24 + readme_renderer wheel-filename ]; + checkInputs = [ + jsonschema + pytestCheckHook + ]; + + postPatch = '' + substituteInPlace tox.ini \ + --replace " --cov=wheel_inspect --no-cov-on-fail" "" + substituteInPlace setup.cfg \ + --replace "entry-points-txt ~= 0.1.0" "entry-points-txt >= 0.1.0" + ''; + + pythonImportsCheck = [ + "wheel_inspect" + ]; + + pytestFlagsArray = [ + "-W" + "ignore::DeprecationWarning" + ]; + meta = with lib; { - homepage = "https://github.com/jwodder/wheel-inspect"; description = "Extract information from wheels"; + homepage = "https://github.com/jwodder/wheel-inspect"; license = with licenses; [ mit ]; - maintainers = with lib.maintainers; [ ayazhafiz ]; + maintainers = with maintainers; [ ayazhafiz ]; }; } diff --git a/pkgs/development/python-modules/xknx/default.nix b/pkgs/development/python-modules/xknx/default.nix index 87a0fd54d2d90..5b5de10973f56 100644 --- a/pkgs/development/python-modules/xknx/default.nix +++ b/pkgs/development/python-modules/xknx/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "xknx"; - version = "0.21.3"; + version = "0.21.4"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "XKNX"; repo = pname; rev = "refs/tags/${version}"; - sha256 = "sha256-AGKozbVdXfRPvaU1Et8GFu3vdNRLA8ZiV8Xc6T7BhOQ="; + sha256 = "sha256-eKbEeW+pa8lUbbzcvexURa6raN3HFzIWjwqE3L80KTY="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/yolink-api/default.nix b/pkgs/development/python-modules/yolink-api/default.nix index 44f2572bda572..17cd0d345fafd 100644 --- a/pkgs/development/python-modules/yolink-api/default.nix +++ b/pkgs/development/python-modules/yolink-api/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "yolink-api"; - version = "0.0.6"; + version = "0.0.8"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "YoSmart-Inc"; repo = pname; rev = "v${version}"; - hash = "sha256-e0WeQdxQYwaklXOlyUc22NvJraY/eG6HCLsI6/+A6vg="; + hash = "sha256-jKyugylgV9B8+PxUPsz4YtQjCfhB8NA2BYMxJOqkIP8="; }; propagatedBuildInputs = [ |