diff options
Diffstat (limited to 'pkgs/development/python-modules')
234 files changed, 1776 insertions, 599 deletions
diff --git a/pkgs/development/python-modules/aardwolf/default.nix b/pkgs/development/python-modules/aardwolf/default.nix index 3b92fc06a91..add8b364591 100644 --- a/pkgs/development/python-modules/aardwolf/default.nix +++ b/pkgs/development/python-modules/aardwolf/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { pname = "aardwolf"; - version = "0.2.7"; + version = "0.2.8"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -33,14 +33,14 @@ buildPythonPackage rec { owner = "skelsec"; repo = "aardwolf"; rev = "refs/tags/${version}"; - hash = "sha256-xz3461QgZ2tySj2cTlKQ5faYQDSECvbk1U6QCbzM86w="; + hash = "sha256-4kJsW0uwWfcgVruEdDw3QhbzfPDuLjmK+YvcLrgF4SI="; }; cargoDeps = rustPlatform.fetchCargoTarball { inherit src; sourceRoot = "${src.name}/aardwolf/utils/rlers"; name = "${pname}-${version}"; - hash = "sha256-JGXTCCyC20EuUX0pP3xSZG3qFB5jRL7+wW2YRC3EiCc="; + hash = "sha256-i7fmdWOseRQGdvdBnlGi+lgWvhC2WFI2FwXU9JywYsc="; }; cargoRoot = "aardwolf/utils/rlers"; diff --git a/pkgs/development/python-modules/adafruit-platformdetect/default.nix b/pkgs/development/python-modules/adafruit-platformdetect/default.nix index 11c01fe8dbb..7bd3f7b403c 100644 --- a/pkgs/development/python-modules/adafruit-platformdetect/default.nix +++ b/pkgs/development/python-modules/adafruit-platformdetect/default.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { pname = "adafruit-platformdetect"; - version = "3.52.1"; + version = "3.52.3"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "Adafruit-PlatformDetect"; inherit version; - hash = "sha256-iAz+cGFUZWJIHNEzQyGjJkwVj9GOK8onHTO8t3bs13g="; + hash = "sha256-5JEnsTvY4PgAuaoIyTHriJVJUPAHMYETgqbhAuAPJcI="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; diff --git a/pkgs/development/python-modules/aesara/default.nix b/pkgs/development/python-modules/aesara/default.nix index 4e1435133f7..0362b5b3d4c 100644 --- a/pkgs/development/python-modules/aesara/default.nix +++ b/pkgs/development/python-modules/aesara/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { pname = "aesara"; - version = "2.9.1"; + version = "2.9.2"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -32,7 +32,7 @@ buildPythonPackage rec { owner = "aesara-devs"; repo = "aesara"; rev = "refs/tags/rel-${version}"; - hash = "sha256-eanFkEiuPzm4InLd9dFmoLs/IOofObn9NIzaqzINdMQ="; + hash = "sha256-6SZHr81OiqzKh977RrJtrDvFlAIjguK+1imP3bjxhS8="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/ailment/default.nix b/pkgs/development/python-modules/ailment/default.nix index 1eeb2c2e7b2..b4113b9f2e7 100644 --- a/pkgs/development/python-modules/ailment/default.nix +++ b/pkgs/development/python-modules/ailment/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "ailment"; - version = "9.2.68"; + version = "9.2.69"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "angr"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-dQ4N1ixqcX+pHm6BIykISiHyao5kxJP+pFFqFV8+Ah0="; + hash = "sha256-qoewPYu4BO5VZq3MXg0j+L58dTusaoqrsrHo6stepJQ="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/aiohttp-remotes/default.nix b/pkgs/development/python-modules/aiohttp-remotes/default.nix index ae0cbf99841..66f81b12329 100644 --- a/pkgs/development/python-modules/aiohttp-remotes/default.nix +++ b/pkgs/development/python-modules/aiohttp-remotes/default.nix @@ -2,6 +2,7 @@ , aiohttp , buildPythonPackage , fetchPypi +, flit , pytest-aiohttp , pytestCheckHook , pythonOlder @@ -11,7 +12,7 @@ buildPythonPackage rec { pname = "aiohttp-remotes"; version = "1.2.0"; - format = "flit"; + format = "pyproject"; disabled = pythonOlder "3.6"; @@ -21,6 +22,10 @@ buildPythonPackage rec { sha256 = "f95c3a6be5e2de746a85ce9af49ec548da6db8378d7e81bb171ec77b13562a6c"; }; + nativeBuildInputs = [ + flit + ]; + propagatedBuildInputs = [ aiohttp ] ++ lib.optionals (pythonOlder "3.7") [ diff --git a/pkgs/development/python-modules/aioprocessing/default.nix b/pkgs/development/python-modules/aioprocessing/default.nix index b09accb38b7..4a66a8f35d0 100644 --- a/pkgs/development/python-modules/aioprocessing/default.nix +++ b/pkgs/development/python-modules/aioprocessing/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "aioprocessing"; version = "2.0.1"; - format = "flit"; + format = "pyproject"; disabled = pythonOlder "3.5"; diff --git a/pkgs/development/python-modules/aiorun/default.nix b/pkgs/development/python-modules/aiorun/default.nix index 20271236723..f0e63e0ae37 100644 --- a/pkgs/development/python-modules/aiorun/default.nix +++ b/pkgs/development/python-modules/aiorun/default.nix @@ -2,6 +2,8 @@ , buildPythonPackage , fetchFromGitHub , pythonOlder +, fetchpatch +, flit-core , pygments , pytestCheckHook , uvloop @@ -10,7 +12,7 @@ buildPythonPackage rec { pname = "aiorun"; version = "2023.7.2"; - format = "flit"; + format = "pyproject"; disabled = pythonOlder "3.7"; @@ -21,6 +23,18 @@ buildPythonPackage rec { hash = "sha256-3AGsT8IUNi5SZHBsBfd7akj8eQ+xb0mrR7ydIr3T8gs="; }; + patches = [ + # Raise flit-core version constrains + (fetchpatch { # https://github.com/cjrh/aiorun/pull/85 + url = "https://github.com/cjrh/aiorun/commit/a0c027ea331167712738e35ca70fefcd794e16d5.patch"; + hash = "sha256-M1rcrkdFcoFa3IncPnJaRhnXbelyk56QnMGtmgB6bvk="; + }) + ]; + + nativeBuildInputs = [ + flit-core + ]; + propagatedBuildInputs = [ pygments ]; diff --git a/pkgs/development/python-modules/aiovodafone/default.nix b/pkgs/development/python-modules/aiovodafone/default.nix index 2a6c040afef..77d49474378 100644 --- a/pkgs/development/python-modules/aiovodafone/default.nix +++ b/pkgs/development/python-modules/aiovodafone/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "aiovodafone"; - version = "0.2.0"; + version = "0.2.1"; format = "pyproject"; disabled = pythonOlder "3.10"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "chemelli74"; repo = "aiovodafone"; rev = "refs/tags/v${version}"; - hash = "sha256-KIYVGPJSOWEWXuYQXmRgtXwL3kI371jvx7vbfTni2jI="; + hash = "sha256-fBGVXYHyC7Ek75KgmH9LCCgETGvHnS9WF1QJMbDtfVc="; }; postPatch = '' diff --git a/pkgs/development/python-modules/amaranth-soc/default.nix b/pkgs/development/python-modules/amaranth-soc/default.nix index e90137ba22b..685d63414ec 100644 --- a/pkgs/development/python-modules/amaranth-soc/default.nix +++ b/pkgs/development/python-modules/amaranth-soc/default.nix @@ -8,15 +8,15 @@ buildPythonPackage rec { pname = "amaranth-soc"; - version = "unstable-2021-12-10"; + version = "unstable-2023-09-15"; # python setup.py --version - realVersion = "0.1.dev49+g${lib.substring 0 7 src.rev}"; + realVersion = "0.1.dev70+g${lib.substring 0 7 src.rev}"; src = fetchFromGitHub { owner = "amaranth-lang"; repo = "amaranth-soc"; - rev = "217d4ea76ad3b3bbf146980d168bc7b3b9d95a18"; - sha256 = "dMip82L7faUn16RDeG3NgMv0nougpwTwDWLX0doD2YA="; + rev = "cce8a79a37498f4d5900be21a295ba77e51e6c9d"; + sha256 = "sha256-hfkJaqICuy3iSTwLM9lbUPvSMDBLW8GdxqswyAOsowo="; }; nativeBuildInputs = [ setuptools-scm ]; diff --git a/pkgs/development/python-modules/amaranth/default.nix b/pkgs/development/python-modules/amaranth/default.nix index 713f886d7df..ad2cacb2ced 100644 --- a/pkgs/development/python-modules/amaranth/default.nix +++ b/pkgs/development/python-modules/amaranth/default.nix @@ -2,9 +2,7 @@ , buildPythonPackage , pythonOlder , fetchFromGitHub -, fetchpatch -, setuptools -, setuptools-scm +, pdm-backend , pyvcd , jinja2 , importlib-resources @@ -20,52 +18,26 @@ buildPythonPackage rec { pname = "amaranth"; - version = "0.3"; - # python setup.py --version - realVersion = "0.3"; - disabled = pythonOlder "3.6"; + format = "pyproject"; + # python -m setuptools_scm + version = "0.4.dev197+g${lib.substring 0 7 src.rev}"; + disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "amaranth-lang"; repo = "amaranth"; - rev = "39a83f4d995d16364cc9b99da646ff8db6394166"; - sha256 = "P9AG3t30eGeeCN5+t7mjhRoOWIGZVzWQji9eYXphjA0="; + rev = "11d5bb19eb34463918c07dc5e2e0eac7dbf822b0"; + sha256 = "sha256-Ji5oYfF2hKSunAdAQTniv8Ajj6NE/bvW5cvadrGKa+U="; }; - patches = [ - (fetchpatch { - name = "fix-for-setuptools-64.0.2-preparation.patch"; - url = "https://github.com/amaranth-lang/amaranth/commit/64771a065a280fa683c1e6692383bec4f59f20fa.patch"; - hash = "sha256-Rsh9vVvUQj9nIcrsRirmR6XwFrfZ2VMaYJ4RCQ8sBE0="; - # This commit removes support for Python 3.6, which is unnecessary to fix - # the build when using new setuptools. Include only one file, which has a - # harmless comment change so that the subsequent patch applies cleanly. - includes = ["amaranth/_toolchain/cxx.py"]; - }) - (fetchpatch { - name = "fix-for-setuptools-64.0.2.patch"; - url = "https://github.com/amaranth-lang/amaranth/pull/722/commits/e5a56b07c568e5f4cc2603eefebd14c5cc4e13d8.patch"; - hash = "sha256-C8FyMSKHA7XsEMpO9eYNZx/X5rGaK7p3eXP+jSb6wVg="; - }) - (fetchpatch { - name = "add-python-3.11-support.patch"; - url = "https://github.com/amaranth-lang/amaranth/commit/851546bf2d16db62663d7002bece51f07078d0a5.patch"; - hash = "sha256-eetlFCLqmpCfTKViD16OScJbkql1yhdi5uJGnfnpcCE="; - }) - ]; - - SETUPTOOLS_SCM_PRETEND_VERSION="${realVersion}"; - nativeBuildInputs = [ git - setuptools - setuptools-scm + pdm-backend ]; propagatedBuildInputs = [ jinja2 pyvcd - setuptools ] ++ lib.optional (pythonOlder "3.9") importlib-resources ++ lib.optional (pythonOlder "3.8") importlib-metadata; @@ -77,17 +49,6 @@ buildPythonPackage rec { yosys ]; - postPatch = '' - substituteInPlace setup.py \ - --replace "Jinja2~=2.11" "Jinja2>=2.11" \ - --replace "pyvcd~=0.2.2" "pyvcd" \ - --replace "amaranth-yosys>=0.10.*" "amaranth-yosys>=0.10" - - # jinja2.contextfunction was removed in jinja2 v3.1 - substituteInPlace amaranth/build/plat.py \ - --replace "@jinja2.contextfunction" "@jinja2.pass_context" - ''; - pythonImportsCheck = [ "amaranth" ]; meta = with lib; { diff --git a/pkgs/development/python-modules/angr/default.nix b/pkgs/development/python-modules/angr/default.nix index 26a988a7632..e3e787df1cd 100644 --- a/pkgs/development/python-modules/angr/default.nix +++ b/pkgs/development/python-modules/angr/default.nix @@ -32,7 +32,7 @@ buildPythonPackage rec { pname = "angr"; - version = "9.2.68"; + version = "9.2.69"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -41,7 +41,7 @@ buildPythonPackage rec { owner = pname; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-+RDsYDROIbcuXl5q45T6lFzDpObWduOK9paDBALbImg="; + hash = "sha256-6I8ybszEIWVtIVNPxkxP7W5jHH66XaaGZ5yF59CXBAc="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/anywidget/default.nix b/pkgs/development/python-modules/anywidget/default.nix index f96ef47e733..b4c29745e55 100644 --- a/pkgs/development/python-modules/anywidget/default.nix +++ b/pkgs/development/python-modules/anywidget/default.nix @@ -14,14 +14,14 @@ buildPythonPackage rec { pname = "anywidget"; - version = "0.6.3"; + version = "0.6.5"; format = "pyproject"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-OUKxmYceEKURJeQTVI7oLT4SdZM90V7BoZf0UykkEV4="; + hash = "sha256-prriSqvy2S9URnXfTEY88lssU71/cV38egSIqnLHE+Q="; }; # We do not need the jupyterlab build dependency, because we do not need to diff --git a/pkgs/development/python-modules/appthreat-vulnerability-db/default.nix b/pkgs/development/python-modules/appthreat-vulnerability-db/default.nix index 1e5cd61aff4..647a77e035a 100644 --- a/pkgs/development/python-modules/appthreat-vulnerability-db/default.nix +++ b/pkgs/development/python-modules/appthreat-vulnerability-db/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "appthreat-vulnerability-db"; - version = "5.4.2"; + version = "5.4.3"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = "AppThreat"; repo = "vulnerability-db"; rev = "refs/tags/v${version}"; - hash = "sha256-S0ebTM7X21Lny9Y1JG7ztv/H5gUjxXxNOQIIBTGFB7c="; + hash = "sha256-hALpNLXPg2Apha3KbEixFEH3NuzLe6lnEy9V5otskDM="; }; postPatch = '' diff --git a/pkgs/development/python-modules/archinfo/default.nix b/pkgs/development/python-modules/archinfo/default.nix index 9b489ef8e73..967ddc9587f 100644 --- a/pkgs/development/python-modules/archinfo/default.nix +++ b/pkgs/development/python-modules/archinfo/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "archinfo"; - version = "9.2.68"; + version = "9.2.69"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "angr"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-rbhzqp8PaotOt5d4E8hqWTwDRsG+hm7sVjBDkkblaIU="; + hash = "sha256-VvTUIFJ5XCo+iGKofv6aMhBS3To1uyWgwEsGXz2bOwE="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/argilla/default.nix b/pkgs/development/python-modules/argilla/default.nix index 4ef9c171d2b..82d79c2396d 100644 --- a/pkgs/development/python-modules/argilla/default.nix +++ b/pkgs/development/python-modules/argilla/default.nix @@ -65,7 +65,7 @@ }: let pname = "argilla"; - version = "1.15.0"; + version = "1.16.0"; optional-dependencies = { server = [ fastapi @@ -126,7 +126,7 @@ buildPythonPackage { owner = "argilla-io"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-CEB2Q+8JJmYWeqKS1QuOysedCSuPWXcljlmaclwZzmY="; + hash = "sha256-SKxIc7T9wmMMGQeebcRVOrB4Y5ETz9LSeKzzqI+wf80="; }; pythonRelaxDeps = [ diff --git a/pkgs/development/python-modules/argon2-cffi/default.nix b/pkgs/development/python-modules/argon2-cffi/default.nix index 24e32526682..2282a06e5c6 100644 --- a/pkgs/development/python-modules/argon2-cffi/default.nix +++ b/pkgs/development/python-modules/argon2-cffi/default.nix @@ -6,6 +6,7 @@ , wheel , buildPythonPackage , fetchPypi +, flit-core , isPy3k , lib , stdenv @@ -15,13 +16,17 @@ buildPythonPackage rec { pname = "argon2-cffi"; version = "21.3.0"; - format = "flit"; + format = "pyproject"; src = fetchPypi { inherit pname version; sha256 = "d384164d944190a7dd7ef22c6aa3ff197da12962bd04b17f64d4e93d934dba5b"; }; + nativeBuildInputs = [ + flit-core + ]; + propagatedBuildInputs = [ cffi six argon2-cffi-bindings ] ++ lib.optional (!isPy3k) enum34; diff --git a/pkgs/development/python-modules/art/default.nix b/pkgs/development/python-modules/art/default.nix index 669b81032be..2bf6f51cd16 100644 --- a/pkgs/development/python-modules/art/default.nix +++ b/pkgs/development/python-modules/art/default.nix @@ -5,14 +5,14 @@ buildPythonPackage rec { pname = "art"; - version = "6.0"; + version = "6.1"; format = "setuptools"; src = fetchFromGitHub { owner = "sepandhaghighi"; repo = "art"; rev = "v${version}"; - hash = "sha256-ZF7UvqJU7KxNccMXL7tsL/s5KYpgGeGqaEATHo4WyNI="; + hash = "sha256-RJexYOGWwAwxQ7lWGgXzFSR2aly1twB9pC4QFs5m7k8="; }; pythonImportsCheck = [ "art" ]; diff --git a/pkgs/development/python-modules/asdf/default.nix b/pkgs/development/python-modules/asdf/default.nix index 0363eae2919..f4a45ecaf9a 100644 --- a/pkgs/development/python-modules/asdf/default.nix +++ b/pkgs/development/python-modules/asdf/default.nix @@ -94,5 +94,7 @@ buildPythonPackage rec { homepage = "https://github.com/asdf-format/asdf"; license = licenses.bsd3; maintainers = with maintainers; [ ]; + # Many tests fail, according to Hydra + broken = true; }; } diff --git a/pkgs/development/python-modules/astropy-extension-helpers/default.nix b/pkgs/development/python-modules/astropy-extension-helpers/default.nix index 0077cfdde15..d02ed123615 100644 --- a/pkgs/development/python-modules/astropy-extension-helpers/default.nix +++ b/pkgs/development/python-modules/astropy-extension-helpers/default.nix @@ -1,6 +1,7 @@ { lib , buildPythonPackage , fetchPypi +, fetchpatch , findutils , pytestCheckHook , pythonOlder @@ -11,23 +12,31 @@ buildPythonPackage rec { pname = "extension-helpers"; - version = "1.0.0"; + version = "1.1.0"; format = "pyproject"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "ca1bfac67c79cf4a7a0c09286ce2a24eec31bf17715818d0726318dd0e5050e6"; + hash = "sha256-SUYMeKP40fjOwXRHn16FrURZSMzEFgM8WqPm3fLFAik="; }; + patches = [ + # Not needed to allow this package to build, but meant for it's dependent + # packages, like astropy. See explanation at: + # https://github.com/astropy/extension-helpers/pull/59 + (fetchpatch { + url = "https://github.com/astropy/extension-helpers/commit/796f3e7831298df2d26b6d994b13fd57061a56d1.patch"; + hash = "sha256-NnqK9HQq1hQ66RUJf9gTCuLyA0BVqVtL292mSXJ9860="; + }) + ]; + nativeBuildInputs = [ setuptools-scm wheel ]; - patches = [ ./permissions.patch ]; - nativeCheckInputs = [ findutils pip diff --git a/pkgs/development/python-modules/astropy-extension-helpers/permissions.patch b/pkgs/development/python-modules/astropy-extension-helpers/permissions.patch deleted file mode 100644 index cef74b33603..00000000000 --- a/pkgs/development/python-modules/astropy-extension-helpers/permissions.patch +++ /dev/null @@ -1,20 +0,0 @@ -diff --git a/extension_helpers/_setup_helpers.py b/extension_helpers/_setup_helpers.py -index ec3e547..e2419f7 100644 ---- a/extension_helpers/_setup_helpers.py -+++ b/extension_helpers/_setup_helpers.py -@@ -79,8 +79,13 @@ def get_extensions(srcdir='.'): - if len(ext_modules) > 0: - main_package_dir = min(packages, key=len) - src_path = os.path.join(os.path.dirname(__file__), 'src') -- shutil.copy(os.path.join(src_path, 'compiler.c'), -- os.path.join(srcdir, main_package_dir, '_compiler.c')) -+ a = os.path.join(src_path, 'compiler.c') -+ b = os.path.join(srcdir, main_package_dir, '_compiler.c') -+ try: -+ os.unlink(b) -+ except OSError: -+ pass -+ shutil.copy(a, b) - ext = Extension(main_package_dir + '.compiler_version', - [os.path.join(main_package_dir, '_compiler.c')]) - ext_modules.append(ext) diff --git a/pkgs/development/python-modules/astropy/default.nix b/pkgs/development/python-modules/astropy/default.nix index 2176a6ff1fc..8ee70bf6404 100644 --- a/pkgs/development/python-modules/astropy/default.nix +++ b/pkgs/development/python-modules/astropy/default.nix @@ -1,5 +1,6 @@ { lib , fetchPypi +, fetchpatch , buildPythonPackage , pythonOlder @@ -10,6 +11,11 @@ , oldest-supported-numpy , setuptools-scm , wheel +# testing +, pytestCheckHook +, pytest-xdist +, pytest-astropy +, python # runtime , numpy @@ -18,21 +24,30 @@ , pyyaml }: -let +buildPythonPackage rec { pname = "astropy"; - version = "5.2.1"; -in -buildPythonPackage { - inherit pname version; + version = "5.3.3"; format = "pyproject"; disabled = pythonOlder "3.8"; # according to setup.cfg src = fetchPypi { inherit pname version; - hash = "sha256-9q4noHf46oSQPvp2x5C5hWFzQaAISw0hw5H3o/MyrCM="; + hash = "sha256-AzDfn116IlQ2fpuM9EJVuhBwsGEjGIxqcu3BgEk/k7s="; }; + patches = [ + # Fixes running tests in parallel issue + # https://github.com/astropy/astropy/issues/15316. Fix from + # https://github.com/astropy/astropy/pull/15327 + (fetchpatch { + url = "https://github.com/astropy/astropy/commit/1042c0fb06a992f683bdc1eea2beda0b846ed356.patch"; + hash = "sha256-bApAcGBRrJ94thhByoYvdqw2e6v77+FmTfgmGcE6MMk="; + }) + ]; + # Relax cython dependency to allow this to build, upstream only doesn't + # support cython 3 as of writing. See: + # https://github.com/astropy/astropy/issues/15315 postPatch = '' substituteInPlace pyproject.toml \ --replace 'cython==' 'cython>=' @@ -54,14 +69,28 @@ buildPythonPackage { pyyaml ]; - # infinite recursion with pytest-astropy (pytest-astropy-header depends on astropy itself) - doCheck = false; + nativeCheckInputs = [ + pytestCheckHook + pytest-xdist + pytest-astropy + ]; + + # Not running it inside the build directory. See: + # https://github.com/astropy/astropy/issues/15316#issuecomment-1722190547 + preCheck = '' + cd "$out" + export HOME="$(mktemp -d)" + export OMP_NUM_THREADS=$(( $NIX_BUILD_CORES / 4 )) + ''; + pythonImportsCheck = [ + "astropy" + ]; - meta = with lib; { + meta = { description = "Astronomy/Astrophysics library for Python"; homepage = "https://www.astropy.org"; - license = licenses.bsd3; - platforms = platforms.all; - maintainers = [ maintainers.kentjames ]; + license = lib.licenses.bsd3; + platforms = lib.platforms.all; + maintainers = with lib.maintainers; [ kentjames doronbehar ]; }; } diff --git a/pkgs/development/python-modules/astroquery/default.nix b/pkgs/development/python-modules/astroquery/default.nix index 67bee933c0d..7b5a24378dd 100644 --- a/pkgs/development/python-modules/astroquery/default.nix +++ b/pkgs/development/python-modules/astroquery/default.nix @@ -66,6 +66,8 @@ buildPythonPackage rec { description = "Functions and classes to access online data resources"; homepage = "https://astroquery.readthedocs.io/"; license = licenses.bsd3; + # Broken since a certain astropy update, due to API incompatibility + broken = true; maintainers = [ maintainers.smaret ]; }; } diff --git a/pkgs/development/python-modules/asyncinotify/default.nix b/pkgs/development/python-modules/asyncinotify/default.nix index 9257e12f721..9049a228518 100644 --- a/pkgs/development/python-modules/asyncinotify/default.nix +++ b/pkgs/development/python-modules/asyncinotify/default.nix @@ -1,13 +1,14 @@ { lib , buildPythonPackage , fetchFromGitLab +, flit-core , python }: buildPythonPackage rec { pname = "asyncinotify"; version = "4.0.2"; - format = "flit"; + format = "pyproject"; src = fetchFromGitLab { owner = "Taywee"; @@ -16,6 +17,10 @@ buildPythonPackage rec { hash = "sha256-Q7b406UENCmD9SGbaml+y2YLDi7VLZBmDkYMo8CLuVw="; }; + nativeBuildInputs = [ + flit-core + ]; + checkPhase = '' ${python.pythonForBuild.interpreter} ${src}/test.py ''; diff --git a/pkgs/development/python-modules/asyncstdlib/default.nix b/pkgs/development/python-modules/asyncstdlib/default.nix index 4d27c6da882..8cd6af449f9 100644 --- a/pkgs/development/python-modules/asyncstdlib/default.nix +++ b/pkgs/development/python-modules/asyncstdlib/default.nix @@ -2,6 +2,7 @@ , buildPythonPackage , fetchFromGitHub , typing-extensions +, flit-core , pytestCheckHook , pythonOlder }: @@ -9,7 +10,7 @@ buildPythonPackage rec { pname = "asyncstdlib"; version = "3.10.8"; - format = "flit"; + format = "pyproject"; disabled = pythonOlder "3.7"; @@ -20,6 +21,10 @@ buildPythonPackage rec { hash = "sha256-7HQFyIR+NWRzbFkzkZiuEQotZfCXpCzrWfWIFg1lWv4="; }; + nativeBuildInputs = [ + flit-core + ]; + propagatedBuildInputs = [ typing-extensions ]; diff --git a/pkgs/development/python-modules/autofaiss/default.nix b/pkgs/development/python-modules/autofaiss/default.nix index aad226fa745..eddea783def 100644 --- a/pkgs/development/python-modules/autofaiss/default.nix +++ b/pkgs/development/python-modules/autofaiss/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "autofaiss"; - version = "2.15.5"; + version = "2.15.8"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "criteo"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-IcAlvFlCERnw1UQWPRpSWpscOuPx0wd1MXOfoXZhvCU="; + hash = "sha256-vB906xbpEjNNzc8Dc8i3ENgl9lCPOgB9vs7QVRS7UcM="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/automx2/default.nix b/pkgs/development/python-modules/automx2/default.nix new file mode 100644 index 00000000000..cfc3a8484b6 --- /dev/null +++ b/pkgs/development/python-modules/automx2/default.nix @@ -0,0 +1,46 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, flask +, flask-migrate +, ldap3 +, pytestCheckHook +, pythonOlder +}: + +buildPythonPackage rec { + pname = "automx2"; + version = "unstable-2023-08-23"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "rseichter"; + repo = pname; + rev = "f3e3fc8e769c3799361001d51b7d9335a6a9d1a8"; + hash = "sha256-NkeazjjGDYUXfoydvEfww6e7SkSZ8rMRlML+oOaf374="; + }; + + propagatedBuildInputs = [ + flask + flask-migrate + ldap3 + ]; + + nativeCheckInputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ + "automx2" + ]; + + meta = with lib; { + description = "Email client configuration made easy"; + homepage = "https://rseichter.github.io/automx2/"; + changelog = "https://github.com/rseichter/automx2/blob/${version}/CHANGELOG"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ twey ]; + }; +} diff --git a/pkgs/development/python-modules/aws-encryption-sdk/default.nix b/pkgs/development/python-modules/aws-encryption-sdk/default.nix new file mode 100644 index 00000000000..6088e22e80d --- /dev/null +++ b/pkgs/development/python-modules/aws-encryption-sdk/default.nix @@ -0,0 +1,54 @@ +{ lib +, buildPythonPackage +, fetchPypi +, attrs +, boto3 +, cryptography +, setuptools +, wrapt +, mock +, pytest +, pytest-mock +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "aws-encryption-sdk"; + version = "3.1.1"; + + src = fetchPypi { + inherit pname version; + hash = "sha256-jV+/AY/GjWscrL5N0Df9gFKWx3Nqn+RX62hNBT9/lWM="; + }; + + propagatedBuildInputs = [ + attrs + boto3 + cryptography + setuptools + wrapt + ]; + + doCheck = true; + + nativeCheckInputs = [ + mock + pytest + pytest-mock + pytestCheckHook + ]; + + disabledTestPaths = [ + # requires networking + "examples" + "test/integration" + ]; + + meta = with lib; { + homepage = "https://aws-encryption-sdk-python.readthedocs.io/"; + changelog = "https://github.com/aws/aws-encryption-sdk-python/blob/v${version}/CHANGELOG.rst"; + description = "Fully compliant, native Python implementation of the AWS Encryption SDK."; + license = licenses.apsl20; + maintainers = with maintainers; [ anthonyroussel ]; + }; +} diff --git a/pkgs/development/python-modules/azure-data-tables/default.nix b/pkgs/development/python-modules/azure-data-tables/default.nix index b09102eaf0f..783a792513b 100644 --- a/pkgs/development/python-modules/azure-data-tables/default.nix +++ b/pkgs/development/python-modules/azure-data-tables/default.nix @@ -1,33 +1,43 @@ { lib +, azure-core , buildPythonPackage , fetchPypi -, azure-core -, msrest +, isodate +, pythonOlder +, typing-extensions +, yarl }: buildPythonPackage rec { pname = "azure-data-tables"; - version = "12.4.3"; + version = "12.4.4"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - extension = "zip"; - hash = "sha256-qLA0vNRyIu36xKwB55BD/TCTOv+nmyOtk3+Y4P+SalI="; + hash = "sha256-HWjIQBWYmU43pSxKLcwx45EExn10jeEkyY9Hpbyn0vw="; }; propagatedBuildInputs = [ azure-core - msrest + isodate + typing-extensions + yarl ]; - # has no tests + # Module has no tests doCheck = false; - pythonImportsCheck = [ "azure.data.tables" ]; + pythonImportsCheck = [ + "azure.data.tables" + ]; meta = with lib; { description = "NoSQL data storage service that can be accessed from anywhere"; homepage = "https://github.com/Azure/azure-sdk-for-python"; + changelog = "https://github.com/Azure/azure-sdk-for-python/blob/azure-data-tables_${version}/sdk/tables/azure-data-tables/CHANGELOG.md"; license = licenses.mit; maintainers = with maintainers; [ jonringer ]; }; diff --git a/pkgs/development/python-modules/azure-eventgrid/default.nix b/pkgs/development/python-modules/azure-eventgrid/default.nix index 3913fc84b3f..56d27d60d26 100644 --- a/pkgs/development/python-modules/azure-eventgrid/default.nix +++ b/pkgs/development/python-modules/azure-eventgrid/default.nix @@ -1,34 +1,34 @@ { lib -, buildPythonPackage -, fetchPypi -, msrest , azure-common , azure-core -, msrestazure +, buildPythonPackage +, fetchPypi +, isodate , pythonOlder +, typing-extensions }: buildPythonPackage rec { pname = "azure-eventgrid"; - version = "4.13.0"; + version = "4.14.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - extension = "zip"; - hash = "sha256-Za/cyt/tCvzLTfIgS5Ifjbb9jPtdCojNzzI5WeBiO6I="; + hash = "sha256-Nati9XRCNJgt/cmhj2t1l+oijsR6SC1UVZ35VANd0l8="; }; propagatedBuildInputs = [ azure-common azure-core - msrest - msrestazure + isodate + ] ++ lib.optionals (pythonOlder "3.8") [ + typing-extensions ]; - # has no tests + # Module has no tests doCheck = false; pythonImportsCheck = [ @@ -38,6 +38,7 @@ buildPythonPackage rec { meta = with lib; { description = "A fully-managed intelligent event routing service that allows for uniform event consumption using a publish-subscribe model"; homepage = "https://github.com/Azure/azure-sdk-for-python"; + changelog = "https://github.com/Azure/azure-sdk-for-python/blob/azure-eventgrid_${version}/sdk/eventgrid/azure-eventgrid/CHANGELOG.md"; license = licenses.mit; maintainers = with maintainers; [ maxwilson ]; }; diff --git a/pkgs/development/python-modules/azure-mgmt-compute/default.nix b/pkgs/development/python-modules/azure-mgmt-compute/default.nix index 5a3cb3a370f..67e7acde59a 100644 --- a/pkgs/development/python-modules/azure-mgmt-compute/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-compute/default.nix @@ -1,36 +1,38 @@ { lib -, buildPythonPackage -, fetchPypi , azure-mgmt-common , azure-mgmt-core +, buildPythonPackage +, fetchPypi , isodate , pythonOlder +, typing-extensions }: buildPythonPackage rec { pname = "azure-mgmt-compute"; - version = "30.1.0"; + version = "30.2.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - extension = "zip"; - hash = "sha256-pWN525DU4kwHi8h0XQ5fdzIp+e8GfNcSwQ+qmIYVp1s="; + hash = "sha256-pd1tAbhn1ot2sAM+x8yKGgEpCtlp7vVyCAcAzMZhyYE="; }; propagatedBuildInputs = [ azure-mgmt-common azure-mgmt-core isodate + ] ++ lib.optionals (pythonOlder "3.8") [ + typing-extensions ]; pythonNamespaces = [ "azure.mgmt" ]; - # has no tests + # Module has no tests doCheck = false; pythonImportsCheck = [ @@ -40,6 +42,7 @@ buildPythonPackage rec { meta = with lib; { description = "This is the Microsoft Azure Compute Management Client Library"; homepage = "https://github.com/Azure/azure-sdk-for-python"; + changelog = "https://github.com/Azure/azure-sdk-for-python/blob/azure-mgmt-compute_${version}/sdk/compute/azure-mgmt-compute/CHANGELOG.md"; license = licenses.mit; maintainers = with maintainers; [ olcai maxwilson ]; }; diff --git a/pkgs/development/python-modules/azure-mgmt-iothub/default.nix b/pkgs/development/python-modules/azure-mgmt-iothub/default.nix index e4e3ae6374c..8890f65af3a 100644 --- a/pkgs/development/python-modules/azure-mgmt-iothub/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-iothub/default.nix @@ -1,40 +1,44 @@ { lib -, buildPythonPackage -, fetchPypi -, msrest -, msrestazure , azure-common , azure-mgmt-core -, azure-mgmt-nspkg +, buildPythonPackage +, fetchPypi +, isodate , pythonOlder +, typing-extensions }: buildPythonPackage rec { pname = "azure-mgmt-iothub"; - version = "2.4.0"; + version = "3.0.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - extension = "zip"; - hash = "sha256-enpNE5kVyGK+ctrGt1gt6633rNvT9FM76kSQ7prb1Wo="; + hash = "sha256-2vIfyYxoo1PsYWMYwOYr4EyNaJmWC+jCy/mRZzrItyI="; }; propagatedBuildInputs = [ azure-common azure-mgmt-core - msrest - msrestazure + isodate + ] ++ lib.optionals (pythonOlder "3.8") [ + typing-extensions ]; - # has no tests + # Module has no tests doCheck = false; + pythonImportsCheck = [ + "azure.mgmt.iothub" + ]; + meta = with lib; { description = "This is the Microsoft Azure IoTHub Management Client Library"; homepage = "https://github.com/Azure/azure-sdk-for-python"; + changelog = "https://github.com/Azure/azure-sdk-for-python/blob/azure-mgmt-iothub_${version}/sdk/iothub/azure-mgmt-iothub/CHANGELOG.md"; license = licenses.mit; maintainers = with maintainers; [ maxwilson ]; }; diff --git a/pkgs/development/python-modules/azure-mgmt-network/default.nix b/pkgs/development/python-modules/azure-mgmt-network/default.nix index 6d8e0896480..61e979ee10a 100644 --- a/pkgs/development/python-modules/azure-mgmt-network/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-network/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "azure-mgmt-network"; - version = "25.0.0"; + version = "25.1.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-rZPbkUQJFIeNSSPWHTK79INWeRX5+GJ7o7mEMLhyJ9E="; + hash = "sha256-+Tn3W/E54D0sRXpPB6XrrbWv/dcKpUvpoK9EuOUhMvw="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/azure-mgmt-recoveryservices/default.nix b/pkgs/development/python-modules/azure-mgmt-recoveryservices/default.nix index 0dcafd78877..5f6377d54ed 100644 --- a/pkgs/development/python-modules/azure-mgmt-recoveryservices/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-recoveryservices/default.nix @@ -1,32 +1,29 @@ { lib -, buildPythonPackage -, fetchPypi -, msrest -, msrestazure , azure-common , azure-mgmt-core +, buildPythonPackage +, fetchPypi +, isodate , pythonOlder , typing-extensions }: buildPythonPackage rec { pname = "azure-mgmt-recoveryservices"; - version = "2.4.0"; + version = "2.5.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - extension = "zip"; - hash = "sha256-2JeOvtNxx6Z3AY4GI9fBRKbMcYVHsbrhk8C+5t5eelk="; + hash = "sha256-XxowjEhYx5uD/4vY5hGSCSvcarmdbdc5Y2GLHciEurU="; }; propagatedBuildInputs = [ azure-common azure-mgmt-core - msrest - msrestazure + isodate ] ++ lib.optionals (pythonOlder "3.8") [ typing-extensions ]; @@ -41,6 +38,7 @@ buildPythonPackage rec { meta = with lib; { description = "This is the Microsoft Azure Recovery Services Client Library"; homepage = "https://github.com/Azure/azure-sdk-for-python"; + changelog = "https://github.com/Azure/azure-sdk-for-python/blob/azure-mgmt-recoveryservices_${version}/sdk/recoveryservices/azure-mgmt-recoveryservices/CHANGELOG.md"; license = licenses.mit; maintainers = with maintainers; [ maxwilson ]; }; diff --git a/pkgs/development/python-modules/azure-mgmt-redis/default.nix b/pkgs/development/python-modules/azure-mgmt-redis/default.nix index 8b0a71a324a..4bfbc40d7a4 100644 --- a/pkgs/development/python-modules/azure-mgmt-redis/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-redis/default.nix @@ -1,39 +1,44 @@ { lib -, buildPythonPackage -, fetchPypi -, msrest -, msrestazure , azure-common , azure-mgmt-core -, azure-mgmt-nspkg -, isPy3k +, buildPythonPackage +, fetchPypi +, isodate +, pythonOlder +, typing-extensions }: buildPythonPackage rec { pname = "azure-mgmt-redis"; - version = "14.2.0"; + version = "14.3.0"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - extension = "zip"; - hash = "sha256-u6PG1mx3iiiLssoLzOj5kxI2L3uvQMnWrEQY6MBJOtA="; + hash = "sha256-eoMbY4oNzYXkn3uFUhxecJQD+BxYkGTbWhAWSgAoLyA="; }; propagatedBuildInputs = [ - msrest - msrestazure + isodate azure-common azure-mgmt-core - ] ++ lib.optionals (!isPy3k) [ - azure-mgmt-nspkg + ] ++ lib.optionals (pythonOlder "3.8") [ + typing-extensions ]; - # has no tests + # Module has no tests doCheck = false; + pythonImportsCheck = [ + "azure.mgmt.redis" + ]; + meta = with lib; { description = "This is the Microsoft Azure Redis Cache Management Client Library"; homepage = "https://github.com/Azure/azure-sdk-for-python"; + changelog = "https://github.com/Azure/azure-sdk-for-python/blob/azure-mgmt-redis_${version}/sdk/redis/azure-mgmt-redis/CHANGELOG.md"; license = licenses.mit; maintainers = with maintainers; [ maxwilson ]; }; diff --git a/pkgs/development/python-modules/azure-servicebus/default.nix b/pkgs/development/python-modules/azure-servicebus/default.nix index abc9aa64b22..d57082feccd 100644 --- a/pkgs/development/python-modules/azure-servicebus/default.nix +++ b/pkgs/development/python-modules/azure-servicebus/default.nix @@ -4,32 +4,29 @@ , buildPythonPackage , fetchPypi , isodate -, msrestazure +, msrest , pythonOlder -, six , typing-extensions , uamqp }: buildPythonPackage rec { pname = "azure-servicebus"; - version = "7.11.1"; + version = "7.11.2"; format = "setuptools"; - disabled = pythonOlder "3.6"; + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - extension = "zip"; - hash = "sha256-iWbHtpFSiQTcpSQ6S8lrUWAi9kjesh1ZvKPVvNquxYU="; + hash = "sha256-0iKPBVxP6tP+vnU37QD8vDHeMsfULO02pxt6hg/RIw8="; }; propagatedBuildInputs = [ azure-common azure-core isodate - msrestazure - six + msrest typing-extensions uamqp ]; @@ -44,6 +41,7 @@ buildPythonPackage rec { meta = with lib; { description = "Microsoft Azure Service Bus Client Library"; homepage = "https://github.com/Azure/azure-sdk-for-python"; + changelog = "https://github.com/Azure/azure-sdk-for-python/blob/azure-servicebus_${version}/sdk/servicebus/azure-servicebus/CHANGELOG.md"; license = licenses.mit; maintainers = with maintainers; [ maxwilson ]; }; diff --git a/pkgs/development/python-modules/azure-storage-file-share/default.nix b/pkgs/development/python-modules/azure-storage-file-share/default.nix index 1582ea52bc9..3afaf383f45 100644 --- a/pkgs/development/python-modules/azure-storage-file-share/default.nix +++ b/pkgs/development/python-modules/azure-storage-file-share/default.nix @@ -1,36 +1,34 @@ { lib -, buildPythonPackage -, fetchPypi -, pythonOlder , azure-core +, buildPythonPackage , cryptography +, fetchPypi , isodate , msrest +, pythonOlder , typing-extensions }: buildPythonPackage rec { pname = "azure-storage-file-share"; - version = "12.13.0"; + version = "12.14.1"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - extension = "zip"; - hash = "sha256-ozqVIWPvAl0doaqK77P+VBhx9q+6Ljk/q7WrAP2ZPm8="; + hash = "sha256-f1vV13c/NEUYWZ0Tgha+CwpHZJ5AZWdbhFPrTmf5hGA="; }; propagatedBuildInputs = [ azure-core cryptography isodate - msrest typing-extensions ]; - # requires checkout from monorepo + # Tests require checkout from monorepo doCheck = false; pythonImportsCheck = [ @@ -41,6 +39,7 @@ buildPythonPackage rec { meta = with lib; { description = "Microsoft Azure File Share Storage Client Library for Python"; homepage = "https://github.com/Azure/azure-sdk-for-python"; + changelog = "https://github.com/Azure/azure-sdk-for-python/blob/azure-storage-file-share_${version}/sdk/storage/azure-storage-file-share/CHANGELOG.md"; license = licenses.mit; maintainers = with maintainers; [ kamadorueda ]; }; diff --git a/pkgs/development/python-modules/base64io/default.nix b/pkgs/development/python-modules/base64io/default.nix new file mode 100644 index 00000000000..8e5b121759f --- /dev/null +++ b/pkgs/development/python-modules/base64io/default.nix @@ -0,0 +1,29 @@ +{ lib +, buildPythonPackage +, fetchPypi +, mock +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "base64io"; + version = "1.0.3"; + + src = fetchPypi { + inherit pname version; + hash = "sha256-JPLQ/nZcNTOeGy0zqpX5E3sbdltZQWT60QFsFYJ6cHM="; + }; + + nativeCheckInputs = [ + mock + pytestCheckHook + ]; + + meta = with lib; { + homepage = "https://base64io-python.readthedocs.io/"; + changelog = "https://github.com/aws/base64io-python/blob/${version}/CHANGELOG.rst"; + description = "Python stream implementation for base64 encoding/decoding"; + license = licenses.apsl20; + maintainers = with maintainers; [ anthonyroussel ]; + }; +} diff --git a/pkgs/development/python-modules/bash_kernel/default.nix b/pkgs/development/python-modules/bash_kernel/default.nix index b7ccfedfbb8..582e7c5dccf 100644 --- a/pkgs/development/python-modules/bash_kernel/default.nix +++ b/pkgs/development/python-modules/bash_kernel/default.nix @@ -2,6 +2,7 @@ , buildPythonPackage , fetchPypi , fetchpatch +, flit-core , ipykernel , isPy27 , python @@ -12,7 +13,7 @@ buildPythonPackage rec { pname = "bash_kernel"; version = "0.9.0"; - format = "flit"; + format = "pyproject"; disabled = isPy27; src = fetchPypi { @@ -33,6 +34,8 @@ buildPythonPackage rec { --replace "\"bash\"" "'${bash}/bin/bash'" ''; + nativeBuildInputs = [ flit-core ]; + propagatedBuildInputs = [ ipykernel pexpect ]; # no tests diff --git a/pkgs/development/python-modules/bibtexparser/default.nix b/pkgs/development/python-modules/bibtexparser/default.nix index 065af5879a4..aef733f9387 100644 --- a/pkgs/development/python-modules/bibtexparser/default.nix +++ b/pkgs/development/python-modules/bibtexparser/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "bibtexparser"; - version = "1.4.0"; + version = "1.4.1"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "sciunto-org"; repo = "python-${pname}"; rev = "refs/tags/v${version}"; - hash = "sha256-dP3ETzgVPI4NsxFI6Hv+nUInrjF+I1FwdqmeAetzL38="; + hash = "sha256-YMkLSx7L2srLINZa6Ec0rPoxE2SdMv6CnI4BpHgHuzM="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/bids-validator/default.nix b/pkgs/development/python-modules/bids-validator/default.nix index 7412fb2077b..115c80553cc 100644 --- a/pkgs/development/python-modules/bids-validator/default.nix +++ b/pkgs/development/python-modules/bids-validator/default.nix @@ -6,14 +6,14 @@ buildPythonPackage rec { pname = "bids-validator"; - version = "1.12.0"; + version = "1.13.1"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-X569N5zfbTg+mDwQU5iGv16kiOTr8rwhKTEl9RCJMRY="; + hash = "sha256-cgXOTmj7oXIhUzLHhvGsFmUCW3Arbf8rHhWPAKLfmJA="; }; # needs packages which are not available in nixpkgs diff --git a/pkgs/development/python-modules/bleak-retry-connector/default.nix b/pkgs/development/python-modules/bleak-retry-connector/default.nix index 5e84af2a53b..8ee08646d1e 100644 --- a/pkgs/development/python-modules/bleak-retry-connector/default.nix +++ b/pkgs/development/python-modules/bleak-retry-connector/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "bleak-retry-connector"; - version = "3.1.3"; + version = "3.2.1"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "Bluetooth-Devices"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-Nd/9mUtEEhCiJSF677lsE5UhMrbWiIl3ktQ7FjtyYlQ="; + hash = "sha256-3dftk/C6g6Hclc/N8LlsYcZfxA1I6bMiXkzRcUg69Oc="; }; postPatch = '' diff --git a/pkgs/development/python-modules/boost-histogram/default.nix b/pkgs/development/python-modules/boost-histogram/default.nix index 6e461e15b82..ed29be91d81 100644 --- a/pkgs/development/python-modules/boost-histogram/default.nix +++ b/pkgs/development/python-modules/boost-histogram/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "boost-histogram"; - version = "1.3.2"; + version = "1.4.0"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -19,7 +19,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "boost_histogram"; inherit version; - hash = "sha256-4XXvvBBUonvFP7vpVHLKyeqTmZyR0GEYQNd2uZWI1Ro="; + hash = "sha256-z5gmz8/hAzUJa1emH2xlafZfAVklnusiUcW/MdhZ11M="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/botocore-stubs/default.nix b/pkgs/development/python-modules/botocore-stubs/default.nix index 2bd7f8e6d90..7b836f1f249 100644 --- a/pkgs/development/python-modules/botocore-stubs/default.nix +++ b/pkgs/development/python-modules/botocore-stubs/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "botocore-stubs"; - version = "1.31.40"; + version = "1.31.53"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -17,7 +17,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "botocore_stubs"; inherit version; - hash = "sha256-IAGiU9r0ri4XHmE3uZgqAKf7/HpTRJoWhW3ASefNUhQ="; + hash = "sha256-Ag7eB210DaUvzJ6tiwZB+2xVc/HXwX1hudnRRLOZBfg="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/cadquery/default.nix b/pkgs/development/python-modules/cadquery/default.nix index 15142e3d80e..1eb8f73b7a7 100644 --- a/pkgs/development/python-modules/cadquery/default.nix +++ b/pkgs/development/python-modules/cadquery/default.nix @@ -5,12 +5,11 @@ , pythonAtLeast , fetchFromGitHub , pyparsing -, opencascade +, opencascade-occt , stdenv , python , cmake , swig -, smesh , freetype , libGL , libGLU @@ -42,8 +41,7 @@ let buildInputs = [ python - opencascade - smesh + opencascade-occt freetype libGL libGLU @@ -57,9 +55,6 @@ let cmakeFlags = [ "-Wno-dev" "-DPYTHONOCC_INSTALL_DIRECTORY=${placeholder "out"}/${python.sitePackages}/OCC" - "-DSMESH_INCLUDE_PATH=${smesh}/include/smesh" - "-DSMESH_LIB_PATH=${smesh}/lib" - "-DPYTHONOCC_WRAP_SMESH=TRUE" ]; }); @@ -76,7 +71,7 @@ in }; buildInputs = [ - opencascade + opencascade-occt ]; propagatedBuildInputs = [ @@ -99,5 +94,6 @@ in homepage = "https://github.com/CadQuery/cadquery"; license = licenses.asl20; maintainers = with maintainers; [ marcus7070 ]; + broken = true; }; } diff --git a/pkgs/development/python-modules/certipy-ad/default.nix b/pkgs/development/python-modules/certipy-ad/default.nix index 175a454ab1e..a0411655c26 100644 --- a/pkgs/development/python-modules/certipy-ad/default.nix +++ b/pkgs/development/python-modules/certipy-ad/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { pname = "certipy-ad"; - version = "4.8.0"; + version = "4.8.1"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -27,7 +27,7 @@ buildPythonPackage rec { owner = "ly4k"; repo = "Certipy"; rev = "refs/tags/${version}"; - hash = "sha256-CyTwaCYhxUqvycZBKSzTWLKmKvebCNyE4vqTUnaX1V0="; + hash = "sha256-HgRUpltkai68tDkanXIOEdrJ4DJYDcbNk0op0enUAXU="; }; postPatch = '' diff --git a/pkgs/development/python-modules/checksumdir/default.nix b/pkgs/development/python-modules/checksumdir/default.nix new file mode 100644 index 00000000000..7492d168d8d --- /dev/null +++ b/pkgs/development/python-modules/checksumdir/default.nix @@ -0,0 +1,35 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, setuptools +, pythonOlder +}: + +buildPythonPackage rec { + pname = "checksumdir"; + version = "1.2.0"; + pyproject = true; + + disable = pythonOlder "3.6"; + + src = fetchFromGitHub { + owner = "to-mc"; + repo = "checksumdir"; + rev = version; + hash = "sha256-PO8sRGFQ1Dt/UYJuFH6Y3EaQVaS+4DJlOQtvF8ZmBWQ="; + }; + + nativeBuildInputs = [ + setuptools + ]; + + doCheck = false; # Package does not contain tests + pythonImportsCheck = [ "checksumdir" ]; + + meta = with lib; { + description = "Simple package to compute a single deterministic hash of the file contents of a directory"; + homepage = "https://github.com/to-mc/checksumdir"; + license = licenses.mit; + maintainers = with maintainers; [ mbalatsko ]; + }; +} diff --git a/pkgs/development/python-modules/chiavdf/default.nix b/pkgs/development/python-modules/chiavdf/default.nix index a2ed3295f01..acd5e4ea092 100644 --- a/pkgs/development/python-modules/chiavdf/default.nix +++ b/pkgs/development/python-modules/chiavdf/default.nix @@ -14,12 +14,12 @@ buildPythonPackage rec { pname = "chiavdf"; - version = "1.0.10"; - disabled = pythonOlder "3.7"; + version = "1.0.11"; + disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-660Frlaj6WbYOl0sfb5ox6qTzE+jKJR0Qka9nEijSyg="; + hash = "sha256-PjUgpMTdWLMFQdnrpeWmn8vA8SlORjmu52ODc/2hivE="; }; patches = [ diff --git a/pkgs/development/python-modules/circus/default.nix b/pkgs/development/python-modules/circus/default.nix index e5420f26c1a..90cf6a4be7f 100644 --- a/pkgs/development/python-modules/circus/default.nix +++ b/pkgs/development/python-modules/circus/default.nix @@ -1,6 +1,7 @@ { lib , buildPythonPackage , fetchPypi +, flit-core , psutil , pytestCheckHook , pyyaml @@ -11,13 +12,17 @@ buildPythonPackage rec { pname = "circus"; version = "0.18.0"; - format = "flit"; + format = "pyproject"; src = fetchPypi { inherit pname version; hash = "sha256-GTzoIk4GjO1mckz0gxBvtmdLUaV1g6waDn7Xp+6Mcas="; }; + nativeBuildInputs = [ + flit-core + ]; + propagatedBuildInputs = [ psutil pyzmq diff --git a/pkgs/development/python-modules/claripy/default.nix b/pkgs/development/python-modules/claripy/default.nix index cf74525d84e..1b9b0a9b616 100644 --- a/pkgs/development/python-modules/claripy/default.nix +++ b/pkgs/development/python-modules/claripy/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "claripy"; - version = "9.2.68"; + version = "9.2.69"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "angr"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-ZMXlCfeSt2Dcvuc0CdB27rfSIEIgvMS81s7nAbmw5QM="; + hash = "sha256-l1l4E0NES06ewf499vE9fmYuqAFaylRamDrJSkGEGMQ="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/cle/default.nix b/pkgs/development/python-modules/cle/default.nix index a808be461f8..5bb2a7db6e6 100644 --- a/pkgs/development/python-modules/cle/default.nix +++ b/pkgs/development/python-modules/cle/default.nix @@ -16,14 +16,14 @@ let # The binaries are following the argr projects release cycle - version = "9.2.68"; + version = "9.2.69"; # Binary files from https://github.com/angr/binaries (only used for testing and only here) binaries = fetchFromGitHub { owner = "angr"; repo = "binaries"; rev = "refs/tags/v${version}"; - hash = "sha256-03DyvPht4E4uysKqgyfu8hxu1qh+YzWsTI09E4ftiSs="; + hash = "sha256-AURNfPdmvMwVxYwLa60T7pJxKbGbTy3xeH/jm1Qdad0="; }; in @@ -38,7 +38,7 @@ buildPythonPackage rec { owner = "angr"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-qJrVAofIhoYS9dA/ipLh6Xuyt2b+trDRE/yq8tV9arI="; + hash = "sha256-6NDNGcKiBKKzkzXx/gnSyO/dCHD4VrcClGCMndwxF9Q="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/coffea/default.nix b/pkgs/development/python-modules/coffea/default.nix index ba60cc47a8c..dbc75a3bb12 100644 --- a/pkgs/development/python-modules/coffea/default.nix +++ b/pkgs/development/python-modules/coffea/default.nix @@ -31,14 +31,14 @@ buildPythonPackage rec { pname = "coffea"; - version = "2023.6.0.rc1"; - format = "pyproject"; + version = "2023.7.0.rc0"; + pyproject = true; src = fetchFromGitHub { owner = "CoffeaTeam"; - repo = pname; + repo = "coffea"; rev = "refs/tags/v${version}"; - hash = "sha256-TEtQ2KnwcylQbprlRtgHv7HIFg7roDWD4TihrQE4icU="; + hash = "sha256-WIJw5NLVN6TrG/0mySqtlqvoNVinmpcWZchSqiNjQ9Q="; }; postPatch = '' diff --git a/pkgs/development/python-modules/confuse/default.nix b/pkgs/development/python-modules/confuse/default.nix index 1d2f56a85f1..a3a979f68f8 100644 --- a/pkgs/development/python-modules/confuse/default.nix +++ b/pkgs/development/python-modules/confuse/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "confuse"; version = "1.7.0"; - format = "flit"; + format = "pyproject"; disabled = pythonOlder "3.7"; diff --git a/pkgs/development/python-modules/ctranslate2/default.nix b/pkgs/development/python-modules/ctranslate2/default.nix index bfb8c31a48a..a86516856fd 100644 --- a/pkgs/development/python-modules/ctranslate2/default.nix +++ b/pkgs/development/python-modules/ctranslate2/default.nix @@ -12,7 +12,7 @@ # tests , pytestCheckHook -, tensorflow +, tensorflow-bin , torch , transformers , wurlitzer @@ -49,7 +49,7 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook - tensorflow + tensorflow-bin torch transformers wurlitzer diff --git a/pkgs/development/python-modules/curlify/default.nix b/pkgs/development/python-modules/curlify/default.nix new file mode 100644 index 00000000000..dbe335c71de --- /dev/null +++ b/pkgs/development/python-modules/curlify/default.nix @@ -0,0 +1,25 @@ +{ lib, buildPythonPackage, fetchFromGitHub, requests }: + +buildPythonPackage { + pname = "curlify"; + version = "2.2.1"; + format = "setuptools"; + + src = fetchFromGitHub { + owner = "ofw"; + repo = "curlify"; + rev = "b914625b12f9b05c39f305b47ebd0d1f061af24d"; + hash = "sha256-yDHmH35TtQDJB0na1V98RtBuVHX5TmKC72hzzs1DQK8="; + }; + + propagatedBuildInputs = [ + requests + ]; + + meta = with lib; { + description = "Convert python requests request object to cURL command"; + homepage = "https://github.com/ofw/curlify"; + license = licenses.mit; + maintainers = with maintainers; [ chrpinedo ]; + }; +} diff --git a/pkgs/development/python-modules/cymem/default.nix b/pkgs/development/python-modules/cymem/default.nix index 0332ffd1f98..f168ea39a37 100644 --- a/pkgs/development/python-modules/cymem/default.nix +++ b/pkgs/development/python-modules/cymem/default.nix @@ -3,17 +3,21 @@ , fetchFromGitHub , cython , pytestCheckHook +, pythonOlder }: buildPythonPackage rec { pname = "cymem"; - version = "2.0.7"; + version = "2.0.8"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "explosion"; repo = "cymem"; rev = "refs/tags/v${version}"; - hash = "sha256-lYMRFFMS+ETjWd4xi12ezC8CVLbLJfynmOU1DpYQcck="; + hash = "sha256-e4lgV39lwC2Goqmd8Jjra+znuCpxsv2IsRXfFbQkGN8="; }; propagatedBuildInputs = [ @@ -34,10 +38,14 @@ buildPythonPackage rec { popd ''; + pythonImportsCheck = [ + "cymem" + ]; meta = with lib; { description = "Cython memory pool for RAII-style memory management"; homepage = "https://github.com/explosion/cymem"; + changelog = "https://github.com/explosion/cymem/releases/tag/v${version}"; license = licenses.mit; maintainers = with maintainers; [ ]; }; diff --git a/pkgs/development/python-modules/datasette/default.nix b/pkgs/development/python-modules/datasette/default.nix index 34a6bbf7dbb..7063e90a1d8 100644 --- a/pkgs/development/python-modules/datasette/default.nix +++ b/pkgs/development/python-modules/datasette/default.nix @@ -29,7 +29,7 @@ buildPythonPackage rec { pname = "datasette"; - version = "0.64.3"; + version = "0.64.4"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -38,7 +38,7 @@ buildPythonPackage rec { owner = "simonw"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-hUMaveScSGbiELvN2oo8Nf/jFvYXeLpxTONl1R4UOZU="; + hash = "sha256-6zZgbUKszSo13qmrWKo5UAPqS/QaS8omoTJQgWFfULk="; }; postPatch = '' @@ -101,6 +101,7 @@ buildPythonPackage rec { meta = with lib; { description = "Multi-tool for exploring and publishing data"; homepage = "https://datasette.io/"; + changelog = "https://github.com/simonw/datasette/releases/tag/${version}"; license = licenses.asl20; maintainers = with maintainers; [ ]; }; diff --git a/pkgs/development/python-modules/dbus-fast/default.nix b/pkgs/development/python-modules/dbus-fast/default.nix index 5dc9b5675a4..a4cf927ec90 100644 --- a/pkgs/development/python-modules/dbus-fast/default.nix +++ b/pkgs/development/python-modules/dbus-fast/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "dbus-fast"; - version = "2.7.0"; + version = "2.9.0"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "Bluetooth-Devices"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-o75N/msocSYBe3tTLYGJbqMnbiQb/t3nfJIDDr6kPxM="; + hash = "sha256-0+uWnm0gygDL4sc2b+3dekgZfgAQZKfmJRMSDgyeMjk="; }; # The project can build both an optimized cython version and an unoptimized diff --git a/pkgs/development/python-modules/django-reversion/default.nix b/pkgs/development/python-modules/django-reversion/default.nix index d11bb0c841a..e85e89e2b6c 100644 --- a/pkgs/development/python-modules/django-reversion/default.nix +++ b/pkgs/development/python-modules/django-reversion/default.nix @@ -7,14 +7,14 @@ buildPythonPackage rec { pname = "django-reversion"; - version = "5.0.4"; + version = "5.0.5"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-wSurRS0x3TwkRFbPHfODrPFLoUfPmUBMXkRBJZbeQvw="; + hash = "sha256-JTxpGwpOC+He7Atiw4yfu3W25aj9gdO1iib0YTWXAQY="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/django-types/default.nix b/pkgs/development/python-modules/django-types/default.nix new file mode 100644 index 00000000000..5c16312538a --- /dev/null +++ b/pkgs/development/python-modules/django-types/default.nix @@ -0,0 +1,25 @@ +{ lib +, buildPythonPackage +, fetchPypi +, poetry-core +}: + +buildPythonPackage rec { + pname = "django-types"; + version = "0.18.0"; + format = "pyproject"; + + src = fetchPypi { + inherit pname version; + hash = "sha256-uOIzTIEIZNer8RzTzbHaOyAVtn5/EnAAfjN3f/G9hlQ="; + }; + + nativeBuildInputs = [ poetry-core ]; + + meta = with lib; { + description = "Type stubs for Django"; + homepage = "https://pypi.org/project/django-types"; + license = licenses.mit; + maintainers = with maintainers; [ thubrecht ]; + }; +} diff --git a/pkgs/development/python-modules/drf-spectacular/default.nix b/pkgs/development/python-modules/drf-spectacular/default.nix index b90a35f4ea6..9e476ad5c18 100644 --- a/pkgs/development/python-modules/drf-spectacular/default.nix +++ b/pkgs/development/python-modules/drf-spectacular/default.nix @@ -28,13 +28,13 @@ buildPythonPackage rec { pname = "drf-spectacular"; - version = "0.26.4"; + version = "0.26.5"; src = fetchFromGitHub { owner = "tfranzel"; repo = "drf-spectacular"; rev = "refs/tags/${version}"; - hash = "sha256-f8x4QOt2EbDv+NlYAmpzXrCdT+q4wLGIrDsuUd45j2U="; + hash = "sha256-sK+upLh0mi8eHKh1Wt9FoLRjqlHitTSX0Zl54S4Ce6E="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/dtw-python/default.nix b/pkgs/development/python-modules/dtw-python/default.nix new file mode 100644 index 00000000000..f50102fe621 --- /dev/null +++ b/pkgs/development/python-modules/dtw-python/default.nix @@ -0,0 +1,57 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, cython +, oldest-supported-numpy +, setuptools +, wheel +, scipy +, numpy +, pytestCheckHook +, pythonOlder +}: + +buildPythonPackage rec { + pname = "dtw-python"; + version = "1.3.0"; + format = "pyproject"; + + disable = pythonOlder "3.6"; + + src = fetchFromGitHub { + owner = "DynamicTimeWarping"; + repo = "dtw-python"; + rev = "v${version}"; + hash = "sha256-7hQuo7dES9f08YZhCf+kxUkMlrr+bg1P7HHRCMv3bLk="; + }; + + nativeBuildInputs = [ + cython + oldest-supported-numpy + setuptools + wheel + ]; + + propagatedBuildInputs = [ + scipy + numpy + ]; + + # We need to run tests on real built package: https://github.com/NixOS/nixpkgs/issues/255262 + preCheck = "cd $out"; + nativeCheckInputs = [ pytestCheckHook ]; + # tests/ are not included to output package, so we have to set path explicitly + pytestFlagsArray = [ + "$src/tests" + ]; + + pythonImportsCheck = [ "dtw" ]; + + meta = with lib; { + description = "Python port of R's Comprehensive Dynamic Time Warp algorithms package"; + homepage = "https://github.com/DynamicTimeWarping/dtw-python"; + changelog = "https://github.com/DynamicTimeWarping/dtw-python/blob/${src.rev}/CHANGELOG.md"; + license = licenses.gpl3Only; + maintainers = with maintainers; [ mbalatsko ]; + }; +} diff --git a/pkgs/development/python-modules/dvc-data/default.nix b/pkgs/development/python-modules/dvc-data/default.nix index 65ad409aaee..004fceaaa8a 100644 --- a/pkgs/development/python-modules/dvc-data/default.nix +++ b/pkgs/development/python-modules/dvc-data/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "dvc-data"; - version = "2.16.1"; + version = "2.16.3"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "iterative"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-hnKOSo/RUzGnj7JbdKOGogVN925LZQiL3uvy5+dQfPw="; + hash = "sha256-cuUxVDc//O0FjPyBgXh8gBkCHSqfHELtTLT4VAu4HSA="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; diff --git a/pkgs/development/python-modules/dvc/default.nix b/pkgs/development/python-modules/dvc/default.nix index 117a6a68bae..66d6e1057b0 100644 --- a/pkgs/development/python-modules/dvc/default.nix +++ b/pkgs/development/python-modules/dvc/default.nix @@ -55,14 +55,14 @@ buildPythonPackage rec { pname = "dvc"; - version = "3.21.1"; + version = "3.22.0"; format = "pyproject"; src = fetchFromGitHub { owner = "iterative"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-FCVxSkVWWtk6dTOtO+l28bDvXnxjX8wwy1uE/5Go4Mw="; + hash = "sha256-8L8ilGOPSfc6mW4JmmLM7VimwlFBQ6h5WIxaRnvWcm0="; }; pythonRelaxDeps = [ diff --git a/pkgs/development/python-modules/dvclive/default.nix b/pkgs/development/python-modules/dvclive/default.nix index 7f07a851fe3..051f5ad473e 100644 --- a/pkgs/development/python-modules/dvclive/default.nix +++ b/pkgs/development/python-modules/dvclive/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "dvclive"; - version = "2.16.0"; + version = "3.0.0"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "iterative"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-VxZXZhbKtym1ow/dU3G4yu4X1GwCsXzcau/YocertzY="; + hash = "sha256-nTxgRfzrKYl6aC8rxusZPBihpsKp7gCyxKVOiDrTNtE="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; diff --git a/pkgs/development/python-modules/easyocr/default.nix b/pkgs/development/python-modules/easyocr/default.nix index 3d260f1f652..ff7f7650fce 100644 --- a/pkgs/development/python-modules/easyocr/default.nix +++ b/pkgs/development/python-modules/easyocr/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { pname = "easyocr"; - version = "1.7.0"; + version = "1.7.1"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -28,7 +28,7 @@ buildPythonPackage rec { owner = "JaidedAI"; repo = "EasyOCR"; rev = "refs/tags/v${version}"; - hash = "sha256-01Exz55eTIO/xzdq/dzV+ELkU75hpxe/EbjIqLBA8h0="; + hash = "sha256-EiiJ2LJ3uYIvgPd2y25MraV5kTa47JalDR7SLbkM9UI="; }; postPatch = '' diff --git a/pkgs/development/python-modules/ecs-logging/default.nix b/pkgs/development/python-modules/ecs-logging/default.nix index 07def603cb7..cd55d1c4c2b 100644 --- a/pkgs/development/python-modules/ecs-logging/default.nix +++ b/pkgs/development/python-modules/ecs-logging/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "ecs-logging"; version = "2.1.0"; - format = "flit"; + format = "pyproject"; disabled = pythonOlder "3.8"; diff --git a/pkgs/development/python-modules/edk2-pytool-library/default.nix b/pkgs/development/python-modules/edk2-pytool-library/default.nix index b92323e0c15..c1bc530db0f 100644 --- a/pkgs/development/python-modules/edk2-pytool-library/default.nix +++ b/pkgs/development/python-modules/edk2-pytool-library/default.nix @@ -7,22 +7,21 @@ , pyasn1 , pyasn1-modules , cryptography -, tinydb , joblib -, tinyrecord +, gitpython , pytestCheckHook }: buildPythonPackage rec { pname = "edk2-pytool-library"; - version = "0.17.0"; + version = "0.18.0"; format = "pyproject"; src = fetchFromGitHub { owner = "tianocore"; repo = "edk2-pytool-library"; rev = "v${version}"; - hash = "sha256-US9m7weW11+VxX6ZsKP5tYKp+bQoiI+TZ3YWE97D/f0="; + hash = "sha256-O7K439nAIHHTWSoR8mZWEu9sXcrhYfZto3RTgHZcOuA="; }; nativeBuildInputs = [ @@ -40,15 +39,19 @@ buildPythonPackage rec { pyasn1 pyasn1-modules cryptography - tinydb joblib - tinyrecord + gitpython ]; nativeCheckInputs = [ pytestCheckHook ]; + disabledTests = [ + # requires network access + "test_basic_parse" + ]; + env.SETUPTOOLS_SCM_PRETEND_VERSION = version; pythonImportsCheck = [ "edk2toollib" ]; diff --git a/pkgs/development/python-modules/emborg/default.nix b/pkgs/development/python-modules/emborg/default.nix index 0d7218ea3ea..b4b0b9b2106 100644 --- a/pkgs/development/python-modules/emborg/default.nix +++ b/pkgs/development/python-modules/emborg/default.nix @@ -2,6 +2,7 @@ , buildPythonPackage , fetchFromGitHub , fetchpatch +, flit-core , pytestCheckHook , pythonOlder , borgbackup @@ -20,7 +21,7 @@ buildPythonPackage rec { pname = "emborg"; version = "1.37"; - format = "flit"; + format = "pyproject"; disabled = pythonOlder "3.7"; @@ -31,6 +32,10 @@ buildPythonPackage rec { hash = "sha256-bHYs+vlNku/T5Hb9u77Xml9/FNj5vgqPeXSzcilsS+I="; }; + nativeBuildInputs = [ + flit-core + ]; + propagatedBuildInputs = [ appdirs arrow diff --git a/pkgs/development/python-modules/ffcv/default.nix b/pkgs/development/python-modules/ffcv/default.nix index 08f80d198e4..861f2d02019 100644 --- a/pkgs/development/python-modules/ffcv/default.nix +++ b/pkgs/development/python-modules/ffcv/default.nix @@ -13,14 +13,13 @@ buildPythonPackage rec { pname = "ffcv"; - version = "0.0.3"; + version = "1.0.0"; src = fetchFromGitHub { owner = "libffcv"; repo = pname; - # See https://github.com/libffcv/ffcv/issues/158. - rev = "131d56235eca3f1497bb84eeaec82c3434ef25d8"; - sha256 = "0f7q2x48lknnf98mqaa35my05qwvdgv0h8l9lpagdw6yhx0a6p2x"; + rev = "refs/tags/v${version}"; + hash = "sha256-L2mwGFivq/gtAw+1D6U2jbW6VxYgetHX7OUrjwyybqE="; }; # See https://github.com/libffcv/ffcv/issues/159. diff --git a/pkgs/development/python-modules/flask-compress/default.nix b/pkgs/development/python-modules/flask-compress/default.nix index 2868ac81c0a..fe237114952 100644 --- a/pkgs/development/python-modules/flask-compress/default.nix +++ b/pkgs/development/python-modules/flask-compress/default.nix @@ -1,29 +1,38 @@ { lib -, fetchPypi +, fetchFromGitHub , buildPythonPackage +, isPyPy +, setuptools , setuptools-scm , flask , brotli +, brotlicffi , pytestCheckHook }: buildPythonPackage rec { - version = "1.13"; + version = "1.14"; pname = "Flask-Compress"; format = "pyproject"; - src = fetchPypi { - inherit pname version; - hash = "sha256-7pbxi/mwDy3rTjQGykoFCTqoDi7wV4Ulo7TTLs3/Ep0="; + src = fetchFromGitHub { + owner = "colour-science"; + repo = "flask-compress"; + rev = "refs/tags/v${version}"; + hash = "sha256-eP6i4h+O4vkjlhfy3kyB+PY7iHVzOnRBRD8lj5yHehU="; }; nativeBuildInputs = [ + setuptools setuptools-scm ]; propagatedBuildInputs = [ flask + ] ++ lib.optionals (!isPyPy) [ brotli + ] ++ lib.optionals isPyPy [ + brotlicffi ]; nativeCheckInputs = [ @@ -34,10 +43,13 @@ buildPythonPackage rec { "flask_compress" ]; + env.SETUPTOOLS_SCM_PRETEND_VERSION = version; + meta = with lib; { - description = "Compress responses in your Flask app with gzip"; + description = "Compress responses in your Flask app with gzip, deflate or brotli"; homepage = "https://github.com/colour-science/flask-compress"; changelog = "https://github.com/colour-science/flask-compress/blob/v${version}/CHANGELOG.md"; license = licenses.mit; + maintainers = with maintainers; [ nickcao ]; }; } diff --git a/pkgs/development/python-modules/formbox/default.nix b/pkgs/development/python-modules/formbox/default.nix index 387ee2bea4e..098d13e87c9 100644 --- a/pkgs/development/python-modules/formbox/default.nix +++ b/pkgs/development/python-modules/formbox/default.nix @@ -1,9 +1,9 @@ -{ lib, buildPythonPackage, pythonOlder, fetchFromSourcehut, bleach, markdown }: +{ lib, buildPythonPackage, pythonOlder, fetchFromSourcehut, flit-core, bleach, markdown }: buildPythonPackage rec { pname = "formbox"; version = "0.4.1"; - format = "flit"; + format = "pyproject"; disabled = pythonOlder "3.6"; src = fetchFromSourcehut { @@ -13,6 +13,7 @@ buildPythonPackage rec { hash = "sha256-zOvXmSeBiwc0Z5mRMwMsHLU3A/iP7rpjXm0T0I2gUTk="; }; + nativeBuildInputs = [ flit-core ]; propagatedBuildInputs = [ bleach markdown ]; doCheck = false; # there's no test pythonImportsCheck = [ "formbox" ]; diff --git a/pkgs/development/python-modules/fritzconnection/default.nix b/pkgs/development/python-modules/fritzconnection/default.nix index 9fc2beef2c0..36d4dbd5b19 100644 --- a/pkgs/development/python-modules/fritzconnection/default.nix +++ b/pkgs/development/python-modules/fritzconnection/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "fritzconnection"; - version = "1.13.1"; + version = "1.13.2"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "kbr"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-FTg5LHjti6Srmz1LcPU0bepNzn2tpmdSBM3Y2BzZEms="; + hash = "sha256-nWXtXhF2pUBxHdrivi4DA7+bFiZPyxb2nqsiN3j4HdI="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/frozendict/default.nix b/pkgs/development/python-modules/frozendict/default.nix index f262710119c..3ed26a476b6 100644 --- a/pkgs/development/python-modules/frozendict/default.nix +++ b/pkgs/development/python-modules/frozendict/default.nix @@ -20,12 +20,6 @@ buildPythonPackage rec { hash = "sha256-4a0DvZOzNJqpop7wi+FagUR+8oaekz4EDNIYdUaAWC8="; }; - postPatch = '' - # https://github.com/Marco-Sulla/python-frozendict/pull/69 - substituteInPlace setup.py \ - --replace 'if impl == "PyPy":' 'if impl == "PyPy" or not src_path.exists():' - ''; - nativeCheckInputs = [ pytestCheckHook ]; @@ -48,6 +42,6 @@ buildPythonPackage rec { homepage = "https://github.com/Marco-Sulla/python-frozendict"; changelog = "https://github.com/Marco-Sulla/python-frozendict/releases/tag/v${version}"; license = licenses.lgpl3Only; - maintainers = with maintainers; [ ]; + maintainers = with maintainers; [ pbsds ]; }; } diff --git a/pkgs/development/python-modules/fx2/default.nix b/pkgs/development/python-modules/fx2/default.nix index 1df4625a681..a691f3723d5 100644 --- a/pkgs/development/python-modules/fx2/default.nix +++ b/pkgs/development/python-modules/fx2/default.nix @@ -9,13 +9,13 @@ buildPythonPackage rec { pname = "fx2"; - version = "0.11"; + version = "unstable-2023-09-20"; src = fetchFromGitHub { owner = "whitequark"; repo = "libfx2"; - rev = "v${version}"; - hash = "sha256-uJpXsUMFqJY7mjj1rtfc0XWEfNDxO1xXobgBDGFHnp4="; + rev = "73fa811818d56a86b82c12e07327946aeddd2b3e"; + hash = "sha256-AGQPOVTdaUCUeVVNQTBmoNvz5CGxcBOK7+oL+X8AcIw="; }; nativeBuildInputs = [ sdcc ]; diff --git a/pkgs/development/python-modules/garminconnect/default.nix b/pkgs/development/python-modules/garminconnect/default.nix index 0b7565164df..78e234be0f5 100644 --- a/pkgs/development/python-modules/garminconnect/default.nix +++ b/pkgs/development/python-modules/garminconnect/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "garminconnect"; - version = "0.2.4"; + version = "0.2.7"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "cyberjunky"; repo = "python-garminconnect"; rev = "refs/tags/${version}"; - hash = "sha256-C+LldV7TyyubaH8HVdFl7NnaPSLf4bzM03+r72vkOk8="; + hash = "sha256-hyrj3icj5QxXf9NDk/x7bocFg6iD+KEDZNcpZVBEx4k="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/garth/default.nix b/pkgs/development/python-modules/garth/default.nix index 1ffdff5c7ed..0eaf2793caa 100644 --- a/pkgs/development/python-modules/garth/default.nix +++ b/pkgs/development/python-modules/garth/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "garth"; - version = "0.4.25"; + version = "0.4.26"; format = "pyproject"; disabled = pythonOlder "3.9"; src = fetchPypi { inherit pname version; - hash = "sha256-n+vy9MCSBvxFOcD/jk2oPSa/bzf550mk+dZYSVa0rm0="; + hash = "sha256-Ezq9lZE6HTtuW396sKZ32mDvNjrkz6UHQGvLhXUjfnI="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/gidgethub/default.nix b/pkgs/development/python-modules/gidgethub/default.nix index 37a9d75beee..e109f4fa048 100644 --- a/pkgs/development/python-modules/gidgethub/default.nix +++ b/pkgs/development/python-modules/gidgethub/default.nix @@ -2,6 +2,7 @@ , buildPythonPackage , fetchPypi , pythonOlder +, flit , uritemplate , pyjwt , pytestCheckHook @@ -15,7 +16,7 @@ buildPythonPackage rec { pname = "gidgethub"; version = "5.3.0"; - format = "flit"; + format = "pyproject"; disabled = pythonOlder "3.6"; @@ -24,6 +25,10 @@ buildPythonPackage rec { hash = "sha256-ns59N/vOuBm4BWDn7Vj5NuSKZdN+xfVtt5FFFWtCaiU="; }; + nativeBuildInputs = [ + flit + ]; + propagatedBuildInputs = [ uritemplate pyjwt diff --git a/pkgs/development/python-modules/google-ai-generativelanguage/default.nix b/pkgs/development/python-modules/google-ai-generativelanguage/default.nix index 444b1cf1f5c..88f5dfc3e9e 100644 --- a/pkgs/development/python-modules/google-ai-generativelanguage/default.nix +++ b/pkgs/development/python-modules/google-ai-generativelanguage/default.nix @@ -15,14 +15,14 @@ buildPythonPackage rec { pname = "google-ai-generativelanguage"; - version = "0.3.1"; + version = "0.3.2"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-DbtXyNBCew90y4RfJgHiolD9SIjZfX18wvo76xGA66k="; + hash = "sha256-PkQpWHUzvTnv7Ky+cRSHzaXTwh2rDvD0qq53tbxPBME="; }; 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 2c7202be0d2..578990f3090 100644 --- a/pkgs/development/python-modules/google-cloud-bigquery-logging/default.nix +++ b/pkgs/development/python-modules/google-cloud-bigquery-logging/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "google-cloud-bigquery-logging"; - version = "1.2.2"; + version = "1.3.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-e6ZCsdEstzxMjaJdubslQ4Lchr3FmBCdtTZ0xVsCl14="; + hash = "sha256-7hj42cr9BKwSBEX09kZPngAUPFPrQ/VS5hBzbAaQhH4="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/google-cloud-datacatalog/default.nix b/pkgs/development/python-modules/google-cloud-datacatalog/default.nix index 6d7d35d6782..1a5d935f4a8 100644 --- a/pkgs/development/python-modules/google-cloud-datacatalog/default.nix +++ b/pkgs/development/python-modules/google-cloud-datacatalog/default.nix @@ -14,14 +14,14 @@ buildPythonPackage rec { pname = "google-cloud-datacatalog"; - version = "3.15.1"; + version = "3.15.2"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-XihIFu8TUrZgQqJ43LJVB0vCIjf89MpGfmDXS5yUuoM="; + hash = "sha256-GaGxn7Q5blqPWNWIl6pRV9lLzmGm5GGwqcyOuAWI0Ds="; }; 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 abfffeb81bd..f7c690c56f6 100644 --- a/pkgs/development/python-modules/google-cloud-iam-logging/default.nix +++ b/pkgs/development/python-modules/google-cloud-iam-logging/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "google-cloud-iam-logging"; - version = "1.2.1"; + version = "1.2.2"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-R35MCPWM5wiJzlFHJuHOD5P6IthPtDjGtw5OhFlfhNc="; + hash = "sha256-6IBjA2WwP11d/vQJSIY3WhbqYvAgFRtZFFSffUqKM38="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/google-cloud-language/default.nix b/pkgs/development/python-modules/google-cloud-language/default.nix index 7b609655732..a07053ea917 100644 --- a/pkgs/development/python-modules/google-cloud-language/default.nix +++ b/pkgs/development/python-modules/google-cloud-language/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "google-cloud-language"; - version = "2.11.0"; + version = "2.11.1"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-ldI19QPZBOiFQRfpKO82rJMMJIJfy4QAw/NoqQj9vhQ="; + hash = "sha256-XxhECfBAwMcwV8JhbmvS6G5FrrZGGA0ZwYnfSqPQLbo="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/google-cloud-redis/default.nix b/pkgs/development/python-modules/google-cloud-redis/default.nix index e935fc37e57..37b9dcf8095 100644 --- a/pkgs/development/python-modules/google-cloud-redis/default.nix +++ b/pkgs/development/python-modules/google-cloud-redis/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "google-cloud-redis"; - version = "2.13.1"; + version = "2.13.2"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-UtT1z5zMzc7+Xhqcx5u77IS8GC8KaNOpYstZ8BlrFGc="; + hash = "sha256-XEhXMDVdlnI9ZK5jfxsiZPNbV8MB7A7yxtMLLwbcoU4="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/google-cloud-resource-manager/default.nix b/pkgs/development/python-modules/google-cloud-resource-manager/default.nix index 5e47e53cd8f..50f605f5fc9 100644 --- a/pkgs/development/python-modules/google-cloud-resource-manager/default.nix +++ b/pkgs/development/python-modules/google-cloud-resource-manager/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "google-cloud-resource-manager"; - version = "1.10.3"; + version = "1.10.4"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-+A786jbxDFqBiJr+k5EJJuOXi0sc7rgvVjovyGMHLRQ="; + hash = "sha256-RWsl3do9TNJ0iKcnNrvDrwTXE64v42VcAbZqM50o1nk="; }; propagatedBuildInputs = [ 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 6791ad76a12..5bb5940f55a 100644 --- a/pkgs/development/python-modules/google-cloud-secret-manager/default.nix +++ b/pkgs/development/python-modules/google-cloud-secret-manager/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "google-cloud-secret-manager"; - version = "2.16.3"; + version = "2.16.4"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-bKtcvxkno0xYbkr5BDfuo9RP9LQbmoLshvz/CaWsJuo="; + hash = "sha256-Nx3HL5FFrzI+ioE8jlA4DmrEvWpdvNQtzzFi2PN+UIA="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/google-cloud-securitycenter/default.nix b/pkgs/development/python-modules/google-cloud-securitycenter/default.nix index 4063ad21ae9..8298b6a07ba 100644 --- a/pkgs/development/python-modules/google-cloud-securitycenter/default.nix +++ b/pkgs/development/python-modules/google-cloud-securitycenter/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "google-cloud-securitycenter"; - version = "1.23.2"; + version = "1.23.3"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-3QdHomKKN8bSUtyFCZJliw/FxNixVj9pdkzMwJWT880="; + hash = "sha256-8yBC/+jxKsyQ5pz+VBSgnwqB/XxXCChpjGLAjMDoQow="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/google-cloud-videointelligence/default.nix b/pkgs/development/python-modules/google-cloud-videointelligence/default.nix index b0c883a56bf..3ff18366e42 100644 --- a/pkgs/development/python-modules/google-cloud-videointelligence/default.nix +++ b/pkgs/development/python-modules/google-cloud-videointelligence/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "google-cloud-videointelligence"; - version = "2.11.3"; + version = "2.11.4"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-qWpj8ATCcGj0WyJ6ZidfimqMPs0Gu1gfkvppiX1bF5c="; + hash = "sha256-B6zimaY/Wz1EQTdWNIU7Vc6PkMYsaiT4pH6wVBSfb5k="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/google-cloud-websecurityscanner/default.nix b/pkgs/development/python-modules/google-cloud-websecurityscanner/default.nix index 1ad657a827b..8804ad810aa 100644 --- a/pkgs/development/python-modules/google-cloud-websecurityscanner/default.nix +++ b/pkgs/development/python-modules/google-cloud-websecurityscanner/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "google-cloud-websecurityscanner"; - version = "1.12.2"; + version = "1.12.3"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-C2WQmyQjoe2t6RZ8HtnNkzN3V8FuYQwgtlhCOwaHNt8="; + hash = "sha256-zu4e4MTpc24p5ZWeRfVQwX0brciaz80FDGbxy6UppEA="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/gprof2dot/default.nix b/pkgs/development/python-modules/gprof2dot/default.nix index 45f9915c06c..cd0ef5b174a 100644 --- a/pkgs/development/python-modules/gprof2dot/default.nix +++ b/pkgs/development/python-modules/gprof2dot/default.nix @@ -3,18 +3,21 @@ , buildPythonPackage , python , graphviz +, pythonOlder }: buildPythonPackage rec { pname = "gprof2dot"; - version = "2021.02.21"; + version = "2022.07.29"; format = "setuptools"; + disabled = pythonOlder "3.7"; + src = fetchFromGitHub { owner = "jrfonseca"; repo = "gprof2dot"; - rev = version; - sha256 = "1jjhsjf5fdi1fkn7mvhnzkh6cynl8gcjrygd3cya5mmda3akhzic"; + rev = "refs/tags/${version}"; + hash = "sha256-nIsBO6KTyG2VZZRXrkU/T/a9Ki1x6hda5Vv3rZv/mJM="; }; makeWrapperArgs = [ @@ -22,7 +25,9 @@ buildPythonPackage rec { ]; # Needed so dot is on path of the test script - nativeCheckInputs = [ graphviz ]; + nativeCheckInputs = [ + graphviz + ]; checkPhase = '' runHook preCheck @@ -34,8 +39,9 @@ buildPythonPackage rec { ''; meta = with lib; { - homepage = "https://github.com/jrfonseca/gprof2dot"; description = "Python script to convert the output from many profilers into a dot graph"; + homepage = "https://github.com/jrfonseca/gprof2dot"; + changelog = "https://github.com/jrfonseca/gprof2dot/releases/tag/${version}"; license = licenses.lgpl3Plus; maintainers = with maintainers; [ pmiddend ]; }; diff --git a/pkgs/development/python-modules/gspread/default.nix b/pkgs/development/python-modules/gspread/default.nix index fd01e1b1d81..6ff8cc13be0 100644 --- a/pkgs/development/python-modules/gspread/default.nix +++ b/pkgs/development/python-modules/gspread/default.nix @@ -1,7 +1,7 @@ { lib , buildPythonPackage , fetchFromGitHub -, flitBuildHook +, flit-core , google-auth , google-auth-oauthlib , pytest-vcr @@ -25,7 +25,7 @@ buildPythonPackage rec { }; nativeBuildInputs = [ - flitBuildHook + flit-core ]; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/heudiconv/default.nix b/pkgs/development/python-modules/heudiconv/default.nix index 514d4e2477b..3cdf1463cd5 100644 --- a/pkgs/development/python-modules/heudiconv/default.nix +++ b/pkgs/development/python-modules/heudiconv/default.nix @@ -19,14 +19,14 @@ buildPythonPackage rec { pname = "heudiconv"; - version = "0.13.1"; + version = "1.0.0"; format = "pyproject"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-UUBRC6RToj4XVbJnxG+EKdue4NVpTAW31RNm9ieF1lU="; + hash = "sha256-cW6G2NtPZiyqqJ3w9a3Y/6blEaXtR9eGG5epPknimsw="; }; postPatch = '' diff --git a/pkgs/development/python-modules/hyperpyyaml/default.nix b/pkgs/development/python-modules/hyperpyyaml/default.nix index 4e59a0ce771..9395b299fea 100644 --- a/pkgs/development/python-modules/hyperpyyaml/default.nix +++ b/pkgs/development/python-modules/hyperpyyaml/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "hyperpyyaml"; - version = "1.2.1"; + version = "1.2.2"; format = "setuptools"; src = fetchFromGitHub { owner = "speechbrain"; repo = "hyperpyyaml"; rev = "refs/tags/v${version}"; - hash = "sha256-tC4kLJAY9MVgjWwU2Qu0rPCVDw7CjKVIciRZgYhnR9I="; + hash = "sha256-eA4/wXmqlqomfRbJNi7dkBRoxneCbCbURSPvASF2sgA="; }; propagatedBuildInputs = [ @@ -35,7 +35,5 @@ buildPythonPackage rec { changelog = "https://github.com/speechbrain/HyperPyYAML/releases/tag/v${version}"; license = licenses.asl20; maintainers = with maintainers; [ GaetanLepage ]; - # hyperpyyaml is not compatible with the too new version of `ruaml-yaml` - broken = true; }; } diff --git a/pkgs/development/python-modules/identify/default.nix b/pkgs/development/python-modules/identify/default.nix index ffcd7ba3f01..13e1e8d93f8 100644 --- a/pkgs/development/python-modules/identify/default.nix +++ b/pkgs/development/python-modules/identify/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "identify"; - version = "2.5.28"; + version = "2.5.29"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "pre-commit"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-pGSXXsA+gIIIZbnwa22EmizZT65MqZrWd3+o47VatBs="; + hash = "sha256-eCOgOXzbjP2yTLKYcnjnWFes4P2jvr9rGfQuHuqxLDc="; }; nativeCheckInputs = [ diff --git a/pkgs/development/python-modules/intake/default.nix b/pkgs/development/python-modules/intake/default.nix index 77301db1d5f..d4f9c66806c 100644 --- a/pkgs/development/python-modules/intake/default.nix +++ b/pkgs/development/python-modules/intake/default.nix @@ -11,7 +11,6 @@ , jinja2 , msgpack , msgpack-numpy -, numpy , pandas , panel , pyarrow @@ -26,16 +25,16 @@ buildPythonPackage rec { pname = "intake"; - version = "unstable-2023-08-24"; + version = "0.7.0"; format = "setuptools"; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.8"; src = fetchFromGitHub { - owner = pname; - repo = pname; - rev = "81b1567a2030adfb22b856b4f63cefe35de68983"; - hash = "sha256-PygLrZz8ssHUrzGt2A7HxidvA2IVY94edVLjSp4jLI4="; + owner = "intake"; + repo = "intake"; + rev = "refs/tags/${version}"; + hash = "sha256-LK4abwPViEFJZ10bbRofF2aw2Mj0dliKwX6dFy93RVQ="; }; propagatedBuildInputs = [ @@ -89,12 +88,14 @@ buildPythonPackage rec { disabledTests = [ # Disable tests which touch network "http" + "test_address_flag" "test_dir" "test_discover" "test_filtered_compressed_cache" "test_flatten_flag" "test_get_dir" "test_pagination" + "test_port_flag" "test_read_part_compressed" "test_read_partition" "test_read_pattern" diff --git a/pkgs/development/python-modules/iocextract/default.nix b/pkgs/development/python-modules/iocextract/default.nix index 5831ab80e14..3353d912b39 100644 --- a/pkgs/development/python-modules/iocextract/default.nix +++ b/pkgs/development/python-modules/iocextract/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "iocextract"; - version = "1.16.0"; + version = "1.16.1"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "InQuest"; repo = "python-iocextract"; rev = "refs/tags/v${version}"; - hash = "sha256-jwMu4G146FpH6aFCiZK9tI/3CKnZYC2RCtO9QXXaquQ="; + hash = "sha256-cCp9ug/TuVY1zL+kiDlFGBmfFJyAmVwxLD36WT0oRAE="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/ipwhl/default.nix b/pkgs/development/python-modules/ipwhl/default.nix index 80068293145..6e6d0e21ef0 100644 --- a/pkgs/development/python-modules/ipwhl/default.nix +++ b/pkgs/development/python-modules/ipwhl/default.nix @@ -1,10 +1,10 @@ { lib, buildPythonPackage, pythonOlder, fetchFromSourcehut -, kubo, packaging, tomli }: +, kubo, packaging, tomli, flit-core }: buildPythonPackage rec { pname = "ipwhl"; version = "1.1.0"; - format = "flit"; + format = "pyproject"; disabled = pythonOlder "3.6"; src = fetchFromSourcehut { @@ -14,6 +14,7 @@ buildPythonPackage rec { hash = "sha256-YaIYcoUnbiv9wUOFIzGj2sWGbh7NsqRQcqOR2X6+QZA="; }; + nativeBuildInputs = [ flit-core ]; buildInputs = [ kubo ]; propagatedBuildInputs = [ packaging tomli ]; doCheck = false; # there's no test diff --git a/pkgs/development/python-modules/ismartgate/default.nix b/pkgs/development/python-modules/ismartgate/default.nix index fd1d81014c8..1a61b002aa3 100644 --- a/pkgs/development/python-modules/ismartgate/default.nix +++ b/pkgs/development/python-modules/ismartgate/default.nix @@ -16,16 +16,16 @@ buildPythonPackage rec { pname = "ismartgate"; - version = "5.0.0"; + version = "5.0.1"; format = "setuptools"; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "bdraco"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-o2yzMxrF0WB6MbeL1Tuf0Sq4wS4FDIWZZx1x2rvwLmY="; + hash = "sha256-mfiHoli0ldw/E1SrtOBpDO8ZTC0wTeaoSZ2nPnx5EaQ="; }; postPatch = '' diff --git a/pkgs/development/python-modules/jax/default.nix b/pkgs/development/python-modules/jax/default.nix index 0ad58dc0358..a92148ada6b 100644 --- a/pkgs/development/python-modules/jax/default.nix +++ b/pkgs/development/python-modules/jax/default.nix @@ -12,7 +12,6 @@ , numpy , opt-einsum , pytestCheckHook -, pytest-xdist , pythonOlder , scipy , stdenv @@ -62,18 +61,13 @@ buildPythonPackage rec { jaxlib' matplotlib pytestCheckHook - pytest-xdist ]; - # high parallelism will result in the tests getting stuck - dontUsePytestXdist = true; - # NOTE: Don't run the tests in the expiremental directory as they require flax # which creates a circular dependency. See https://discourse.nixos.org/t/how-to-nix-ify-python-packages-with-circular-dependencies/14648/2. # Not a big deal, this is how the JAX docs suggest running the test suite # anyhow. pytestFlagsArray = [ - "--numprocesses=4" "-W ignore::DeprecationWarning" "tests/" ]; diff --git a/pkgs/development/python-modules/jaxtyping/default.nix b/pkgs/development/python-modules/jaxtyping/default.nix index 7f94da78ba3..0d0621c56ec 100644 --- a/pkgs/development/python-modules/jaxtyping/default.nix +++ b/pkgs/development/python-modules/jaxtyping/default.nix @@ -16,14 +16,14 @@ let self = buildPythonPackage rec { pname = "jaxtyping"; - version = "0.2.21"; - format = "pyproject"; + version = "0.2.22"; + pyproject = true; src = fetchFromGitHub { owner = "google"; repo = "jaxtyping"; rev = "refs/tags/v${version}"; - hash = "sha256-BacfFcrzXeS6LemU7P6oCZJGB/Zzq09kEPuz2rTIyfI="; + hash = "sha256-OYx7Eq5jxSGERHsk611+n+Nq2B915gpJLPZYdO7Lt+k="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/jplephem/default.nix b/pkgs/development/python-modules/jplephem/default.nix index a2da6c10b3a..dfb0594151e 100644 --- a/pkgs/development/python-modules/jplephem/default.nix +++ b/pkgs/development/python-modules/jplephem/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "jplephem"; - version = "2.18"; + version = "2.19"; src = fetchPypi { inherit pname version; - hash = "sha256-SSkR6KTEeDB5GwO5oP/ff8ZfaF0cuzoXkLHqKIrn+uU="; + hash = "sha256-wWJFTGVtblID/5cB2CZnH6+fMgnZccu2jdtGAD3/bc8="; }; propagatedBuildInputs = [ numpy ]; 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 972455056d3..0469943e334 100644 --- a/pkgs/development/python-modules/json-schema-for-humans/default.nix +++ b/pkgs/development/python-modules/json-schema-for-humans/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { pname = "json-schema-for-humans"; - version = "0.45.1"; + version = "0.45.2"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -27,7 +27,7 @@ buildPythonPackage rec { owner = "coveooss"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-9dX9+YwJdJpgU3cZkxk7+CgdRFgcVhrvU0amO8zHZhs="; + hash = "sha256-DmUQ06UabLcB67PyfRC/gmSkEY/V8kuZ/T/ZW1D11vA="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/jupyter-book/default.nix b/pkgs/development/python-modules/jupyter-book/default.nix index 81b89e77a8b..631a853833d 100644 --- a/pkgs/development/python-modules/jupyter-book/default.nix +++ b/pkgs/development/python-modules/jupyter-book/default.nix @@ -28,7 +28,7 @@ buildPythonPackage rec { pname = "jupyter-book"; version = "0.15.1"; - format = "flit"; + format = "pyproject"; disabled = pythonOlder "3.7"; diff --git a/pkgs/development/python-modules/jupyter-cache/default.nix b/pkgs/development/python-modules/jupyter-cache/default.nix index cbeb05bde98..29a8bb02458 100644 --- a/pkgs/development/python-modules/jupyter-cache/default.nix +++ b/pkgs/development/python-modules/jupyter-cache/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "jupyter-cache"; version = "0.6.1"; - format = "flit"; + format = "pyproject"; disabled = pythonOlder "3.7"; diff --git a/pkgs/development/python-modules/kotsu/default.nix b/pkgs/development/python-modules/kotsu/default.nix new file mode 100644 index 00000000000..47d78c8b916 --- /dev/null +++ b/pkgs/development/python-modules/kotsu/default.nix @@ -0,0 +1,46 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, pythonOlder +, pandas +, typing-extensions +, pytestCheckHook +, pytest-mock +, scikit-learn +}: + +buildPythonPackage rec { + pname = "kotsu"; + version = "0.3.3"; + format = "setuptools"; + + disable = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "datavaluepeople"; + repo = "kotsu"; + rev = "v${version}"; + hash = "sha256-V5OkgiLUTRNbNt6m94+aYUZd9Nw+/60LfhrqqdFhiUw="; + }; + + patches = [ + ./disable-pytest-coverage-flags.patch + ]; + + propagatedBuildInputs = [ pandas typing-extensions ]; + + nativeCheckInputs = [ + pytestCheckHook + pytest-mock + scikit-learn + ]; + pythonImportsCheck = [ "kotsu" ]; + + meta = with lib; { + description = "Lightweight framework for structured and repeatable model validation"; + homepage = "https://github.com/datavaluepeople/kotsu"; + changelog = "https://github.com/datavaluepeople/kotsu/blob/${src.rev}/CHANGELOG.md"; + license = licenses.mit; + maintainers = with maintainers; [ mbalatsko ]; + }; +} diff --git a/pkgs/development/python-modules/kotsu/disable-pytest-coverage-flags.patch b/pkgs/development/python-modules/kotsu/disable-pytest-coverage-flags.patch new file mode 100644 index 00000000000..f035ab0e655 --- /dev/null +++ b/pkgs/development/python-modules/kotsu/disable-pytest-coverage-flags.patch @@ -0,0 +1,18 @@ +diff --git a/setup.cfg b/setup.cfg +index 3ab277a..b253e18 100644 +--- a/setup.cfg ++++ b/setup.cfg +@@ -50,13 +50,6 @@ convention = google + add_ignore = D105, D107 + #add_ignore = D100,D101,D102,D103,D104,D200 - start with no ignored errors and add as required + +-[tool:pytest] +-addopts = --cov=./kotsu --cov-report xml --cov-report term +- +-[coverage:run] +-# Omit auto-generated versioneer file from test coverage +-omit = kotsu/_version.py +- + [versioneer] + VCS = git + style = pep440 diff --git a/pkgs/development/python-modules/liccheck/default.nix b/pkgs/development/python-modules/liccheck/default.nix index 0af550ef6f8..713fc3cca23 100644 --- a/pkgs/development/python-modules/liccheck/default.nix +++ b/pkgs/development/python-modules/liccheck/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "liccheck"; - version = "0.9.1"; + version = "0.9.2"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "dhatim"; repo = "python-license-check"; rev = "refs/tags/${version}"; - hash = "sha256-ZgwHcZI0vsNYJWPkUnoBogVPPIuifAX9hu4fa1fHSz4="; + hash = "sha256-2WJw5TVMjOr+GX4YV0nssOtQeYvDHBLnlWquJQWPL9I="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/loca/default.nix b/pkgs/development/python-modules/loca/default.nix index 8ad0a4adbe7..28a9020d744 100644 --- a/pkgs/development/python-modules/loca/default.nix +++ b/pkgs/development/python-modules/loca/default.nix @@ -1,9 +1,9 @@ -{ lib, buildPythonPackage, pythonOlder, fetchFromSourcehut }: +{ lib, buildPythonPackage, pythonOlder, fetchFromSourcehut, flit-core }: buildPythonPackage rec { pname = "loca"; version = "2.0.1"; - format = "flit"; + format = "pyproject"; disabled = pythonOlder "3.7"; src = fetchFromSourcehut { @@ -13,6 +13,10 @@ buildPythonPackage rec { sha256 = "1l6jimw3wd81nz1jrzsfw1zzsdm0jm998xlddcqaq0h38sx69w8g"; }; + nativeBuildInputs = [ + flit-core + ]; + doCheck = false; # all checks are static analyses pythonImportsCheck = [ "loca" ]; diff --git a/pkgs/development/python-modules/looseversion/default.nix b/pkgs/development/python-modules/looseversion/default.nix index 19b5d10ca0e..b16fd1a572d 100644 --- a/pkgs/development/python-modules/looseversion/default.nix +++ b/pkgs/development/python-modules/looseversion/default.nix @@ -2,18 +2,23 @@ , buildPythonPackage , fetchPypi , pytestCheckHook +, hatchling }: buildPythonPackage rec { pname = "looseversion"; version = "1.3.0"; - format = "flit"; + format = "pyproject"; src = fetchPypi { inherit version pname; sha256 = "sha256-695l8/a7lTGoEBbG/vPrlaYRga3Ee3+UnpwOpHkRZp4="; }; + nativeBuildInputs = [ + hatchling + ]; + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/lxmf/default.nix b/pkgs/development/python-modules/lxmf/default.nix index af7ae5d6e87..1dae9f126b9 100644 --- a/pkgs/development/python-modules/lxmf/default.nix +++ b/pkgs/development/python-modules/lxmf/default.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { pname = "lxmf"; - version = "0.3.2"; + version = "0.3.3"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -16,7 +16,7 @@ buildPythonPackage rec { owner = "markqvist"; repo = "lxmf"; rev = "refs/tags/${version}"; - hash = "sha256-6ZnYI6GlFkMjBLsZhhFg8G9j3I/DfjLAnKsRFEua7uU="; + hash = "sha256-IbBuQuKWFjWUpVRdo5rl2Wq8vCAngg9/TKLuljRmKAU="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/m3u8/default.nix b/pkgs/development/python-modules/m3u8/default.nix index 7ba084913ba..9ff8dfbf0e7 100644 --- a/pkgs/development/python-modules/m3u8/default.nix +++ b/pkgs/development/python-modules/m3u8/default.nix @@ -4,17 +4,21 @@ , iso8601 , bottle , pytestCheckHook +, pythonOlder }: buildPythonPackage rec { pname = "m3u8"; - version = "3.5.0"; + version = "3.6.0"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "globocom"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-9Xmbc1aL7SI24FFn0/5KJtAM3+Xyvd3bwUh8DU1wGKE="; + hash = "sha256-JLYRkibcvmNct2eIBfBP7z3gR680xhZL/Kn/1S7feoo="; }; propagatedBuildInputs = [ @@ -38,8 +42,9 @@ buildPythonPackage rec { ]; meta = with lib; { - homepage = "https://github.com/globocom/m3u8"; description = "Python m3u8 parser"; + homepage = "https://github.com/globocom/m3u8"; + changelog = "https://github.com/globocom/m3u8/releases/tag//${version}"; license = licenses.mit; maintainers = with maintainers; [ Scriptkiddi ]; }; diff --git a/pkgs/development/python-modules/manuf/default.nix b/pkgs/development/python-modules/manuf/default.nix new file mode 100644 index 00000000000..6d237ab396f --- /dev/null +++ b/pkgs/development/python-modules/manuf/default.nix @@ -0,0 +1,60 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, runCommand +, python3 +, wireshark-cli +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "manuf"; + version = "1.1.5"; + format = "setuptools"; + + src = fetchFromGitHub { + owner = "coolbho3k"; + repo = "manuf"; + rev = "${version}"; + hash = "sha256-3CFs3aqwE8rZPwU1QBqAGxNHT5jg7ymG12yBD56gTNI="; + }; + + nativeBuildInputs = [ wireshark-cli ]; + + patches = [ + # Do update while building package from wireshark-cli + ./internal_db_update_nix.patch + # Fix MANUF_URL for external db update functionality (https://github.com/coolbho3k/manuf/issues/34) + ./fix_manuf_url.patch + ]; + + postPatch = '' + cat ${wireshark-cli}/share/wireshark/{manuf,wka} > manuf/manuf + ''; + + nativeCheckInputs = [ + pytestCheckHook + ]; + + disabledTests = [ + "test_update_update" + ]; + + pythonImportsCheck = [ "manuf" ]; + + passthru.tests = { + testMacAddress = runCommand "${pname}-test" {} '' + ${python3.pkgs.manuf}/bin/manuf BC:EE:7B:00:00:00 > $out + [ "$(cat $out | tr -d '\n')" = "Vendor(manuf='ASUSTekC', manuf_long='ASUSTek COMPUTER INC.', comment=None)" ] + ''; + }; + + meta = with lib; { + homepage = "https://github.com/coolbho3k/manuf"; + description = " Parser library for Wireshark's OUI database"; + mainProgram = "manuf"; + platforms = platforms.linux; + license = with licenses; [ lgpl3Plus asl20 ]; + maintainers = with maintainers; [ dsuetin ]; + }; +} diff --git a/pkgs/development/python-modules/manuf/fix_manuf_url.patch b/pkgs/development/python-modules/manuf/fix_manuf_url.patch new file mode 100644 index 00000000000..e858649b90f --- /dev/null +++ b/pkgs/development/python-modules/manuf/fix_manuf_url.patch @@ -0,0 +1,14 @@ +diff --git a/manuf/manuf.py b/manuf/manuf.py +index 09e9687..0ac9296 100755 +--- a/manuf/manuf.py ++++ b/manuf/manuf.py +@@ -61,7 +61,8 @@ class MacParser(object): + IOError: If manuf file could not be found. + + """ +- MANUF_URL = "https://gitlab.com/wireshark/wireshark/raw/master/manuf" ++ # https://github.com/coolbho3k/manuf/issues/34 ++ MANUF_URL = "https://www.wireshark.org/download/automated/data/manuf" + WFA_URL = "https://gitlab.com/wireshark/wireshark/raw/master/wka" + + def __init__(self, manuf_name=None, update=False): diff --git a/pkgs/development/python-modules/manuf/internal_db_update_nix.patch b/pkgs/development/python-modules/manuf/internal_db_update_nix.patch new file mode 100644 index 00000000000..174c71e4692 --- /dev/null +++ b/pkgs/development/python-modules/manuf/internal_db_update_nix.patch @@ -0,0 +1,31 @@ +diff --git a/manuf/manuf.py b/manuf/manuf.py +index e5e9193..09e9687 100755 +--- a/manuf/manuf.py ++++ b/manuf/manuf.py +@@ -65,8 +65,14 @@ class MacParser(object): + WFA_URL = "https://gitlab.com/wireshark/wireshark/raw/master/wka" + + def __init__(self, manuf_name=None, update=False): +- self._manuf_name = manuf_name or self.get_packaged_manuf_file_path() +- if update: ++ if manuf_name is not None: ++ self._manuf_name = manuf_name ++ self.external_db = True ++ else: ++ self._manuf_name = self.get_packaged_manuf_file_path() ++ self.external_db = False ++ ++ if update and self.external_db: + self.update() + else: + self.refresh() +@@ -134,6 +140,9 @@ class MacParser(object): + URLError: If the download fails + + """ ++ if manuf_url is None and not self.external_db: ++ return ++ + if not manuf_url: + manuf_url = self.MANUF_URL + if not manuf_name: diff --git a/pkgs/development/python-modules/mdformat-admon/default.nix b/pkgs/development/python-modules/mdformat-admon/default.nix index 1d285d89c70..a7fd0f94037 100644 --- a/pkgs/development/python-modules/mdformat-admon/default.nix +++ b/pkgs/development/python-modules/mdformat-admon/default.nix @@ -24,7 +24,7 @@ let in python.pkgs.buildPythonPackage rec { pname = "mdformat-admon"; version = "1.0.2"; - format = "flit"; + format = "pyproject"; disabled = pythonOlder "3.7"; @@ -35,6 +35,10 @@ in python.pkgs.buildPythonPackage rec { hash = "sha256-33Q3Re/axnoOHZ9XYA32mmK+efsSelJXW8sD7C1M/jU="; }; + nativeBuildInputs = with python.pkgs; [ + flit-core + ]; + buildInputs = with python.pkgs; [ mdformat ]; diff --git a/pkgs/development/python-modules/mdformat-footnote/default.nix b/pkgs/development/python-modules/mdformat-footnote/default.nix index cee0e1bd5e5..4d7b56f0c2f 100644 --- a/pkgs/development/python-modules/mdformat-footnote/default.nix +++ b/pkgs/development/python-modules/mdformat-footnote/default.nix @@ -1,6 +1,7 @@ { lib , buildPythonPackage , fetchFromGitHub +, flit-core , linkify-it-py , markdown-it-py , mdformat @@ -11,7 +12,7 @@ buildPythonPackage rec { pname = "mdformat-footnote"; version = "0.1.1"; - format = "flit"; + format = "pyproject"; disabled = pythonOlder "3.7"; @@ -22,6 +23,10 @@ buildPythonPackage rec { hash = "sha256-DUCBWcmB5i6/HkqxjlU3aTRO7i0n2sj+e/doKB8ffeo="; }; + nativeBuildInputs = [ + flit-core + ]; + buildInputs = [ mdformat mdit-py-plugins diff --git a/pkgs/development/python-modules/mdformat-frontmatter/default.nix b/pkgs/development/python-modules/mdformat-frontmatter/default.nix index 67e0634fa1d..b073bb83a59 100644 --- a/pkgs/development/python-modules/mdformat-frontmatter/default.nix +++ b/pkgs/development/python-modules/mdformat-frontmatter/default.nix @@ -1,6 +1,7 @@ { lib , buildPythonPackage , fetchFromGitHub +, flit-core , linkify-it-py , markdown-it-py , mdformat @@ -12,7 +13,7 @@ buildPythonPackage rec { pname = "mdformat-frontmatter"; version = "2.0.1"; - format = "flit"; + format = "pyproject"; disabled = pythonOlder "3.7"; @@ -23,6 +24,10 @@ buildPythonPackage rec { hash = "sha256-PhT5whtvvcYSs5gHQEsIvV1evhx7jR+3DWFMHrF0uMw="; }; + nativeBuildInputs = [ + flit-core + ]; + buildInputs = [ mdformat mdit-py-plugins diff --git a/pkgs/development/python-modules/mdformat-mkdocs/default.nix b/pkgs/development/python-modules/mdformat-mkdocs/default.nix index 73404542652..e8efd7bac91 100644 --- a/pkgs/development/python-modules/mdformat-mkdocs/default.nix +++ b/pkgs/development/python-modules/mdformat-mkdocs/default.nix @@ -1,6 +1,7 @@ { lib , buildPythonPackage , fetchFromGitHub +, flit-core , mdformat , mdformat-gfm , mdit-py-plugins @@ -10,7 +11,7 @@ buildPythonPackage rec { pname = "mdformat-mkdocs"; version = "1.0.4"; - format = "flit"; + format = "pyproject"; disabled = pythonOlder "3.7"; @@ -21,6 +22,10 @@ buildPythonPackage rec { hash = "sha256-mGWeG8clWJ7obsvO+gYaVzfAyDOh9HNdyWW5KgOgfmM="; }; + nativeBuildInputs = [ + flit-core + ]; + buildInputs = [ mdformat mdformat-gfm diff --git a/pkgs/development/python-modules/mdformat-simple-breaks/default.nix b/pkgs/development/python-modules/mdformat-simple-breaks/default.nix index b4d293f6368..c5bbeeb46de 100644 --- a/pkgs/development/python-modules/mdformat-simple-breaks/default.nix +++ b/pkgs/development/python-modules/mdformat-simple-breaks/default.nix @@ -1,6 +1,7 @@ { lib , buildPythonPackage , fetchFromGitHub +, flit-core , mdformat , mdit-py-plugins , pythonOlder @@ -9,7 +10,7 @@ buildPythonPackage rec { pname = "mdformat-simple-breaks"; version = "0.0.1"; - format = "flit"; + format = "pyproject"; disabled = pythonOlder "3.7"; @@ -20,6 +21,10 @@ buildPythonPackage rec { hash = "sha256-4lJHB4r9lI2uGJ/BmFFc92sumTRKBBwiRmGBdQkzfd0="; }; + nativeBuildInputs = [ + flit-core + ]; + buildInputs = [ mdformat ]; diff --git a/pkgs/development/python-modules/mdformat-tables/default.nix b/pkgs/development/python-modules/mdformat-tables/default.nix index 747029eab27..018371ada82 100644 --- a/pkgs/development/python-modules/mdformat-tables/default.nix +++ b/pkgs/development/python-modules/mdformat-tables/default.nix @@ -1,6 +1,7 @@ { lib , buildPythonPackage , fetchFromGitHub +, flit-core , mdformat , mdit-py-plugins , pytestCheckHook @@ -10,7 +11,7 @@ buildPythonPackage rec { pname = "mdformat-tables"; version = "0.4.1"; - format = "flit"; + format = "pyproject"; disabled = pythonOlder "3.7"; @@ -21,6 +22,10 @@ buildPythonPackage rec { hash = "sha256-Q61GmaRxjxJh9GjyR8QCZOH0njFUtAWihZ9lFQJ2nQQ="; }; + nativeBuildInputs = [ + flit-core + ]; + buildInputs = [ mdformat ]; diff --git a/pkgs/development/python-modules/mecab-python3/default.nix b/pkgs/development/python-modules/mecab-python3/default.nix index baeb56992eb..e5943b186dd 100644 --- a/pkgs/development/python-modules/mecab-python3/default.nix +++ b/pkgs/development/python-modules/mecab-python3/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "mecab-python3"; - version = "1.0.6"; + version = "1.0.7"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-FvOKzkhAIL00RqEAVIKWeMHnuX8XQLWLAKMdWVz/Al4="; + hash = "sha256-2ZM79P2UQmD1i0Ifhjm7wRIEE9Hz/N6MVQlyIdwT1R0="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/mediafile/default.nix b/pkgs/development/python-modules/mediafile/default.nix index a3c2ad7794f..00a657800da 100644 --- a/pkgs/development/python-modules/mediafile/default.nix +++ b/pkgs/development/python-modules/mediafile/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "mediafile"; version = "0.10.1"; - format = "flit"; + format = "pyproject"; disabled = pythonOlder "3.6"; diff --git a/pkgs/development/python-modules/mediapy/default.nix b/pkgs/development/python-modules/mediapy/default.nix index 28f754e98ed..c37aa8f867e 100644 --- a/pkgs/development/python-modules/mediapy/default.nix +++ b/pkgs/development/python-modules/mediapy/default.nix @@ -2,6 +2,7 @@ , buildPythonPackage , fetchPypi , pythonOlder +, flit-core , ipython , matplotlib , numpy @@ -11,6 +12,7 @@ buildPythonPackage rec { pname = "mediapy"; version = "1.1.8"; + format = "pyproject"; disabled = pythonOlder "3.6"; @@ -19,9 +21,10 @@ buildPythonPackage rec { hash = "sha256-mVhBM+NQEkLYByp/kCPFJCAY26La5CWjcPl6PgclA9A="; }; + nativeBuildInputs = [ flit-core ]; + propagatedBuildInputs = [ ipython matplotlib numpy pillow ]; - format = "flit"; pythonImportsCheck = [ "mediapy" ]; diff --git a/pkgs/development/python-modules/merge3/default.nix b/pkgs/development/python-modules/merge3/default.nix index e16a73eee3d..e06556dddf3 100644 --- a/pkgs/development/python-modules/merge3/default.nix +++ b/pkgs/development/python-modules/merge3/default.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { pname = "merge3"; - version = "0.0.13"; + version = "0.0.14"; format = "pyproject"; @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "8abda1d2d49776323d23d09bfdd80d943a57d43d28d6152ffd2c87956a9b6b54"; + sha256 = "sha256-MEBumThvSmUoD7nEPmgYkPoqHYOcrCdZ0VbHzBYDAVk="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/meshtastic/default.nix b/pkgs/development/python-modules/meshtastic/default.nix index 51db2a480aa..dcac8a6b277 100644 --- a/pkgs/development/python-modules/meshtastic/default.nix +++ b/pkgs/development/python-modules/meshtastic/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { pname = "meshtastic"; - version = "2.2.5"; + version = "2.2.6"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -29,7 +29,7 @@ buildPythonPackage rec { owner = "meshtastic"; repo = "Meshtastic-python"; rev = "refs/tags/${version}"; - hash = "sha256-qRSJN1tWMECQU/jbC2UzhEZAVQwvm7hTIr3cqvFO4TM="; + hash = "sha256-JnheGeiLJMI0zsb+jiuMxjXg/3rDbMyA2XVtl1ujiso="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/ml-dtypes/default.nix b/pkgs/development/python-modules/ml-dtypes/default.nix index eae60372af0..08c4a02ca90 100644 --- a/pkgs/development/python-modules/ml-dtypes/default.nix +++ b/pkgs/development/python-modules/ml-dtypes/default.nix @@ -11,16 +11,16 @@ buildPythonPackage rec { pname = "ml-dtypes"; - version = "0.2.0"; + version = "0.3.1"; format = "pyproject"; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.9"; src = fetchFromGitHub { owner = "jax-ml"; repo = "ml_dtypes"; rev = "refs/tags/v${version}"; - hash = "sha256-eqajWUwylIYsS8gzEaCZLLr+1+34LXWhfKBjuwsEhhI="; + hash = "sha256-tuqB5itrAkT2b76rgRAJaOeng4V83TzPu400DPYrdKU="; # Since this upstream patch (https://github.com/jax-ml/ml_dtypes/commit/1bfd097e794413b0d465fa34f2eff0f3828ff521), # the attempts to use the nixpkgs packaged eigen dependency have failed. # Hence, we rely on the bundled eigen library. @@ -31,8 +31,9 @@ buildPythonPackage rec { substituteInPlace pyproject.toml \ --replace "numpy~=1.21.2" "numpy" \ --replace "numpy~=1.23.3" "numpy" \ - --replace "pybind11~=2.10.0" "pybind11" \ - --replace "setuptools~=67.6.0" "setuptools" + --replace "numpy~=1.26.0" "numpy" \ + --replace "pybind11~=2.11.1" "pybind11" \ + --replace "setuptools~=68.1.0" "setuptools" ''; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/more-itertools/default.nix b/pkgs/development/python-modules/more-itertools/default.nix index f5243236189..86a1b5d3d32 100644 --- a/pkgs/development/python-modules/more-itertools/default.nix +++ b/pkgs/development/python-modules/more-itertools/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "more-itertools"; version = "9.1.0"; - format = "flit"; + format = "pyproject"; src = fetchPypi { inherit pname version; hash = "sha256-yrqjQa0DieqDwXqUVmpTrkydBzSYYeyxTcbQNFz5rF0="; }; - nativeBuildInouts = [ + nativeBuildInputs = [ flit-core ]; diff --git a/pkgs/development/python-modules/mrsqm/default.nix b/pkgs/development/python-modules/mrsqm/default.nix new file mode 100644 index 00000000000..3bbe69f2d4e --- /dev/null +++ b/pkgs/development/python-modules/mrsqm/default.nix @@ -0,0 +1,45 @@ +{ lib +, buildPythonPackage +, fetchPypi +, pythonOlder +, cython +, fftw +, pandas +, scikit-learn +, numpy +}: + +buildPythonPackage rec { + pname = "mrsqm"; + version = "0.0.4"; + format = "setuptools"; + + disable = pythonOlder "3.8"; + + src = fetchPypi { + inherit pname version; + hash = "sha256-kg9GSgtBpnCF+09jyP5TRwZh0tifxx4WRtQGn8bLH8c="; + }; + + buildInputs = [ fftw ]; + + nativeBuildInputs = [ + cython + ]; + + propagatedBuildInputs = [ + pandas + scikit-learn + numpy + ]; + + doCheck = false; # Package has no tests + pythonImportsCheck = [ "mrsqm" ]; + + meta = with lib; { + description = "MrSQM (Multiple Representations Sequence Miner) is a time series classifier"; + homepage = "https://pypi.org/project/mrsqm"; + license = licenses.gpl3Only; + maintainers = with maintainers; [ mbalatsko ]; + }; +} diff --git a/pkgs/development/python-modules/mypy-boto3-s3/default.nix b/pkgs/development/python-modules/mypy-boto3-s3/default.nix index 61aa96fa134..91df8b1ce0b 100644 --- a/pkgs/development/python-modules/mypy-boto3-s3/default.nix +++ b/pkgs/development/python-modules/mypy-boto3-s3/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "mypy-boto3-s3"; - version = "1.28.36"; + version = "1.28.52"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-RNo3X9TXWxxczCbc075IKUxwYURe/W2Q6/ykP/67s+Q="; + hash = "sha256-F5y3VCzF72VvEyOtUesjevy6d9Hl7QfSGgE/427/uLI="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/myst-nb/default.nix b/pkgs/development/python-modules/myst-nb/default.nix index 6ede481fba8..33c06fc2461 100644 --- a/pkgs/development/python-modules/myst-nb/default.nix +++ b/pkgs/development/python-modules/myst-nb/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { pname = "myst-nb"; version = "0.17.2"; - format = "flit"; + format = "pyproject"; disabled = pythonOlder "3.7"; diff --git a/pkgs/development/python-modules/nestedtext/default.nix b/pkgs/development/python-modules/nestedtext/default.nix index 807060528ee..185fffba413 100644 --- a/pkgs/development/python-modules/nestedtext/default.nix +++ b/pkgs/development/python-modules/nestedtext/default.nix @@ -2,7 +2,7 @@ , buildPythonPackage , docopt , fetchFromGitHub -, flitBuildHook +, flit-core , hypothesis , inform , nestedtext @@ -27,7 +27,7 @@ buildPythonPackage rec { }; nativeBuildInputs = [ - flitBuildHook + flit-core ]; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/nkdfu/default.nix b/pkgs/development/python-modules/nkdfu/default.nix index 340af281269..35d6fa16e1d 100644 --- a/pkgs/development/python-modules/nkdfu/default.nix +++ b/pkgs/development/python-modules/nkdfu/default.nix @@ -1,15 +1,19 @@ -{ lib, buildPythonPackage, fetchPypi, fire, tqdm, intelhex, libusb1 }: +{ lib, buildPythonPackage, fetchPypi, flit-core, fire, tqdm, intelhex, libusb1 }: buildPythonPackage rec { pname = "nkdfu"; version = "0.2"; - format = "flit"; + format = "pyproject"; src = fetchPypi { inherit pname version; hash = "sha256-8l913dOCxHKFtpQ83p9RV3sUlu0oT5PVi14FSuYJ9fg="; }; + nativeBuildInputs = [ + flit-core + ]; + propagatedBuildInputs = [ fire tqdm diff --git a/pkgs/development/python-modules/nomadnet/default.nix b/pkgs/development/python-modules/nomadnet/default.nix index 71070e2decd..9415343d6ea 100644 --- a/pkgs/development/python-modules/nomadnet/default.nix +++ b/pkgs/development/python-modules/nomadnet/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "nomadnet"; - version = "0.3.6"; + version = "0.3.7"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "markqvist"; repo = "NomadNet"; rev = "refs/tags/${version}"; - hash = "sha256-3b6uwojekWthH5AsAVfS/ue+yAoIMac1LQff1mrM9PM="; + hash = "sha256-cyD68GsAuJKmbVxWCCJVWz/VErB9LEdRzz9IT8ir+U0="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/onnx/default.nix b/pkgs/development/python-modules/onnx/default.nix index 4d4b587314d..df15ebe77e4 100644 --- a/pkgs/development/python-modules/onnx/default.nix +++ b/pkgs/development/python-modules/onnx/default.nix @@ -66,10 +66,14 @@ in buildPythonPackage rec { --replace 'include(googletest)' "" substituteInPlace cmake/unittest.cmake \ --replace 'googletest)' ')' - - # remove this override in 1.15 that will enable to set the CMAKE_CXX_STANDARD with cmakeFlags - substituteInPlace CMakeLists.txt \ - --replace 'CMAKE_CXX_STANDARD 11' 'CMAKE_CXX_STANDARD 17' + '' + lib.optionalString stdenv.isLinux '' + # remove this override in 1.15 that will enable to set the CMAKE_CXX_STANDARD with cmakeFlags + substituteInPlace CMakeLists.txt \ + --replace 'CMAKE_CXX_STANDARD 11' 'CMAKE_CXX_STANDARD 17' + '' + lib.optionalString stdenv.isDarwin '' + # remove this override in 1.15 that will enable to set the CMAKE_CXX_STANDARD with cmakeFlags + substituteInPlace CMakeLists.txt \ + --replace 'CMAKE_CXX_STANDARD 11' 'CMAKE_CXX_STANDARD 14' ''; preConfigure = '' diff --git a/pkgs/development/python-modules/paddleocr/default.nix b/pkgs/development/python-modules/paddleocr/default.nix index 9bd81077abf..c75d6e87e07 100644 --- a/pkgs/development/python-modules/paddleocr/default.nix +++ b/pkgs/development/python-modules/paddleocr/default.nix @@ -28,7 +28,7 @@ }: let - version = "2.7.0.1"; + version = "2.7.0"; in buildPythonPackage { pname = "paddleocr"; @@ -38,8 +38,8 @@ buildPythonPackage { src = fetchFromGitHub { owner = "PaddlePaddle"; repo = "PaddleOCR"; - rev = "254786752a2659e184822b4b2de5637a05236590"; - hash = "sha256-M/Fpk9swX9Gds7o5poM9Iv6LOhKoZNbe0Wv9JNMPOU0="; + rev = "v${version}"; + hash = "sha256-r7Y666KpY855NCSinCBBUz9PXHfZ56+oZW1/0ISpWe4="; }; patches = [ diff --git a/pkgs/development/python-modules/panel/default.nix b/pkgs/development/python-modules/panel/default.nix index 3df9474d378..7fe1be6f745 100644 --- a/pkgs/development/python-modules/panel/default.nix +++ b/pkgs/development/python-modules/panel/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "panel"; - version = "1.2.2"; + version = "1.2.3"; format = "wheel"; @@ -25,7 +25,7 @@ buildPythonPackage rec { # tries to fetch even more artifacts src = fetchPypi { inherit pname version format; - hash = "sha256-RMRjxcUp6MTs001wdNfC/e6diOcgtqrSaVIOSQfPgTs="; + hash = "sha256-CAW6z0phPohpFjv4D1DlmomDiv52vb5qBatWN/Mmg/c="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/parametrize-from-file/default.nix b/pkgs/development/python-modules/parametrize-from-file/default.nix index 38370a1c805..4306579bc51 100644 --- a/pkgs/development/python-modules/parametrize-from-file/default.nix +++ b/pkgs/development/python-modules/parametrize-from-file/default.nix @@ -2,6 +2,7 @@ , buildPythonPackage , fetchPypi , fetchpatch +, flit-core , pytestCheckHook , coveralls , numpy @@ -16,7 +17,7 @@ buildPythonPackage rec { pname = "parametrize-from-file"; version = "0.17.0"; - format = "flit"; + format = "pyproject"; src = fetchPypi { inherit version; @@ -40,6 +41,10 @@ buildPythonPackage rec { --replace "more_itertools~=8.10" "more_itertools" ''; + nativeBuildInputs = [ + flit-core + ]; + nativeCheckInputs = [ numpy pytestCheckHook diff --git a/pkgs/development/python-modules/patiencediff/default.nix b/pkgs/development/python-modules/patiencediff/default.nix index 4837ffba7c2..00d55188567 100644 --- a/pkgs/development/python-modules/patiencediff/default.nix +++ b/pkgs/development/python-modules/patiencediff/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "patiencediff"; - version = "0.2.13"; + version = "0.2.14"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "breezy-team"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-Hst/2hRqH8AIKD2EXtJo8m3diOxPBWAmNhtS3TUYT3I="; + hash = "sha256-KTOESjaj8fMxJZ7URqg6UMpiQppqZAlk4IPWEw4/Nvw="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/pdoc/default.nix b/pkgs/development/python-modules/pdoc/default.nix index fc9ce57cde0..621c2842e70 100644 --- a/pkgs/development/python-modules/pdoc/default.nix +++ b/pkgs/development/python-modules/pdoc/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "pdoc"; - version = "14.0.0"; + version = "14.1.0"; disabled = pythonOlder "3.8"; format = "pyproject"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "mitmproxy"; repo = "pdoc"; rev = "v${version}"; - hash = "sha256-rMHp0diXvWIOyucuTAXO/IOljKhDYOZKtkih5+rUJCM="; + hash = "sha256-LQXhdzocw01URrmpDayK9rpsArvM/E44AE8Eok9DBwk="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/peaqevcore/default.nix b/pkgs/development/python-modules/peaqevcore/default.nix index 24f1be71cb3..e9f7ed8aaf1 100644 --- a/pkgs/development/python-modules/peaqevcore/default.nix +++ b/pkgs/development/python-modules/peaqevcore/default.nix @@ -6,14 +6,14 @@ buildPythonPackage rec { pname = "peaqevcore"; - version = "19.4.2"; + version = "19.5.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-SJ3G301HO0TnrupzhK4K6JPDs25Nltv+lNj1nQB7gV4="; + hash = "sha256-b/sTrSXj3+dkg8++zDZfroSBHIMJIeyPbY5aRnv8mI4="; }; postPatch = '' diff --git a/pkgs/development/python-modules/pep440/default.nix b/pkgs/development/python-modules/pep440/default.nix index c9753a47d81..0faa3c324b3 100644 --- a/pkgs/development/python-modules/pep440/default.nix +++ b/pkgs/development/python-modules/pep440/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "pep440"; version = "0.1.2"; - format = "flit"; + format = "pyproject"; disabled = pythonOlder "3.8"; diff --git a/pkgs/development/python-modules/pex/default.nix b/pkgs/development/python-modules/pex/default.nix index 51f13095ed0..a9462cd8e2c 100644 --- a/pkgs/development/python-modules/pex/default.nix +++ b/pkgs/development/python-modules/pex/default.nix @@ -7,14 +7,14 @@ buildPythonPackage rec { pname = "pex"; - version = "2.1.145"; + version = "2.1.147"; format = "pyproject"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-1rrIxOjOdGz+Xxb6QrH6Zth/eF+zaBOGFf4I9P17nbI="; + hash = "sha256-oTzMMTbq+prKNE8hhBWsRvhxBD+Ca/M1pVuppSByjp4="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/pgvector/default.nix b/pkgs/development/python-modules/pgvector/default.nix index a521038ef03..03fbef0bd48 100644 --- a/pkgs/development/python-modules/pgvector/default.nix +++ b/pkgs/development/python-modules/pgvector/default.nix @@ -4,6 +4,7 @@ , django , fetchFromGitHub , numpy +, peewee , postgresql , postgresqlTestHook , psycopg @@ -16,7 +17,7 @@ buildPythonPackage rec { pname = "pgvector"; - version = "0.2.1"; + version = "0.2.2"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -25,7 +26,7 @@ buildPythonPackage rec { owner = "pgvector"; repo = "pgvector-python"; rev = "refs/tags/v${version}"; - hash = "sha256-Phe8iAdOCVp4wpLuLfO+fQMD1MOD47OEIQJ45rYQzug="; + hash = "sha256-qvLDFnrTYibdhjSeeIFI4YdpPRsvNBnQ23uqsLCblEo="; }; propagatedBuildInputs = [ @@ -35,6 +36,7 @@ buildPythonPackage rec { nativeCheckInputs = [ asyncpg django + peewee (postgresql.withPackages (p: with p; [ pgvector ])) postgresqlTestHook psycopg diff --git a/pkgs/development/python-modules/pinecone-client/default.nix b/pkgs/development/python-modules/pinecone-client/default.nix index 84f3798df84..62fb96fb31a 100644 --- a/pkgs/development/python-modules/pinecone-client/default.nix +++ b/pkgs/development/python-modules/pinecone-client/default.nix @@ -13,11 +13,11 @@ }: buildPythonPackage rec { pname = "pinecone-client"; - version = "2.2.2"; + version = "2.2.4"; src = fetchPypi { inherit pname version; - hash = "sha256-OR/kE3VO/U4O8AFUtEJx1jxM3Uvt8IjSMRGlcl2GMhA="; + hash = "sha256-LBzB1mSLK+ZulE2y/6WRZqN7kWTRE1rVJdnNix4pgWg="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pkgutil-resolve-name/default.nix b/pkgs/development/python-modules/pkgutil-resolve-name/default.nix index d70cfd1c434..ddb610b53bc 100644 --- a/pkgs/development/python-modules/pkgutil-resolve-name/default.nix +++ b/pkgs/development/python-modules/pkgutil-resolve-name/default.nix @@ -1,13 +1,15 @@ { buildPythonPackage , fetchPypi +, fetchpatch , lib , nix-update-script , pythonOlder +, flit-core }: buildPythonPackage rec { pname = "pkgutil-resolve-name"; version = "1.3.10"; - format = "flit"; + format = "pyproject"; disabled = pythonOlder "3.7"; @@ -17,6 +19,18 @@ buildPythonPackage rec { hash = "sha256-NX1snmp1VlPP14iTgXwIU682XdUeyX89NYqBk3O70XQ="; }; + patches = [ + # Raise flit-core version constrains + (fetchpatch { # https://github.com/graingert/pkgutil-resolve-name/pull/5 + url = "https://github.com/graingert/pkgutil-resolve-name/commit/042834290c735fa836bb308ce9e93c9f64d67cbe.patch"; + hash = "sha256-M1rcrkdFcoFa3IncPnJaRhnXbelyk56QnMGtmgB6bvk="; + }) + ]; + + nativeBuildInputs = [ + flit-core + ]; + # has no tests doCheck = false; diff --git a/pkgs/development/python-modules/plac/default.nix b/pkgs/development/python-modules/plac/default.nix index 752c7aab5e8..a1822fe5157 100644 --- a/pkgs/development/python-modules/plac/default.nix +++ b/pkgs/development/python-modules/plac/default.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { pname = "plac"; - version = "1.3.5"; + version = "1.4.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -15,8 +15,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "ialbert"; repo = pname; - rev = "v${version}"; - hash = "sha256-U3k97YJhQjulYNWcKVx96/5zND5VfsRjA3ZZHWhcDNg="; + rev = "refs/tags/v${version}"; + hash = "sha256-BH6NKbDMhlNuo+orIEweABNSVZv1K9VrZBrCIs6H6BU="; }; # tests are broken, see https://github.com/ialbert/plac/issues/74 diff --git a/pkgs/development/python-modules/plaid-python/default.nix b/pkgs/development/python-modules/plaid-python/default.nix index a449edd308b..6064eb50067 100644 --- a/pkgs/development/python-modules/plaid-python/default.nix +++ b/pkgs/development/python-modules/plaid-python/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "plaid-python"; - version = "15.5.0"; + version = "16.0.0"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-zI3fOd1IcnXS5moM3mHl/1qzrAHnxoVrFg1GBCqiA10="; + hash = "sha256-FoZTfTPKidY0VPHYui25ArFm/MBIC7Ynwo9TyMT7st4="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/plugwise/default.nix b/pkgs/development/python-modules/plugwise/default.nix index f451b1f30c5..c1a5338eba5 100644 --- a/pkgs/development/python-modules/plugwise/default.nix +++ b/pkgs/development/python-modules/plugwise/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { pname = "plugwise"; - version = "0.32.2"; + version = "0.33.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -29,7 +29,7 @@ buildPythonPackage rec { owner = pname; repo = "python-plugwise"; rev = "refs/tags/v${version}"; - hash = "sha256-kJ7HbGwmA6/OtSxpkvajf+VzjYK+uq6kMaja9CmVBt4="; + hash = "sha256-EhPy1n1dsvsE4ciVNx86Ttvoyc61e2Lxecioy0kVN4A="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/podman/default.nix b/pkgs/development/python-modules/podman/default.nix new file mode 100644 index 00000000000..6d46b97e384 --- /dev/null +++ b/pkgs/development/python-modules/podman/default.nix @@ -0,0 +1,76 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, fixtures +, pytestCheckHook +, pythonOlder +, pyxdg +, requests +, requests-mock +, setuptools +, tomli +, urllib3 +, wheel +}: + +buildPythonPackage rec { + pname = "podman"; + version = "4.6.0"; + pyproject = true; + + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "containers"; + repo = "podman-py"; + rev = "refs/tags/v${version}"; + hash = "sha256-76mLgkQgYbm04bj1VX7SC/kW8JEbYjbK3x6Xb612wnk="; + }; + + nativeBuildInputs = [ + setuptools + wheel + ]; + + propagatedBuildInputs = [ + pyxdg + requests + tomli + urllib3 + ]; + + nativeCheckInputs = [ + fixtures + pytestCheckHook + requests-mock + ]; + + preCheck = '' + export HOME=$(mktemp -d) + ''; + + pythonImportsCheck = [ + "podman" + ]; + + disabledTests = [ + # Integration tests require a running container setup + "AdapterIntegrationTest" + "ContainersIntegrationTest" + "ImagesIntegrationTest" + "ManifestsIntegrationTest" + "NetworksIntegrationTest" + "PodsIntegrationTest" + "SecretsIntegrationTest" + "SystemIntegrationTest" + "VolumesIntegrationTest" + ]; + + meta = with lib; { + description = "Python bindings for Podman's RESTful API"; + homepage = "https://github.com/containers/podman-py"; + changelog = "https://github.com/containers/podman-py/releases/tag/v${version}"; + license = licenses.asl20; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/posthog/default.nix b/pkgs/development/python-modules/posthog/default.nix index d6136cf7172..0f20800ece0 100644 --- a/pkgs/development/python-modules/posthog/default.nix +++ b/pkgs/development/python-modules/posthog/default.nix @@ -14,7 +14,7 @@ }: let pname = "posthog"; - version = "3.0.1"; + version = "3.0.2"; in buildPythonPackage { inherit pname version; @@ -24,7 +24,7 @@ buildPythonPackage { owner = "PostHog"; repo = "posthog-python"; rev = "refs/tags/v${version}"; - hash = "sha256-GSHsa05DUcbIHg1HCoIn8d4NZoG+Iddqfgod2nP4fX0="; + hash = "sha256-QASqjphAWtYuIyhbFTYwv1gD+rXvrmp5W0Te4MFn1AA="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pplpy/default.nix b/pkgs/development/python-modules/pplpy/default.nix index 190e28e714c..333c0df0a27 100644 --- a/pkgs/development/python-modules/pplpy/default.nix +++ b/pkgs/development/python-modules/pplpy/default.nix @@ -13,11 +13,11 @@ buildPythonPackage rec { pname = "pplpy"; - version = "0.8.7"; + version = "0.8.9"; src = fetchPypi { inherit pname version; - sha256 = "500bd0f4ae1a76956fae7fcba77854f5ec3e64fce76803664983763c3f2bd8bd"; + sha256 = "sha256-23o7Vx1u8FP3UTeXXpR8OhweRaMLq5Dq8hW05cwVeX4="; }; buildInputs = [ diff --git a/pkgs/development/python-modules/publicsuffixlist/default.nix b/pkgs/development/python-modules/publicsuffixlist/default.nix index 79070dcfcb0..059a6729989 100644 --- a/pkgs/development/python-modules/publicsuffixlist/default.nix +++ b/pkgs/development/python-modules/publicsuffixlist/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "publicsuffixlist"; - version = "0.10.0.20230828"; + version = "0.10.0.20230920"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-eVPcj1gMY9a8Znhon2lEs9EKWgc55euyvzxnrkDH05o="; + hash = "sha256-4Sp8uyJAJ+Sg0wv6TjNkMOCKlL/c/2ToWP1byG2BZtE="; }; passthru.optional-dependencies = { diff --git a/pkgs/development/python-modules/pvlib/default.nix b/pkgs/development/python-modules/pvlib/default.nix index 46b1c99b0d0..683295edbc7 100644 --- a/pkgs/development/python-modules/pvlib/default.nix +++ b/pkgs/development/python-modules/pvlib/default.nix @@ -21,14 +21,14 @@ buildPythonPackage rec { pname = "pvlib"; - version = "0.10.1"; + version = "0.10.2"; format = "pyproject"; disabled = pythonOlder "3.7"; src = fetchPypi{ inherit pname version; - hash = "sha256-H3wiNCmnZ6+GjXMhDbeOL98Yy7V6s2oOFAKWJCb8XCk="; + hash = "sha256-gCOFP2heAtzpe38j1ljOz1yR1P8pRZ0eILVK8Kd3tFc="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/pydata-sphinx-theme/default.nix b/pkgs/development/python-modules/pydata-sphinx-theme/default.nix index b2beabc5476..794ded6318e 100644 --- a/pkgs/development/python-modules/pydata-sphinx-theme/default.nix +++ b/pkgs/development/python-modules/pydata-sphinx-theme/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "pydata-sphinx-theme"; - version = "0.14.0"; + version = "0.14.1"; format = "wheel"; @@ -23,7 +23,7 @@ buildPythonPackage rec { dist = "py3"; python = "py3"; pname = "pydata_sphinx_theme"; - hash = "sha256-vffSdZFOdnVijKK/brOiHQ76DmuZo6VCGDJZQHZ1TDM="; + hash = "sha256-xDYCe8dq4CPfTnBRfjuvkM3aWojuRrgYte8Mw4hKugQ="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pydateinfer/default.nix b/pkgs/development/python-modules/pydateinfer/default.nix new file mode 100644 index 00000000000..a2fb97236df --- /dev/null +++ b/pkgs/development/python-modules/pydateinfer/default.nix @@ -0,0 +1,40 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, unittestCheckHook +, pytz +, pyyaml +, argparse +}: + +buildPythonPackage rec { + pname = "pydateinfer"; + version = "0.3.0"; + format = "setuptools"; + + src = fetchFromGitHub { + owner = "wdm0006"; + repo = "dateinfer"; + rev = "${version},"; # yes the comma is required, this is correct name of git tag + hash = "sha256-0gy7wfT/uMTmpdIF2OPGVeUh+4yqJSI2Ebif0Lf/DLM="; + }; + + propagatedBuildInputs = [ + pytz + ]; + + preCheck = "cd dateinfer"; + nativeCheckInputs = [ + unittestCheckHook + pyyaml + argparse + ]; + pythonImportsCheck = [ "dateinfer" ]; + + meta = with lib; { + description = "Infers date format from examples"; + homepage = "https://pypi.org/project/pydateinfer/"; + license = licenses.asl20; + maintainers = with maintainers; [ mbalatsko ]; + }; +} diff --git a/pkgs/development/python-modules/pyerfa/default.nix b/pkgs/development/python-modules/pyerfa/default.nix index 4b9c5039f36..fda4be537d9 100644 --- a/pkgs/development/python-modules/pyerfa/default.nix +++ b/pkgs/development/python-modules/pyerfa/default.nix @@ -1,6 +1,7 @@ { lib , buildPythonPackage , fetchPypi +, fetchpatch , jinja2 , oldest-supported-numpy , setuptools-scm @@ -8,20 +9,28 @@ , liberfa , packaging , numpy +, pytestCheckHook +, pytest-doctestplus }: buildPythonPackage rec { pname = "pyerfa"; format = "pyproject"; - version = "2.0.0.1"; - - doCheck = false; + version = "2.0.0.3"; src = fetchPypi { inherit pname version; - hash = "sha256-L9Rjf/4sHm7edILBP1g7p8cxGdeL75AXVEjOUGoO3jA="; + hash = "sha256-13+7+lg1DBlMy5nl2TqgXTwrFNWq2LZi2Txq2f/0Hzk="; }; + patches = [ + # Sort of helps maybe for https://github.com/liberfa/pyerfa/issues/112 + (fetchpatch { + url = "https://github.com/liberfa/pyerfa/commit/4866342b94c5e7344711146f1186a4c3e7534da8.patch"; + hash = "sha256-uPFFdLYfRweQdeEApBAw6Ulqh31NTQwwmnaU+x/M+C0="; + }) + ]; + nativeBuildInputs = [ jinja2 oldest-supported-numpy @@ -31,14 +40,32 @@ buildPythonPackage rec { ]; propagatedBuildInputs = [ - liberfa numpy ]; + buildInputs = [ + liberfa + ]; preBuild = '' export PYERFA_USE_SYSTEM_LIBERFA=1 ''; + # See https://github.com/liberfa/pyerfa/issues/112#issuecomment-1721197483 + NIX_CFLAGS_COMPILE = "-O2"; + nativeCheckInputs = [ + pytestCheckHook + pytest-doctestplus + ]; + # Getting circular import errors without this, not clear yet why. This was mentioned to + # upstream at: https://github.com/liberfa/pyerfa/issues/112 and downstream at + # https://github.com/NixOS/nixpkgs/issues/255262 + preCheck = '' + cd $out + ''; + pythonImportsCheck = [ + "erfa" + ]; + meta = with lib; { description = "Python bindings for ERFA routines"; longDescription = '' diff --git a/pkgs/development/python-modules/pykka/default.nix b/pkgs/development/python-modules/pykka/default.nix index dd6566548bb..b13aaa716f6 100644 --- a/pkgs/development/python-modules/pykka/default.nix +++ b/pkgs/development/python-modules/pykka/default.nix @@ -5,34 +5,44 @@ , poetry-core , pytestCheckHook , pytest-mock +, typing-extensions }: buildPythonPackage rec { pname = "pykka"; - version = "3.1.1"; + version = "4.0.0"; format = "pyproject"; - disabled = pythonOlder "3.6.1"; + + disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "jodal"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-bvRjFpXufGygTgPfEOJOCXFbMy3dNlrTHlGoaIG/Fbs="; + hash = "sha256-xFEEv4UAKv/H//7OIBSb9juwmuH4xWd6BKBXaX2GwFU="; }; nativeBuildInputs = [ poetry-core ]; + propagatedBuildInputs = lib.optionals (pythonOlder "3.10") [ + typing-extensions + ]; + nativeCheckInputs = [ pytestCheckHook pytest-mock ]; + pythonImportsCheck = [ + "pykka" + ]; + meta = with lib; { homepage = "https://www.pykka.org/"; description = "A Python implementation of the actor model"; - changelog = "https://github.com/jodal/pykka/blob/v${version}/docs/changes.rst"; + changelog = "https://github.com/jodal/pykka/releases/tag/v${version}"; maintainers = with maintainers; [ marsam ]; license = licenses.asl20; }; diff --git a/pkgs/development/python-modules/pyngrok/default.nix b/pkgs/development/python-modules/pyngrok/default.nix index 6022db4d2e8..251c08f0260 100644 --- a/pkgs/development/python-modules/pyngrok/default.nix +++ b/pkgs/development/python-modules/pyngrok/default.nix @@ -1,16 +1,20 @@ { lib , buildPythonPackage +, pythonOlder , fetchPypi , pyyaml }: buildPythonPackage rec { pname = "pyngrok"; - version = "6.0.0"; + version = "7.0.0"; + format = "setuptools"; + + disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-3YqHlEuOKFcuPRJr+yyBopSFlFdfUjfu/TZRrgtIcVU="; + hash = "sha256-YOE9t/W4LsZqBFMbJRbyB6oQqrqW02iecqQYR6yZfV8="; }; propagatedBuildInputs = [ @@ -20,8 +24,9 @@ buildPythonPackage rec { pythonImportsCheck = [ "pyngrok" ]; meta = with lib; { - homepage = "https://github.com/alexdlaird/pyngrok"; description = "A Python wrapper for ngrok"; + homepage = "https://github.com/alexdlaird/pyngrok"; + changelog = "https://github.com/alexdlaird/pyngrok/blob/${version}/CHANGELOG.md"; license = licenses.mit; maintainers = with maintainers; [ wegank ]; }; diff --git a/pkgs/development/python-modules/pyosmium/default.nix b/pkgs/development/python-modules/pyosmium/default.nix index 289f4d1c048..40090532fea 100644 --- a/pkgs/development/python-modules/pyosmium/default.nix +++ b/pkgs/development/python-modules/pyosmium/default.nix @@ -1,8 +1,8 @@ { lib , buildPythonPackage , fetchFromGitHub +, fetchpatch , cmake -, python , libosmium , protozero , boost @@ -32,6 +32,14 @@ buildPythonPackage rec { hash = "sha256-+YJQGPQm2FGOPhNzlXX2GM+ad4QdipJhwViOKGHtqBk="; }; + patches = [ + # Compatibility with recent pybind versions + (fetchpatch { + url = "https://github.com/osmcode/pyosmium/commit/31b1363389b423f49e14140ce868ecac83e92f69.patch"; + hash = "sha256-maBuwzyZ4/wVLLGVr4gZFZDKvJckUXiBluxZRPGETag="; + }) + ]; + nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/python-modules/pyoverkiz/default.nix b/pkgs/development/python-modules/pyoverkiz/default.nix index 4dae164a050..291bcee9c50 100644 --- a/pkgs/development/python-modules/pyoverkiz/default.nix +++ b/pkgs/development/python-modules/pyoverkiz/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "pyoverkiz"; - version = "1.10.1"; + version = "1.11.0"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "iMicknl"; repo = "python-overkiz-api"; rev = "refs/tags/v${version}"; - hash = "sha256-tb0xU1H1VrWTuObCg1+mFkzawAzrknO3fER7cN2St7U="; + hash = "sha256-ZwDqctkbF3PUu4F9s7amdBoOYQ15jJk64HK4I7rJX/A="; }; postPatch = '' diff --git a/pkgs/development/python-modules/pyproj/default.nix b/pkgs/development/python-modules/pyproj/default.nix index e65313c753e..0d77ed937cf 100644 --- a/pkgs/development/python-modules/pyproj/default.nix +++ b/pkgs/development/python-modules/pyproj/default.nix @@ -17,14 +17,14 @@ buildPythonPackage rec { pname = "pyproj"; - version = "3.6.0"; + version = "3.6.1"; disabled = pythonOlder "3.9"; src = fetchFromGitHub { owner = "pyproj4"; repo = "pyproj"; rev = "refs/tags/${version}"; - hash = "sha256-XMJg1azsvMtVnKuIulrrZ1Of3CFk2/EgQjkN1g0FpmQ="; + hash = "sha256-ynAhu89VpvtQJRkIeVyffQHhd+OvWSiZzaI/7nd6fXA="; }; # force pyproj to use ${proj} diff --git a/pkgs/development/python-modules/pyschlage/default.nix b/pkgs/development/python-modules/pyschlage/default.nix index 45ba38aed42..886747e3161 100644 --- a/pkgs/development/python-modules/pyschlage/default.nix +++ b/pkgs/development/python-modules/pyschlage/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "pyschlage"; - version = "2023.9.0"; + version = "2023.9.1"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "dknowles2"; repo = "pyschlage"; rev = "refs/tags/${version}"; - hash = "sha256-4uYUEx6OcUMG8nS/PqZK5hHFQd/7pTGIix2it8pleuY="; + hash = "sha256-HFgQXMUmjWW5syBwtCunQ/TeulPwtF48Nesy9iZ3hlU="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; diff --git a/pkgs/development/python-modules/pytest-celery/default.nix b/pkgs/development/python-modules/pytest-celery/default.nix index 2a6ad34d706..0af07db4ec1 100644 --- a/pkgs/development/python-modules/pytest-celery/default.nix +++ b/pkgs/development/python-modules/pytest-celery/default.nix @@ -1,10 +1,10 @@ -{ lib, buildPythonPackage, fetchFromGitHub }: +{ lib, buildPythonPackage, fetchFromGitHub, flit-core }: buildPythonPackage rec { pname = "pytest-celery"; version = "0.1.0"; - format = "flit"; + format = "pyproject"; src = fetchFromGitHub { owner = "celery"; @@ -19,6 +19,10 @@ buildPythonPackage rec { --replace '"celery >= 4.4.0"' "" ''; + nativeBuildInputs = [ + flit-core + ]; + # This package has nothing to test or import. doCheck = false; diff --git a/pkgs/development/python-modules/pytest-check/default.nix b/pkgs/development/python-modules/pytest-check/default.nix index dbbf42c9b6a..1f11f31e213 100644 --- a/pkgs/development/python-modules/pytest-check/default.nix +++ b/pkgs/development/python-modules/pytest-check/default.nix @@ -1,6 +1,7 @@ { lib , buildPythonPackage , fetchPypi +, flit-core , pytest , pytestCheckHook }: @@ -8,14 +9,18 @@ buildPythonPackage rec { pname = "pytest-check"; version = "2.1.4"; - format = "flit"; + format = "pyproject"; src = fetchPypi { inherit pname version; hash = "sha256-AbN/1wPaD6ZntwF68fBGDHRKhfHuh2de4+D5Ssw98XI="; }; - buildInputs = [ + nativeBuildInputs = [ + flit-core + ]; + + propagatedBuildInputs = [ pytest ]; diff --git a/pkgs/development/python-modules/pytest-cid/default.nix b/pkgs/development/python-modules/pytest-cid/default.nix index 29cf253fad2..eea7a6ead0e 100644 --- a/pkgs/development/python-modules/pytest-cid/default.nix +++ b/pkgs/development/python-modules/pytest-cid/default.nix @@ -2,6 +2,7 @@ , fetchFromGitHub , buildPythonPackage , pythonOlder +, flit-core , py-cid , pytestCheckHook , pytest-cov @@ -10,7 +11,7 @@ buildPythonPackage rec { pname = "pytest-cid"; version = "1.1.2"; - format = "flit"; + format = "pyproject"; disabled = pythonOlder "3.5"; src = fetchFromGitHub { @@ -25,6 +26,10 @@ buildPythonPackage rec { --replace "pytest >= 5.0, < 7.0" "pytest >= 5.0" ''; + nativeBuildInputs = [ + flit-core + ]; + propagatedBuildInputs = [ py-cid ]; diff --git a/pkgs/development/python-modules/pytest-md-report/default.nix b/pkgs/development/python-modules/pytest-md-report/default.nix index 89b035e74d8..be52de50f41 100644 --- a/pkgs/development/python-modules/pytest-md-report/default.nix +++ b/pkgs/development/python-modules/pytest-md-report/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "pytest-md-report"; - version = "0.4.0"; + version = "0.4.1"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-iabj6WuS6+65O4ztagT1/H+U8/SKySQ9bQiOfvln1AQ="; + hash = "sha256-4946iE+VYaPndJtQLQE7Q7VSs4aXxrg3wL4p84oT5to="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pytest-param-files/default.nix b/pkgs/development/python-modules/pytest-param-files/default.nix index bf629cc356a..80dea1dbeaa 100644 --- a/pkgs/development/python-modules/pytest-param-files/default.nix +++ b/pkgs/development/python-modules/pytest-param-files/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { hash = "sha256-Q7wWoggJN2w2a2umQHx5TsVcugqpovBEtOKruNMZQ8A="; }; - format = "flit"; + format = "pyproject"; nativeBuildInputs = [ flit-core ]; diff --git a/pkgs/development/python-modules/pytest-raisin/default.nix b/pkgs/development/python-modules/pytest-raisin/default.nix index 2b3860c93f9..2da96d21c9e 100644 --- a/pkgs/development/python-modules/pytest-raisin/default.nix +++ b/pkgs/development/python-modules/pytest-raisin/default.nix @@ -1,14 +1,14 @@ { lib , buildPythonPackage , fetchFromGitHub -, flit-core +, flit , pytest }: buildPythonPackage rec { pname = "pytest-raisin"; version = "0.4"; - format = "flit"; + format = "pyproject"; src = fetchFromGitHub { owner = "wimglenn"; @@ -18,7 +18,7 @@ buildPythonPackage rec { }; nativeBuildInputs = [ - flit-core + flit ]; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pytest-reverse/default.nix b/pkgs/development/python-modules/pytest-reverse/default.nix new file mode 100644 index 00000000000..bd413c4d705 --- /dev/null +++ b/pkgs/development/python-modules/pytest-reverse/default.nix @@ -0,0 +1,41 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, setuptools +, pytest +, pytestCheckHook +, pythonOlder +}: + +buildPythonPackage rec { + pname = "pytest-reverse"; + version = "1.7.0"; + format = "pyproject"; + + disable = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "adamchainz"; + repo = "pytest-reverse"; + rev = version; + hash = "sha256-r0aSbUgArHQkpaXUvMT6oyOxEliQRtSGuDt4IILzhH4="; + }; + + nativeBuildInputs = [ + setuptools + ]; + + buildInputs = [ pytest ]; + + nativeCheckInputs = [ pytestCheckHook ]; + + pythonImportsCheck = [ "pytest_reverse" ]; + + meta = with lib; { + description = "Pytest plugin to reverse test order"; + homepage = "https://github.com/adamchainz/pytest-reverse"; + changelog = "https://github.com/adamchainz/pytest-reverse/blob/${version}/CHANGELOG.rst"; + license = licenses.mit; + maintainers = with maintainers; [ mbalatsko ]; + }; +} diff --git a/pkgs/development/python-modules/python-benedict/default.nix b/pkgs/development/python-modules/python-benedict/default.nix index e2daf959abb..b100ba2292c 100644 --- a/pkgs/development/python-modules/python-benedict/default.nix +++ b/pkgs/development/python-modules/python-benedict/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { pname = "python-benedict"; - version = "0.32.0"; + version = "0.32.1"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -33,7 +33,7 @@ buildPythonPackage rec { owner = "fabiocaccamo"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-4fBV7sInw/jrKt7CmG7riMTmpLyrsyvWZGRY6s3YbHw="; + hash = "sha256-q9EIOMmUcttL1ohxQD+SkZTxKv8PwdN29+ez2xB7rvM="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/python-fx/default.nix b/pkgs/development/python-modules/python-fx/default.nix index 729c5ed9a18..4bdd0816b2f 100644 --- a/pkgs/development/python-modules/python-fx/default.nix +++ b/pkgs/development/python-modules/python-fx/default.nix @@ -30,7 +30,7 @@ buildPythonPackage rec { pname = "python-fx"; - version = "0.2.0"; + version = "0.3.0"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -39,7 +39,7 @@ buildPythonPackage rec { owner = "cielong"; repo = "pyfx"; rev = "refs/tags/v${version}"; - hash = "sha256-nRMeYL0JGvCtUQBUMXUsZ4+F2KX+x/CbZ61sAidT9so="; + hash = "sha256-Bgg6UbAyog1I4F2NfULY+UlPf2HeyBJdxm4+5bmCLN0="; }; postPatch = '' diff --git a/pkgs/development/python-modules/python-lsp-jsonrpc/default.nix b/pkgs/development/python-modules/python-lsp-jsonrpc/default.nix index 51385c46434..27057d92ea1 100644 --- a/pkgs/development/python-modules/python-lsp-jsonrpc/default.nix +++ b/pkgs/development/python-modules/python-lsp-jsonrpc/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "python-lsp-jsonrpc"; - version = "1.1.1"; + version = "1.1.2"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "python-lsp"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-XTvnDTaP5oweGSq1VItq+SEv7S/LrQq4YP1XQc3bxbk="; + hash = "sha256-5WN/31e6WCgXVzevMuQbNjyo/2jjWDF+m48nrLKS+64="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; diff --git a/pkgs/development/python-modules/python-openstackclient/default.nix b/pkgs/development/python-modules/python-openstackclient/default.nix index d0cecb30bb9..fdafe57d5cc 100644 --- a/pkgs/development/python-modules/python-openstackclient/default.nix +++ b/pkgs/development/python-modules/python-openstackclient/default.nix @@ -16,11 +16,11 @@ buildPythonPackage rec { pname = "python-openstackclient"; - version = "6.2.0"; + version = "6.3.0"; src = fetchPypi { inherit pname version; - hash = "sha256-fFOr4bc7RT9Z2ntzZ5w7dZtI5RuLBUhktf3qLqgnJ9Y="; + hash = "sha256-m6C9+NAwh+WFtAqNzEKc673V/ewkwdYKECv58zEyDfE="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/python-rtmidi/default.nix b/pkgs/development/python-modules/python-rtmidi/default.nix index ffeefcd2e42..1d785987cff 100644 --- a/pkgs/development/python-modules/python-rtmidi/default.nix +++ b/pkgs/development/python-modules/python-rtmidi/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { pname = "python-rtmidi"; - version = "1.5.5"; + version = "1.5.6"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -29,7 +29,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "python_rtmidi"; inherit version; - hash = "sha256-Pz6bD6SX6BPMC91zsorgeXfJGAPk1VULx8ejShUBy94="; + hash = "sha256-sqCjmbtKXhpWR3eYr9QdAioYtelU9tD/krRbuZvuNxA="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/python_docs_theme/default.nix b/pkgs/development/python-modules/python_docs_theme/default.nix index 1e3776b906a..90cf78e4d69 100644 --- a/pkgs/development/python-modules/python_docs_theme/default.nix +++ b/pkgs/development/python-modules/python_docs_theme/default.nix @@ -1,9 +1,9 @@ -{ lib, buildPythonPackage, fetchFromGitHub, sphinx }: +{ lib, buildPythonPackage, fetchFromGitHub, flit-core, sphinx }: buildPythonPackage rec { pname = "python_docs_theme"; version = "2023.7"; - format = "flit"; + format = "pyproject"; src = fetchFromGitHub { owner = "python"; @@ -12,6 +12,8 @@ buildPythonPackage rec { sha256 = "sha256-43/TlgYm7Q4ZtY25MiLU9fd1atDmiDUeUK6AYfDfmag="; }; + nativeBuildInputs = [ flit-core ]; + propagatedBuildInputs = [ sphinx ]; pythonImportsCheck = [ "python_docs_theme" ]; diff --git a/pkgs/development/python-modules/pythonocc-core/default.nix b/pkgs/development/python-modules/pythonocc-core/default.nix index 7873574b0a1..cedf05029c9 100644 --- a/pkgs/development/python-modules/pythonocc-core/default.nix +++ b/pkgs/development/python-modules/pythonocc-core/default.nix @@ -1,4 +1,7 @@ -{ lib, stdenv, python, fetchFromGitHub +{ lib +, stdenv +, python +, fetchFromGitHub , cmake , Cocoa , fontconfig @@ -11,7 +14,6 @@ , libXmu , opencascade-occt , rapidjson -, smesh , swig4 }: @@ -34,7 +36,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake swig4 ]; buildInputs = [ - python opencascade-occt smesh + python opencascade-occt freetype libGL libGLU libX11 libXext libXmu libXi fontconfig rapidjson ] ++ lib.optionals stdenv.isDarwin [ Cocoa ]; @@ -42,10 +44,6 @@ stdenv.mkDerivation rec { cmakeFlags = [ "-Wno-dev" "-DPYTHONOCC_INSTALL_DIRECTORY=${placeholder "out"}/${python.sitePackages}/OCC" - - "-DSMESH_INCLUDE_PATH=${smesh}/include/smesh" - "-DSMESH_LIB_PATH=${smesh}/lib" - "-DPYTHONOCC_WRAP_SMESH=TRUE" ]; passthru = { @@ -57,6 +55,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Python wrapper for the OpenCASCADE 3D modeling kernel"; homepage = "https://github.com/tpaviot/pythonocc-core"; + changelog = "https://github.com/tpaviot/pythonocc-core/releases/tag/${version}"; license = licenses.lgpl3; platforms = platforms.unix; maintainers = with maintainers; [ gebner ]; diff --git a/pkgs/development/python-modules/pytube/default.nix b/pkgs/development/python-modules/pytube/default.nix index a684e5ca6a3..2c8f714e500 100644 --- a/pkgs/development/python-modules/pytube/default.nix +++ b/pkgs/development/python-modules/pytube/default.nix @@ -7,9 +7,9 @@ buildPythonPackage rec { pname = "pytube"; - version = "12.1.2"; + version = "15.0.0"; - disabled = pythonOlder "3.6"; + disabled = pythonOlder "3.7"; format = "setuptools"; @@ -17,13 +17,17 @@ buildPythonPackage rec { owner = "pytube"; repo = "pytube"; rev = "v${version}"; - hash = "sha256-Y4mriCwFvwAZ3e8kHKo9/S2vReb4q+b8KTHxtQo8SEw="; + hash = "sha256-Nvs/YlOjk/P5nd1kpUnCM2n6yiEaqZP830UQI0Ug1rk="; }; nativeCheckInputs = [ pytestCheckHook ]; + disabledTests = [ + "test_streaming" + ]; + disabledTestPaths = [ "tests/test_extract.py" "tests/test_query.py" diff --git a/pkgs/development/python-modules/pyvex/default.nix b/pkgs/development/python-modules/pyvex/default.nix index cde97a30746..6663c1d4a47 100644 --- a/pkgs/development/python-modules/pyvex/default.nix +++ b/pkgs/development/python-modules/pyvex/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "pyvex"; - version = "9.2.68"; + version = "9.2.69"; format = "pyproject"; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-Wsme663FssNGG/XhjkFi3tFeyli1yiofBQQiXi9P6nI="; + hash = "sha256-qyqWJ3B4R7aKHDsTJ29luwTfVysMx56hY82rBgRS2Sw="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/pyvista/default.nix b/pkgs/development/python-modules/pyvista/default.nix index 4d40a650506..d6c4ac17512 100644 --- a/pkgs/development/python-modules/pyvista/default.nix +++ b/pkgs/development/python-modules/pyvista/default.nix @@ -6,20 +6,23 @@ , numpy , pillow , pooch +, pythonOlder , scooby , vtk }: buildPythonPackage rec { pname = "pyvista"; - version = "0.42.1"; + version = "0.42.2"; format = "setuptools"; + disabled = pythonOlder "3.8"; + src = fetchFromGitHub { owner = pname; repo = pname; - rev = "v${version}"; - hash = "sha256-Bk2bw6WCLzMb3nLMCS9rRugNocA9eYju/aoE68TYu5c="; + rev = "refs/tags/v${version}"; + hash = "sha256-i+09vjp6m9CSEbWcvj2TCnOb408xw5Gli1en6FTYZH4="; }; propagatedBuildInputs = [ @@ -40,8 +43,9 @@ buildPythonPackage rec { ]; meta = with lib; { - homepage = "https://pyvista.org"; description = "Easier Pythonic interface to VTK"; + homepage = "https://pyvista.org"; + changelog = "https://github.com/pyvista/pyvista/releases/tag/v${version}"; license = licenses.mit; maintainers = with maintainers; [ wegank ]; }; diff --git a/pkgs/development/python-modules/qcodes-loop/default.nix b/pkgs/development/python-modules/qcodes-loop/default.nix index 2590a557b8c..ee9cb180a35 100644 --- a/pkgs/development/python-modules/qcodes-loop/default.nix +++ b/pkgs/development/python-modules/qcodes-loop/default.nix @@ -1,4 +1,5 @@ { lib +, stdenv , fetchpatch , fetchPypi , pythonOlder @@ -97,5 +98,7 @@ buildPythonPackage rec { homepage = "https://github.com/QCoDeS/Qcodes_loop"; license = licenses.mit; maintainers = with maintainers; [ evilmav ]; + # Some tests fail on this platform + broken = stdenv.isDarwin; }; } diff --git a/pkgs/development/python-modules/qpsolvers/default.nix b/pkgs/development/python-modules/qpsolvers/default.nix index 18141543c98..367416c2960 100644 --- a/pkgs/development/python-modules/qpsolvers/default.nix +++ b/pkgs/development/python-modules/qpsolvers/default.nix @@ -3,6 +3,7 @@ , fetchFromGitHub , buildPythonPackage , unittestCheckHook +, flit-core , daqp , ecos , numpy @@ -14,7 +15,7 @@ buildPythonPackage rec { pname = "qpsolvers"; version = "3.4.0"; - format = "flit"; + format = "pyproject"; src = fetchFromGitHub { owner = "qpsolvers"; @@ -35,6 +36,7 @@ buildPythonPackage rec { ]; nativeCheckInputs = [ + flit-core quadprog unittestCheckHook ]; diff --git a/pkgs/development/python-modules/quantiphy-eval/default.nix b/pkgs/development/python-modules/quantiphy-eval/default.nix index 68eba2e9462..92e1f94c1ad 100644 --- a/pkgs/development/python-modules/quantiphy-eval/default.nix +++ b/pkgs/development/python-modules/quantiphy-eval/default.nix @@ -1,6 +1,7 @@ { lib , buildPythonPackage , fetchFromGitHub +, flit-core , inform , pythonOlder , sly @@ -9,7 +10,7 @@ buildPythonPackage rec { pname = "quantiphy-eval"; version = "0.5"; - format = "flit"; + format = "pyproject"; disabled = pythonOlder "3.6"; @@ -20,6 +21,10 @@ buildPythonPackage rec { hash = "sha256-7VHcuINhe17lRNkHUnZkVOEtD6mVWk5gu0NbrLZwprg="; }; + nativeBuildInputs = [ + flit-core + ]; + propagatedBuildInputs = [ inform sly diff --git a/pkgs/development/python-modules/quantiphy/default.nix b/pkgs/development/python-modules/quantiphy/default.nix index b05a0428f97..57ac30017ce 100644 --- a/pkgs/development/python-modules/quantiphy/default.nix +++ b/pkgs/development/python-modules/quantiphy/default.nix @@ -1,7 +1,7 @@ { lib , buildPythonPackage , fetchFromGitHub -, flitBuildHook +, flit-core , pytestCheckHook , pythonOlder , inform @@ -27,7 +27,7 @@ buildPythonPackage rec { }; nativeBuildInputs = [ - flitBuildHook + flit-core ]; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/rarfile/default.nix b/pkgs/development/python-modules/rarfile/default.nix index 6bc0c7f2a24..2f988ddace7 100644 --- a/pkgs/development/python-modules/rarfile/default.nix +++ b/pkgs/development/python-modules/rarfile/default.nix @@ -8,14 +8,14 @@ assert !useUnrar -> libarchive != null; buildPythonPackage rec { pname = "rarfile"; - version = "4.0"; + version = "4.1"; disabled = isPy27; src = fetchFromGitHub { owner = "markokr"; repo = "rarfile"; rev = "v${version}"; - sha256 = "0gpriqkvcb6bsccvq8b099xjv5fkjs0d7g4636d5jphy417jxk5m"; + sha256 = "sha256-9PT4/KgkdFhTjZIia2xiSM5VnaZ4040Ww7bG9Nr3XDU="; }; nativeCheckInputs = [ pytestCheckHook nose glibcLocales ]; diff --git a/pkgs/development/python-modules/rkm-codes/default.nix b/pkgs/development/python-modules/rkm-codes/default.nix index 558dcdc076a..ca003ed9069 100644 --- a/pkgs/development/python-modules/rkm-codes/default.nix +++ b/pkgs/development/python-modules/rkm-codes/default.nix @@ -1,7 +1,7 @@ { lib , buildPythonPackage , fetchFromGitHub -, flitBuildHook +, flit-core , setuptools }: @@ -18,7 +18,7 @@ buildPythonPackage rec { format = "pyproject"; nativeBuildInputs = [ - flitBuildHook + flit-core ]; propagatedBuildInputs = [ setuptools diff --git a/pkgs/development/python-modules/rns/default.nix b/pkgs/development/python-modules/rns/default.nix index bed7f75832d..c180e5349b0 100644 --- a/pkgs/development/python-modules/rns/default.nix +++ b/pkgs/development/python-modules/rns/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "rns"; - version = "0.5.8"; + version = "0.5.9"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "markqvist"; repo = "Reticulum"; rev = "refs/tags/${version}"; - hash = "sha256-6NGEXglo3J9Buz4Qm5tOHnXWvEf/NHSp2utfHZOPWT4="; + hash = "sha256-vzFN8b+F4CO/f/7CbUpX/Xj8wZMEpz2veUXsPHYzPxE="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/rsskey/default.nix b/pkgs/development/python-modules/rsskey/default.nix index 095ce2b5c8c..61cba286d1b 100644 --- a/pkgs/development/python-modules/rsskey/default.nix +++ b/pkgs/development/python-modules/rsskey/default.nix @@ -1,6 +1,7 @@ { lib , buildPythonPackage , fetchPypi +, flit-core , feedparser , httpx , loca @@ -11,13 +12,17 @@ buildPythonPackage rec { pname = "rsskey"; version = "0.2.0"; - format = "flit"; + format = "pyproject"; src = fetchPypi { inherit pname version; hash = "sha256-QedLuwd0ES2LWhZ72Cjh3+ZZ7HbRyNsyLN9lNFbY5dQ="; }; + nativeBuildInputs = [ + flit-core + ]; + propagatedBuildInputs = [ feedparser httpx diff --git a/pkgs/development/python-modules/s3fs/default.nix b/pkgs/development/python-modules/s3fs/default.nix index c66df5ec520..bc37fc05500 100644 --- a/pkgs/development/python-modules/s3fs/default.nix +++ b/pkgs/development/python-modules/s3fs/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "s3fs"; - version = "2023.9.0"; + version = "2023.9.1"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-NQV9TVlyLKuf6RyaMBR+Plvd/FXsFP3od2xRIXnII90="; + hash = "sha256-QuGCHtlMFgfISIU9HXFevNJcEzgLb1EMLLSYx+Wz5nQ="; }; postPatch = '' diff --git a/pkgs/development/python-modules/scikit-posthocs/0001-increased-abs-tolerance-for-wilcoxon-test.patch b/pkgs/development/python-modules/scikit-posthocs/0001-increased-abs-tolerance-for-wilcoxon-test.patch new file mode 100644 index 00000000000..e3fa524e5a4 --- /dev/null +++ b/pkgs/development/python-modules/scikit-posthocs/0001-increased-abs-tolerance-for-wilcoxon-test.patch @@ -0,0 +1,25 @@ +From 02266a00ce0eb6a089e7efe07816da1aa5152fc9 Mon Sep 17 00:00:00 2001 +From: Maksim Terpilovskii <maximtrp@gmail.com> +Date: Sun, 31 Jul 2022 12:25:14 +0300 +Subject: [PATCH] increased abs tolerance for wilcoxon test + +--- + tests/test_posthocs.py | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/tests/test_posthocs.py b/tests/test_posthocs.py +index 956d808..8cc65e4 100644 +--- a/tests/test_posthocs.py ++++ b/tests/test_posthocs.py +@@ -471,7 +471,7 @@ class TestPosthocs(unittest.TestCase): + [2.857818e-06, 1.230888e-05, 1]]) + + results = sp.posthoc_wilcoxon(self.df.sort_index(), val_col = 'pulse', group_col = 'kind') +- self.assertTrue(np.allclose(results, r_results)) ++ self.assertTrue(np.allclose(results, r_results, atol=1e-4)) + + + def test_posthoc_scheffe(self): +-- +2.36.1 + diff --git a/pkgs/development/python-modules/scikit-posthocs/0002-Update-test_posthocs.py.patch b/pkgs/development/python-modules/scikit-posthocs/0002-Update-test_posthocs.py.patch new file mode 100644 index 00000000000..fa4d6d3ecec --- /dev/null +++ b/pkgs/development/python-modules/scikit-posthocs/0002-Update-test_posthocs.py.patch @@ -0,0 +1,34 @@ +From 5416ffba3ab01aebab3909400b5a9e847022898e Mon Sep 17 00:00:00 2001 +From: Maksim Terpilovskii <maximtrp@gmail.com> +Date: Thu, 16 Mar 2023 00:20:02 +0300 +Subject: [PATCH] Update test_posthocs.py + +--- + tests/test_posthocs.py | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/tests/test_posthocs.py b/tests/test_posthocs.py +index 8cc65e4..42ca5f3 100644 +--- a/tests/test_posthocs.py ++++ b/tests/test_posthocs.py +@@ -71,7 +71,7 @@ class TestPosthocs(unittest.TestCase): + a = splt.sign_plot(x, flat=True, labels=False) + with self.assertRaises(ValueError): + splt.sign_plot(x.astype(float), flat=True, labels=False) +- self.assertTrue(isinstance(a, ma._subplots.Axes)) ++ self.assertTrue(isinstance(a, ma._axes.Axes)) + + def test_sign_plot_nonflat(self): + +@@ -85,7 +85,7 @@ class TestPosthocs(unittest.TestCase): + with self.assertRaises(ValueError): + splt.sign_plot(x.astype(np.int64), labels=False) + +- self.assertTrue(isinstance(a, ma._subplots.Axes) and isinstance(cbar, mpl.colorbar.ColorbarBase)) ++ self.assertTrue(isinstance(a, ma._axes.Axes) and isinstance(cbar, mpl.colorbar.ColorbarBase)) + + # Outliers tests + def test_outliers_iqr(self): +-- +2.36.1 + diff --git a/pkgs/development/python-modules/scikit-posthocs/default.nix b/pkgs/development/python-modules/scikit-posthocs/default.nix new file mode 100644 index 00000000000..d7df6518903 --- /dev/null +++ b/pkgs/development/python-modules/scikit-posthocs/default.nix @@ -0,0 +1,65 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, setuptools +, wheel +, matplotlib +, numpy +, pandas +, scipy +, seaborn +, statsmodels +, pytestCheckHook +, seaborn-data +}: + +buildPythonPackage rec { + pname = "scikit-posthocs"; + version = "0.7.0"; + format = "pyproject"; + + src = fetchFromGitHub { + owner = "maximtrp"; + repo = "scikit-posthocs"; + rev = "v${version}"; + hash = "sha256-IkvAc684AWEK427OGAa4qVy6leWmd3b8Dnhd5bYAt5I="; + }; + + patches = [ + # Fixed on master: https://github.com/maximtrp/scikit-posthocs/commit/02266a00ce0eb6a089e7efe07816da1aa5152fc9 + ./0001-increased-abs-tolerance-for-wilcoxon-test.patch + # Fixed on master: https://github.com/maximtrp/scikit-posthocs/commit/5416ffba3ab01aebab3909400b5a9e847022898e + ./0002-Update-test_posthocs.py.patch + ]; + + nativeBuildInputs = [ + setuptools + wheel + ]; + + propagatedBuildInputs = [ + matplotlib + numpy + pandas + scipy + seaborn + statsmodels + ]; + + preCheck = '' + # tests require to write to home directory + export SEABORN_DATA=${seaborn-data.exercise} + ''; + nativeCheckInputs = [ + pytestCheckHook + ]; + pythonImportsCheck = [ "scikit_posthocs" ]; + + meta = with lib; { + description = "Multiple Pairwise Comparisons (Post Hoc) Tests in Python"; + homepage = "https://github.com/maximtrp/scikit-posthocs"; + changelog = "https://github.com/maximtrp/scikit-posthocs/releases/tag/v${version}"; + license = licenses.mit; + maintainers = with maintainers; [ mbalatsko ]; + }; +} diff --git a/pkgs/development/python-modules/scrapy/default.nix b/pkgs/development/python-modules/scrapy/default.nix index 2fd3c6ceb7d..7bfa428efae 100644 --- a/pkgs/development/python-modules/scrapy/default.nix +++ b/pkgs/development/python-modules/scrapy/default.nix @@ -31,15 +31,15 @@ buildPythonPackage rec { pname = "scrapy"; - version = "2.10.1"; + version = "2.11.0"; format = "setuptools"; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.8"; src = fetchPypi { inherit version; pname = "Scrapy"; - hash = "sha256-kdZ4dfu1N2B7B+MTY0RXGKNTK1RObitLr4oEKyGh0Q8="; + hash = "sha256-PL3tzgw/DgSC1hvi10WGg758188UsO5q37rduA9bNqU="; }; nativeBuildInputs = [ @@ -109,6 +109,8 @@ buildPythonPackage rec { "test_peek_one_element" "test_peek_lifo" "test_callback_kwargs" + # Test fails on Hydra + "test_start_requests_laziness" ] ++ lib.optionals stdenv.isDarwin [ "test_xmliter_encoding" "test_download" diff --git a/pkgs/development/python-modules/setupmeta/default.nix b/pkgs/development/python-modules/setupmeta/default.nix index 258f958ce03..09a3f565d54 100644 --- a/pkgs/development/python-modules/setupmeta/default.nix +++ b/pkgs/development/python-modules/setupmeta/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "setupmeta"; - version = "3.4.0"; + version = "3.5.2"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "codrsquad"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-HNGoLCTidgnaU5QA+0d/PQuCswigjdvQC3/w19i+Xuc="; + hash = "sha256-r3pGlcdem+c5I2dKrRueksesqq9HTk0oEr/xJuM7vuc="; }; preBuild = '' diff --git a/pkgs/development/python-modules/simple-websocket/default.nix b/pkgs/development/python-modules/simple-websocket/default.nix index a72bf1591a8..ecb48035991 100644 --- a/pkgs/development/python-modules/simple-websocket/default.nix +++ b/pkgs/development/python-modules/simple-websocket/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "simple-websocket"; - version = "0.9.0"; + version = "0.10.1"; format = "pyproject"; src = fetchFromGitHub { owner = "miguelgrinberg"; repo = "simple-websocket"; rev = "refs/tags/v${version}"; - hash = "sha256-pGPHS3MbDZgXBOtsZ87ULlkGdHHfaOSDLTNN4l5wKhE="; + hash = "sha256-OdgMYi2UobIlE4cDl5aNtVaFiHPTpf5TcuohG+TCSpg="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/skodaconnect/default.nix b/pkgs/development/python-modules/skodaconnect/default.nix index 759f568237a..989dfbc8ee8 100644 --- a/pkgs/development/python-modules/skodaconnect/default.nix +++ b/pkgs/development/python-modules/skodaconnect/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "skodaconnect"; - version = "1.3.6"; + version = "1.3.7"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "lendy007"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-gV/+mt6XxY1UcA1H8zM4pG1ugrDo0m876e3XG1yV32A="; + hash = "sha256-FJnByPP1hUs6ECuZh9aMJksq32xhPcWWolSFBzP7Zd8="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; diff --git a/pkgs/development/python-modules/skorch/default.nix b/pkgs/development/python-modules/skorch/default.nix index 2f8b842d9a9..13757f13e1a 100644 --- a/pkgs/development/python-modules/skorch/default.nix +++ b/pkgs/development/python-modules/skorch/default.nix @@ -2,28 +2,46 @@ , stdenv , buildPythonPackage , fetchPypi -, pytestCheckHook -, flaky +, pythonOlder , numpy -, pandas -, torch , scikit-learn , scipy , tabulate +, torch , tqdm +, flaky +, pandas +, pytestCheckHook +, safetensors +, pythonAtLeast }: buildPythonPackage rec { pname = "skorch"; - version = "0.14.0"; + version = "0.15.0"; src = fetchPypi { inherit pname version; - hash = "sha256-/d0s0N40W18uGfVbD9VEbhbWfduoo+TBqDjmTkjMUxs="; + hash = "sha256-39XVBlCmbg162z9uL84GZrU+v+M8waXbGdVV72ZYf84="; }; - propagatedBuildInputs = [ numpy torch scikit-learn scipy tabulate tqdm ]; - nativeCheckInputs = [ flaky pandas pytestCheckHook ]; + disabled = pythonOlder "3.8"; + + propagatedBuildInputs = [ + numpy + scikit-learn + scipy + tabulate + torch + tqdm + ]; + + nativeCheckInputs = [ + flaky + pandas + pytestCheckHook + safetensors + ]; # patch out pytest-cov dep/invocation postPatch = '' @@ -41,6 +59,10 @@ buildPythonPackage rec { ] ++ lib.optionals stdenv.isDarwin [ # there is a problem with the compiler selection "test_fit_and_predict_with_compile" + ] ++ lib.optionals (pythonAtLeast "3.11") [ + # Python 3.11+ not yet supported for torch.compile + # https://github.com/pytorch/pytorch/blob/v2.0.1/torch/_dynamo/eval_frame.py#L376-L377 + "test_fit_and_predict_with_compile" ]; disabledTestPaths = [ diff --git a/pkgs/development/python-modules/slackclient/default.nix b/pkgs/development/python-modules/slackclient/default.nix index 4715e58d36b..10b31c02ad2 100644 --- a/pkgs/development/python-modules/slackclient/default.nix +++ b/pkgs/development/python-modules/slackclient/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { pname = "slackclient"; - version = "3.21.3"; + version = "3.22.0"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -30,7 +30,7 @@ buildPythonPackage rec { owner = "slackapi"; repo = "python-slack-sdk"; rev = "refs/tags/v${version}"; - hash = "sha256-begpT/DaDqOi8HZE10FCuIIv18KSU/i5G/Z5DXKUT7Y="; + hash = "sha256-PRJgOAC1IJjQb1c4FAbpV8bxOPL9PTbAxNXo2MABRzc="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/solo-python/default.nix b/pkgs/development/python-modules/solo-python/default.nix index b0166c303d7..fef12eb963a 100644 --- a/pkgs/development/python-modules/solo-python/default.nix +++ b/pkgs/development/python-modules/solo-python/default.nix @@ -2,6 +2,7 @@ , buildPythonPackage , fetchFromGitHub , pythonOlder +, flit , click , cryptography , ecdsa @@ -15,7 +16,7 @@ buildPythonPackage rec { pname = "solo-python"; version = "0.1.1"; - format = "flit"; + format = "pyproject"; disabled = pythonOlder "3.6"; @@ -26,6 +27,10 @@ buildPythonPackage rec { hash = "sha256-XVPYr7JwxeZfZ68+vQ7a7MNiAfJ2bvMbM3R1ryVJ+OU="; }; + nativeBuildInputs = [ + flit + ]; + propagatedBuildInputs = [ click cryptography diff --git a/pkgs/development/python-modules/sourmash/default.nix b/pkgs/development/python-modules/sourmash/default.nix index 62e04863927..ac879c12886 100644 --- a/pkgs/development/python-modules/sourmash/default.nix +++ b/pkgs/development/python-modules/sourmash/default.nix @@ -20,19 +20,19 @@ buildPythonPackage rec { pname = "sourmash"; - version = "4.8.3"; + version = "4.8.4"; format = "pyproject"; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-LIMpL9cLafytRFyPam/FBNi757j1v6o1FG/K2JknDQY="; + hash = "sha256-Q1hMESwzEHGXcd4XW4nLqU8cLTCxrqRgAOr1qB77roo="; }; cargoDeps = rustPlatform.fetchCargoTarball { inherit src; name = "${pname}-${version}"; - hash = "sha256-mcJzFRYkdxuqqXH+ryg5v+9tQtuN1hkEeW2DF+wEJ/w="; + hash = "sha256-HisWvJgx15OfYoMzzqYm1JyY1/jmGXBSZZmuNaKTDjI="; }; nativeBuildInputs = with rustPlatform; [ diff --git a/pkgs/development/python-modules/spectral-cube/default.nix b/pkgs/development/python-modules/spectral-cube/default.nix index 252f25ddad2..abeb5d0f927 100644 --- a/pkgs/development/python-modules/spectral-cube/default.nix +++ b/pkgs/development/python-modules/spectral-cube/default.nix @@ -63,5 +63,7 @@ buildPythonPackage rec { changelog = "https://github.com/radio-astro-tools/spectral-cube/releases/tag/v${version}"; license = licenses.bsd3; maintainers = with maintainers; [ smaret ]; + # Tests fail to start, according to Hydra + broken = true; }; } diff --git a/pkgs/development/python-modules/sphinx-design/default.nix b/pkgs/development/python-modules/sphinx-design/default.nix index 4e585353687..ad109b1d30f 100644 --- a/pkgs/development/python-modules/sphinx-design/default.nix +++ b/pkgs/development/python-modules/sphinx-design/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "sphinx-design"; version = "0.5.0"; - format = "flit"; + format = "pyproject"; disabled = pythonOlder "3.8"; diff --git a/pkgs/development/python-modules/sphinx-external-toc/default.nix b/pkgs/development/python-modules/sphinx-external-toc/default.nix index cc0163ba3d6..0aff8f37caa 100644 --- a/pkgs/development/python-modules/sphinx-external-toc/default.nix +++ b/pkgs/development/python-modules/sphinx-external-toc/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "sphinx-external-toc"; version = "0.3.1"; - format = "flit"; + format = "pyproject"; disabled = pythonOlder "3.7"; diff --git a/pkgs/development/python-modules/sphinx-hoverxref/default.nix b/pkgs/development/python-modules/sphinx-hoverxref/default.nix index f11db7fc973..d6237387bf8 100644 --- a/pkgs/development/python-modules/sphinx-hoverxref/default.nix +++ b/pkgs/development/python-modules/sphinx-hoverxref/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { pname = "sphinx-hoverxref"; version = "1.3.0"; - format = "flit"; + format = "pyproject"; outputs = [ "out" "doc" ]; src = fetchFromGitHub { diff --git a/pkgs/development/python-modules/sphinx-inline-tabs/default.nix b/pkgs/development/python-modules/sphinx-inline-tabs/default.nix index 4803e8d4c1a..0f44efae979 100644 --- a/pkgs/development/python-modules/sphinx-inline-tabs/default.nix +++ b/pkgs/development/python-modules/sphinx-inline-tabs/default.nix @@ -1,13 +1,14 @@ { lib , buildPythonPackage , fetchFromGitHub +, flit-core , sphinx }: buildPythonPackage rec { pname = "sphinx-inline-tabs"; version = "2023.04.21"; - format = "flit"; + format = "pyproject"; src = fetchFromGitHub { owner = "pradyunsg"; @@ -16,6 +17,10 @@ buildPythonPackage rec { hash = "sha256-1oZheHDNOQU0vWL3YClQrJe94WyUJ72bCAF1UKtjJ0w="; }; + nativeBuildInputs = [ + flit-core + ]; + propagatedBuildInputs = [ sphinx ]; diff --git a/pkgs/development/python-modules/sphinx-mdinclude/default.nix b/pkgs/development/python-modules/sphinx-mdinclude/default.nix index ca7e574c82f..d20446e91bb 100644 --- a/pkgs/development/python-modules/sphinx-mdinclude/default.nix +++ b/pkgs/development/python-modules/sphinx-mdinclude/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "sphinx-mdinclude"; version = "0.5.3"; - format = "flit"; + format = "pyproject"; src = fetchPypi { pname = "sphinx_mdinclude"; diff --git a/pkgs/development/python-modules/sphinx-notfound-page/default.nix b/pkgs/development/python-modules/sphinx-notfound-page/default.nix index c6255bbc538..edc8e2ce6b0 100644 --- a/pkgs/development/python-modules/sphinx-notfound-page/default.nix +++ b/pkgs/development/python-modules/sphinx-notfound-page/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "sphinx-notfound-page"; version = "0.8.3"; - format = "flit"; + format = "pyproject"; outputs = [ "out" "doc" ]; src = fetchFromGitHub { diff --git a/pkgs/development/python-modules/sphinx-pytest/default.nix b/pkgs/development/python-modules/sphinx-pytest/default.nix index 6d05a38d63a..ecb2cbf55e7 100644 --- a/pkgs/development/python-modules/sphinx-pytest/default.nix +++ b/pkgs/development/python-modules/sphinx-pytest/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { hash = "sha256-vRHPq6BAuhn5QvHG2BGen9v6ezA3RgFVtustsNxU+n8="; }; - format = "flit"; + format = "pyproject"; nativeBuildInputs = [ flit-core ]; diff --git a/pkgs/development/python-modules/streamlit/default.nix b/pkgs/development/python-modules/streamlit/default.nix index 95a11c70592..58a10bdb148 100755 --- a/pkgs/development/python-modules/streamlit/default.nix +++ b/pkgs/development/python-modules/streamlit/default.nix @@ -12,7 +12,7 @@ , packaging , pandas , pillow -, protobuf3 +, protobuf , pyarrow , pydeck , pympler @@ -60,7 +60,7 @@ buildPythonPackage rec { packaging pandas pillow - protobuf3 + protobuf pyarrow pydeck pympler diff --git a/pkgs/development/python-modules/svg2tikz/default.nix b/pkgs/development/python-modules/svg2tikz/default.nix index 18ca0bd263e..b6623d3b800 100644 --- a/pkgs/development/python-modules/svg2tikz/default.nix +++ b/pkgs/development/python-modules/svg2tikz/default.nix @@ -10,9 +10,9 @@ buildPythonPackage rec { pname = "svg2tikz"; - version = "1.2.0"; + version = "2.1.0"; - disabled = pythonOlder "3.10"; + disabled = pythonOlder "3.7"; format = "pyproject"; @@ -20,14 +20,9 @@ buildPythonPackage rec { owner = "xyz2tex"; repo = "svg2tikz"; rev = "refs/tags/v${version}"; - hash = "sha256-oFcKRcXef1Uz0qFi6Gga/D4u8zW0RjXAnHDlhRr33Ts="; + hash = "sha256-v8+0h90uJlkI5eJcwCG55nxPz8n2aJXwP8Ocp48cl9M="; }; - postPatch = '' - substituteInPlace pyproject.toml \ - --replace "+dairiki.1" "" - ''; - nativeBuildInputs = [ poetry-core ]; @@ -44,7 +39,7 @@ buildPythonPackage rec { pythonImportsCheck = [ "svg2tikz" ]; meta = with lib; { - changelog = "https://github.com/xyz2tex/svg2tikz/blob/${src.rev}/README.md#changes-bug-fixes-and-known-problems-from-the-original"; + changelog = "https://github.com/xyz2tex/svg2tikz/blob/${src.rev}/CHANGELOG.md"; homepage = "https://github.com/xyz2tex/svg2tikz"; description = "Set of tools for converting SVG graphics to TikZ/PGF code"; license = licenses.gpl2Plus; diff --git a/pkgs/development/python-modules/svgelements/default.nix b/pkgs/development/python-modules/svgelements/default.nix new file mode 100644 index 00000000000..22a7e2c5b1a --- /dev/null +++ b/pkgs/development/python-modules/svgelements/default.nix @@ -0,0 +1,50 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, setuptools +, wheel +, anyio +, numpy +, pillow +, pytest-forked +, pytest-xdist +, pytestCheckHook +, scipy +}: + +buildPythonPackage rec { + pname = "svgelements"; + version = "1.9.6"; + pyproject = true; + + src = fetchFromGitHub { + owner = "meerk40t"; + repo = "svgelements"; + rev = "refs/tags/${version}"; + hash = "sha256-nx2sGXeeh8S17TfRDFifQbdSxc4YGsDNnrPSSbxv7S4="; + }; + + nativeBuildInputs = [ + setuptools + wheel + ]; + + pythonImportsCheck = [ "svgelements" ]; + + nativeCheckInputs = [ + anyio + numpy + pillow + pytest-forked + pytest-xdist + pytestCheckHook + scipy + ]; + + meta = with lib; { + description = "SVG Parsing for Elements, Paths, and other SVG Objects"; + homepage = "https://github.com/meerk40t/svgelements"; + license = licenses.mit; + maintainers = with maintainers; [ GaetanLepage ]; + }; +} diff --git a/pkgs/development/python-modules/tabledata/default.nix b/pkgs/development/python-modules/tabledata/default.nix index 5e7b00c99ef..b178665628a 100644 --- a/pkgs/development/python-modules/tabledata/default.nix +++ b/pkgs/development/python-modules/tabledata/default.nix @@ -8,13 +8,13 @@ buildPythonPackage rec { pname = "tabledata"; - version = "1.3.1"; + version = "1.3.3"; src = fetchFromGitHub { owner = "thombashi"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-oDo+wj5MO5Zopya2lp+sU/LAnFGZy6OIdW4YgcAmw1Q="; + hash = "sha256-84KrXnks76mvIjcEeQPpwd8rPO5SMbH/jfqERaFTrWo="; }; propagatedBuildInputs = [ dataproperty typepy ]; diff --git a/pkgs/development/python-modules/tempita/default.nix b/pkgs/development/python-modules/tempita/default.nix index a45edb8d267..344ed1ea68d 100644 --- a/pkgs/development/python-modules/tempita/default.nix +++ b/pkgs/development/python-modules/tempita/default.nix @@ -5,7 +5,7 @@ buildPythonPackage { pname = "tempita"; src = fetchFromGitHub { - owner = "gjhiggins"; + owner = "agramfort"; repo = "tempita"; rev = "47414a7c6e46a9a9afe78f0bce2ea299fa84d10"; sha256 = "0f33jjjs5rvp7ar2j6ggyfykcrsrn04jaqcq71qfvycf6b7nw3rn"; @@ -14,7 +14,7 @@ buildPythonPackage { buildInputs = [ nose ]; meta = { - homepage = "https://github.com/gjhiggins/tempita"; + homepage = "https://github.com/agramfort/tempita"; description = "A very small text templating language"; license = lib.licenses.mit; }; diff --git a/pkgs/development/python-modules/threadpoolctl/default.nix b/pkgs/development/python-modules/threadpoolctl/default.nix index bfe40429127..54d7fa12829 100644 --- a/pkgs/development/python-modules/threadpoolctl/default.nix +++ b/pkgs/development/python-modules/threadpoolctl/default.nix @@ -2,7 +2,7 @@ , buildPythonPackage , pythonOlder , fetchFromGitHub -, flit +, flit-core , pytestCheckHook , numpy , scipy @@ -13,7 +13,7 @@ buildPythonPackage rec { version = "3.1.0"; disabled = pythonOlder "3.6"; - format = "flit"; + format = "pyproject"; src = fetchFromGitHub { owner = "joblib"; @@ -22,6 +22,10 @@ buildPythonPackage rec { hash = "sha256-/qt7cgFbvpc1BLZC7a4S0RToqSggKXAqF1Xr6xOqzw8="; }; + nativeBuildInputs = [ + flit-core + ]; + nativeCheckInputs = [ pytestCheckHook numpy diff --git a/pkgs/development/python-modules/tidyexc/default.nix b/pkgs/development/python-modules/tidyexc/default.nix index b4f7ed0ef58..5e14812fe7b 100644 --- a/pkgs/development/python-modules/tidyexc/default.nix +++ b/pkgs/development/python-modules/tidyexc/default.nix @@ -2,12 +2,13 @@ , buildPythonPackage , fetchPypi , pythonOlder +, flit }: buildPythonPackage rec { pname = "tidyexc"; version = "0.10.0"; - format = "flit"; + format = "pyproject"; disabled = pythonOlder "3.6"; @@ -16,6 +17,10 @@ buildPythonPackage rec { sha256 = "1gl1jmihafawg7hvnn4xb20vd2x5qpvca0m1wr2gk0m2jj42yiq6"; }; + nativeBuildInputs = [ + flit + ]; + pythonImportsCheck = [ "tidyexc" ]; diff --git a/pkgs/development/python-modules/tinycss2/default.nix b/pkgs/development/python-modules/tinycss2/default.nix index 4c21305ac09..35c8578cab4 100644 --- a/pkgs/development/python-modules/tinycss2/default.nix +++ b/pkgs/development/python-modules/tinycss2/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "tinycss2"; version = "1.1.1"; - format = "flit"; + format = "pyproject"; disabled = pythonOlder "3.6"; diff --git a/pkgs/development/python-modules/tldextract/default.nix b/pkgs/development/python-modules/tldextract/default.nix index 1b2c1a7e6ba..04a6762c8c9 100644 --- a/pkgs/development/python-modules/tldextract/default.nix +++ b/pkgs/development/python-modules/tldextract/default.nix @@ -15,14 +15,14 @@ buildPythonPackage rec { pname = "tldextract"; - version = "3.5.0"; + version = "3.6.0"; format = "pyproject"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-TfHGW5W+YdWUKOhhHpVeVObx1Eg9Po1XM9OpBiFV6RA="; + hash = "sha256-pdi2WDeR2sominWS6892QVL6SWF5g8SZFu6d6Zs2YiI="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/tplink-omada-client/default.nix b/pkgs/development/python-modules/tplink-omada-client/default.nix index 4c8967a3880..bde5f96cf7c 100644 --- a/pkgs/development/python-modules/tplink-omada-client/default.nix +++ b/pkgs/development/python-modules/tplink-omada-client/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "tplink-omada-client"; - version = "1.3.3"; + version = "1.3.4"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "tplink_omada_client"; inherit version; - hash = "sha256-Jo0p/28Hzokeq0SAdyWfkKzoscVkQj9kP3VnRlWjR8o="; + hash = "sha256-ckb5pKAT4HfozKtgu7MpNGUdJuOLzkUjTfA/6h6imO4="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/ttls/default.nix b/pkgs/development/python-modules/ttls/default.nix index c47b9203fd4..29d36e43ef2 100644 --- a/pkgs/development/python-modules/ttls/default.nix +++ b/pkgs/development/python-modules/ttls/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "ttls"; - version = "1.7.0"; + version = "1.8.0"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "jschlyter"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-Gsr1ww/00/N1YyK9U0iryBfdio2niUP8TboyB13B6H8="; + hash = "sha256-WhngJfDu1Dcc4M5083o8ZBC1aSp4nOKOGPni2I/Llwg="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/turnt/default.nix b/pkgs/development/python-modules/turnt/default.nix index 1fe1d303856..b003f134004 100644 --- a/pkgs/development/python-modules/turnt/default.nix +++ b/pkgs/development/python-modules/turnt/default.nix @@ -1,15 +1,19 @@ -{ lib, buildPythonPackage, fetchPypi, click, tomli }: +{ lib, buildPythonPackage, fetchPypi, flit, click, tomli }: buildPythonPackage rec { pname = "turnt"; version = "1.11.0"; - format = "flit"; + format = "pyproject"; src = fetchPypi { inherit pname version; hash = "sha256-XN+qzRgZMSdeBmW0OM36mQ79sRCuP8E++SqH8FOoEq0="; }; + nativeBuildInputs = [ + flit + ]; + propagatedBuildInputs = [ click tomli diff --git a/pkgs/development/python-modules/twilio/default.nix b/pkgs/development/python-modules/twilio/default.nix index 6d2cfc72c43..078d1775e0a 100644 --- a/pkgs/development/python-modules/twilio/default.nix +++ b/pkgs/development/python-modules/twilio/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { pname = "twilio"; - version = "8.8.0"; + version = "8.9.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -27,7 +27,7 @@ buildPythonPackage rec { owner = "twilio"; repo = "twilio-python"; rev = "refs/tags/${version}"; - hash = "sha256-fWAVTaie+6lz5cX7hg0s22kHXelIfhh5FNTfxxbUEPw="; + hash = "sha256-apdLWv4UV4MTAx+kyi/MaOibmBYjwMamaI9b6IGKIl0="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/type-infer/default.nix b/pkgs/development/python-modules/type-infer/default.nix new file mode 100644 index 00000000000..7adbd97059c --- /dev/null +++ b/pkgs/development/python-modules/type-infer/default.nix @@ -0,0 +1,71 @@ +{ lib +, buildPythonPackage +, pythonOlder +, fetchPypi +, poetry-core +, colorlog +, dataclasses-json +, langid +, nltk +, numpy +, pandas +, psutil +, python-dateutil +, scipy +, toml +, nltk-data +, symlinkJoin +}: +let + testNltkData = symlinkJoin { + name = "nltk-test-data"; + paths = [ nltk-data.punkt nltk-data.stopwords ]; + }; +in +buildPythonPackage rec { + pname = "type-infer"; + version = "0.0.15"; + format = "pyproject"; + + disable = pythonOlder "3.8"; + + # using PyPI because the repo does not have tags or release branches + src = fetchPypi { + pname = "type_infer"; + inherit version; + hash = "sha256-AnThYE6hHc3Pwu8fl0VBiQJfGVjeEKo4RrCsOl2pfCA="; + }; + + nativeBuildInputs = [ + poetry-core + ]; + + propagatedBuildInputs = [ + colorlog + dataclasses-json + langid + nltk + numpy + pandas + psutil + python-dateutil + scipy + toml + ]; + + # PyPI package does not include tests + doCheck = false; + + # Package import requires NLTK data to be downloaded + # It is the only way to set NLTK_DATA environment variable, + # so that it is available in pythonImportsCheck + env.NLTK_DATA = testNltkData; + pythonImportsCheck = [ "type_infer" ]; + + meta = with lib; { + description = "Automated type inference for Machine Learning pipelines"; + homepage = "https://pypi.org/project/type-infer/"; + license = licenses.gpl3Only; + maintainers = with maintainers; [ mbalatsko ]; + }; +} diff --git a/pkgs/development/python-modules/types-pytz/default.nix b/pkgs/development/python-modules/types-pytz/default.nix index 54848a027df..9433d55512e 100644 --- a/pkgs/development/python-modules/types-pytz/default.nix +++ b/pkgs/development/python-modules/types-pytz/default.nix @@ -5,12 +5,12 @@ buildPythonPackage rec { pname = "types-pytz"; - version = "2023.3.1.0"; + version = "2023.3.1.1"; format = "setuptools"; src = fetchPypi { inherit pname version; - hash = "sha256-jn0hmMukSnLfdiiIfJD2ilaOFEXxTbZGMa9Qw8q4wJA="; + hash = "sha256-zCPQGSzUnI9rukTuDIHkWGqPMCBJcPwIlNIJprCNq5o="; }; # Modules doesn't have tests diff --git a/pkgs/development/python-modules/types-redis/default.nix b/pkgs/development/python-modules/types-redis/default.nix index 92ffba08b68..1b59386174e 100644 --- a/pkgs/development/python-modules/types-redis/default.nix +++ b/pkgs/development/python-modules/types-redis/default.nix @@ -7,12 +7,12 @@ buildPythonPackage rec { pname = "types-redis"; - version = "4.6.0.6"; + version = "4.6.0.7"; format = "setuptools"; src = fetchPypi { inherit pname version; - hash = "sha256-eGWoQ4ApN6st3KM1ecTiVb/nP4evhYJOrXpnKbqS/FI="; + hash = "sha256-KMQVPdtcnU8Q3vRKJFRnPDYdLV/DzYZ887sVIPP1mjg="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/types-requests/default.nix b/pkgs/development/python-modules/types-requests/default.nix index 14481ff78da..aef0939ef3c 100644 --- a/pkgs/development/python-modules/types-requests/default.nix +++ b/pkgs/development/python-modules/types-requests/default.nix @@ -6,12 +6,12 @@ buildPythonPackage rec { pname = "types-requests"; - version = "2.31.0.2"; + version = "2.31.0.4"; format = "setuptools"; src = fetchPypi { inherit pname version; - hash = "sha256-aqP3+vDqUtcouxjAoNFSLZv9jHLSb/b2G/w9BqQRz0A="; + hash = "sha256-oREEEUjX4EvxAMR2vE2z7msKHNC0AYd39qZgscTxMY0="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/unearth/default.nix b/pkgs/development/python-modules/unearth/default.nix index bcf6f5afa78..4602a30fde9 100644 --- a/pkgs/development/python-modules/unearth/default.nix +++ b/pkgs/development/python-modules/unearth/default.nix @@ -15,14 +15,14 @@ buildPythonPackage rec { pname = "unearth"; - version = "0.10.0"; + version = "0.11.0"; format = "pyproject"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-1bFSpasqo+UUmhHPezulxdSTF23KOPZsqJadrdWo9kU="; + hash = "sha256-ryBymzmNLzuDklHXReT0DyPLCb1reX4Kb/bu1GynBCI="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/upcloud-api/default.nix b/pkgs/development/python-modules/upcloud-api/default.nix index 5c0409be372..17fec99811e 100644 --- a/pkgs/development/python-modules/upcloud-api/default.nix +++ b/pkgs/development/python-modules/upcloud-api/default.nix @@ -8,13 +8,13 @@ buildPythonPackage rec { pname = "upcloud-api"; - version = "2.5.0"; + version = "2.5.1"; src = fetchFromGitHub { owner = "UpCloudLtd"; repo = "upcloud-python-api"; rev = "refs/tags/v${version}"; - hash = "sha256-35vPODc/oL+JPMnStFutIRYVTUkYAXKRt/KXBW0Yc+U="; + hash = "sha256-fMsI0aZ8jA08rrNPm8HmfYz/a3HLUExvvXIeDGPh2e8="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/userpath/default.nix b/pkgs/development/python-modules/userpath/default.nix index edf92f57116..5f4a31d39b1 100644 --- a/pkgs/development/python-modules/userpath/default.nix +++ b/pkgs/development/python-modules/userpath/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "userpath"; - version = "1.9.0"; + version = "1.9.1"; format = "pyproject"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-heMnRUMXRHfGLVcB7UOj7xBRgkqd13aWitxBHlhkDdE="; + hash = "sha256-zoF2co2YyRS2QBeBvzsj/M2WjRZHU5yHiMcBA3XgJ5Y="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/wandb/default.nix b/pkgs/development/python-modules/wandb/default.nix index 0c06b498947..2622b180068 100644 --- a/pkgs/development/python-modules/wandb/default.nix +++ b/pkgs/development/python-modules/wandb/default.nix @@ -52,7 +52,7 @@ buildPythonPackage rec { pname = "wandb"; - version = "0.15.10"; + version = "0.15.11"; format = "pyproject"; disabled = pythonOlder "3.6"; @@ -61,7 +61,7 @@ buildPythonPackage rec { owner = pname; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-MuYaeg7+lMOOSalnLyKsCw+f44daDDayvyKvY8z697c="; + hash = "sha256-WaVgyF+pQgFCqIsi5Tcu+btyUKU2e3/qJi4Ma8dnx8M="; }; patches = [ diff --git a/pkgs/development/python-modules/weconnect/default.nix b/pkgs/development/python-modules/weconnect/default.nix index a1d1522bb9a..496e73090c9 100644 --- a/pkgs/development/python-modules/weconnect/default.nix +++ b/pkgs/development/python-modules/weconnect/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "weconnect"; - version = "0.58.0"; + version = "0.58.3"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "tillsteinbach"; repo = "WeConnect-python"; rev = "refs/tags/v${version}"; - hash = "sha256-2+RvDAKIUsQwmVrqcgt0RXOF+Z+lZ6oSyZyI+HTcZBs="; + hash = "sha256-fSrmprt3aiYa8gRXOWKHKXah3zSqhRvD32nVdMrihwA="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/xdg-base-dirs/default.nix b/pkgs/development/python-modules/xdg-base-dirs/default.nix index f2ca5bf0a50..b2eb4094c92 100644 --- a/pkgs/development/python-modules/xdg-base-dirs/default.nix +++ b/pkgs/development/python-modules/xdg-base-dirs/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "xdg-base-dirs"; - version = "6.0.0"; + version = "6.0.1"; format = "pyproject"; disabled = pythonOlder "3.10"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "srstevenson"; repo = "xdg-base-dirs"; rev = version; - hash = "sha256-yVuruSKv99IZGNCpY9cKwAe6gJNAWjL+Lol2D1/0hiI="; + hash = "sha256-nbdF1tjVqlxwiGW0pySS6HyJbmNuQ7mVdQYfhofO4Dk="; }; nativeBuildInputs = [ @@ -28,6 +28,11 @@ buildPythonPackage rec { pythonImportsCheck = [ "xdg_base_dirs" ]; + # remove coverage flags from pytest config + postPatch = '' + sed -i /addopts/d pyproject.toml + ''; + meta = with lib; { description = "An implementation of the XDG Base Directory Specification in Python"; homepage = "https://github.com/srstevenson/xdg-base-dirs"; diff --git a/pkgs/development/python-modules/xknxproject/default.nix b/pkgs/development/python-modules/xknxproject/default.nix index 7de6ca3bc80..64ad5a1ebf8 100644 --- a/pkgs/development/python-modules/xknxproject/default.nix +++ b/pkgs/development/python-modules/xknxproject/default.nix @@ -2,17 +2,17 @@ , buildPythonPackage , cryptography , fetchFromGitHub -, fetchpatch , pytestCheckHook , pythonOlder , pyzipper , setuptools +, striprtf , wheel }: buildPythonPackage rec { pname = "xknxproject"; - version = "3.2.0"; + version = "3.3.0"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -21,17 +21,9 @@ buildPythonPackage rec { owner = "XKNX"; repo = "xknxproject"; rev = "refs/tags/${version}"; - hash = "sha256-ZLBvhuLXEOgqS7tRwP/e1Dv1/EMqxqXgpAZtLQGIt/o="; + hash = "sha256-RH5RQHLpfrI9fRg6OfPZ7/BPHQuHCrkJlwW/EJitdPo="; }; - patches = [ - (fetchpatch { - name = "unpin-setuptools.patch"; - url = "https://github.com/XKNX/xknxproject/commit/53fecaf757d682fda00b04c3a2a1f3da86d9705f.patch"; - hash = "sha256-EpfgEq4pIx7ahqJZalzo30ruj8NlZYHcKHxFXCGL98w="; - }) - ]; - nativeBuildInputs = [ setuptools wheel @@ -40,6 +32,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ cryptography pyzipper + striprtf ]; nativeCheckInputs = [ diff --git a/pkgs/development/python-modules/xmlschema/default.nix b/pkgs/development/python-modules/xmlschema/default.nix index 42af3b86d4b..a8e595e4979 100644 --- a/pkgs/development/python-modules/xmlschema/default.nix +++ b/pkgs/development/python-modules/xmlschema/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "xmlschema"; - version = "2.3.1"; + version = "2.5.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "sissaschool"; repo = "xmlschema"; rev = "refs/tags/v${version}"; - hash = "sha256-0xXA3IguVAyFp5dFvuzAQhzJlGMmNthmPXcja9FYV44="; + hash = "sha256-ETWD+i0VJbmfSHFvOsRkuzScKZdEyr6It3+U5Q7cQbQ="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/yalexs/default.nix b/pkgs/development/python-modules/yalexs/default.nix index ed411bc3a7d..19d40b4f805 100644 --- a/pkgs/development/python-modules/yalexs/default.nix +++ b/pkgs/development/python-modules/yalexs/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "yalexs"; - version = "1.9.0"; + version = "1.10.0"; format = "setuptools"; disabled = pythonOlder "3.9"; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = "bdraco"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-9rXAFMFpKF+oIKXSFLVCLDfdpMF837xRIEe3aH7ditc="; + hash = "sha256-7LFKqC8IHzXKKU5Pw6Qud9jqJFc0lSEJFn636T6CsfQ="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/yaramod/default.nix b/pkgs/development/python-modules/yaramod/default.nix index 83f1f87c2c5..1f459858dfa 100644 --- a/pkgs/development/python-modules/yaramod/default.nix +++ b/pkgs/development/python-modules/yaramod/default.nix @@ -20,7 +20,7 @@ let in buildPythonPackage rec { pname = "yaramod"; - version = "3.20.1"; + version = "3.20.2"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -29,7 +29,7 @@ in owner = "avast"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-je4BBJ34VcA8pkvIBXfqrHAhWF+DdakSqeFma3mHpWo="; + hash = "sha256-OLsTvG+qaUJlKdHwswGBifzoT/uNunrrVWQg7hJxkhE="; }; postPatch = '' diff --git a/pkgs/development/python-modules/zeversolarlocal/default.nix b/pkgs/development/python-modules/zeversolarlocal/default.nix index 04063837b42..b1e515d7632 100644 --- a/pkgs/development/python-modules/zeversolarlocal/default.nix +++ b/pkgs/development/python-modules/zeversolarlocal/default.nix @@ -1,7 +1,9 @@ { lib , buildPythonPackage , fetchPypi +, fetchpatch , flit-core +, dos2unix , httpx , pytest-asyncio , pytest-mock @@ -12,7 +14,7 @@ buildPythonPackage rec { pname = "zeversolarlocal"; version = "1.1.0"; - format = "flit"; + format = "pyproject"; disabled = pythonOlder "3.7"; @@ -23,6 +25,7 @@ buildPythonPackage rec { nativeBuildInputs = [ flit-core + dos2unix ]; propagatedBuildInputs = [ @@ -35,6 +38,20 @@ buildPythonPackage rec { pytestCheckHook ]; + # the patch below won't apply unless we fix the line endings + prePatch = '' + dos2unix pyproject.toml + ''; + + patches = [ + # Raise the flit-core limit + # https://github.com/sander76/zeversolarlocal/pull/4 + (fetchpatch { + url = "https://github.com/sander76/zeversolarlocal/commit/bff072ea046de07eced77bc79eb8e90dfef1f53f.patch"; + hash = "sha256-tzFCwPzhAfwVfN5mLY/DMwRv7zGzx3ScBe+kKzkYcvo="; + }) + ]; + postPatch = '' substituteInPlace pyproject.toml \ --replace "--cov zeversolarlocal --cov-report xml:cov.xml --cov-report term-missing -vv" "" |