diff options
Diffstat (limited to 'nixpkgs/pkgs/development/python-modules')
240 files changed, 2296 insertions, 760 deletions
diff --git a/nixpkgs/pkgs/development/python-modules/aardwolf/default.nix b/nixpkgs/pkgs/development/python-modules/aardwolf/default.nix index 3b92fc06a915..add8b364591f 100644 --- a/nixpkgs/pkgs/development/python-modules/aardwolf/default.nix +++ b/nixpkgs/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/nixpkgs/pkgs/development/python-modules/adafruit-platformdetect/default.nix b/nixpkgs/pkgs/development/python-modules/adafruit-platformdetect/default.nix index 0bb566508b34..7bd3f7b403cd 100644 --- a/nixpkgs/pkgs/development/python-modules/adafruit-platformdetect/default.nix +++ b/nixpkgs/pkgs/development/python-modules/adafruit-platformdetect/default.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { pname = "adafruit-platformdetect"; - version = "3.51.0"; + 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-/a0IKOFWnXC6BJItpJDqiA9aCB1PNhglNlB/4KvyQdg="; + hash = "sha256-5JEnsTvY4PgAuaoIyTHriJVJUPAHMYETgqbhAuAPJcI="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; diff --git a/nixpkgs/pkgs/development/python-modules/adlfs/default.nix b/nixpkgs/pkgs/development/python-modules/adlfs/default.nix index b6a0d4c7956b..f3d19bd779ab 100644 --- a/nixpkgs/pkgs/development/python-modules/adlfs/default.nix +++ b/nixpkgs/pkgs/development/python-modules/adlfs/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "adlfs"; - version = "2023.8.0"; + version = "2023.9.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "fsspec"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-ZPHB01CiBYiNoii73zVecq1l0WCqB2CzhhhaBeetb4g="; + hash = "sha256-gu0qGaOIi5U8CtuhTfbX+AjyYSS6psPrJCM1ZqVe8Ww="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/aesara/default.nix b/nixpkgs/pkgs/development/python-modules/aesara/default.nix index 4e1435133f77..0362b5b3d4c2 100644 --- a/nixpkgs/pkgs/development/python-modules/aesara/default.nix +++ b/nixpkgs/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/nixpkgs/pkgs/development/python-modules/ailment/default.nix b/nixpkgs/pkgs/development/python-modules/ailment/default.nix index 2cde5dda3ae9..b4113b9f2e79 100644 --- a/nixpkgs/pkgs/development/python-modules/ailment/default.nix +++ b/nixpkgs/pkgs/development/python-modules/ailment/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "ailment"; - version = "9.2.66"; + 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-5F6mSdYkeDS/n4Quu6UrBK3alfieop6Go3muGlmr/84="; + hash = "sha256-qoewPYu4BO5VZq3MXg0j+L58dTusaoqrsrHo6stepJQ="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/aiolifx-themes/default.nix b/nixpkgs/pkgs/development/python-modules/aiolifx-themes/default.nix index 618c0e0d9023..08015af0f7ad 100644 --- a/nixpkgs/pkgs/development/python-modules/aiolifx-themes/default.nix +++ b/nixpkgs/pkgs/development/python-modules/aiolifx-themes/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "aiolifx-themes"; - version = "0.4.8"; + version = "0.4.9"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "Djelibeybi"; repo = "aiolifx-themes"; rev = "refs/tags/v${version}"; - hash = "sha256-jbL6f6gDH6AxsfuD7mFtvCGKLqy/NKoo5bUmXN9hBrM="; + hash = "sha256-8t0yRia/grSSEqySV57QoB3lgU9iwqiVOvVLE5Jd2pM="; }; prePatch = '' diff --git a/nixpkgs/pkgs/development/python-modules/aiopegelonline/default.nix b/nixpkgs/pkgs/development/python-modules/aiopegelonline/default.nix new file mode 100644 index 000000000000..3e78733ce443 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/aiopegelonline/default.nix @@ -0,0 +1,46 @@ +{ lib +, aiohttp +, aioresponses +, buildPythonPackage +, fetchFromGitHub +, pytest-asyncio +, pytestCheckHook +, pythonOlder +}: + +buildPythonPackage rec { + pname = "aiopegelonline"; + version = "0.0.6"; + format = "setuptools"; + + disabled = pythonOlder "3.9"; + + src = fetchFromGitHub { + owner = "mib1185"; + repo = "aiopegelonline"; + rev = "refs/tags/v${version}"; + hash = "sha256-UbH5S+BfXMAurEvPx0sOzNoV/yypbMCPN3Y3cSherfQ="; + }; + + propagatedBuildInputs = [ + aiohttp + ]; + + nativeCheckInputs = [ + aioresponses + pytest-asyncio + pytestCheckHook + ]; + + pythonImportsCheck = [ + "aiopegelonline" + ]; + + meta = with lib; { + description = "Library to retrieve data from PEGELONLINE"; + homepage = "https://github.com/mib1185/aiopegelonline"; + changelog = "https://github.com/mib1185/aiopegelonline/releases/tag/v${version}"; + license = licenses.asl20; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/aiovodafone/default.nix b/nixpkgs/pkgs/development/python-modules/aiovodafone/default.nix index 2a6c040afefb..77d494743786 100644 --- a/nixpkgs/pkgs/development/python-modules/aiovodafone/default.nix +++ b/nixpkgs/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/nixpkgs/pkgs/development/python-modules/aliyun-python-sdk-iot/default.nix b/nixpkgs/pkgs/development/python-modules/aliyun-python-sdk-iot/default.nix index 43f132b19020..9f4098d6fa5b 100644 --- a/nixpkgs/pkgs/development/python-modules/aliyun-python-sdk-iot/default.nix +++ b/nixpkgs/pkgs/development/python-modules/aliyun-python-sdk-iot/default.nix @@ -7,14 +7,14 @@ buildPythonPackage rec { pname = "aliyun-python-sdk-iot"; - version = "8.55.0"; + version = "8.56.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-cLiOdXZpjZUVJ0O0rykM6GQH0pXaiMQp1zH6kuDLqOY="; + hash = "sha256-8d77P522c6gV8LhKErixzE2DvGmjr9bms+2eHYirgwg="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/aliyun-python-sdk-kms/default.nix b/nixpkgs/pkgs/development/python-modules/aliyun-python-sdk-kms/default.nix index 36f5f197695b..55288c2b6d2a 100644 --- a/nixpkgs/pkgs/development/python-modules/aliyun-python-sdk-kms/default.nix +++ b/nixpkgs/pkgs/development/python-modules/aliyun-python-sdk-kms/default.nix @@ -7,14 +7,14 @@ buildPythonPackage rec { pname = "aliyun-python-sdk-kms"; - version = "2.16.1"; + version = "2.16.2"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-o3JzdxVoIBS6zmi9QP6DMy9P2SUAmj6xENQbxm8nDno="; + hash = "sha256-+HI0qLZNRXyiM4+HZQ2xijzn99vJv+9x7+jyiUre09Y="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/amaranth-soc/default.nix b/nixpkgs/pkgs/development/python-modules/amaranth-soc/default.nix index e90137ba22b7..685d63414ec5 100644 --- a/nixpkgs/pkgs/development/python-modules/amaranth-soc/default.nix +++ b/nixpkgs/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/nixpkgs/pkgs/development/python-modules/amaranth/default.nix b/nixpkgs/pkgs/development/python-modules/amaranth/default.nix index 713f886d7df4..ad2cacb2ced8 100644 --- a/nixpkgs/pkgs/development/python-modules/amaranth/default.nix +++ b/nixpkgs/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/nixpkgs/pkgs/development/python-modules/angr/default.nix b/nixpkgs/pkgs/development/python-modules/angr/default.nix index 815d283a58ee..e3e787df1cde 100644 --- a/nixpkgs/pkgs/development/python-modules/angr/default.nix +++ b/nixpkgs/pkgs/development/python-modules/angr/default.nix @@ -32,7 +32,7 @@ buildPythonPackage rec { pname = "angr"; - version = "9.2.66"; + 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-l/O+7M9f2HtIcXNd49+zr2Z0Cx/3mbXgZvqOyPlvJbk="; + hash = "sha256-6I8ybszEIWVtIVNPxkxP7W5jHH66XaaGZ5yF59CXBAc="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/appthreat-vulnerability-db/default.nix b/nixpkgs/pkgs/development/python-modules/appthreat-vulnerability-db/default.nix index 793591627837..647a77e035a5 100644 --- a/nixpkgs/pkgs/development/python-modules/appthreat-vulnerability-db/default.nix +++ b/nixpkgs/pkgs/development/python-modules/appthreat-vulnerability-db/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "appthreat-vulnerability-db"; - version = "5.4.1"; + 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-sfhcAEJn+9uTPZLjgurfpuWNEdefzQZSXZdw7IeuqZw="; + hash = "sha256-hALpNLXPg2Apha3KbEixFEH3NuzLe6lnEy9V5otskDM="; }; postPatch = '' diff --git a/nixpkgs/pkgs/development/python-modules/apycula/default.nix b/nixpkgs/pkgs/development/python-modules/apycula/default.nix index 4ec3b1f0250c..2d985b8786f5 100644 --- a/nixpkgs/pkgs/development/python-modules/apycula/default.nix +++ b/nixpkgs/pkgs/development/python-modules/apycula/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "apycula"; - version = "0.8.3"; + version = "0.9.0"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -20,7 +20,7 @@ buildPythonPackage rec { src = fetchPypi { inherit version; pname = "Apycula"; - hash = "sha256-QGBWNWAEe6KbfYIoW3FScEL7b4TTcK1YZQoNkfxDNMo="; + hash = "sha256-M62RgNUxn14o8w+vIJjDrMpYnfvwcU4jw05PPvPvR8A="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/archinfo/default.nix b/nixpkgs/pkgs/development/python-modules/archinfo/default.nix index 73e371ed0aab..967ddc9587f7 100644 --- a/nixpkgs/pkgs/development/python-modules/archinfo/default.nix +++ b/nixpkgs/pkgs/development/python-modules/archinfo/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "archinfo"; - version = "9.2.66"; + 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-l9AakU68ACb02NGKWbkmUp14/lC21PJeGuzexYPTaNg="; + hash = "sha256-VvTUIFJ5XCo+iGKofv6aMhBS3To1uyWgwEsGXz2bOwE="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/art/default.nix b/nixpkgs/pkgs/development/python-modules/art/default.nix index 669b81032be7..2bf6f51cd163 100644 --- a/nixpkgs/pkgs/development/python-modules/art/default.nix +++ b/nixpkgs/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/nixpkgs/pkgs/development/python-modules/asyauth/default.nix b/nixpkgs/pkgs/development/python-modules/asyauth/default.nix index f546540c94d4..ccb8ef68911e 100644 --- a/nixpkgs/pkgs/development/python-modules/asyauth/default.nix +++ b/nixpkgs/pkgs/development/python-modules/asyauth/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "asyauth"; - version = "0.0.14"; + version = "0.0.15"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-EJLuSvkJrQBIrSM/dODhTtwPpnz67lmg4ZEwI4TPOVc="; + hash = "sha256-J2shp4YMGvDFDrfKxnqHQSfH6yteKM1DpQ+8DjblcNI="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/asysocks/default.nix b/nixpkgs/pkgs/development/python-modules/asysocks/default.nix index 0d052fa188dd..36e28f882b2c 100644 --- a/nixpkgs/pkgs/development/python-modules/asysocks/default.nix +++ b/nixpkgs/pkgs/development/python-modules/asysocks/default.nix @@ -7,14 +7,14 @@ buildPythonPackage rec { pname = "asysocks"; - version = "0.2.7"; + version = "0.2.9"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-Kf2KDonjb+t7sA4jnC8mTh7fWoEDfRPhDkggb9A5E0Q="; + hash = "sha256-zg3xEveyEOisk8s4R/36Ly9JH5xDvVsjS4FZIxHOlZ8="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/aws-encryption-sdk/default.nix b/nixpkgs/pkgs/development/python-modules/aws-encryption-sdk/default.nix new file mode 100644 index 000000000000..6088e22e80d7 --- /dev/null +++ b/nixpkgs/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/nixpkgs/pkgs/development/python-modules/aws-sam-translator/default.nix b/nixpkgs/pkgs/development/python-modules/aws-sam-translator/default.nix index f5af4ac77973..7fe9fdac96eb 100644 --- a/nixpkgs/pkgs/development/python-modules/aws-sam-translator/default.nix +++ b/nixpkgs/pkgs/development/python-modules/aws-sam-translator/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "aws-sam-translator"; - version = "1.73.0"; + version = "1.74.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "aws"; repo = "serverless-application-model"; rev = "refs/tags/v${version}"; - hash = "sha256-rj+q/06gIvPYTJP/EH9ZrP0Sp4J3K1aCRyNkgpphWP4="; + hash = "sha256-uOfBR0bvLVyBcfSAkSqOx4KjmSYbfktpJlxKjipfj50="; }; postPatch = '' diff --git a/nixpkgs/pkgs/development/python-modules/azure-data-tables/default.nix b/nixpkgs/pkgs/development/python-modules/azure-data-tables/default.nix index b09102eaf0f0..783a792513be 100644 --- a/nixpkgs/pkgs/development/python-modules/azure-data-tables/default.nix +++ b/nixpkgs/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/nixpkgs/pkgs/development/python-modules/azure-eventgrid/default.nix b/nixpkgs/pkgs/development/python-modules/azure-eventgrid/default.nix index 3913fc84b3f7..56d27d60d26f 100644 --- a/nixpkgs/pkgs/development/python-modules/azure-eventgrid/default.nix +++ b/nixpkgs/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/nixpkgs/pkgs/development/python-modules/azure-mgmt-compute/default.nix b/nixpkgs/pkgs/development/python-modules/azure-mgmt-compute/default.nix index 5a3cb3a370fe..67e7acde59a6 100644 --- a/nixpkgs/pkgs/development/python-modules/azure-mgmt-compute/default.nix +++ b/nixpkgs/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/nixpkgs/pkgs/development/python-modules/azure-mgmt-iothub/default.nix b/nixpkgs/pkgs/development/python-modules/azure-mgmt-iothub/default.nix index e4e3ae6374c9..8890f65af3af 100644 --- a/nixpkgs/pkgs/development/python-modules/azure-mgmt-iothub/default.nix +++ b/nixpkgs/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/nixpkgs/pkgs/development/python-modules/azure-mgmt-maps/default.nix b/nixpkgs/pkgs/development/python-modules/azure-mgmt-maps/default.nix index d8be6d179383..e1f0f2302b95 100644 --- a/nixpkgs/pkgs/development/python-modules/azure-mgmt-maps/default.nix +++ b/nixpkgs/pkgs/development/python-modules/azure-mgmt-maps/default.nix @@ -1,37 +1,48 @@ { lib -, buildPythonPackage -, fetchPypi -, msrest -, msrestazure , azure-common , azure-mgmt-core +, buildPythonPackage +, fetchPypi +, isodate +, pythonOlder +, typing-extensions }: buildPythonPackage rec { pname = "azure-mgmt-maps"; - version = "2.0.0"; + version = "2.1.0"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - extension = "zip"; - sha256 = "384e17f76a68b700a4f988478945c3a9721711c0400725afdfcb63cf84e85f0e"; + hash = "sha256-XVaml4UuVBanYYHxjB1YT/PvExzgAPbD4gI3Hbc0dI0="; }; propagatedBuildInputs = [ - msrest - msrestazure + isodate azure-common azure-mgmt-core + ] ++ lib.optionals (pythonOlder "3.8") [ + typing-extensions ]; - pythonNamespaces = [ "azure.mgmt" ]; + pythonNamespaces = [ + "azure.mgmt" + ]; - # has no tests + # Module has no tests doCheck = false; + pythonImportsCheck = [ + "azure.mgmt.maps" + ]; + meta = with lib; { description = "This is the Microsoft Azure Maps Client Library"; homepage = "https://github.com/Azure/azure-sdk-for-python"; + changelog = "https://github.com/Azure/azure-sdk-for-python/blob/v${version}/sdk/maps/azure-mgmt-maps/CHANGELOG.md"; license = licenses.mit; maintainers = with maintainers; [ maxwilson ]; }; diff --git a/nixpkgs/pkgs/development/python-modules/azure-mgmt-network/default.nix b/nixpkgs/pkgs/development/python-modules/azure-mgmt-network/default.nix index 6d8e08964807..61e979ee10a7 100644 --- a/nixpkgs/pkgs/development/python-modules/azure-mgmt-network/default.nix +++ b/nixpkgs/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/nixpkgs/pkgs/development/python-modules/azure-mgmt-recoveryservices/default.nix b/nixpkgs/pkgs/development/python-modules/azure-mgmt-recoveryservices/default.nix index 0dcafd78877a..5f6377d54edd 100644 --- a/nixpkgs/pkgs/development/python-modules/azure-mgmt-recoveryservices/default.nix +++ b/nixpkgs/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/nixpkgs/pkgs/development/python-modules/azure-mgmt-redis/default.nix b/nixpkgs/pkgs/development/python-modules/azure-mgmt-redis/default.nix index 8b0a71a324af..4bfbc40d7a42 100644 --- a/nixpkgs/pkgs/development/python-modules/azure-mgmt-redis/default.nix +++ b/nixpkgs/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/nixpkgs/pkgs/development/python-modules/azure-servicebus/default.nix b/nixpkgs/pkgs/development/python-modules/azure-servicebus/default.nix index abc9aa64b22d..d57082feccd6 100644 --- a/nixpkgs/pkgs/development/python-modules/azure-servicebus/default.nix +++ b/nixpkgs/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/nixpkgs/pkgs/development/python-modules/azure-storage-file-share/default.nix b/nixpkgs/pkgs/development/python-modules/azure-storage-file-share/default.nix index 1582ea52bc9d..3afaf383f45e 100644 --- a/nixpkgs/pkgs/development/python-modules/azure-storage-file-share/default.nix +++ b/nixpkgs/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/nixpkgs/pkgs/development/python-modules/azure-storage-queue/default.nix b/nixpkgs/pkgs/development/python-modules/azure-storage-queue/default.nix index c98609a6df78..0990203d42dd 100644 --- a/nixpkgs/pkgs/development/python-modules/azure-storage-queue/default.nix +++ b/nixpkgs/pkgs/development/python-modules/azure-storage-queue/default.nix @@ -1,33 +1,49 @@ { lib +, azure-core , buildPythonPackage +, cryptography , fetchPypi -, azure-common -, azure-storage-common -, msrest +, isodate +, pythonOlder +, typing-extensions }: buildPythonPackage rec { pname = "azure-storage-queue"; - version = "12.6.0"; + version = "12.7.1"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-GaAfHYYLXll4nhcnzmrsTwkDrFYwelZMT6d3+zi2tQ0="; - extension = "zip"; + hash = "sha256-zBt5z13ZRxB1xMLA3xEWf7mSoil43JLl8q46w0n/avY="; }; propagatedBuildInputs = [ - azure-common - azure-storage-common - msrest + azure-core + cryptography + isodate + typing-extensions ]; + passthru.optional-dependencies = { + aio = [ + azure-core + ] ++ azure-core.optional-dependencies.aio; + }; + # has no tests doCheck = false; + pythonImportsCheck = [ + "azure.storage.queue" + ]; + meta = with lib; { description = "Client library for Microsoft Azure Storage services containing the queue service APIs"; homepage = "https://github.com/Azure/azure-sdk-for-python"; + changelog = "https://github.com/Azure/azure-sdk-for-python/blob/azure-storage-queue_${version}/sdk/storage/azure-storage-queue/CHANGELOG.md"; license = licenses.mit; maintainers = with maintainers; [ cmcdragonkai ]; }; diff --git a/nixpkgs/pkgs/development/python-modules/base64io/default.nix b/nixpkgs/pkgs/development/python-modules/base64io/default.nix new file mode 100644 index 000000000000..8e5b121759fc --- /dev/null +++ b/nixpkgs/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/nixpkgs/pkgs/development/python-modules/beautiful-date/default.nix b/nixpkgs/pkgs/development/python-modules/beautiful-date/default.nix index 5b114655bcbb..22f69a728539 100644 --- a/nixpkgs/pkgs/development/python-modules/beautiful-date/default.nix +++ b/nixpkgs/pkgs/development/python-modules/beautiful-date/default.nix @@ -1,6 +1,7 @@ { lib , buildPythonPackage , fetchFromGitHub +, freezegun , python-dateutil , pytestCheckHook , pythonOlder @@ -8,16 +9,16 @@ buildPythonPackage rec { pname = "beautiful-date"; - version = "2.2.0"; + version = "2.3.0"; format = "setuptools"; - disable = pythonOlder "3.6"; + disable = pythonOlder "3.7"; src = fetchFromGitHub { owner = "kuzmoyev"; repo = "beautiful-date"; - rev = "v${version}"; - hash = "sha256-5xRmHaAPf1ps75cOINHkHT1aYb5UGLZGl0OHVQaMES0="; + rev = "refs/tags/v${version}"; + hash = "sha256-e6YJBaDwWqVehxBPOvsIdV4FIXlIwj29H5untXGJvT0="; }; propagatedBuildInputs = [ @@ -25,13 +26,16 @@ buildPythonPackage rec { ]; nativeCheckInputs = [ + freezegun pytestCheckHook ]; - pythonImportsCheck = [ "beautiful_date" ]; + pythonImportsCheck = [ + "beautiful_date" + ]; meta = with lib; { - description = "Simple and beautiful way to create date and datetime objects in Python"; + description = "Simple and beautiful way to create date and datetime objects"; homepage = "https://github.com/kuzmoyev/beautiful-date"; license = licenses.mit; maintainers = with maintainers; [ mbalatsko ]; diff --git a/nixpkgs/pkgs/development/python-modules/bentoml/default.nix b/nixpkgs/pkgs/development/python-modules/bentoml/default.nix index b09a029f307c..d6827f5b50ba 100644 --- a/nixpkgs/pkgs/development/python-modules/bentoml/default.nix +++ b/nixpkgs/pkgs/development/python-modules/bentoml/default.nix @@ -68,7 +68,7 @@ }: let - version = "1.1.4"; + version = "1.1.6"; aws = [ fs-s3fs ]; grpc = [ grpcio @@ -103,8 +103,8 @@ buildPythonPackage { src = fetchFromGitHub { owner = "bentoml"; repo = "BentoML"; - rev = "v${version}"; - hash = "sha256-aGSw40haVGo4UpUItStsFxfgjAnY4Rhiat4qDUIINWU="; + rev = "refs/tags/v${version}"; + hash = "sha256-SDahF4oAewWzCofErgYJDId/TBv74gLCxYT/jKEAgpU="; }; pythonRelaxDeps = [ diff --git a/nixpkgs/pkgs/development/python-modules/bids-validator/default.nix b/nixpkgs/pkgs/development/python-modules/bids-validator/default.nix index 7412fb2077b7..115c80553cc5 100644 --- a/nixpkgs/pkgs/development/python-modules/bids-validator/default.nix +++ b/nixpkgs/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/nixpkgs/pkgs/development/python-modules/bitsandbytes/default.nix b/nixpkgs/pkgs/development/python-modules/bitsandbytes/default.nix index 1bd32dab6741..c511f01d6dcf 100644 --- a/nixpkgs/pkgs/development/python-modules/bitsandbytes/default.nix +++ b/nixpkgs/pkgs/development/python-modules/bitsandbytes/default.nix @@ -3,12 +3,9 @@ , fetchFromGitHub , python , pythonOlder -, pytestCheckHook , setuptools , wheel , torch -, einops -, lion-pytorch , scipy , symlinkJoin }: @@ -85,7 +82,6 @@ buildPythonPackage { ]; doCheck = false; # tests require CUDA and also GPU access - nativeCheckInputs = [ pytestCheckHook einops lion-pytorch ]; pythonImportsCheck = [ "bitsandbytes" diff --git a/nixpkgs/pkgs/development/python-modules/bleak-retry-connector/default.nix b/nixpkgs/pkgs/development/python-modules/bleak-retry-connector/default.nix index 5e84af2a53b7..8ee08646d1e9 100644 --- a/nixpkgs/pkgs/development/python-modules/bleak-retry-connector/default.nix +++ b/nixpkgs/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/nixpkgs/pkgs/development/python-modules/bootstrap/build/default.nix b/nixpkgs/pkgs/development/python-modules/bootstrap/build/default.nix index 639d2e3292cb..f4e49bd65605 100644 --- a/nixpkgs/pkgs/development/python-modules/bootstrap/build/default.nix +++ b/nixpkgs/pkgs/development/python-modules/bootstrap/build/default.nix @@ -7,12 +7,15 @@ , packaging , pyproject-hooks , tomli +, makeWrapper }: let buildBootstrapPythonModule = basePackage: attrs: stdenv.mkDerivation ({ pname = "${python.libPrefix}-bootstrap-${basePackage.pname}"; inherit (basePackage) version src meta; + nativeBuildInputs = [ makeWrapper ]; + buildPhase = '' runHook preBuild @@ -38,12 +41,30 @@ let bootstrap-pyproject-hooks = buildBootstrapPythonModule pyproject-hooks {}; bootstrap-tomli = buildBootstrapPythonModule tomli {}; + + sitePkgs = python.sitePackages; in buildBootstrapPythonModule build { - propagatedBuildInputs = [ - bootstrap-packaging - bootstrap-pyproject-hooks - ] ++ lib.optionals (python.pythonOlder "3.11") [ - bootstrap-tomli - ]; + # like the installPhase above, but wrapping the pyproject-build command + # to set up PYTHONPATH with the correct dependencies. + # This allows using `pyproject-build` without propagating its dependencies + # into the build environment, which is necessary to prevent + # pythonCatchConflicts from raising false positive alerts. + # This would happen whenever the package to build has a dependency on + # another version of a package that is also a dependency of pyproject-build. + installPhase = '' + runHook preInstall + + PYTHONPATH="${installer}/${python.sitePackages}" \ + ${python.interpreter} -m installer \ + --destdir "$out" --prefix "" dist/*.whl + + wrapProgram $out/bin/pyproject-build \ + --prefix PYTHONPATH : "$out/${sitePkgs}" \ + --prefix PYTHONPATH : "${bootstrap-pyproject-hooks}/${sitePkgs}" \ + --prefix PYTHONPATH : "${bootstrap-packaging}/${sitePkgs}" \ + --prefix PYTHONPATH : "${bootstrap-tomli}/${sitePkgs}" + + runHook postInstall + ''; } diff --git a/nixpkgs/pkgs/development/python-modules/botocore-stubs/default.nix b/nixpkgs/pkgs/development/python-modules/botocore-stubs/default.nix index 2bd7f8e6d90e..7a74a0b5964b 100644 --- a/nixpkgs/pkgs/development/python-modules/botocore-stubs/default.nix +++ b/nixpkgs/pkgs/development/python-modules/botocore-stubs/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "botocore-stubs"; - version = "1.31.40"; + version = "1.31.52"; 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-L6m3jHozWpTZGAeXc9wxmHht50FYYYfYR6hxC5wzcAk="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/canals/default.nix b/nixpkgs/pkgs/development/python-modules/canals/default.nix index ae4d8615c757..9b919465365d 100644 --- a/nixpkgs/pkgs/development/python-modules/canals/default.nix +++ b/nixpkgs/pkgs/development/python-modules/canals/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "canals"; - version = "0.6.0"; + version = "0.8.0"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "deepset-ai"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-s4nKPywfRn2hNhn/coWGqShv7D+MCEHblVzfweQJlnM="; + hash = "sha256-co2Zv4U4Vnn8IdPqZnyLD+siFu7tectj7ckh4oaKWYU="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/casbin/default.nix b/nixpkgs/pkgs/development/python-modules/casbin/default.nix index 1b6a7d72e415..eb825a5d9ad7 100644 --- a/nixpkgs/pkgs/development/python-modules/casbin/default.nix +++ b/nixpkgs/pkgs/development/python-modules/casbin/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "casbin"; - version = "1.27.0"; + version = "1.28.0"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = pname; repo = "pycasbin"; rev = "refs/tags/v${version}"; - hash = "sha256-gZgaWgkvMuD7IfIy85rX3i6lZqj5WkStF0dHe+AQSJY="; + hash = "sha256-h/wg7O6zWnSQL5+VzAUA+G/4i7LcFpHvK2weyql998Y="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/censys/default.nix b/nixpkgs/pkgs/development/python-modules/censys/default.nix index 150a8e36747a..f0a144e646ee 100644 --- a/nixpkgs/pkgs/development/python-modules/censys/default.nix +++ b/nixpkgs/pkgs/development/python-modules/censys/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { pname = "censys"; - version = "2.2.5"; + version = "2.2.6"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -27,7 +27,7 @@ buildPythonPackage rec { owner = "censys"; repo = "censys-python"; rev = "refs/tags/v${version}"; - hash = "sha256-D25deUPMWc6KRlwytSfZqoPeJGmTV304slUP9gCyrUw="; + hash = "sha256-awe/6d6AryihS8vYCRtU8APbLUsqv9aKULBmjjaz3gM="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/certipy-ad/default.nix b/nixpkgs/pkgs/development/python-modules/certipy-ad/default.nix index 175a454ab1ea..a0411655c26d 100644 --- a/nixpkgs/pkgs/development/python-modules/certipy-ad/default.nix +++ b/nixpkgs/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/nixpkgs/pkgs/development/python-modules/ckcc-protocol/default.nix b/nixpkgs/pkgs/development/python-modules/ckcc-protocol/default.nix index a298a166f9c8..e9654b0e67d5 100644 --- a/nixpkgs/pkgs/development/python-modules/ckcc-protocol/default.nix +++ b/nixpkgs/pkgs/development/python-modules/ckcc-protocol/default.nix @@ -10,24 +10,34 @@ buildPythonPackage rec { pname = "ckcc-protocol"; - version = "1.3.2"; + version = "1.4.0"; + format = "setuptools"; + disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-4y5pe0CFD3C1+N0kP/2j9Wser2zkn8Uf4203ci45Rq0="; + hash = "sha256-zZPU0+MwjqRYCqa+W0YTqCZv2WsMwa9R5xaN7ye77OU="; }; - propagatedBuildInputs = [ click ecdsa hidapi pyaes ]; + propagatedBuildInputs = [ + click + ecdsa + hidapi + pyaes + ]; # Project has no tests doCheck = false; - pythonImportsCheck = [ "ckcc" ]; + + pythonImportsCheck = [ + "ckcc" + ]; meta = with lib; { description = "Communicate with your Coldcard using Python"; homepage = "https://github.com/Coldcard/ckcc-protocol"; license = licenses.mit; - maintainers = [ maintainers.hkjn ]; + maintainers = with maintainers; [ hkjn ]; }; } diff --git a/nixpkgs/pkgs/development/python-modules/claripy/default.nix b/nixpkgs/pkgs/development/python-modules/claripy/default.nix index d71fc9266d2d..1b9b0a9b6162 100644 --- a/nixpkgs/pkgs/development/python-modules/claripy/default.nix +++ b/nixpkgs/pkgs/development/python-modules/claripy/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "claripy"; - version = "9.2.66"; + 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-CDFZ6CN3pqNpwigYVHyKxwpa9iPfl4m/XDAo1YSRir8="; + hash = "sha256-l1l4E0NES06ewf499vE9fmYuqAFaylRamDrJSkGEGMQ="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/cle/default.nix b/nixpkgs/pkgs/development/python-modules/cle/default.nix index a8aa9cbfbc60..5bb2a7db6e6e 100644 --- a/nixpkgs/pkgs/development/python-modules/cle/default.nix +++ b/nixpkgs/pkgs/development/python-modules/cle/default.nix @@ -16,14 +16,14 @@ let # The binaries are following the argr projects release cycle - version = "9.2.66"; + 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-/LDVpw1Ej2YuzwA2qUoZv/ajQZPL9dDvvawj9r5bGbo="; + hash = "sha256-6NDNGcKiBKKzkzXx/gnSyO/dCHD4VrcClGCMndwxF9Q="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/clevercsv/default.nix b/nixpkgs/pkgs/development/python-modules/clevercsv/default.nix index 4ab05a964f56..6f7d682ba033 100644 --- a/nixpkgs/pkgs/development/python-modules/clevercsv/default.nix +++ b/nixpkgs/pkgs/development/python-modules/clevercsv/default.nix @@ -20,14 +20,14 @@ buildPythonPackage rec { pname = "clevercsv"; - version = "0.8.0"; + version = "0.8.1"; format = "setuptools"; src = fetchFromGitHub { owner = "alan-turing-institute"; repo = "CleverCSV"; rev = "refs/tags/v${version}"; - hash = "sha256-/JveB6fpIJvR5byGcmO9XBuCbUw7yNTpSoDs68Wffmo="; + hash = "sha256-kCkMZnHbFUuBBvlQ5rn0tNeL7uTAq0aodpj2JvPo968="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/cloup/default.nix b/nixpkgs/pkgs/development/python-modules/cloup/default.nix index d23b27833bfc..a05ea2d4e3b5 100644 --- a/nixpkgs/pkgs/development/python-modules/cloup/default.nix +++ b/nixpkgs/pkgs/development/python-modules/cloup/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "cloup"; - version = "3.0.1"; + version = "3.0.2"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-4ItMwje7mlvY/4G6btSUmOIgDaw5InsWSOlXiCAo6ZM="; + hash = "sha256-zBBZYQ2B2qCMxgflbHroGfqwEPGdGfPIdc7rZ1GDrPY="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/coffea/default.nix b/nixpkgs/pkgs/development/python-modules/coffea/default.nix index ba60cc47a8c3..dbc75a3bb12f 100644 --- a/nixpkgs/pkgs/development/python-modules/coffea/default.nix +++ b/nixpkgs/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/nixpkgs/pkgs/development/python-modules/confection/default.nix b/nixpkgs/pkgs/development/python-modules/confection/default.nix index d4b3152c3b46..30ed7f3c682e 100644 --- a/nixpkgs/pkgs/development/python-modules/confection/default.nix +++ b/nixpkgs/pkgs/development/python-modules/confection/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "confection"; - version = "0.1.1"; + version = "0.1.3"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "explosion"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-OpUMx8hcTnBdaATzRXBICwF6eAGsdyA0jFvX4nVBiM4="; + hash = "sha256-PJbFv+5bT4+oF7PRAO6AGnjRhjNudiJEkPFgGSmuI8c="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/curlify/default.nix b/nixpkgs/pkgs/development/python-modules/curlify/default.nix new file mode 100644 index 000000000000..dbe335c71dec --- /dev/null +++ b/nixpkgs/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/nixpkgs/pkgs/development/python-modules/cyclonedx-python-lib/default.nix b/nixpkgs/pkgs/development/python-modules/cyclonedx-python-lib/default.nix index d13bef9f0bd1..706129075717 100644 --- a/nixpkgs/pkgs/development/python-modules/cyclonedx-python-lib/default.nix +++ b/nixpkgs/pkgs/development/python-modules/cyclonedx-python-lib/default.nix @@ -4,6 +4,7 @@ , fetchFromGitHub , importlib-metadata , jsonschema +, license-expression , lxml , packageurl-python , py-serializable @@ -22,7 +23,7 @@ buildPythonPackage rec { pname = "cyclonedx-python-lib"; - version = "4.1.0"; + version = "4.2.2"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -31,7 +32,7 @@ buildPythonPackage rec { owner = "CycloneDX"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-pRYjpmHhsw03b87YjS8YMmkQNwfcihp/bk56LFn55AU="; + hash = "sha256-7bqIKwKGfMj5YPqZpvWtP881LNOgvJ+DMHs1U63gCN0="; }; nativeBuildInputs = [ @@ -41,6 +42,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ importlib-metadata + license-expression packageurl-python requirements-parser setuptools diff --git a/nixpkgs/pkgs/development/python-modules/cymem/default.nix b/nixpkgs/pkgs/development/python-modules/cymem/default.nix index 0332ffd1f98a..f168ea39a371 100644 --- a/nixpkgs/pkgs/development/python-modules/cymem/default.nix +++ b/nixpkgs/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/nixpkgs/pkgs/development/python-modules/datasette/default.nix b/nixpkgs/pkgs/development/python-modules/datasette/default.nix index 34a6bbf7dbbf..7063e90a1d85 100644 --- a/nixpkgs/pkgs/development/python-modules/datasette/default.nix +++ b/nixpkgs/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/nixpkgs/pkgs/development/python-modules/dbus-fast/default.nix b/nixpkgs/pkgs/development/python-modules/dbus-fast/default.nix index 5dc9b5675a4d..a4cf927ec901 100644 --- a/nixpkgs/pkgs/development/python-modules/dbus-fast/default.nix +++ b/nixpkgs/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/nixpkgs/pkgs/development/python-modules/debugpy/default.nix b/nixpkgs/pkgs/development/python-modules/debugpy/default.nix index 2a937c9f41a2..2cf365846246 100644 --- a/nixpkgs/pkgs/development/python-modules/debugpy/default.nix +++ b/nixpkgs/pkgs/development/python-modules/debugpy/default.nix @@ -20,18 +20,16 @@ buildPythonPackage rec { pname = "debugpy"; - version = "1.6.7.post1"; + version = "1.8.0"; format = "setuptools"; - # Currently doesn't support 3.11: - # https://github.com/microsoft/debugpy/issues/1107 - disabled = pythonOlder "3.7" || pythonAtLeast "3.11"; + disabled = pythonOlder "3.8" || pythonAtLeast "3.13"; src = fetchFromGitHub { owner = "microsoft"; repo = "debugpy"; rev = "refs/tags/v${version}"; - hash = "sha256-zsF6XUSAAKhwmUZkroRWvOBWXjTWzWuRYOhnYuN3KrY="; + hash = "sha256-FW1RDmj4sDBS0q08C82ErUd16ofxJxgVaxfykn/wVBA="; }; patches = [ @@ -50,13 +48,6 @@ buildPythonPackage rec { # To avoid this issue, debugpy should be installed using python.withPackages: # python.withPackages (ps: with ps; [ debugpy ]) ./fix-test-pythonpath.patch - - # Support disabling process timeouts when set to 0 - # See https://github.com/microsoft/debugpy/pull/1286 - (fetchpatch { - url = "https://github.com/microsoft/debugpy/commit/1569cc8319350afcc5ba8630660f599d514ac3bb.patch"; - hash = "sha256-v4GKLb2M20F1egAGtix9cTkSzBnvSgSSphSQST5p63w="; - }) ] ++ lib.optionals stdenv.isLinux [ # Hard code GDB path (used to attach to process) (substituteAll { @@ -121,6 +112,11 @@ buildPythonPackage rec { disabledTests = [ # https://github.com/microsoft/debugpy/issues/1241 "test_flask_breakpoint_multiproc" + + # DeprecationWarning: pkg_resources is deprecated as an API + # Supposedly fixed in https://github.com/microsoft/debugpy/pull/1374, + # but still fails for a nix build + "test_gevent" ]; pythonImportsCheck = [ diff --git a/nixpkgs/pkgs/development/python-modules/deploykit/default.nix b/nixpkgs/pkgs/development/python-modules/deploykit/default.nix index 2d1636818021..9668ec25c359 100644 --- a/nixpkgs/pkgs/development/python-modules/deploykit/default.nix +++ b/nixpkgs/pkgs/development/python-modules/deploykit/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "deploykit"; - version = "1.1.0"; + version = "1.1.1"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "numtide"; repo = pname; rev = version; - hash = "sha256-re7r2K9F5FTTVn84WC+wZX30JA9AXQcHK3pLjYglMs8="; + hash = "sha256-7PiXq1bQJ1jswLHNqCDSYZabgfp8HRuRt5YPGzd5Ej0="; }; buildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/devito/default.nix b/nixpkgs/pkgs/development/python-modules/devito/default.nix index b56c44579df4..208778465191 100644 --- a/nixpkgs/pkgs/development/python-modules/devito/default.nix +++ b/nixpkgs/pkgs/development/python-modules/devito/default.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { pname = "devito"; - version = "4.8.1"; + version = "4.8.2"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -35,7 +35,7 @@ buildPythonPackage rec { owner = "devitocodes"; repo = "devito"; rev = "refs/tags/v${version}"; - hash = "sha256-LzqY//205XEOd3/f8k1g4OYndRHMTVplBogGJf5Forw="; + hash = "sha256-zckFU9Q5Rpj0TPeT96lXfR/yp2SYrV4sjAjqN/y8GDw="; }; pythonRemoveDeps = [ diff --git a/nixpkgs/pkgs/development/python-modules/devolo-plc-api/default.nix b/nixpkgs/pkgs/development/python-modules/devolo-plc-api/default.nix index f6f0b92f549d..5fac8fd6aa0f 100644 --- a/nixpkgs/pkgs/development/python-modules/devolo-plc-api/default.nix +++ b/nixpkgs/pkgs/development/python-modules/devolo-plc-api/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "devolo-plc-api"; - version = "1.4.0"; + version = "1.4.1"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "2Fake"; repo = "devolo_plc_api"; rev = "refs/tags/v${version}"; - hash = "sha256-roKwCNOvSVRFKBxXz0a9SDo925RHqX0qKv/1QWD3diw="; + hash = "sha256-EP99AswHmLO+8ZQAPjJyw/P9QqfDawy3AqyJR870Qms="; }; postPatch = '' diff --git a/nixpkgs/pkgs/development/python-modules/django-ninja/default.nix b/nixpkgs/pkgs/development/python-modules/django-ninja/default.nix new file mode 100644 index 000000000000..620960797ea0 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/django-ninja/default.nix @@ -0,0 +1,45 @@ +{ lib +, buildPythonPackage +, django +, fetchFromGitHub +, flit-core +, psycopg2 +, pydantic +, pytest-asyncio +, pytest-django +, pytestCheckHook +, pythonOlder +}: + +buildPythonPackage rec { + pname = "django-ninja"; + version = "0.22.2"; + format = "pyproject"; + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "vitalik"; + repo = "django-ninja"; + rev = "v${version}"; + hash = "sha256-oeisurp9seSn3X/5jFF9DMm9nU6uDYIU1b6/J3o2be0="; + }; + + propagatedBuildInputs = [ django pydantic ]; + + nativeBuildInputs = [ flit-core ]; + + nativeCheckInputs = [ + psycopg2 + pytest-asyncio + pytest-django + pytestCheckHook + ]; + + meta = with lib; { + changelog = "https://github.com/vitalik/django-ninja/releases/tag/v${version}"; + description = "Web framework for building APIs with Django and Python type hints"; + homepage = "https://django-ninja.rest-framework.com/"; + license = licenses.mit; + maintainers = with maintainers; [ elohmeier ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/django-reversion/default.nix b/nixpkgs/pkgs/development/python-modules/django-reversion/default.nix index d11bb0c841a7..e85e89e2b6c9 100644 --- a/nixpkgs/pkgs/development/python-modules/django-reversion/default.nix +++ b/nixpkgs/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/nixpkgs/pkgs/development/python-modules/django-types/default.nix b/nixpkgs/pkgs/development/python-modules/django-types/default.nix new file mode 100644 index 000000000000..71542f2f9b4f --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/django-types/default.nix @@ -0,0 +1,25 @@ +{ lib +, buildPythonPackage +, fetchPypi +, poetry-core +}: + +buildPythonPackage rec { + pname = "django-types"; + version = "0.17.0"; + format = "pyproject"; + + src = fetchPypi { + inherit pname version; + hash = "sha256-wcQqt4h2xXxyg0LVqwYHJas3H8jcg7uFuuC+BoRqrXA="; + }; + + 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/nixpkgs/pkgs/development/python-modules/django/4.nix b/nixpkgs/pkgs/development/python-modules/django/4.nix index c3df9cf4aef0..d694ff7fb033 100644 --- a/nixpkgs/pkgs/development/python-modules/django/4.nix +++ b/nixpkgs/pkgs/development/python-modules/django/4.nix @@ -42,14 +42,14 @@ buildPythonPackage rec { pname = "Django"; - version = "4.2.4"; + version = "4.2.5"; format = "pyproject"; disabled = pythonOlder "3.10"; src = fetchPypi { inherit pname version; - hash = "sha256-fkIl7AZeDzVMz3NJoi0gneCcwcB0gyvp64TFHBeZxDI="; + hash = "sha256-XlwclUj/t3lrSopHgumi5aPfNhUln8G/0+vHO2RhRsE="; }; patches = [ diff --git a/nixpkgs/pkgs/development/python-modules/dnfile/default.nix b/nixpkgs/pkgs/development/python-modules/dnfile/default.nix index 0f589b7d95ac..232927aace70 100644 --- a/nixpkgs/pkgs/development/python-modules/dnfile/default.nix +++ b/nixpkgs/pkgs/development/python-modules/dnfile/default.nix @@ -4,27 +4,27 @@ , pefile , pytestCheckHook , pythonOlder +, setuptools }: buildPythonPackage rec { pname = "dnfile"; - version = "0.13.0"; - format = "setuptools"; + version = "0.14.1"; + format = "pyproject"; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "malwarefrank"; - repo = pname; + repo = "dnfile"; rev = "refs/tags/v${version}"; - hash = "sha256-TH30gEoxXkaDac6hJsGQFWzwDeqzdZ19HK8i/3Dlh8k="; + hash = "sha256-5xkoG7c9Piwrv+9qour7MZ+rabdngtd05b0T+AU8tSo="; fetchSubmodules = true; }; - postPatch = '' - substituteInPlace setup.py \ - --replace "pytest-runner" "" - ''; + nativeBuildInputs = [ + setuptools + ]; propagatedBuildInputs = [ pefile diff --git a/nixpkgs/pkgs/development/python-modules/dvc-data/default.nix b/nixpkgs/pkgs/development/python-modules/dvc-data/default.nix index 65ad409aaee3..004fceaaa8a1 100644 --- a/nixpkgs/pkgs/development/python-modules/dvc-data/default.nix +++ b/nixpkgs/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/nixpkgs/pkgs/development/python-modules/dvc-render/default.nix b/nixpkgs/pkgs/development/python-modules/dvc-render/default.nix index 1a397e6e4636..c0ab18a4d17c 100644 --- a/nixpkgs/pkgs/development/python-modules/dvc-render/default.nix +++ b/nixpkgs/pkgs/development/python-modules/dvc-render/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "dvc-render"; - version = "0.5.3"; + version = "0.6.0"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "iterative"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-4nqImAYk4pYXSuE2/znzwjtf0349bydqi4iN69wG080="; + hash = "sha256-seL96aOJ554pD7lgzXZFDCXqY/3TAQugWMA7MtqKoAE="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; diff --git a/nixpkgs/pkgs/development/python-modules/dvc-studio-client/default.nix b/nixpkgs/pkgs/development/python-modules/dvc-studio-client/default.nix index 3b6479d5e841..c9d0949c09d7 100644 --- a/nixpkgs/pkgs/development/python-modules/dvc-studio-client/default.nix +++ b/nixpkgs/pkgs/development/python-modules/dvc-studio-client/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "dvc-studio-client"; - version = "0.13.0"; + version = "0.15.0"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "iterative"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-m4UJRRwY+aJdPIMHPIWe3En7FCADeT1qCZnu3BJeYXc="; + hash = "sha256-azv9B5TiDlKzPD1+8tUOyMo8LDVgcSwiikwLrM/9ZEg="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; diff --git a/nixpkgs/pkgs/development/python-modules/dvc/default.nix b/nixpkgs/pkgs/development/python-modules/dvc/default.nix index 5700bec74686..66d6e1057b04 100644 --- a/nixpkgs/pkgs/development/python-modules/dvc/default.nix +++ b/nixpkgs/pkgs/development/python-modules/dvc/default.nix @@ -55,14 +55,14 @@ buildPythonPackage rec { pname = "dvc"; - version = "3.18.0"; + version = "3.22.0"; format = "pyproject"; src = fetchFromGitHub { owner = "iterative"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-wTKQmFvI4kaXGivRiGDoI4lM/xHxYUDBqplscvjVQRs="; + hash = "sha256-8L8ilGOPSfc6mW4JmmLM7VimwlFBQ6h5WIxaRnvWcm0="; }; pythonRelaxDeps = [ diff --git a/nixpkgs/pkgs/development/python-modules/easyocr/default.nix b/nixpkgs/pkgs/development/python-modules/easyocr/default.nix index 3d260f1f652f..ff7f7650fce9 100644 --- a/nixpkgs/pkgs/development/python-modules/easyocr/default.nix +++ b/nixpkgs/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/nixpkgs/pkgs/development/python-modules/edk2-pytool-library/default.nix b/nixpkgs/pkgs/development/python-modules/edk2-pytool-library/default.nix index b92323e0c15c..c1bc530db0ff 100644 --- a/nixpkgs/pkgs/development/python-modules/edk2-pytool-library/default.nix +++ b/nixpkgs/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/nixpkgs/pkgs/development/python-modules/elkm1-lib/default.nix b/nixpkgs/pkgs/development/python-modules/elkm1-lib/default.nix index d7536d9a56e0..f64cbda4885b 100644 --- a/nixpkgs/pkgs/development/python-modules/elkm1-lib/default.nix +++ b/nixpkgs/pkgs/development/python-modules/elkm1-lib/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "elkm1-lib"; - version = "2.2.5"; + version = "2.2.6"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "gwww"; repo = "elkm1"; rev = "refs/tags/${version}"; - hash = "sha256-8Mzxaww6a+vi3i8H4W9jRgY+5mpTGaJbNBXPDPn8sl4="; + hash = "sha256-5Jmn/ywyg6fmp0ZxPf79ET+JWPF4VjDJMwj/qU6ckS0="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/fabric/default.nix b/nixpkgs/pkgs/development/python-modules/fabric/default.nix index 80a4bd6674a2..e3da62493454 100644 --- a/nixpkgs/pkgs/development/python-modules/fabric/default.nix +++ b/nixpkgs/pkgs/development/python-modules/fabric/default.nix @@ -2,6 +2,7 @@ , buildPythonPackage , fetchPypi , cryptography +, decorator , invoke , mock , paramiko @@ -11,11 +12,11 @@ buildPythonPackage rec { pname = "fabric"; - version = "3.0.0"; + version = "3.2.2"; src = fetchPypi { inherit pname version; - hash = "sha256-v+lgwa6QTnYkr51ArVubmVge2cT9CTScDQK3SG4dD4k="; + hash = "sha256-h4PKQuOwB28IsmkBqsa52bHxnEEAdOesz6uQLBhP9KM="; }; # only relevant to python < 3.4 @@ -24,7 +25,7 @@ buildPythonPackage rec { --replace ', "pathlib2"' ' ' ''; - propagatedBuildInputs = [ invoke paramiko cryptography ]; + propagatedBuildInputs = [ invoke paramiko cryptography decorator ]; nativeCheckInputs = [ pytestCheckHook pytest-relaxed mock ]; diff --git a/nixpkgs/pkgs/development/python-modules/findpython/default.nix b/nixpkgs/pkgs/development/python-modules/findpython/default.nix index 68fb70cda533..9a9bd93fc745 100644 --- a/nixpkgs/pkgs/development/python-modules/findpython/default.nix +++ b/nixpkgs/pkgs/development/python-modules/findpython/default.nix @@ -15,7 +15,7 @@ let pname = "findpython"; - version = "0.3.1"; + version = "0.4.0"; in buildPythonPackage { inherit pname version; @@ -25,7 +25,7 @@ buildPythonPackage { src = fetchPypi { inherit pname version; - hash = "sha256-diH4qcGZpw0hmDHN2uuEyn6D4guDWBcr/0eHGhil7aQ="; + hash = "sha256-GLFNEVZ42hiuku4i1wAcwwkV6lMQU/dwEO4Fo5aA9Dg="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/flake8-bugbear/default.nix b/nixpkgs/pkgs/development/python-modules/flake8-bugbear/default.nix index 2e8935b078ca..f2455cf2161f 100644 --- a/nixpkgs/pkgs/development/python-modules/flake8-bugbear/default.nix +++ b/nixpkgs/pkgs/development/python-modules/flake8-bugbear/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "flake8-bugbear"; - version = "23.7.10"; + version = "23.9.16"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "PyCQA"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-pObZ3HvXuc9MabxY5XK2DPaGZXicH6zQ4RtfGpGdGBE="; + hash = "sha256-fGrefEoyEgJE3danv9hG+Os79ixPzurEzLc3Dnj2M3k="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/flask-compress/default.nix b/nixpkgs/pkgs/development/python-modules/flask-compress/default.nix index 2868ac81c0ab..fe2371149523 100644 --- a/nixpkgs/pkgs/development/python-modules/flask-compress/default.nix +++ b/nixpkgs/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/nixpkgs/pkgs/development/python-modules/flask-migrate/default.nix b/nixpkgs/pkgs/development/python-modules/flask-migrate/default.nix index d5bb05b58917..819c9d239231 100644 --- a/nixpkgs/pkgs/development/python-modules/flask-migrate/default.nix +++ b/nixpkgs/pkgs/development/python-modules/flask-migrate/default.nix @@ -12,16 +12,16 @@ buildPythonPackage rec { pname = "flask-migrate"; - version = "4.0.4"; + version = "4.0.5"; format = "pyproject"; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "miguelgrinberg"; repo = "Flask-Migrate"; rev = "v${version}"; - hash = "sha256-x52LGYvXuTUCP9dR3FP7a/xNRWyCAV1sReDAYJbYDvE="; + hash = "sha256-fdnoX7ypTpH2mQ+7Xuhzdh706Of7PIVhHQGVbe0jv1s="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/fontawesomefree/default.nix b/nixpkgs/pkgs/development/python-modules/fontawesomefree/default.nix index 2b001fecaf8c..437259ff6d3e 100644 --- a/nixpkgs/pkgs/development/python-modules/fontawesomefree/default.nix +++ b/nixpkgs/pkgs/development/python-modules/fontawesomefree/default.nix @@ -5,7 +5,7 @@ buildPythonPackage rec { pname = "fontawesomefree"; - version = "6.4.0"; + version = "6.4.2"; format = "wheel"; # they only provide a wheel @@ -13,7 +13,7 @@ buildPythonPackage rec { inherit pname version format; dist = "py3"; python = "py3"; - hash = "sha256-4S7a1xts9pk/x8aupjZ+Ex8vJHtkNfrKmbEjKbrNKyc="; + hash = "sha256-zq/378T8Odrf88P/cpinoQlUAxENNz8iRWuxw0q22wI="; }; pythonImportsCheck = [ diff --git a/nixpkgs/pkgs/development/python-modules/fritzconnection/default.nix b/nixpkgs/pkgs/development/python-modules/fritzconnection/default.nix index 9fc2beef2c0d..36d4dbd5b192 100644 --- a/nixpkgs/pkgs/development/python-modules/fritzconnection/default.nix +++ b/nixpkgs/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/nixpkgs/pkgs/development/python-modules/fschat/default.nix b/nixpkgs/pkgs/development/python-modules/fschat/default.nix new file mode 100644 index 000000000000..26f69132ed0c --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/fschat/default.nix @@ -0,0 +1,102 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, setuptools +, aiohttp +, fastapi +, httpx +, markdown2 +, nh3 +, numpy +, prompt-toolkit +, pydantic +, requests +, rich +, shortuuid +, tiktoken +, uvicorn +, anthropic +, openai +, ray +, wandb +, einops +, gradio +, accelerate +, peft +, sentencepiece +, torch +, transformers +, protobuf +}: +let + version = "0.2.28"; +in +buildPythonPackage { + pname = "fschat"; + inherit version; + format = "pyproject"; + + src = fetchFromGitHub { + owner = "lm-sys"; + repo = "FastChat"; + rev = "v${version}"; + hash = "sha256-nTP4zY6mJykzKb6LBWosg77mwE33vq9eiYSpAlZU5NI="; + }; + + nativeBuildInputs = [ + setuptools + ]; + + propagatedBuildInputs = [ + aiohttp + fastapi + httpx + markdown2 + nh3 + numpy + prompt-toolkit + pydantic + requests + rich + shortuuid + tiktoken + uvicorn + # ] ++ markdown2.optional-dependencies.all; + ]; + + passthru.optional-dependencies = { + llm_judge = [ + anthropic + openai + ray + ]; + train = [ + # flash-attn + wandb + einops + ]; + webui = [ + gradio + ]; + model_worker = [ + accelerate + peft + sentencepiece + torch + transformers + protobuf + ]; + }; + + pythonImportsCheck = [ "fastchat" ]; + + # tests require networking + doCheck = false; + + meta = with lib; { + description = "An open platform for training, serving, and evaluating large language models. Release repo for Vicuna and Chatbot Arena"; + homepage = "https://github.com/lm-sys/FastChat"; + license = licenses.asl20; + maintainers = with maintainers; [ happysalada ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/fx2/default.nix b/nixpkgs/pkgs/development/python-modules/fx2/default.nix index 1df4625a6818..a691f3723d5a 100644 --- a/nixpkgs/pkgs/development/python-modules/fx2/default.nix +++ b/nixpkgs/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/nixpkgs/pkgs/development/python-modules/garminconnect/default.nix b/nixpkgs/pkgs/development/python-modules/garminconnect/default.nix index 815b695ce1c2..78e234be0f53 100644 --- a/nixpkgs/pkgs/development/python-modules/garminconnect/default.nix +++ b/nixpkgs/pkgs/development/python-modules/garminconnect/default.nix @@ -2,14 +2,16 @@ , buildPythonPackage , cloudscraper , fetchFromGitHub +, garth +, pdm-backend , pythonOlder , requests }: buildPythonPackage rec { pname = "garminconnect"; - version = "0.1.55"; - format = "setuptools"; + version = "0.2.7"; + format = "pyproject"; disabled = pythonOlder "3.7"; @@ -17,15 +19,20 @@ buildPythonPackage rec { owner = "cyberjunky"; repo = "python-garminconnect"; rev = "refs/tags/${version}"; - hash = "sha256-YPLlrlV8UyoaNtE+LgX7jpZkR7jbSe/2WRR0v0cfACY="; + hash = "sha256-hyrj3icj5QxXf9NDk/x7bocFg6iD+KEDZNcpZVBEx4k="; }; + nativeBuildInputs = [ + pdm-backend + ]; + propagatedBuildInputs = [ cloudscraper + garth requests ]; - # Module has no tests + # Tests require a token doCheck = false; pythonImportsCheck = [ diff --git a/nixpkgs/pkgs/development/python-modules/garth/default.nix b/nixpkgs/pkgs/development/python-modules/garth/default.nix new file mode 100644 index 000000000000..0eaf2793caa8 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/garth/default.nix @@ -0,0 +1,65 @@ +{ lib +, buildPythonPackage +, fetchPypi +, pdm-backend +, pydantic +, pytest-vcr +, pytestCheckHook +, pythonOlder +, requests +, requests-oauthlib +}: + +buildPythonPackage rec { + pname = "garth"; + version = "0.4.26"; + format = "pyproject"; + + disabled = pythonOlder "3.9"; + + src = fetchPypi { + inherit pname version; + hash = "sha256-Ezq9lZE6HTtuW396sKZ32mDvNjrkz6UHQGvLhXUjfnI="; + }; + + nativeBuildInputs = [ + pdm-backend + ]; + + propagatedBuildInputs = [ + pydantic + requests + requests-oauthlib + ]; + + nativeCheckInputs = [ + pytest-vcr + pytestCheckHook + ]; + + pythonImportsCheck = [ + "garth" + ]; + + disabledTests = [ + # Tests require network access + "test_client_request" + "test_connectapi" + "test_daily" + "test_download" + "test_exchange" + "test_hrv_data_get" + "test_login" + "test_refresh_oauth2_token" + "test_sleep_data" + "test_username" + "test_weekly" + ]; + + meta = with lib; { + description = "Garmin SSO auth and connect client"; + homepage = "https://github.com/matin/garth"; + license = licenses.mit; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/gehomesdk/default.nix b/nixpkgs/pkgs/development/python-modules/gehomesdk/default.nix index 81a8e3678272..7e1d88cde508 100644 --- a/nixpkgs/pkgs/development/python-modules/gehomesdk/default.nix +++ b/nixpkgs/pkgs/development/python-modules/gehomesdk/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "gehomesdk"; - version = "0.5.20"; + version = "0.5.23"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-5nu7pewkxCZ/F6m7xOwvMwuhFsanQKHtdwGqNto3/zk="; + hash = "sha256-6Xk7wAF0bZrHriSyDMnPfaPRBiVinHawj3nEqpwbUmo="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/geopandas/default.nix b/nixpkgs/pkgs/development/python-modules/geopandas/default.nix index ebc8c5377b3f..e176a614e8d6 100644 --- a/nixpkgs/pkgs/development/python-modules/geopandas/default.nix +++ b/nixpkgs/pkgs/development/python-modules/geopandas/default.nix @@ -14,16 +14,16 @@ buildPythonPackage rec { pname = "geopandas"; - version = "0.13.2"; + version = "0.14.0"; format = "setuptools"; - disabled = pythonOlder "3.8"; + disabled = pythonOlder "3.9"; src = fetchFromGitHub { owner = "geopandas"; repo = "geopandas"; rev = "refs/tags/v${version}"; - hash = "sha256-8H0IO+Oabl1ZOHHvMFHnPEyW0xH/G4wuUtkZrsP6K3k="; + hash = "sha256-lhQXYSY2JrY3+GgMnfTJugnOD/g3VjG0tgw+cEgpIP8="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/google-ai-generativelanguage/default.nix b/nixpkgs/pkgs/development/python-modules/google-ai-generativelanguage/default.nix index 444b1cf1f5cd..88f5dfc3e9ee 100644 --- a/nixpkgs/pkgs/development/python-modules/google-ai-generativelanguage/default.nix +++ b/nixpkgs/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/nixpkgs/pkgs/development/python-modules/google-auth-httplib2/default.nix b/nixpkgs/pkgs/development/python-modules/google-auth-httplib2/default.nix index c35297f6b5cf..510b62c5bbae 100644 --- a/nixpkgs/pkgs/development/python-modules/google-auth-httplib2/default.nix +++ b/nixpkgs/pkgs/development/python-modules/google-auth-httplib2/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "google-auth-httplib2"; - version = "0.1.0"; + version = "0.1.1"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-oHw5/WMr7KzT8HcY39YCG/OWl48DrTzkMh0GABXMMKw="; + hash = "sha256-xkvFVf3G3XiOpi7Pe8z/z0l793JEiHo/PXpaAvjj/Ck="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/google-cloud-bigquery-logging/default.nix b/nixpkgs/pkgs/development/python-modules/google-cloud-bigquery-logging/default.nix index 2c7202be0d25..578990f30905 100644 --- a/nixpkgs/pkgs/development/python-modules/google-cloud-bigquery-logging/default.nix +++ b/nixpkgs/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/nixpkgs/pkgs/development/python-modules/google-cloud-compute/default.nix b/nixpkgs/pkgs/development/python-modules/google-cloud-compute/default.nix index 634c488fde42..b705224111ea 100644 --- a/nixpkgs/pkgs/development/python-modules/google-cloud-compute/default.nix +++ b/nixpkgs/pkgs/development/python-modules/google-cloud-compute/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "google-cloud-compute"; - version = "1.14.0"; + version = "1.14.1"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-AtGjz+ghJ+/WI8ppavkF2J6Hqq65pQYhWb3PN0f9j2Y="; + hash = "sha256-rNmHZH18gmqpe0QYFBx0Dq1eiBHTNJMV8viaMMAcf0s="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/google-cloud-container/default.nix b/nixpkgs/pkgs/development/python-modules/google-cloud-container/default.nix index e9890447e46a..a79c74b3de08 100644 --- a/nixpkgs/pkgs/development/python-modules/google-cloud-container/default.nix +++ b/nixpkgs/pkgs/development/python-modules/google-cloud-container/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "google-cloud-container"; - version = "2.30.0"; + version = "2.31.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-iR6+A3ekRxl3zA1K7DMaw4dyMwjM/yxh/7tOH//mwXY="; + hash = "sha256-PGrG29a5tq41hn8zzJWdAy4Dju1O5ZPYhZ+CcsBraAY="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/google-cloud-datacatalog/default.nix b/nixpkgs/pkgs/development/python-modules/google-cloud-datacatalog/default.nix index 6d7d35d67823..1a5d935f4a81 100644 --- a/nixpkgs/pkgs/development/python-modules/google-cloud-datacatalog/default.nix +++ b/nixpkgs/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/nixpkgs/pkgs/development/python-modules/google-cloud-dataproc/default.nix b/nixpkgs/pkgs/development/python-modules/google-cloud-dataproc/default.nix index 9732cfe2a6a1..70ad01460836 100644 --- a/nixpkgs/pkgs/development/python-modules/google-cloud-dataproc/default.nix +++ b/nixpkgs/pkgs/development/python-modules/google-cloud-dataproc/default.nix @@ -14,14 +14,14 @@ buildPythonPackage rec { pname = "google-cloud-dataproc"; - version = "5.5.0"; + version = "5.5.1"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-XYjEmBMCkCUxKvAF2KNXwG72C6TMszLikFvLtnjJf14="; + hash = "sha256-+tfaWdOR/sFfGih71x1VznI3gZ2quQ4h1rEUCFHZ1DQ="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/google-cloud-dlp/default.nix b/nixpkgs/pkgs/development/python-modules/google-cloud-dlp/default.nix index c7e75a8e8af0..ddf8472ea795 100644 --- a/nixpkgs/pkgs/development/python-modules/google-cloud-dlp/default.nix +++ b/nixpkgs/pkgs/development/python-modules/google-cloud-dlp/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "google-cloud-dlp"; - version = "3.12.2"; + version = "3.12.3"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-+Ab1XD45m3PqQ0LHBIRVId5wARJ9KOjClEk9C2c2NBY="; + hash = "sha256-c4gPKov6YASVdvuU2FaYqiNn0yrJAbdieP5Qt1ZjRAs="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/google-cloud-firestore/default.nix b/nixpkgs/pkgs/development/python-modules/google-cloud-firestore/default.nix index 19b8c25f377c..0869a6e7f221 100644 --- a/nixpkgs/pkgs/development/python-modules/google-cloud-firestore/default.nix +++ b/nixpkgs/pkgs/development/python-modules/google-cloud-firestore/default.nix @@ -15,14 +15,14 @@ buildPythonPackage rec { pname = "google-cloud-firestore"; - version = "2.11.1"; + version = "2.12.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-f336hlZ8jWbGbI26i8XvhWd8hTK0IGBVozlBP4BxUl0="; + hash = "sha256-Pu3JsiONj9tsJkXaRV3nuo3wqaHSU4FZMqw6mMXuyc0="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/google-cloud-iam-logging/default.nix b/nixpkgs/pkgs/development/python-modules/google-cloud-iam-logging/default.nix index abfffeb81bd2..f7c690c56f67 100644 --- a/nixpkgs/pkgs/development/python-modules/google-cloud-iam-logging/default.nix +++ b/nixpkgs/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/nixpkgs/pkgs/development/python-modules/google-cloud-language/default.nix b/nixpkgs/pkgs/development/python-modules/google-cloud-language/default.nix index 7b6096557320..a07053ea9172 100644 --- a/nixpkgs/pkgs/development/python-modules/google-cloud-language/default.nix +++ b/nixpkgs/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/nixpkgs/pkgs/development/python-modules/google-cloud-redis/default.nix b/nixpkgs/pkgs/development/python-modules/google-cloud-redis/default.nix index e935fc37e572..37b9dcf80958 100644 --- a/nixpkgs/pkgs/development/python-modules/google-cloud-redis/default.nix +++ b/nixpkgs/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/nixpkgs/pkgs/development/python-modules/google-cloud-resource-manager/default.nix b/nixpkgs/pkgs/development/python-modules/google-cloud-resource-manager/default.nix index 5e47e53cd8fa..50f605f5fc99 100644 --- a/nixpkgs/pkgs/development/python-modules/google-cloud-resource-manager/default.nix +++ b/nixpkgs/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/nixpkgs/pkgs/development/python-modules/google-cloud-secret-manager/default.nix b/nixpkgs/pkgs/development/python-modules/google-cloud-secret-manager/default.nix index 6791ad76a127..5bb5940f55a4 100644 --- a/nixpkgs/pkgs/development/python-modules/google-cloud-secret-manager/default.nix +++ b/nixpkgs/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/nixpkgs/pkgs/development/python-modules/google-cloud-securitycenter/default.nix b/nixpkgs/pkgs/development/python-modules/google-cloud-securitycenter/default.nix index 4063ad21ae9c..8298b6a07ba7 100644 --- a/nixpkgs/pkgs/development/python-modules/google-cloud-securitycenter/default.nix +++ b/nixpkgs/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/nixpkgs/pkgs/development/python-modules/google-cloud-tasks/default.nix b/nixpkgs/pkgs/development/python-modules/google-cloud-tasks/default.nix index fc00275aeeff..4354e9047444 100644 --- a/nixpkgs/pkgs/development/python-modules/google-cloud-tasks/default.nix +++ b/nixpkgs/pkgs/development/python-modules/google-cloud-tasks/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "google-cloud-tasks"; - version = "2.14.1"; + version = "2.14.2"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-yhqD33ORp4WS3Mp1FYOyLJB00KctyN69tKRof/mViik="; + hash = "sha256-PvsoDnpjX1eGCgajRhMcEXBC6CCtSDr9JWgA+uG01wE="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/google-cloud-videointelligence/default.nix b/nixpkgs/pkgs/development/python-modules/google-cloud-videointelligence/default.nix index b0c883a56bfd..3ff18366e426 100644 --- a/nixpkgs/pkgs/development/python-modules/google-cloud-videointelligence/default.nix +++ b/nixpkgs/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/nixpkgs/pkgs/development/python-modules/google-cloud-websecurityscanner/default.nix b/nixpkgs/pkgs/development/python-modules/google-cloud-websecurityscanner/default.nix index 1ad657a827b6..8804ad810aaa 100644 --- a/nixpkgs/pkgs/development/python-modules/google-cloud-websecurityscanner/default.nix +++ b/nixpkgs/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/nixpkgs/pkgs/development/python-modules/gudhi/default.nix b/nixpkgs/pkgs/development/python-modules/gudhi/default.nix index 6fbba605da99..1e0932e62867 100644 --- a/nixpkgs/pkgs/development/python-modules/gudhi/default.nix +++ b/nixpkgs/pkgs/development/python-modules/gudhi/default.nix @@ -38,7 +38,6 @@ buildPythonPackage rec { nativeCheckInputs = [ pytest ]; cmakeFlags = [ - "-DCMAKE_BUILD_TYPE=Release" "-DWITH_GUDHI_PYTHON=ON" "-DPython_ADDITIONAL_VERSIONS=3" ]; diff --git a/nixpkgs/pkgs/development/python-modules/hahomematic/default.nix b/nixpkgs/pkgs/development/python-modules/hahomematic/default.nix index c1bcfbc33899..9a3d67da9973 100644 --- a/nixpkgs/pkgs/development/python-modules/hahomematic/default.nix +++ b/nixpkgs/pkgs/development/python-modules/hahomematic/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "hahomematic"; - version = "2023.9.0"; + version = "2023.9.3"; format = "pyproject"; disabled = pythonOlder "3.11"; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = "danielperna84"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-FM07+ORPFne+9gtruuKqp2EwPLF9py7zi9a6vehN2Yk="; + hash = "sha256-j8uM/vEfZO1C4jsYU68nTt/cmhRKsW2MTFG84g53vE4="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/hsluv/default.nix b/nixpkgs/pkgs/development/python-modules/hsluv/default.nix index d7e1ef4612ee..27701da88914 100644 --- a/nixpkgs/pkgs/development/python-modules/hsluv/default.nix +++ b/nixpkgs/pkgs/development/python-modules/hsluv/default.nix @@ -7,14 +7,14 @@ buildPythonPackage rec { pname = "hsluv"; - version = "5.0.3"; + version = "5.0.4"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "hsluv"; repo = "hsluv-python"; rev = "v${version}"; - hash = "sha256-p3KD+zhHCOs/rLUVf1IkW/isfpUPQstB2VHGmZ/aEPU="; + hash = "sha256-bjivmPTU3Gp3pcC0ru4GSZANdhPqS1QSTMeiPGN8GCI="; }; nativeCheckInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/hyperpyyaml/default.nix b/nixpkgs/pkgs/development/python-modules/hyperpyyaml/default.nix index 4e59a0ce771b..9395b299fea0 100644 --- a/nixpkgs/pkgs/development/python-modules/hyperpyyaml/default.nix +++ b/nixpkgs/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/nixpkgs/pkgs/development/python-modules/ical/default.nix b/nixpkgs/pkgs/development/python-modules/ical/default.nix index da27462cc50b..c69df0352c2a 100644 --- a/nixpkgs/pkgs/development/python-modules/ical/default.nix +++ b/nixpkgs/pkgs/development/python-modules/ical/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { pname = "ical"; - version = "5.0.1"; + version = "5.1.0"; format = "setuptools"; disabled = pythonOlder "3.10"; @@ -27,7 +27,7 @@ buildPythonPackage rec { owner = "allenporter"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-6gMmY6XlFdqF0DxkrCJhZPzUYZuEpDnIHG++nBRE3hg="; + hash = "sha256-ffNgYtwErt9tzfDWQnt0h7QHQL+gMvFpP8zH6FSoHEM="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/identify/default.nix b/nixpkgs/pkgs/development/python-modules/identify/default.nix index ffcd7ba3f01c..13e1e8d93f8f 100644 --- a/nixpkgs/pkgs/development/python-modules/identify/default.nix +++ b/nixpkgs/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/nixpkgs/pkgs/development/python-modules/intake/default.nix b/nixpkgs/pkgs/development/python-modules/intake/default.nix index e194cfa06086..d4f9c66806ce 100644 --- a/nixpkgs/pkgs/development/python-modules/intake/default.nix +++ b/nixpkgs/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-S2PoUN0Bao5VULfHhgbXXowopPLm/njAHO3dIM8ILno="; + 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/nixpkgs/pkgs/development/python-modules/ismartgate/default.nix b/nixpkgs/pkgs/development/python-modules/ismartgate/default.nix index fd1d81014c82..1a61b002aa3a 100644 --- a/nixpkgs/pkgs/development/python-modules/ismartgate/default.nix +++ b/nixpkgs/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/nixpkgs/pkgs/development/python-modules/jax/default.nix b/nixpkgs/pkgs/development/python-modules/jax/default.nix index b22d82d7f22f..a92148ada6bb 100644 --- a/nixpkgs/pkgs/development/python-modules/jax/default.nix +++ b/nixpkgs/pkgs/development/python-modules/jax/default.nix @@ -12,7 +12,6 @@ , numpy , opt-einsum , pytestCheckHook -, pytest-xdist , pythonOlder , scipy , stdenv @@ -27,7 +26,7 @@ let in buildPythonPackage rec { pname = "jax"; - version = "0.4.14"; + version = "0.4.16"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -37,13 +36,17 @@ buildPythonPackage rec { repo = pname; # google/jax contains tags for jax and jaxlib. Only use jax tags! rev = "refs/tags/${pname}-v${version}"; - hash = "sha256-0KnILQkahSiA1uuyT+kgy1XaCcZ3cpx1q114e2pecvg="; + hash = "sha256-q+8CXGxK8JX0bUMK4KJB3qV/EaLHg68D1B5UrtRz0Eg="; }; nativeBuildInputs = [ setuptools ]; + # The version is automatically set to ".dev" if this variable is not set. + # https://github.com/google/jax/commit/e01f2617b85c5bdffc5ffb60b3d8d8ca9519a1f3 + JAX_RELEASE = "1"; + # jaxlib is _not_ included in propagatedBuildInputs because there are # different versions of jaxlib depending on the desired target hardware. The # JAX project ships separate wheels for CPU, GPU, and TPU. @@ -58,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/nixpkgs/pkgs/development/python-modules/jaxlib/bin.nix b/nixpkgs/pkgs/development/python-modules/jaxlib/bin.nix index c0773878c1d8..b9e8fac59306 100644 --- a/nixpkgs/pkgs/development/python-modules/jaxlib/bin.nix +++ b/nixpkgs/pkgs/development/python-modules/jaxlib/bin.nix @@ -39,7 +39,7 @@ in assert cudaSupport -> lib.versionAtLeast cudatoolkit.version "11.1" && lib.versionAtLeast cudnn.version "8.2" && stdenv.isLinux; let - version = "0.4.14"; + version = "0.4.16"; inherit (python) pythonVersion; @@ -60,15 +60,15 @@ let { "x86_64-linux" = getSrcFromPypi { platform = "manylinux2014_x86_64"; - hash = "sha256-nyylSZfqHeftlvVgJZFCN1ldjluZVJIYu4ZSsVxvXf8="; + hash = "sha256-4XyaDnKEMhAbfPEvN3RCDEjXTWbOL6tWrTlyYeiboVs="; }; "aarch64-darwin" = getSrcFromPypi { platform = "macosx_11_0_arm64"; - hash = "sha256-La3wYbGCjWTl7krBD6BaBRqyBD8R530Lckbz0AWv0FM="; + hash = "sha256-IG2pCui/Yj+LDMbQwBVlu7yl2llqnaxMzz/MtBvBr6U="; }; "x86_64-darwin" = getSrcFromPypi { platform = "macosx_10_14_x86_64"; - hash = "sha256-hDg5+qisgtgOrdvbjxsUgI73cW6Aah8NLjhPe4kMAsM="; + hash = "sha256-x5DqsmHqEb7Dl7dnxT5N0l30GKt5OPZpq3HGX9MFKmo="; }; }; @@ -78,7 +78,7 @@ let # https://github.com/google/jax/issues/12879 as to why this specific URL is the correct index. gpuSrc = fetchurl { url = "https://storage.googleapis.com/jax-releases/cuda11/jaxlib-${version}+cuda11.cudnn86-cp310-cp310-manylinux2014_x86_64.whl"; - hash = "sha256-CcQ5kjp4XfUX4/RwFY3T5G3kVKAeyoCTXu1Lo4O16Qo="; + hash = "sha256-eLOprP2kv6roodwRKZXVZFQCD1wC26TSTEDJBjMu/Uo="; }; in diff --git a/nixpkgs/pkgs/development/python-modules/jaxlib/default.nix b/nixpkgs/pkgs/development/python-modules/jaxlib/default.nix index 7a9e49a6a290..6fb960f684c6 100644 --- a/nixpkgs/pkgs/development/python-modules/jaxlib/default.nix +++ b/nixpkgs/pkgs/development/python-modules/jaxlib/default.nix @@ -54,7 +54,7 @@ let inherit (cudaPackages) backendStdenv cudatoolkit cudaFlags cudnn nccl; pname = "jaxlib"; - version = "0.4.14"; + version = "0.4.16"; meta = with lib; { description = "JAX is Autograd and XLA, brought together for high-performance machine learning research."; @@ -151,7 +151,7 @@ let repo = "jax"; # google/jax contains tags for jax and jaxlib. Only use jaxlib tags! rev = "refs/tags/${pname}-v${version}"; - hash = "sha256-0KnILQkahSiA1uuyT+kgy1XaCcZ3cpx1q114e2pecvg="; + hash = "sha256-q+8CXGxK8JX0bUMK4KJB3qV/EaLHg68D1B5UrtRz0Eg="; }; nativeBuildInputs = [ @@ -203,6 +203,10 @@ let GCC_HOST_COMPILER_PREFIX = lib.optionalString cudaSupport "${cudatoolkit_cc_joined}/bin"; GCC_HOST_COMPILER_PATH = lib.optionalString cudaSupport "${cudatoolkit_cc_joined}/bin/gcc"; + # The version is automatically set to ".dev" if this variable is not set. + # https://github.com/google/jax/commit/e01f2617b85c5bdffc5ffb60b3d8d8ca9519a1f3 + JAXLIB_RELEASE = "1"; + preConfigure = '' # dummy ldconfig mkdir dummy-ldconfig @@ -260,10 +264,10 @@ let ]; sha256 = (if cudaSupport then { - x86_64-linux = "sha256-L+d4umcN8eZQJS7NtbyMhFbbGUVd0a73GOYbZx3bW9Q="; + x86_64-linux = "sha256-6HkrEWAPjGPj4zRxahl0FLiV7WZO/6zsdCX8STfV5EE="; } else { - x86_64-linux = "sha256-V1giQbu70RYjbNsqudibiCgvtFNRIJ8XG75QtIzjM4g="; - aarch64-linux = "sha256-DRU4aT7kQffhsOllgHtSlIsYOeLF4Sy5o5RR1CaTle0="; + x86_64-linux = "sha256-MDnuJwJ/xKnC72Qub0ETYj5uQB2r8/AgGm10oqmzzcc="; + aarch64-linux = "sha256-aVUm612VNEsjZLDrtiOPTqSk1t+AhmOx+pOG3bZdOAw="; }).${stdenv.system} or (throw "jaxlib: unsupported system: ${stdenv.system}"); }; diff --git a/nixpkgs/pkgs/development/python-modules/jaxtyping/default.nix b/nixpkgs/pkgs/development/python-modules/jaxtyping/default.nix index 7f94da78ba31..0d0621c56ec9 100644 --- a/nixpkgs/pkgs/development/python-modules/jaxtyping/default.nix +++ b/nixpkgs/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/nixpkgs/pkgs/development/python-modules/jq/default.nix b/nixpkgs/pkgs/development/python-modules/jq/default.nix index 335b6e92781d..d7dc37b06852 100644 --- a/nixpkgs/pkgs/development/python-modules/jq/default.nix +++ b/nixpkgs/pkgs/development/python-modules/jq/default.nix @@ -2,6 +2,7 @@ , buildPythonPackage , cython , fetchFromGitHub +, fetchpatch , jq , pytestCheckHook , pythonOlder @@ -9,7 +10,7 @@ buildPythonPackage rec { pname = "jq"; - version = "1.4.1"; + version = "1.5.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -18,12 +19,17 @@ buildPythonPackage rec { owner = "mwilliamson"; repo = "jq.py"; rev = "refs/tags/${version}"; - hash = "sha256-prH3yUFh3swXGsxnoax09aYAXaiu8o2M21ZbOp9HDJY="; + hash = "sha256-mITk5y2AdUc9kZ/WrsnHxS1GRRmO4FDbPRgTtV2gIXI="; }; patches = [ # Removes vendoring ./jq-py-setup.patch + (fetchpatch { + url = "https://github.com/mwilliamson/jq.py/commit/805705dde4beb9db9a1743663d415198fb02eb1a.patch"; + includes = [ "tests/*" ]; + hash = "sha256-AgdpwmtOTeJ4nSbM6IknKaIVqqtWkpxTTtblXjlbWeA="; + }) ]; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/json-schema-for-humans/default.nix b/nixpkgs/pkgs/development/python-modules/json-schema-for-humans/default.nix index 972455056d37..0469943e334a 100644 --- a/nixpkgs/pkgs/development/python-modules/json-schema-for-humans/default.nix +++ b/nixpkgs/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/nixpkgs/pkgs/development/python-modules/jsonpath-ng/default.nix b/nixpkgs/pkgs/development/python-modules/jsonpath-ng/default.nix index 3f189a89439b..edda6a341e32 100644 --- a/nixpkgs/pkgs/development/python-modules/jsonpath-ng/default.nix +++ b/nixpkgs/pkgs/development/python-modules/jsonpath-ng/default.nix @@ -1,42 +1,48 @@ { lib , buildPythonPackage -, decorator , fetchFromGitHub , ply , pytestCheckHook -, six +, pythonOlder +, setuptools }: buildPythonPackage rec { pname = "jsonpath-ng"; - version = "1.5.3"; + version = "1.6.0"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "h2non"; repo = pname; - # missing tag https://github.com/h2non/jsonpath-ng/issues/114 - rev = "cce4a3d4063ac8af928795acc53beb27a2bfd101"; - hash = "sha256-+9iQHQs5TQhZFeIqMlsa3FFPfZEktAWy1lSdJU7kZrc="; + rev = "refs/tags/v${version}"; + hash = "sha256-q4kIH/2+VKdlSa+IhJ3ymHpc5gmml9lW4aJS477/YSo="; }; propagatedBuildInputs = [ - decorator ply - six + setuptools ]; - nativeCheckInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ + pytestCheckHook + ]; disabledTestPaths = [ # Exclude tests that require oslotest "tests/test_jsonpath_rw_ext.py" ]; - pythonImportsCheck = [ "jsonpath_ng" ]; + pythonImportsCheck = [ + "jsonpath_ng" + ]; meta = with lib; { - description = "JSONPath implementation for Python"; + description = "JSONPath implementation"; homepage = "https://github.com/h2non/jsonpath-ng"; + changelog = "https://github.com/h2non/jsonpath-ng/blob/v${version}/History.md"; license = with licenses; [ asl20 ]; maintainers = with maintainers; [ fab ]; }; diff --git a/nixpkgs/pkgs/development/python-modules/karton-classifier/default.nix b/nixpkgs/pkgs/development/python-modules/karton-classifier/default.nix index 689d67d50910..9f19e1ab6b9e 100644 --- a/nixpkgs/pkgs/development/python-modules/karton-classifier/default.nix +++ b/nixpkgs/pkgs/development/python-modules/karton-classifier/default.nix @@ -46,6 +46,7 @@ buildPythonPackage rec { # Tests expecting results from a different version of libmagic "test_process_archive_ace" "test_process_runnable_win32_lnk" + "test_process_misc_csv" ]; meta = with lib; { diff --git a/nixpkgs/pkgs/development/python-modules/karton-core/default.nix b/nixpkgs/pkgs/development/python-modules/karton-core/default.nix index 8805636080cd..1af9386b5b6a 100644 --- a/nixpkgs/pkgs/development/python-modules/karton-core/default.nix +++ b/nixpkgs/pkgs/development/python-modules/karton-core/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "karton-core"; - version = "5.2.0"; + version = "5.3.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "CERT-Polska"; repo = "karton"; rev = "refs/tags/v${version}"; - hash = "sha256-1Bv0e218cvLuv/go0L13C39fFAeo0FJeCoU+XFUBhzk="; + hash = "sha256-sf8O4Y/yMoTFCibQRtNDX3pXdQ0Xzor3WqeU4xp3WuU="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/kotsu/default.nix b/nixpkgs/pkgs/development/python-modules/kotsu/default.nix new file mode 100644 index 000000000000..47d78c8b916f --- /dev/null +++ b/nixpkgs/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/nixpkgs/pkgs/development/python-modules/kotsu/disable-pytest-coverage-flags.patch b/nixpkgs/pkgs/development/python-modules/kotsu/disable-pytest-coverage-flags.patch new file mode 100644 index 000000000000..f035ab0e6553 --- /dev/null +++ b/nixpkgs/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/nixpkgs/pkgs/development/python-modules/langid/default.nix b/nixpkgs/pkgs/development/python-modules/langid/default.nix new file mode 100644 index 000000000000..fe8f07e85b23 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/langid/default.nix @@ -0,0 +1,37 @@ +{ lib +, buildPythonPackage +, fetchPypi +, setuptools +, wheel +, numpy +}: + +buildPythonPackage rec { + pname = "langid"; + version = "1.1.6"; + format = "setuptools"; + + src = fetchPypi { # use PyPi as source, github repository does not contain tags or release branches + inherit pname version; + hash = "sha256-BEvK4ZEtq4XDPY6Y8oEbj0/xIT5emp6VEBN7hNosspM="; + }; + + nativeBuildInputs = [ + setuptools + wheel + ]; + + propagatedBuildInputs = [ + numpy + ]; + + doCheck = false; # Package has no tests + pythonImportsCheck = [ "langid" ]; + + meta = with lib; { + description = "Langid.py is a standalone Language Identification (LangID) tool"; + homepage = "https://pypi.org/project/langid/"; + license = licenses.bsd2; + maintainers = with maintainers; [ mbalatsko ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/libpcap/default.nix b/nixpkgs/pkgs/development/python-modules/libpcap/default.nix new file mode 100644 index 000000000000..1dbc2de90dfb --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/libpcap/default.nix @@ -0,0 +1,66 @@ +{ lib +, stdenv +, buildPythonPackage +, fetchPypi +, pythonOlder +, dbus +, pkgsLibpcap +, pkg-about +, setuptools +, tox +}: + +buildPythonPackage rec { + pname = "libpcap"; + version = "1.11.0b7"; + format = "pyproject"; + + disabled = pythonOlder "3.7"; + + src = fetchPypi { + inherit pname version; + extension = "zip"; + hash = "sha256-gEWFqmeOJTVHdjcSOxfVLZtrNSO3CTY1L2VcXOu7q7k="; + }; + + nativeBuildInputs = [ + setuptools + tox + ]; + + postPatch = '' + cat <<EOF >src/libpcap/libpcap.cfg + [libpcap] + LIBPCAP = ${pkgsLibpcap}/lib/libpcap${stdenv.hostPlatform.extensions.sharedLibrary} + EOF + ''; + + propagatedBuildInputs = [ + dbus.lib + pkgsLibpcap + pkg-about + ]; + + # Project has tests, but I can't get them to run even outside of nix + doCheck = false; + + pythonImportsCheck = [ + "libpcap" + ]; + + meta = with lib; { + description = "Python binding for the libpcap C library"; + longDescription = '' + Python libpcap module is a low-level binding for libpcap C library. + + It is an effort to allow python programs full access to the API provided by the well known libpcap Unix C library and by its implementations provided under Win32 systems by such packet capture systems as: Npcap, WinPcap + + libpcap is a lightweight Python package, based on the ctypes library. + + It is fully compliant implementation of the original C libpcap from 1.0.0 up to 1.9.0 API and the WinPcap’s 4.1.3 libpcap (1.0.0rel0b) API by implementing whole its functionality in a clean Python instead of C. + ''; + homepage = "https://github.com/karpierz/libpcap/"; + license = licenses.bsd3; + maintainers = [ teams.ororatech ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/lxmf/default.nix b/nixpkgs/pkgs/development/python-modules/lxmf/default.nix index af7ae5d6e87a..1dae9f126b92 100644 --- a/nixpkgs/pkgs/development/python-modules/lxmf/default.nix +++ b/nixpkgs/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/nixpkgs/pkgs/development/python-modules/manuf/default.nix b/nixpkgs/pkgs/development/python-modules/manuf/default.nix new file mode 100644 index 000000000000..6d237ab396fd --- /dev/null +++ b/nixpkgs/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/nixpkgs/pkgs/development/python-modules/manuf/fix_manuf_url.patch b/nixpkgs/pkgs/development/python-modules/manuf/fix_manuf_url.patch new file mode 100644 index 000000000000..e858649b90f2 --- /dev/null +++ b/nixpkgs/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/nixpkgs/pkgs/development/python-modules/manuf/internal_db_update_nix.patch b/nixpkgs/pkgs/development/python-modules/manuf/internal_db_update_nix.patch new file mode 100644 index 000000000000..174c71e46929 --- /dev/null +++ b/nixpkgs/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/nixpkgs/pkgs/development/python-modules/markdown2/default.nix b/nixpkgs/pkgs/development/python-modules/markdown2/default.nix index 8e4cd387e997..ac5e880886cf 100644 --- a/nixpkgs/pkgs/development/python-modules/markdown2/default.nix +++ b/nixpkgs/pkgs/development/python-modules/markdown2/default.nix @@ -3,18 +3,22 @@ , fetchFromGitHub , python , pygments +, pythonOlder +, wavedrom }: buildPythonPackage rec { pname = "markdown2"; - version = "2.4.8"; + version = "2.4.10"; + + disabled = pythonOlder "3.5"; # PyPI does not contain tests, so using GitHub instead. src = fetchFromGitHub { owner = "trentm"; repo = "python-markdown2"; rev = version; - hash = "sha256-0T3HcfjEApEEWtNZGZcta85dY9d/0mSyRBlrqBQEQwk="; + hash = "sha256-1Vs2OMQm/XBOEefV6W58X5hap91aTNuTx8UFf0285uk="; }; nativeCheckInputs = [ pygments ]; @@ -29,6 +33,16 @@ buildPythonPackage rec { runHook postCheck ''; + passthru.optional-dependencies = { + code_syntax_highlighting = [ + pygments + ]; + wavedrom = [ + wavedrom + ]; + all = lib.flatten (lib.attrValues (lib.filterAttrs (n: v: n != "all") passthru.optional-dependencies)); + }; + meta = with lib; { changelog = "https://github.com/trentm/python-markdown2/blob/${src.rev}/CHANGES.md"; description = "A fast and complete Python implementation of Markdown"; diff --git a/nixpkgs/pkgs/development/python-modules/marshmallow-dataclass/default.nix b/nixpkgs/pkgs/development/python-modules/marshmallow-dataclass/default.nix index b2875289816b..2883b6b31add 100644 --- a/nixpkgs/pkgs/development/python-modules/marshmallow-dataclass/default.nix +++ b/nixpkgs/pkgs/development/python-modules/marshmallow-dataclass/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "marshmallow-dataclass"; - version = "8.5.14"; + version = "8.6.0"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "lovasoa"; repo = "marshmallow_dataclass"; rev = "refs/tags/v${version}"; - hash = "sha256-ckz2EQj8gtD+YxNCxisswfSu9FcD//ZeSZRrLBhrld0="; + hash = "sha256-+1bMo5D+7kbkZHcAvmgC1WxNk6Ba04iLccMqTKrxt80="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/md2gemini/default.nix b/nixpkgs/pkgs/development/python-modules/md2gemini/default.nix index 9c4215940aa5..e50c405334c1 100644 --- a/nixpkgs/pkgs/development/python-modules/md2gemini/default.nix +++ b/nixpkgs/pkgs/development/python-modules/md2gemini/default.nix @@ -19,5 +19,6 @@ buildPythonPackage rec { homepage = "https://github.com/makeworld-the-better-one/md2gemini"; license = licenses.lgpl3Plus; maintainers = [ maintainers.kaction ]; + broken = versionAtLeast mistune.version "3"; }; } diff --git a/nixpkgs/pkgs/development/python-modules/mecab-python3/default.nix b/nixpkgs/pkgs/development/python-modules/mecab-python3/default.nix index baeb56992eb8..e5943b186dda 100644 --- a/nixpkgs/pkgs/development/python-modules/mecab-python3/default.nix +++ b/nixpkgs/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/nixpkgs/pkgs/development/python-modules/merge3/default.nix b/nixpkgs/pkgs/development/python-modules/merge3/default.nix index e16a73eee3df..e06556dddf35 100644 --- a/nixpkgs/pkgs/development/python-modules/merge3/default.nix +++ b/nixpkgs/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/nixpkgs/pkgs/development/python-modules/meshtastic/default.nix b/nixpkgs/pkgs/development/python-modules/meshtastic/default.nix index 18b2ae836151..dcac8a6b277b 100644 --- a/nixpkgs/pkgs/development/python-modules/meshtastic/default.nix +++ b/nixpkgs/pkgs/development/python-modules/meshtastic/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { pname = "meshtastic"; - version = "2.2.2"; + 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-7mQq0phe920t7aJxvP0cCpVNH9s7F+x1fBdzAVUgtKE="; + hash = "sha256-JnheGeiLJMI0zsb+jiuMxjXg/3rDbMyA2XVtl1ujiso="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/metakernel/default.nix b/nixpkgs/pkgs/development/python-modules/metakernel/default.nix index 3f270fee8fce..3c8396bef797 100644 --- a/nixpkgs/pkgs/development/python-modules/metakernel/default.nix +++ b/nixpkgs/pkgs/development/python-modules/metakernel/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "metakernel"; - version = "0.30.0"; + version = "0.30.1"; format = "pyproject"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-O5BAfb+6fCbETaJmWsVSayTId/57VjA7U3FGCeNe28Y="; + hash = "sha256-TKBvuGh8DnPDLaOpwOvLZHdj1kBOTE/JLda1nQ6J//U="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/mistune/default.nix b/nixpkgs/pkgs/development/python-modules/mistune/default.nix index 8025fbd48628..2023b478cb85 100644 --- a/nixpkgs/pkgs/development/python-modules/mistune/default.nix +++ b/nixpkgs/pkgs/development/python-modules/mistune/default.nix @@ -2,18 +2,21 @@ , buildPythonPackage , fetchPypi , pytestCheckHook +, pythonOlder , setuptools }: buildPythonPackage rec { pname = "mistune"; - version = "2.0.5"; + version = "3.0.1"; + + disabled = pythonOlder "3.7"; format = "pyproject"; src = fetchPypi { inherit pname version; - hash = "sha256-AkYRPLJJLbh1xr5Wl0p8iTMzvybNkokchfYxUc7gnTQ="; + hash = "sha256-6RIRbBOqCUT53FMNs464j2p3CHqxKPSfhKSPTAXqFjw="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/mkdocstrings-python/default.nix b/nixpkgs/pkgs/development/python-modules/mkdocstrings-python/default.nix index 3bf71e64642d..3fc681de70ea 100644 --- a/nixpkgs/pkgs/development/python-modules/mkdocstrings-python/default.nix +++ b/nixpkgs/pkgs/development/python-modules/mkdocstrings-python/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "mkdocstrings-python"; - version = "1.6.3"; + version = "1.7.0"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "mkdocstrings"; repo = "python"; rev = "refs/tags/${version}"; - hash = "sha256-jppuuzROhVqNHm44gITpnC+xSN4s3ueY00N9v+IoJfE="; + hash = "sha256-akN9/h7jh0SFY1GZ1YlwMw33/RmycekMs0nWpUHLu6Y="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/ml-dtypes/default.nix b/nixpkgs/pkgs/development/python-modules/ml-dtypes/default.nix index eae60372af0d..4a2948ca3e73 100644 --- a/nixpkgs/pkgs/development/python-modules/ml-dtypes/default.nix +++ b/nixpkgs/pkgs/development/python-modules/ml-dtypes/default.nix @@ -11,16 +11,16 @@ buildPythonPackage rec { pname = "ml-dtypes"; - version = "0.2.0"; + version = "0.3.0"; 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-crBTPQeRjgykkIpWx95ypyDeA/RRjWIasg9MR2r2yIU="; # 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/nixpkgs/pkgs/development/python-modules/mrsqm/default.nix b/nixpkgs/pkgs/development/python-modules/mrsqm/default.nix new file mode 100644 index 000000000000..3bbe69f2d4e5 --- /dev/null +++ b/nixpkgs/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/nixpkgs/pkgs/development/python-modules/msprime/default.nix b/nixpkgs/pkgs/development/python-modules/msprime/default.nix index f4b3a2eb70c6..008ce7f2711e 100644 --- a/nixpkgs/pkgs/development/python-modules/msprime/default.nix +++ b/nixpkgs/pkgs/development/python-modules/msprime/default.nix @@ -10,7 +10,7 @@ , newick , tskit , demes -, pytest +, pytestCheckHook , pytest-xdist , scipy }: @@ -45,33 +45,29 @@ buildPythonPackage rec { ]; nativeCheckInputs = [ - pytest + pytestCheckHook pytest-xdist scipy ]; + disabledTests = [ + "tests/test_ancestry.py::TestSimulator::test_debug_logging" + "tests/test_ancestry.py::TestSimulator::test_debug_logging_dtw" + ]; + disabledTestPaths = [ + "tests/test_demography.py" + "tests/test_algorithms.py" + "tests/test_provenance.py" + "tests/test_dict_encoding.py" + ]; - checkPhase = '' - runHook preCheck - - # avoid adding the current directory to sys.path - # https://docs.pytest.org/en/7.1.x/explanation/pythonpath.html#invoking-pytest-versus-python-m-pytest - # need pythonPackages.stdpopsim - # need pythonPackages.bintrees - # need pythonPachages.python_jsonschema_objects - # ModuleNotFoundError: No module named 'lwt_interface.dict_encoding_testlib' - # fails for python311 - # fails for python311 - pytest -v --import-mode append \ - --ignore=tests/test_demography.py \ - --ignore=tests/test_algorithms.py \ - --ignore=tests/test_provenance.py \ - --ignore=tests/test_dict_encoding.py \ - --deselect=tests/test_ancestry.py::TestSimulator::test_debug_logging \ - --deselect=tests/test_ancestry.py::TestSimulator::test_debug_logging_dtwf - - runHook postCheck + # `python -m pytest` puts $PWD in sys.path, which causes the extension + # modules imported as `msprime._msprime` to be unavailable, failing the + # tests. This deletes the `msprime` folder such that only what's installed in + # $out is used for the imports. See also discussion at: + # https://github.com/NixOS/nixpkgs/issues/255262 + preCheck = '' + rm -r msprime ''; - pythonImportsCheck = [ "msprime" ]; diff --git a/nixpkgs/pkgs/development/python-modules/murmurhash/default.nix b/nixpkgs/pkgs/development/python-modules/murmurhash/default.nix index 79e0f3755844..6845d8a5b6b0 100644 --- a/nixpkgs/pkgs/development/python-modules/murmurhash/default.nix +++ b/nixpkgs/pkgs/development/python-modules/murmurhash/default.nix @@ -7,14 +7,14 @@ buildPythonPackage rec { pname = "murmurhash"; - version = "1.0.9"; + version = "1.0.10"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-/no4yw09h8FOyd3cSTL/4tvHfXVGmrgP1QFGibDge1g="; + hash = "sha256-UoKqsTF4BMbr1t1/afFbqQda7mccRKNL4r3g8bEe+Io="; }; postPatch = '' diff --git a/nixpkgs/pkgs/development/python-modules/mypy-boto3-s3/default.nix b/nixpkgs/pkgs/development/python-modules/mypy-boto3-s3/default.nix index 61aa96fa1340..91df8b1ce0bc 100644 --- a/nixpkgs/pkgs/development/python-modules/mypy-boto3-s3/default.nix +++ b/nixpkgs/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/nixpkgs/pkgs/development/python-modules/mypy/default.nix b/nixpkgs/pkgs/development/python-modules/mypy/default.nix index 0528aeaec52b..90fafe527bd7 100644 --- a/nixpkgs/pkgs/development/python-modules/mypy/default.nix +++ b/nixpkgs/pkgs/development/python-modules/mypy/default.nix @@ -119,6 +119,9 @@ buildPythonPackage rec { "mypyc/test/test_commandline.py" # fails to find hatchling "mypy/test/testpep561.py" + ] ++ lib.optionals stdenv.hostPlatform.isi686 [ + # https://github.com/python/mypy/issues/15221 + "mypyc/test/test_run.py" ]; meta = with lib; { diff --git a/nixpkgs/pkgs/development/python-modules/nats-py/default.nix b/nixpkgs/pkgs/development/python-modules/nats-py/default.nix index 889017f006d9..b1de4350f500 100644 --- a/nixpkgs/pkgs/development/python-modules/nats-py/default.nix +++ b/nixpkgs/pkgs/development/python-modules/nats-py/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "nats-py"; - version = "2.3.1"; + version = "2.4.0"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "nats-io"; repo = "nats.py"; rev = "refs/tags/v${version}"; - hash = "sha256-vcTkQeaWBsPlPCp53VqI3inH0PkdxkKWDTW/vtrD/xw="; + hash = "sha256-6t4BTUWjzTbegPvySv9Y6pQrRDwparuYb6rC+HOXWLo="; }; postPatch = '' diff --git a/nixpkgs/pkgs/development/python-modules/natsort/default.nix b/nixpkgs/pkgs/development/python-modules/natsort/default.nix index fc5d5ab4d590..b39460f71aa6 100644 --- a/nixpkgs/pkgs/development/python-modules/natsort/default.nix +++ b/nixpkgs/pkgs/development/python-modules/natsort/default.nix @@ -34,6 +34,12 @@ buildPythonPackage rec { pytestCheckHook ]; + disabledTests = [ + # timing sensitive test + # hypothesis.errors.DeadlineExceeded: Test took 524.23ms, which exceeds the deadline of 200.00ms + "test_string_component_transform_factory" + ]; + pythonImportsCheck = [ "natsort" ]; diff --git a/nixpkgs/pkgs/development/python-modules/nocaselist/default.nix b/nixpkgs/pkgs/development/python-modules/nocaselist/default.nix index ffa66704c97c..3972833e1069 100644 --- a/nixpkgs/pkgs/development/python-modules/nocaselist/default.nix +++ b/nixpkgs/pkgs/development/python-modules/nocaselist/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "nocaselist"; - version = "1.1.1"; + version = "2.0.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-UnKyMuCCRmlqsm/g670ouJidrJ7lcytQJklQMjtRPSM="; + hash = "sha256-RWqgAMZ3fF0hsCnFLlMvlDKNT7TxWtKk3T3WLbMLOJI="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/nomadnet/default.nix b/nixpkgs/pkgs/development/python-modules/nomadnet/default.nix index 71070e2decd5..9415343d6ea7 100644 --- a/nixpkgs/pkgs/development/python-modules/nomadnet/default.nix +++ b/nixpkgs/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/nixpkgs/pkgs/development/python-modules/numpy/default.nix b/nixpkgs/pkgs/development/python-modules/numpy/default.nix index 20019633d8ca..c1cd59bc62ed 100644 --- a/nixpkgs/pkgs/development/python-modules/numpy/default.nix +++ b/nixpkgs/pkgs/development/python-modules/numpy/default.nix @@ -6,7 +6,7 @@ , buildPythonPackage , gfortran , hypothesis -, pytest +, pytestCheckHook , typing-extensions , blas , lapack @@ -101,19 +101,41 @@ in buildPythonPackage rec { enableParallelBuilding = true; nativeCheckInputs = [ - pytest + pytestCheckHook hypothesis typing-extensions ]; - checkPhase = '' - runHook preCheck - pushd "$out" - ${python.interpreter} -c 'import numpy, sys; sys.exit(numpy.test("fast", verbose=10) is False)' - popd - runHook postCheck + preCheck = '' + cd "$out" ''; + # https://github.com/numpy/numpy/blob/a277f6210739c11028f281b8495faf7da298dbef/numpy/_pytesttester.py#L180 + pytestFlagsArray = [ + "-m" "not\\ slow" # fast test suite + ]; + + # https://github.com/numpy/numpy/issues/24548 + disabledTests = lib.optionals stdenv.isi686 [ + "test_new_policy" # AssertionError: assert False + "test_identityless_reduction_huge_array" # ValueError: Maximum allowed dimension exceeded + "test_float_remainder_overflow" # AssertionError: FloatingPointError not raised by divmod + "test_int" # AssertionError: selectedintkind(19): expected 16 but got -1 + ] ++ lib.optionals stdenv.isAarch32 [ + "test_impossible_feature_enable" # AssertionError: Failed to generate error + "test_features" # AssertionError: Failure Detection + "test_new_policy" # AssertionError: assert False + "test_identityless_reduction_huge_array" # ValueError: Maximum allowed dimension exceeded + "test_unary_spurious_fpexception"# AssertionError: Got warnings: [<warnings.WarningMessage object at 0xd1197430>] + "test_int" # AssertionError: selectedintkind(19): expected 16 but got -1 + "test_real" # AssertionError: selectedrealkind(16): expected 10 but got -1 + "test_quad_precision" # AssertionError: selectedrealkind(32): expected 16 but got -1 + "test_big_arrays" # ValueError: array is too big; `arr.size * arr.dtype.itemsize` is larger tha... + "test_multinomial_pvals_float32" # Failed: DID NOT RAISE <class 'ValueError'> + ] ++ lib.optionals stdenv.isAarch64 [ + "test_big_arrays" # OOM on a 16G machine + ]; + passthru = { # just for backwards compatibility blas = blas.provider; diff --git a/nixpkgs/pkgs/development/python-modules/objax/default.nix b/nixpkgs/pkgs/development/python-modules/objax/default.nix index 957d58207156..548039d63b32 100644 --- a/nixpkgs/pkgs/development/python-modules/objax/default.nix +++ b/nixpkgs/pkgs/development/python-modules/objax/default.nix @@ -12,13 +12,13 @@ buildPythonPackage rec { pname = "objax"; - version = "1.6.0"; + version = "1.7.0"; src = fetchFromGitHub { owner = "google"; repo = "objax"; rev = "v${version}"; - hash = "sha256-/6tZxVDe/3C53Re14odU9VA3mKvSj9X3/xt6bHFLHwQ="; + hash = "sha256-1/XmxFZfU+XMD0Mlcv4xTUYZDwltAx1bZOlPuKWQQC0="; }; # Avoid propagating the dependency on `jaxlib`, see diff --git a/nixpkgs/pkgs/development/python-modules/oci/default.nix b/nixpkgs/pkgs/development/python-modules/oci/default.nix index 13f5819a6ef3..62acb84d4f82 100644 --- a/nixpkgs/pkgs/development/python-modules/oci/default.nix +++ b/nixpkgs/pkgs/development/python-modules/oci/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "oci"; - version = "2.111.0"; + version = "2.112.1"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "oracle"; repo = "oci-python-sdk"; rev = "refs/tags/v${version}"; - hash = "sha256-7lkxk/oFb5DPH3LcOJLJByMaf4xQB8L6FLKrXOn+HsM="; + hash = "sha256-HPmAXLEoTEDVZh1npkcLQamEn/CehzM1FOgGOHUrBrg="; }; pythonRelaxDeps = [ diff --git a/nixpkgs/pkgs/development/python-modules/onnx/default.nix b/nixpkgs/pkgs/development/python-modules/onnx/default.nix index 0f9b290cc28d..df15ebe77e44 100644 --- a/nixpkgs/pkgs/development/python-modules/onnx/default.nix +++ b/nixpkgs/pkgs/development/python-modules/onnx/default.nix @@ -13,6 +13,7 @@ , pythonOlder , tabulate , typing-extensions +, abseil-cpp }: let @@ -36,6 +37,10 @@ in buildPythonPackage rec { pybind11 ]; + buildInputs = [ + abseil-cpp + ]; + propagatedBuildInputs = [ protobuf numpy @@ -61,6 +66,14 @@ in buildPythonPackage rec { --replace 'include(googletest)' "" substituteInPlace cmake/unittest.cmake \ --replace 'googletest)' ')' + '' + 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/nixpkgs/pkgs/development/python-modules/opower/default.nix b/nixpkgs/pkgs/development/python-modules/opower/default.nix index 916a4c66b9fc..cafaf385a733 100644 --- a/nixpkgs/pkgs/development/python-modules/opower/default.nix +++ b/nixpkgs/pkgs/development/python-modules/opower/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "opower"; - version = "0.0.33"; + version = "0.0.34"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "tronikos"; repo = "opower"; rev = "refs/tags/v${version}"; - hash = "sha256-YZ9I+Pdfh7i8gtBYnVwIaJSRSG0uU+8hKSCSk391hzc="; + hash = "sha256-VIw0FRFhZpd9R5/j8ejgfy1p8/R2Gv8Wtjc3PDA4bqo="; }; pythonRemoveDeps = [ diff --git a/nixpkgs/pkgs/development/python-modules/oracledb/default.nix b/nixpkgs/pkgs/development/python-modules/oracledb/default.nix index b7aae7330bba..de0c449905a2 100644 --- a/nixpkgs/pkgs/development/python-modules/oracledb/default.nix +++ b/nixpkgs/pkgs/development/python-modules/oracledb/default.nix @@ -1,32 +1,33 @@ { lib , buildPythonPackage +, cryptography +, cython_3 , fetchPypi , pythonOlder -, cryptography -, cython }: buildPythonPackage rec { pname = "oracledb"; - version = "1.4.0"; + version = "1.4.1"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-lrpQj3g4ksfKZI8misvLikqcgDfH3UpQnwXyyJ1iMb4="; + hash = "sha256-v2IlgQNsfTdWZDOANv4X7/0SStEjyDZeIvJ0LQvSN68="; }; nativeBuildInputs = [ - cython + cython_3 ]; propagatedBuildInputs = [ cryptography ]; - doCheck = false; # Checks need an Oracle database + # Checks need an Oracle database + doCheck = false; pythonImportsCheck = [ "oracledb" diff --git a/nixpkgs/pkgs/development/python-modules/osc/default.nix b/nixpkgs/pkgs/development/python-modules/osc/default.nix index e6e7f7bc6ce9..737ea4208472 100644 --- a/nixpkgs/pkgs/development/python-modules/osc/default.nix +++ b/nixpkgs/pkgs/development/python-modules/osc/default.nix @@ -1,16 +1,23 @@ -{ stdenv, lib, buildPythonPackage, fetchFromGitHub, bashInteractive -, rpm, urllib3, cryptography, diffstat +{ stdenv +, bashInteractive +, buildPythonPackage +, cryptography +, diffstat +, fetchFromGitHub +, lib +, rpm +, urllib3 }: buildPythonPackage rec { pname = "osc"; - version = "1.3.0"; + version = "1.3.1"; src = fetchFromGitHub { owner = "openSUSE"; repo = "osc"; rev = version; - sha256 = "sha256-gHcPqo3AuSrVprYUGLenC0kw9hKNmjabZ1m6YVMsNPs="; + sha256 = "sha256-pywSXGM3IX3cTr1uJIP7pNGIYE/skMIoJeoaMU75zwc="; }; buildInputs = [ bashInteractive ]; # needed for bash-completion helper diff --git a/nixpkgs/pkgs/development/python-modules/oss2/default.nix b/nixpkgs/pkgs/development/python-modules/oss2/default.nix index 54427f03897c..52fc79baed4c 100644 --- a/nixpkgs/pkgs/development/python-modules/oss2/default.nix +++ b/nixpkgs/pkgs/development/python-modules/oss2/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "oss2"; - version = "2.17.0"; + version = "2.18.1"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "aliyun"; repo = "aliyun-oss-python-sdk"; rev = "refs/tags/${version}"; - hash = "sha256-EL6qbtVyOJ2RGw3sZiRJouqVNLBMUKGycAZl31M1+oQ="; + hash = "sha256-4P2o10FhnLwRkhRYS+LzY+ugWPQgz+Tddn9XYR17018="; }; nativeBuildInputs = [ @@ -58,7 +58,9 @@ buildPythonPackage rec { "tests/test_api_base.py" "tests/test_async_fetch_task.py" "tests/test_bucket_access_monitor.py" + "tests/test_bucket_callback_policy.py" "tests/test_bucket_cname.py" + "tests/test_bucket_describe_regions.py" "tests/test_bucket_inventory.py" "tests/test_bucket_meta_query.py" "tests/test_bucket_replication.py" @@ -75,6 +77,7 @@ buildPythonPackage rec { "tests/test_crypto_object.py" "tests/test_crypto.py" "tests/test_download.py" + "tests/test_exception_ec.py" "tests/test_headers.py" "tests/test_image.py" "tests/test_init.py" @@ -103,6 +106,8 @@ buildPythonPackage rec { disabledTests = [ "test_crypto_get_compact_deprecated_kms" + # RuntimeError + "test_crypto_put" ]; meta = with lib; { diff --git a/nixpkgs/pkgs/development/python-modules/ossfs/default.nix b/nixpkgs/pkgs/development/python-modules/ossfs/default.nix index 2989176dd2cd..9b30afeb4927 100644 --- a/nixpkgs/pkgs/development/python-modules/ossfs/default.nix +++ b/nixpkgs/pkgs/development/python-modules/ossfs/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "ossfs"; - version = "2023.5.0"; + version = "2023.8.0"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "fsspec"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-h9h5h2eJO1wzOR7oC2usrEx0ADSoKDu74YczAmZL9NU="; + hash = "sha256-v6QZgv1QwBrQpCwP/1z6704UNvQyoCrpQGkhTmncbjQ="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; diff --git a/nixpkgs/pkgs/development/python-modules/panel/default.nix b/nixpkgs/pkgs/development/python-modules/panel/default.nix index 3df9474d3780..7fe1be6f7458 100644 --- a/nixpkgs/pkgs/development/python-modules/panel/default.nix +++ b/nixpkgs/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/nixpkgs/pkgs/development/python-modules/pex/default.nix b/nixpkgs/pkgs/development/python-modules/pex/default.nix index 51f13095ed08..a9462cd8e2cc 100644 --- a/nixpkgs/pkgs/development/python-modules/pex/default.nix +++ b/nixpkgs/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/nixpkgs/pkgs/development/python-modules/pgvector/default.nix b/nixpkgs/pkgs/development/python-modules/pgvector/default.nix index a521038ef03d..03fbef0bd48b 100644 --- a/nixpkgs/pkgs/development/python-modules/pgvector/default.nix +++ b/nixpkgs/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/nixpkgs/pkgs/development/python-modules/pillow/default.nix b/nixpkgs/pkgs/development/python-modules/pillow/default.nix index bf3b1991c39a..ebfcdd8d5574 100644 --- a/nixpkgs/pkgs/development/python-modules/pillow/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pillow/default.nix @@ -3,7 +3,6 @@ , buildPythonPackage , pythonOlder , fetchPypi -, fetchpatch , isPyPy , defusedxml, olefile, freetype, libjpeg, zlib, libtiff, libwebp, libxcrypt, tcl, lcms2, tk, libX11 , libxcb, openjpeg, libimagequant, pyroma, numpy, pytestCheckHook, setuptools @@ -13,7 +12,7 @@ import ./generic.nix (rec { pname = "pillow"; - version = "10.0.0"; + version = "10.0.1"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -21,19 +20,9 @@ import ./generic.nix (rec { src = fetchPypi { pname = "Pillow"; inherit version; - hash = "sha256-nIK1s+BDx68NlXktDSDM9o9hof7Gs1MOcYtohCJyc5Y="; + hash = "sha256-1ylnsGvpMA/tXPvItbr87sSL983H2rZrHSVJA1KHGR0="; }; - patches = [ - # Pull in zlib-1.3 fix pending upstream inclusion - # https://github.com/python-pillow/Pillow/pull/7344 - (fetchpatch { - name = "zlib-1.3.patch"; - url = "https://github.com/python-pillow/Pillow/commit/9ef7cb39def45b0fe1cdf4828ca20838a1fc39d1.patch"; - hash = "sha256-N7V6Xz+SBHSm3YIgmbty7zbqkv8MzpLMhU4Xxerhx8w="; - }) - ]; - passthru.tests = { inherit imageio matplotlib pilkit pydicom reportlab; }; diff --git a/nixpkgs/pkgs/development/python-modules/plaid-python/default.nix b/nixpkgs/pkgs/development/python-modules/plaid-python/default.nix index a449edd308b6..6064eb500678 100644 --- a/nixpkgs/pkgs/development/python-modules/plaid-python/default.nix +++ b/nixpkgs/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/nixpkgs/pkgs/development/python-modules/plugwise/default.nix b/nixpkgs/pkgs/development/python-modules/plugwise/default.nix index f451b1f30c56..c1a5338eba5a 100644 --- a/nixpkgs/pkgs/development/python-modules/plugwise/default.nix +++ b/nixpkgs/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/nixpkgs/pkgs/development/python-modules/pmdarima/default.nix b/nixpkgs/pkgs/development/python-modules/pmdarima/default.nix new file mode 100644 index 000000000000..17bde3ddf3c7 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/pmdarima/default.nix @@ -0,0 +1,64 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, cython +, joblib +, numpy +, pandas +, scikit-learn +, scipy +, statsmodels +, urllib3 +, pythonOlder +, python +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "pmdarima"; + version = "2.0.3"; + format = "setuptools"; + + disable = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "alkaline-ml"; + repo = "pmdarima"; + rev = "v${version}"; + hash = "sha256-uX4iZZ2deYqVWnqVZT6J0Djf2pXo7ug4MsOsPkKjvSU="; + }; + + nativeBuildInputs = [ cython ]; + + propagatedBuildInputs = [ + joblib + numpy + pandas + scikit-learn + scipy + statsmodels + urllib3 + ]; + + # Make sure we're running the tests for the actually installed + # package, so that cython's compiled files are available. + preCheck = '' + cd $out/lib/${python.libPrefix}/site-packages + ''; + + nativeCheckInputs = [ pytestCheckHook ]; + disabledTests= [ + # touches internet + "test_load_from_web" + ]; + + pythonImportsCheck = [ "pmdarima" ]; + + meta = with lib; { + description = "A statistical library designed to fill the void in Python's time series analysis capabilities, including the equivalent of R's auto.arima function"; + homepage = "https://github.com/alkaline-ml/pmdarima"; + changelog = "https://github.com/alkaline-ml/pmdarima/releases/tag/v${version}"; + license = licenses.mit; + maintainers = with maintainers; [ mbalatsko ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/pplpy/default.nix b/nixpkgs/pkgs/development/python-modules/pplpy/default.nix index 190e28e714cd..333c0df0a274 100644 --- a/nixpkgs/pkgs/development/python-modules/pplpy/default.nix +++ b/nixpkgs/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/nixpkgs/pkgs/development/python-modules/publicsuffixlist/default.nix b/nixpkgs/pkgs/development/python-modules/publicsuffixlist/default.nix index 79070dcfcb08..059a67299896 100644 --- a/nixpkgs/pkgs/development/python-modules/publicsuffixlist/default.nix +++ b/nixpkgs/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/nixpkgs/pkgs/development/python-modules/pvlib/default.nix b/nixpkgs/pkgs/development/python-modules/pvlib/default.nix index 46b1c99b0d06..683295edbc7f 100644 --- a/nixpkgs/pkgs/development/python-modules/pvlib/default.nix +++ b/nixpkgs/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/nixpkgs/pkgs/development/python-modules/pwntools/default.nix b/nixpkgs/pkgs/development/python-modules/pwntools/default.nix index 8e3df0360de5..5281701f99e1 100644 --- a/nixpkgs/pkgs/development/python-modules/pwntools/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pwntools/default.nix @@ -29,11 +29,11 @@ let in buildPythonPackage rec { pname = "pwntools"; - version = "4.10.0"; + version = "4.11.0"; src = fetchPypi { inherit pname version; - hash = "sha256-WI6J6meFJ8C1tsru7n524xNS544vHPPdp7yaz1JuRG0="; + hash = "sha256-qF8ed380P5HiIdF14VI9AG7vHIEGwQ/S4zgoC6snP6Y="; }; postPatch = '' diff --git a/nixpkgs/pkgs/development/python-modules/pyacoustid/default.nix b/nixpkgs/pkgs/development/python-modules/pyacoustid/default.nix index 6e1bb63f0f60..6bfa6900e78a 100644 --- a/nixpkgs/pkgs/development/python-modules/pyacoustid/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pyacoustid/default.nix @@ -8,11 +8,11 @@ buildPythonPackage rec { pname = "pyacoustid"; - version = "1.2.2"; + version = "1.3.0"; src = fetchPypi { inherit pname version; - sha256 = "c279d9c30a7f481f1420fc37db65833b5f9816cd364dc2acaa93a11c482d4141"; + sha256 = "sha256-X09IcZHBnruQgnCxt7UpfxMtozKxVouWqRRXTAee0Xc="; }; propagatedBuildInputs = [ requests audioread ]; diff --git a/nixpkgs/pkgs/development/python-modules/pyathena/default.nix b/nixpkgs/pkgs/development/python-modules/pyathena/default.nix index e5b507b01143..5aab2c91702d 100644 --- a/nixpkgs/pkgs/development/python-modules/pyathena/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pyathena/default.nix @@ -15,14 +15,14 @@ buildPythonPackage rec { pname = "pyathena"; - version = "3.0.6"; + version = "3.0.7"; format = "pyproject"; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-7m6hdRNIlCCa8sa+GFm3vkNx93QfqnpY+fl5Bf9qc6Q="; + hash = "sha256-Mdb+pEkXbwRVx3wxpPdwkCweNO48/GuYiOLATbPUpwQ="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/pydata-sphinx-theme/default.nix b/nixpkgs/pkgs/development/python-modules/pydata-sphinx-theme/default.nix index a9fe89026b68..794ded6318e4 100644 --- a/nixpkgs/pkgs/development/python-modules/pydata-sphinx-theme/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pydata-sphinx-theme/default.nix @@ -12,18 +12,18 @@ buildPythonPackage rec { pname = "pydata-sphinx-theme"; - version = "0.13.3"; + version = "0.14.1"; format = "wheel"; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.8"; src = fetchPypi { inherit version format; dist = "py3"; python = "py3"; pname = "pydata_sphinx_theme"; - hash = "sha256-v0HKbBxiFukp4og05AS/yQ4IC1GRW751Y7Xm/acDVPA="; + hash = "sha256-xDYCe8dq4CPfTnBRfjuvkM3aWojuRrgYte8Mw4hKugQ="; }; propagatedBuildInputs = [ @@ -42,6 +42,7 @@ buildPythonPackage rec { meta = with lib; { description = "Bootstrap-based Sphinx theme from the PyData community"; homepage = "https://github.com/pydata/pydata-sphinx-theme"; + changelog = "https://github.com/pydata/pydata-sphinx-theme/releases/tag/v${version}"; license = licenses.bsd3; maintainers = with maintainers; [ marsam ]; }; diff --git a/nixpkgs/pkgs/development/python-modules/pydateinfer/default.nix b/nixpkgs/pkgs/development/python-modules/pydateinfer/default.nix new file mode 100644 index 000000000000..a2fb97236dfd --- /dev/null +++ b/nixpkgs/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/nixpkgs/pkgs/development/python-modules/pyinstrument/default.nix b/nixpkgs/pkgs/development/python-modules/pyinstrument/default.nix index 4cc60efbc637..9848af44925d 100644 --- a/nixpkgs/pkgs/development/python-modules/pyinstrument/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pyinstrument/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "pyinstrument"; - version = "4.5.2"; + version = "4.5.3"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "joerick"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-VL/JzgMxn5zABfmol+5oofR1RjyxTdzvUi6JnwsSFao="; + hash = "sha256-rGjHVbIl0kXgscKNZ/U1AU3Ij9Y+iOpIXnmO4jeb3jI="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/pyipma/default.nix b/nixpkgs/pkgs/development/python-modules/pyipma/default.nix index 8d2d153ebb9c..9f74c16a0c06 100644 --- a/nixpkgs/pkgs/development/python-modules/pyipma/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pyipma/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "pyipma"; - version = "3.0.6"; + version = "3.0.7"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "dgomes"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-BwW8gUFeinZ9Z/v1orJKRTqt2WxVMD+hQj+A3gU1LDI="; + hash = "sha256-a6UXc8XLZhSyUb8AxnXoPgiyP004GQfuapRmVeOaFQU="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/pykka/default.nix b/nixpkgs/pkgs/development/python-modules/pykka/default.nix index dd6566548bbb..b13aaa716f6d 100644 --- a/nixpkgs/pkgs/development/python-modules/pykka/default.nix +++ b/nixpkgs/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/nixpkgs/pkgs/development/python-modules/pynetbox/default.nix b/nixpkgs/pkgs/development/python-modules/pynetbox/default.nix index b6de298bea56..c61063058a3d 100644 --- a/nixpkgs/pkgs/development/python-modules/pynetbox/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pynetbox/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "pynetbox"; - version = "7.1.0"; + version = "7.2.0"; format = "setuptools"; src = fetchFromGitHub { owner = "netbox-community"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-E79n4E386bSxDRzxcjCIvK0Z3r78HsFjGIXqjqQ1zyE="; + hash = "sha256-rYqwZIqcNeSpXsICL8WGLJ3Tcnwnnm6gvRBEJ/5iE/Q="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; diff --git a/nixpkgs/pkgs/development/python-modules/pyngrok/default.nix b/nixpkgs/pkgs/development/python-modules/pyngrok/default.nix index 6022db4d2e84..251c08f02608 100644 --- a/nixpkgs/pkgs/development/python-modules/pyngrok/default.nix +++ b/nixpkgs/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/nixpkgs/pkgs/development/python-modules/pynws/default.nix b/nixpkgs/pkgs/development/python-modules/pynws/default.nix index 4b9c70a044b6..edc9eb26440e 100644 --- a/nixpkgs/pkgs/development/python-modules/pynws/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pynws/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "pynws"; - version = "1.5.1"; + version = "1.6.0"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "MatthewFlamm"; repo = pname; rev = "v${version}"; - hash = "sha256-Mq8kYS4p53gdSGF83AkSPecVizoEBbeKvyk7nCsRYdM="; + hash = "sha256-x56kfnmdVV0Fc7XSI60rrtEl4k3uzpIdZxTofUbkUHU="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/pyopengl/default.nix b/nixpkgs/pkgs/development/python-modules/pyopengl/default.nix index 94b5d38d3fc8..318f2aa033b6 100644 --- a/nixpkgs/pkgs/development/python-modules/pyopengl/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pyopengl/default.nix @@ -8,6 +8,7 @@ buildPythonPackage rec { pname = "pyopengl"; version = "3.1.6"; + format = "setuptools"; src = fetchPypi { pname = "PyOpenGL"; @@ -24,7 +25,20 @@ buildPythonPackage rec { substituteInPlace OpenGL/platform/glx.py \ --replace "'GL'" "'${pkgs.libGL}/lib/libGL${ext}'" \ --replace "'GLU'" "'${pkgs.libGLU}/lib/libGLU${ext}'" \ - --replace "'glut'" "'${pkgs.freeglut}/lib/libglut${ext}'" + --replace "'glut'" "'${pkgs.freeglut}/lib/libglut${ext}'" \ + --replace "'GLESv1_CM'," "'${pkgs.libGL}/lib/libGLESv1_CM${ext}'," \ + --replace "'GLESv2'," "'${pkgs.libGL}/lib/libGLESv2${ext}'," + substituteInPlace OpenGL/platform/egl.py \ + --replace "('OpenGL','GL')" "('${pkgs.libGL}/lib/libOpenGL${ext}', '${pkgs.libGL}/lib/libGL${ext}')" \ + --replace "'GLU'," "'${pkgs.libGLU}/lib/libGLU${ext}'," \ + --replace "'glut'," "'${pkgs.freeglut}/lib/libglut${ext}'," \ + --replace "'GLESv1_CM'," "'${pkgs.libGL}/lib/libGLESv1_CM${ext}'," \ + --replace "'GLESv2'," "'${pkgs.libGL}/lib/libGLESv2${ext}'," \ + --replace "'EGL'," "'${pkgs.libGL}/lib/libEGL${ext}'," + substituteInPlace OpenGL/platform/darwin.py \ + --replace "'OpenGL'," "'${pkgs.libGL}/lib/libGL${ext}'," \ + --replace "'GLUT'," "'${pkgs.freeglut}/lib/libglut${ext}'," + # TODO: patch 'gle' in OpenGL/platform/egl.py '' + '' # https://github.com/NixOS/nixpkgs/issues/76822 # pyopengl introduced a new "robust" way of loading libraries in 3.1.4. @@ -41,7 +55,10 @@ buildPythonPackage rec { # Tests have many dependencies # Extension types could not be found. # Should run test suite from $out/${python.sitePackages} - doCheck = false; + doCheck = false; # does not affect pythonImportsCheck + + # OpenGL looks for libraries during import, making this a somewhat decent test of the flaky patching above. + pythonImportsCheck = "OpenGL"; meta = with lib; { homepage = "https://pyopengl.sourceforge.net/"; diff --git a/nixpkgs/pkgs/development/python-modules/pyoverkiz/default.nix b/nixpkgs/pkgs/development/python-modules/pyoverkiz/default.nix index 4dae164a0501..291bcee9c500 100644 --- a/nixpkgs/pkgs/development/python-modules/pyoverkiz/default.nix +++ b/nixpkgs/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/nixpkgs/pkgs/development/python-modules/pyrender/default.nix b/nixpkgs/pkgs/development/python-modules/pyrender/default.nix new file mode 100644 index 000000000000..eb1d5d17ee47 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/pyrender/default.nix @@ -0,0 +1,85 @@ +{ lib +, buildPythonPackage +, pythonOlder +, fetchFromGitHub +, fetchpatch +, freetype-py +, imageio +, networkx +, numpy +, pillow +, pyglet +, pyopengl +, scipy +, six +, trimesh +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "pyrender"; + version = "0.1.45"; + format = "setuptools"; + + disabled = pythonOlder "3.5"; + + src = fetchFromGitHub { + owner = "mmatl"; + repo = "pyrender"; + rev = "refs/tags/${version}"; + hash = "sha256-V2G8QWXMxFDQpT4XDOJhIFI2V9VhDQCaXYBb/QVLxgM="; + }; + + patches = [ + (fetchpatch { # yet to be tagged + name = "relax-pyopengl.patch"; + url = "https://github.com/mmatl/pyrender/commit/7c613e8aed7142df9ff40767a8f10b7a19b6255c.patch"; + hash = "sha256-SXRV9RC3PfQGjjIQ+n97HZrSDPae3rAHnTBiHXSFLaY="; + }) + ]; + + # trimesh too new + # issue: https://github.com/mmatl/pyrender/issues/203 + # mega pr: https://github.com/mmatl/pyrender/pull/216 + # relevant pr commit: https://github.com/mmatl/pyrender/pull/216/commits/5069aeb957addff8919f05dc9be4040f55bff329 + # the commit does not apply as a patch when cherry picked, hence the substituteInPlace + postPatch = '' + substituteInPlace tests/unit/test_meshes.py \ + --replace \ + "bm = trimesh.load('tests/data/WaterBottle.glb').dump()[0]" \ + 'bm = trimesh.load("tests/data/WaterBottle.glb").geometry["WaterBottle"]' + ''; + + propagatedBuildInputs = [ + freetype-py + imageio + networkx + numpy + pillow + pyglet + pyopengl + scipy + six + trimesh + ]; + + env.PYOPENGL_PLATFORM = "egl"; # enables headless rendering during check + + nativeCheckInputs = [ + pytestCheckHook + ]; + + disabledTestPaths = [ + # does not work inside sandbox, no GPU + "tests/unit/test_offscreen.py" + ]; + + pythonImportsCheck = [ "pyrender" ]; + + meta = with lib; { + homepage = "https://pyrender.readthedocs.io/en/latest/"; + description = "Easy-to-use glTF 2.0-compliant OpenGL renderer for visualization of 3D scenes"; + license = licenses.mit; + maintainers = with maintainers; [ pbsds ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/pyschlage/default.nix b/nixpkgs/pkgs/development/python-modules/pyschlage/default.nix index 45ba38aed42b..886747e3161b 100644 --- a/nixpkgs/pkgs/development/python-modules/pyschlage/default.nix +++ b/nixpkgs/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/nixpkgs/pkgs/development/python-modules/pyswitchbot/default.nix b/nixpkgs/pkgs/development/python-modules/pyswitchbot/default.nix index 5ea2ebb98405..73a7a012c793 100644 --- a/nixpkgs/pkgs/development/python-modules/pyswitchbot/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pyswitchbot/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "pyswitchbot"; - version = "0.39.1"; + version = "0.40.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "Danielhiversen"; repo = "pySwitchbot"; rev = "refs/tags/${version}"; - hash = "sha256-wrn57mluIvUYBXOxw4NTFuq0UuOQwtC/WRWhfQpyRTA="; + hash = "sha256-ST1UwgmlKhnLqr/cIvZRpNEYjxv9URInmkVbi6GA7/c="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/pytest-reverse/default.nix b/nixpkgs/pkgs/development/python-modules/pytest-reverse/default.nix new file mode 100644 index 000000000000..bd413c4d7050 --- /dev/null +++ b/nixpkgs/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/nixpkgs/pkgs/development/python-modules/python-benedict/default.nix b/nixpkgs/pkgs/development/python-modules/python-benedict/default.nix index e2daf959abb0..b100ba2292c9 100644 --- a/nixpkgs/pkgs/development/python-modules/python-benedict/default.nix +++ b/nixpkgs/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/nixpkgs/pkgs/development/python-modules/python-openstackclient/default.nix b/nixpkgs/pkgs/development/python-modules/python-openstackclient/default.nix index d0cecb30bb95..fdafe57d5ccf 100644 --- a/nixpkgs/pkgs/development/python-modules/python-openstackclient/default.nix +++ b/nixpkgs/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/nixpkgs/pkgs/development/python-modules/python-rtmidi/default.nix b/nixpkgs/pkgs/development/python-modules/python-rtmidi/default.nix index ffeefcd2e42e..1d785987cff0 100644 --- a/nixpkgs/pkgs/development/python-modules/python-rtmidi/default.nix +++ b/nixpkgs/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/nixpkgs/pkgs/development/python-modules/pythonfinder/default.nix b/nixpkgs/pkgs/development/python-modules/pythonfinder/default.nix index 79fb7ce78cbb..25e0484041a7 100644 --- a/nixpkgs/pkgs/development/python-modules/pythonfinder/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pythonfinder/default.nix @@ -1,65 +1,71 @@ { lib , buildPythonPackage -, pythonOlder -, fetchFromGitHub -, pytestCheckHook -, attrs , cached-property , click +, fetchFromGitHub , packaging -, pytest-cov +, pydantic , pytest-timeout +, pytestCheckHook +, pythonOlder , setuptools }: buildPythonPackage rec { pname = "pythonfinder"; - version = "1.3.2"; + version = "2.0.5"; format = "pyproject"; + disabled = pythonOlder "3.7"; + src = fetchFromGitHub { owner = "sarugaku"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-sfoAS3QpD78we8HcXpxjSyEIN1xLRVLExaM3oXe6tLU="; + hash = "sha256-L/+6w5lLqHO5c9CThoUPOHXRPVxBlOWFDAmfoYxRw5g="; }; + postPatch = '' + substituteInPlace setup.cfg \ + --replace " --cov" "" + ''; + nativeBuildInputs = [ setuptools ]; propagatedBuildInputs = [ - attrs cached-property - click packaging + pydantic ]; + passthru.optional-dependencies = { + cli = [ + click + ]; + }; + nativeCheckInputs = [ - pytestCheckHook - pytest-cov pytest-timeout - ]; + pytestCheckHook + ] ++ lib.flatten (builtins.attrValues passthru.optional-dependencies); pythonImportsCheck = [ "pythonfinder" ]; - pytestFlagsArray = [ - "--no-cov" - ]; - # these tests invoke git in a subprocess and # for some reason git can't be found even if included in nativeCheckInputs - disabledTests = [ - "test_shims_are_kept" - "test_shims_are_removed" - ]; + # disabledTests = [ + # "test_shims_are_kept" + # "test_shims_are_removed" + # ]; meta = with lib; { + description = "Cross platform search tool for finding Python"; homepage = "https://github.com/sarugaku/pythonfinder"; changelog = "https://github.com/sarugaku/pythonfinder/blob/v${version}/CHANGELOG.rst"; - description = "Cross Platform Search Tool for Finding Pythons"; license = licenses.mit; maintainers = with maintainers; [ cpcloud ]; }; diff --git a/nixpkgs/pkgs/development/python-modules/pytube/default.nix b/nixpkgs/pkgs/development/python-modules/pytube/default.nix index a684e5ca6a39..2c8f714e500e 100644 --- a/nixpkgs/pkgs/development/python-modules/pytube/default.nix +++ b/nixpkgs/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/nixpkgs/pkgs/development/python-modules/pyunifiprotect/default.nix b/nixpkgs/pkgs/development/python-modules/pyunifiprotect/default.nix index 65dc66a3fc7a..00b0f3740c35 100644 --- a/nixpkgs/pkgs/development/python-modules/pyunifiprotect/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pyunifiprotect/default.nix @@ -31,7 +31,7 @@ buildPythonPackage rec { pname = "pyunifiprotect"; - version = "4.20.0"; + version = "4.21.0"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -40,7 +40,7 @@ buildPythonPackage rec { owner = "briis"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-d4pMswABy/KFO2adwufSRRsj879O894nphh3MEjZOl0="; + hash = "sha256-BFcICpWq0aBjEww9EuO6UH8oGX8fufernFqh/gihIrM="; }; postPatch = '' diff --git a/nixpkgs/pkgs/development/python-modules/pyvex/default.nix b/nixpkgs/pkgs/development/python-modules/pyvex/default.nix index 292bd039f8d0..6663c1d4a471 100644 --- a/nixpkgs/pkgs/development/python-modules/pyvex/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pyvex/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "pyvex"; - version = "9.2.66"; + version = "9.2.69"; format = "pyproject"; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-NmOa/DH/EapcYCrpdcdn4CR9DiKuVnrDvKbnTiO3Ldc="; + hash = "sha256-qyqWJ3B4R7aKHDsTJ29luwTfVysMx56hY82rBgRS2Sw="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/pyvista/default.nix b/nixpkgs/pkgs/development/python-modules/pyvista/default.nix index 4d40a650506c..d6c4ac175127 100644 --- a/nixpkgs/pkgs/development/python-modules/pyvista/default.nix +++ b/nixpkgs/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/nixpkgs/pkgs/development/python-modules/pywaze/default.nix b/nixpkgs/pkgs/development/python-modules/pywaze/default.nix index 02ae6ac07abc..5a5ef4abf3c3 100644 --- a/nixpkgs/pkgs/development/python-modules/pywaze/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pywaze/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "pywaze"; - version = "0.4.0"; + version = "0.5.0"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "eifinger"; repo = "pywaze"; rev = "refs/tags/v${version}"; - hash = "sha256-m3erAODTBR0LrZIKzP2Kw5dSaFKP7ehnrO9z5ILvUw8="; + hash = "sha256-iuI/tfU2nEX+Y9pWEsm0Nvu6pModHh/5g2eyud8TnB0="; }; postPatch = '' diff --git a/nixpkgs/pkgs/development/python-modules/qdrant-client/default.nix b/nixpkgs/pkgs/development/python-modules/qdrant-client/default.nix index 643a67d898ed..b1d46d5fcb95 100644 --- a/nixpkgs/pkgs/development/python-modules/qdrant-client/default.nix +++ b/nixpkgs/pkgs/development/python-modules/qdrant-client/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { pname = "qdrant-client"; - version = "1.5.0"; + version = "1.5.4"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -27,7 +27,7 @@ buildPythonPackage rec { owner = "qdrant"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-k+ggx4QyVduqtV4WwHELyQDAHdaGE0bizpG1ie6x7FM="; + hash = "sha256-9aZBUrGCNRQjYRF1QmIwVqeT5Tdgv7CCkyOUsbZbmVM="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/rarfile/default.nix b/nixpkgs/pkgs/development/python-modules/rarfile/default.nix index 6bc0c7f2a24e..2f988ddace7f 100644 --- a/nixpkgs/pkgs/development/python-modules/rarfile/default.nix +++ b/nixpkgs/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/nixpkgs/pkgs/development/python-modules/reorder-python-imports/default.nix b/nixpkgs/pkgs/development/python-modules/reorder-python-imports/default.nix index 00efb26386ba..63cdb2fda21d 100644 --- a/nixpkgs/pkgs/development/python-modules/reorder-python-imports/default.nix +++ b/nixpkgs/pkgs/development/python-modules/reorder-python-imports/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "reorder-python-imports"; - version = "3.9.0"; - disabled = pythonOlder "3.7"; + version = "3.11.0"; + disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "asottile"; repo = "reorder_python_imports"; rev = "v${version}"; - hash = "sha256-z8giVbW8+k/y9Kg+O2tMle5MoRAar2Gccx2YCtFQvxw="; + hash = "sha256-5fv2DSMeCleDxsW+nua2dOOeWZIZfuP+Qo++w2YEf4Q="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/reptor/default.nix b/nixpkgs/pkgs/development/python-modules/reptor/default.nix index eafb5dd66a87..6375f811af0b 100644 --- a/nixpkgs/pkgs/development/python-modules/reptor/default.nix +++ b/nixpkgs/pkgs/development/python-modules/reptor/default.nix @@ -28,7 +28,7 @@ buildPythonPackage rec { pname = "reptor"; - version = "0.2"; + version = "0.4"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -37,7 +37,7 @@ buildPythonPackage rec { owner = "Syslifters"; repo = "reptor"; rev = "refs/tags/${version}"; - hash = "sha256-Pkz0snlYMd+xn7fJKVdO8M8wA7ABSq8R6i6UN+bwx6Y="; + hash = "sha256-3FRMdiSKWlEUmggtSDea9w386uwAn/VUzXiD1xRNuxQ="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/requests-pkcs12/default.nix b/nixpkgs/pkgs/development/python-modules/requests-pkcs12/default.nix index aee478432006..a4f59da74fc9 100644 --- a/nixpkgs/pkgs/development/python-modules/requests-pkcs12/default.nix +++ b/nixpkgs/pkgs/development/python-modules/requests-pkcs12/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "requests-pkcs12"; - version = "1.18"; + version = "1.21"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "m-click"; repo = "requests_pkcs12"; rev = version; - hash = "sha256-jZWaTcPM4EO8e+eVpYU8fQ4H53OzlaMUsT/d2DWuU+0="; + hash = "sha256-0avykVnMzClFqjDdC4BW9jnZzupinG5JUwq8TuCWkgo="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/ring-doorbell/default.nix b/nixpkgs/pkgs/development/python-modules/ring-doorbell/default.nix index a484f6bff0b4..321615b4b85e 100644 --- a/nixpkgs/pkgs/development/python-modules/ring-doorbell/default.nix +++ b/nixpkgs/pkgs/development/python-modules/ring-doorbell/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "ring-doorbell"; - version = "0.7.2"; + version = "0.7.3"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -20,7 +20,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "ring_doorbell"; inherit version; - hash = "sha256-Cn6Cq/JwhoQ+s5wCefXfzOpnUf+EhWDmcVTKb7+k7ys="; + hash = "sha256-HYRuQZpdtBkVfFBdqQupAjzQpLIBvKGm42cCumc03GM="; }; propagatedBuildInputs = [ @@ -42,6 +42,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python library to communicate with Ring Door Bell"; homepage = "https://github.com/tchellomello/python-ring-doorbell"; + changelog = "https://github.com/tchellomello/python-ring-doorbell/releases/tag/${version}"; license = licenses.lgpl3Plus; maintainers = with maintainers; [ graham33 ]; }; diff --git a/nixpkgs/pkgs/development/python-modules/rns/default.nix b/nixpkgs/pkgs/development/python-modules/rns/default.nix index 574af8aeecc9..c180e5349b04 100644 --- a/nixpkgs/pkgs/development/python-modules/rns/default.nix +++ b/nixpkgs/pkgs/development/python-modules/rns/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "rns"; - version = "0.5.7"; + 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-0WNgJKhxK4WjYQ0n7ofqrRxf4m9uWn2ygcZiv3uhrhM="; + hash = "sha256-vzFN8b+F4CO/f/7CbUpX/Xj8wZMEpz2veUXsPHYzPxE="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/s3fs/default.nix b/nixpkgs/pkgs/development/python-modules/s3fs/default.nix index c66df5ec520f..bc37fc055006 100644 --- a/nixpkgs/pkgs/development/python-modules/s3fs/default.nix +++ b/nixpkgs/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/nixpkgs/pkgs/development/python-modules/schema-salad/default.nix b/nixpkgs/pkgs/development/python-modules/schema-salad/default.nix index b61a5e2e7bce..39a35038fb0a 100644 --- a/nixpkgs/pkgs/development/python-modules/schema-salad/default.nix +++ b/nixpkgs/pkgs/development/python-modules/schema-salad/default.nix @@ -75,5 +75,7 @@ buildPythonPackage rec { changelog = "https://github.com/common-workflow-language/schema_salad/releases/tag/${version}"; license = with licenses; [ asl20 ]; maintainers = with maintainers; [ veprbl ]; + # https://github.com/common-workflow-language/schema_salad/issues/721 + broken = versionAtLeast mistune.version "2.1"; }; } diff --git a/nixpkgs/pkgs/development/python-modules/scikit-posthocs/0001-increased-abs-tolerance-for-wilcoxon-test.patch b/nixpkgs/pkgs/development/python-modules/scikit-posthocs/0001-increased-abs-tolerance-for-wilcoxon-test.patch new file mode 100644 index 000000000000..e3fa524e5a4f --- /dev/null +++ b/nixpkgs/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/nixpkgs/pkgs/development/python-modules/scikit-posthocs/0002-Update-test_posthocs.py.patch b/nixpkgs/pkgs/development/python-modules/scikit-posthocs/0002-Update-test_posthocs.py.patch new file mode 100644 index 000000000000..fa4d6d3ececf --- /dev/null +++ b/nixpkgs/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/nixpkgs/pkgs/development/python-modules/scikit-posthocs/default.nix b/nixpkgs/pkgs/development/python-modules/scikit-posthocs/default.nix new file mode 100644 index 000000000000..d7df6518903e --- /dev/null +++ b/nixpkgs/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/nixpkgs/pkgs/development/python-modules/scipy/default.nix b/nixpkgs/pkgs/development/python-modules/scipy/default.nix index e58a165f5cca..7312e53ed413 100644 --- a/nixpkgs/pkgs/development/python-modules/scipy/default.nix +++ b/nixpkgs/pkgs/development/python-modules/scipy/default.nix @@ -14,7 +14,7 @@ , pythran , wheel , nose -, pytest +, pytestCheckHook , pytest-xdist , numpy , pybind11 @@ -107,7 +107,22 @@ in buildPythonPackage { __darwinAllowLocalNetworking = true; - nativeCheckInputs = [ nose pytest pytest-xdist ]; + nativeCheckInputs = [ + nose + pytestCheckHook + pytest-xdist + ]; + + # The following tests are broken on aarch64-darwin with newer compilers and library versions. + # See https://github.com/scipy/scipy/issues/18308 + disabledTests = lib.optionals (stdenv.isDarwin && stdenv.isAarch64) [ + "test_a_b_neg_int_after_euler_hypergeometric_transformation" + "test_dst4_definition_ortho" + "test_load_mat4_le" + "hyp2f1_test_case47" + "hyp2f1_test_case3" + "test_uint64_max" + ]; doCheck = !(stdenv.isx86_64 && stdenv.isDarwin); @@ -145,9 +160,38 @@ in buildPythonPackage { checkPhase = '' runHook preCheck + + # Adapted from pytestCheckHook because scipy uses a custom check phase. + # It needs to pass `$args` as a Python list to `scipy.test` rather than as + # arguments to pytest on the command-line. + args="" + if [ -n "$disabledTests" ]; then + disabledTestsString=$(_pytestComputeDisabledTestsString "''${disabledTests[@]}") + args+="'-k','$disabledTestsString'" + fi + + if [ -n "''${disabledTestPaths-}" ]; then + eval "disabledTestPaths=($disabledTestPaths)" + fi + + for path in ''${disabledTestPaths[@]}; do + if [ ! -e "$path" ]; then + echo "Disabled tests path \"$path\" does not exist. Aborting" + exit 1 + fi + args+="''${args:+,}'--ignore=\"$path\"'" + done + args+="''${args:+,}$(printf \'%s\', "''${pytestFlagsArray[@]}")" + args=''${args%,} + pushd "$out" export OMP_NUM_THREADS=$(( $NIX_BUILD_CORES / 4 )) - ${python.interpreter} -c "import scipy, sys; sys.exit(scipy.test('fast', verbose=10, parallel=$NIX_BUILD_CORES) != True)" + ${python.interpreter} -c "import scipy, sys; sys.exit(scipy.test( + 'fast', + verbose=10, + extra_argv=[$args], + parallel=$NIX_BUILD_CORES + ) != True)" popd runHook postCheck ''; diff --git a/nixpkgs/pkgs/development/python-modules/scrapy/default.nix b/nixpkgs/pkgs/development/python-modules/scrapy/default.nix index 2fd3c6ceb7db..7bfa428efaef 100644 --- a/nixpkgs/pkgs/development/python-modules/scrapy/default.nix +++ b/nixpkgs/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/nixpkgs/pkgs/development/python-modules/sense-energy/default.nix b/nixpkgs/pkgs/development/python-modules/sense-energy/default.nix index 36317a10bfb3..35c0b4b6f4f8 100644 --- a/nixpkgs/pkgs/development/python-modules/sense-energy/default.nix +++ b/nixpkgs/pkgs/development/python-modules/sense-energy/default.nix @@ -2,6 +2,7 @@ , buildPythonPackage , fetchFromGitHub , aiohttp +, ciso8601 , async-timeout , kasa-crypt , orjson @@ -13,7 +14,7 @@ buildPythonPackage rec { pname = "sense-energy"; - version = "0.12.1"; + version = "0.12.2"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -22,7 +23,7 @@ buildPythonPackage rec { owner = "scottbonline"; repo = "sense"; rev = "refs/tags/${version}"; - hash = "sha256-6zhbchCRHyltJ/EP9Hnj4LoRn7/0PDJCmWNjF+IsQdM="; + hash = "sha256-OVFRM31LwHNeJUx+s/TN/1o4wvjMQEKaZEPI+y+S64s="; }; postPatch = '' @@ -35,6 +36,7 @@ buildPythonPackage rec { async-timeout kasa-crypt orjson + ciso8601 requests websocket-client websockets diff --git a/nixpkgs/pkgs/development/python-modules/simple-websocket/default.nix b/nixpkgs/pkgs/development/python-modules/simple-websocket/default.nix new file mode 100644 index 000000000000..ecb480359912 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/simple-websocket/default.nix @@ -0,0 +1,43 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, pytestCheckHook +, setuptools +, wheel +, wsproto +}: + +buildPythonPackage rec { + pname = "simple-websocket"; + version = "0.10.1"; + format = "pyproject"; + + src = fetchFromGitHub { + owner = "miguelgrinberg"; + repo = "simple-websocket"; + rev = "refs/tags/v${version}"; + hash = "sha256-OdgMYi2UobIlE4cDl5aNtVaFiHPTpf5TcuohG+TCSpg="; + }; + + nativeBuildInputs = [ + setuptools + wheel + ]; + + nativeCheckInputs = [ + pytestCheckHook + wsproto + ]; + + pythonImportsCheck = [ + "simple_websocket" + ]; + + meta = with lib; { + description = "Simple WebSocket server and client for Python"; + homepage = "https://github.com/miguelgrinberg/simple-websocket"; + changelog = "https://github.com/miguelgrinberg/simple-websocket/blob/${version}/CHANGES.md"; + license = licenses.mit; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/simplefix/default.nix b/nixpkgs/pkgs/development/python-modules/simplefix/default.nix index 1f90a3b0ef97..329c1ba313e0 100644 --- a/nixpkgs/pkgs/development/python-modules/simplefix/default.nix +++ b/nixpkgs/pkgs/development/python-modules/simplefix/default.nix @@ -1,24 +1,41 @@ -{ lib, python, buildPythonPackage, fetchFromGitHub }: +{ lib +, buildPythonPackage +, fetchFromGitHub +, pythonOlder +, unittestCheckHook +}: buildPythonPackage rec { pname = "simplefix"; - version = "1.0.16"; + version = "1.0.17"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchFromGitHub { repo = "simplefix"; owner = "da4089"; rev = "refs/tags/v${version}"; - hash = "sha256-dkwmWCOeTAoeSY8+1wg7RWX/d57JWc8bGagzrEPMAIU="; + hash = "sha256-D85JW3JRQ1xErw6krMbAg94WYjPi76Xqjv/MGNMY5ZU="; }; - checkPhase = '' - cd test - ${python.interpreter} -m unittest all - ''; + nativeCheckInputs = [ + unittestCheckHook + ]; + + pythonImportsCheck = [ + "simplefix" + ]; + + unittestFlagsArray = [ + "-s" + "test" + ]; meta = with lib; { description = "Simple FIX Protocol implementation for Python"; homepage = "https://github.com/da4089/simplefix"; + changelog = "https://github.com/da4089/simplefix/releases/tag/v${version}"; license = licenses.mit; maintainers = with maintainers; [ catern ]; }; diff --git a/nixpkgs/pkgs/development/python-modules/skodaconnect/default.nix b/nixpkgs/pkgs/development/python-modules/skodaconnect/default.nix index 759f568237a1..989dfbc8ee88 100644 --- a/nixpkgs/pkgs/development/python-modules/skodaconnect/default.nix +++ b/nixpkgs/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/nixpkgs/pkgs/development/python-modules/skorch/default.nix b/nixpkgs/pkgs/development/python-modules/skorch/default.nix index 2f8b842d9a9a..13757f13e1aa 100644 --- a/nixpkgs/pkgs/development/python-modules/skorch/default.nix +++ b/nixpkgs/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/nixpkgs/pkgs/development/python-modules/skytemple-files/default.nix b/nixpkgs/pkgs/development/python-modules/skytemple-files/default.nix index 349544f1d035..d6a56883bc46 100644 --- a/nixpkgs/pkgs/development/python-modules/skytemple-files/default.nix +++ b/nixpkgs/pkgs/development/python-modules/skytemple-files/default.nix @@ -28,19 +28,19 @@ buildPythonPackage rec { pname = "skytemple-files"; - version = "1.5.4"; + version = "1.5.5"; src = fetchFromGitHub { owner = "SkyTemple"; repo = pname; rev = version; - hash = "sha256-RB+Cp4mL0y59/l7yu0z3jefADHR9/h0rbTZLm7BvJ7k="; + hash = "sha256-PVHI3SuXXH+XpSaBhtSUT5I6wYK3WmwW67nJmPLKdg4="; fetchSubmodules = true; }; postPatch = '' - substituteInPlace skytemple_files/patch/arm_patcher.py \ - --replace "exec_name = os.getenv('SKYTEMPLE_ARMIPS_EXEC', f'{prefix}armips')" "exec_name = \"${armips}/bin/armips\"" + substituteInPlace skytemple_files/patch/arm_patcher.py skytemple_files/data/data_cd/armips_importer.py \ + --replace "exec_name = os.getenv(\"SKYTEMPLE_ARMIPS_EXEC\", f\"{prefix}armips\")" "exec_name = \"${armips}/bin/armips\"" ''; buildInputs = [ armips ]; diff --git a/nixpkgs/pkgs/development/python-modules/slack-sdk/default.nix b/nixpkgs/pkgs/development/python-modules/slack-sdk/default.nix index 433f9ad62a85..14211eadd65d 100644 --- a/nixpkgs/pkgs/development/python-modules/slack-sdk/default.nix +++ b/nixpkgs/pkgs/development/python-modules/slack-sdk/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { pname = "slack-sdk"; - version = "3.21.3"; + version = "3.22.0"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -29,7 +29,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/nixpkgs/pkgs/development/python-modules/slackclient/default.nix b/nixpkgs/pkgs/development/python-modules/slackclient/default.nix index 4715e58d36be..10b31c02ad24 100644 --- a/nixpkgs/pkgs/development/python-modules/slackclient/default.nix +++ b/nixpkgs/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/nixpkgs/pkgs/development/python-modules/smbprotocol/default.nix b/nixpkgs/pkgs/development/python-modules/smbprotocol/default.nix index 9f199d612511..471f02e50bd8 100644 --- a/nixpkgs/pkgs/development/python-modules/smbprotocol/default.nix +++ b/nixpkgs/pkgs/development/python-modules/smbprotocol/default.nix @@ -11,16 +11,16 @@ buildPythonPackage rec { pname = "smbprotocol"; - version = "1.10.1"; + version = "1.11.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "jborean93"; - repo = pname; + repo = "smbprotocol"; rev = "refs/tags/v${version}"; - hash = "sha256-8T091yF/Hu60aaUr6IDZt2cLxz1sXUbMewSqW1Ch0Vo="; + hash = "sha256-MhkeizBorDAlTLrvbsuzvrwrbBZv/dYA7Khvg/FrKoI="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/sourmash/default.nix b/nixpkgs/pkgs/development/python-modules/sourmash/default.nix index 62e048639273..ac879c12886a 100644 --- a/nixpkgs/pkgs/development/python-modules/sourmash/default.nix +++ b/nixpkgs/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/nixpkgs/pkgs/development/python-modules/spacy-loggers/default.nix b/nixpkgs/pkgs/development/python-modules/spacy-loggers/default.nix index ebc5df787bfb..293224c3d07c 100644 --- a/nixpkgs/pkgs/development/python-modules/spacy-loggers/default.nix +++ b/nixpkgs/pkgs/development/python-modules/spacy-loggers/default.nix @@ -8,11 +8,11 @@ buildPythonPackage rec { pname = "spacy-loggers"; - version = "1.0.4"; + version = "1.0.5"; src = fetchPypi { inherit pname version; - hash = "sha256-5vmDv3EjAJHVu3sRv2S9VEFeyoORCNX4PZFV0LqTvyg="; + hash = "sha256-1gsL2/kVpg5RbMLmU7rv+Ubwz8RhtFLRGk1UWMb+XyQ="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/spsdk/default.nix b/nixpkgs/pkgs/development/python-modules/spsdk/default.nix index 4aafc2e6c131..d8e6b0ab45ef 100644 --- a/nixpkgs/pkgs/development/python-modules/spsdk/default.nix +++ b/nixpkgs/pkgs/development/python-modules/spsdk/default.nix @@ -1,7 +1,6 @@ { lib , buildPythonPackage , fetchFromGitHub -, dos2unix , pythonRelaxDepsHook , asn1crypto , astunparse @@ -29,6 +28,8 @@ , pyserial , ruamel-yaml , sly +, spsdk +, testers , typing-extensions , pytestCheckHook , voluptuous @@ -80,6 +81,7 @@ buildPythonPackage rec { deepmerge fastjsonschema hexdump + importlib-metadata jinja2 libusbsio oscrypto @@ -94,7 +96,6 @@ buildPythonPackage rec { ]; nativeCheckInputs = [ - importlib-metadata pyftdi pytestCheckHook voluptuous @@ -102,11 +103,14 @@ buildPythonPackage rec { pythonImportsCheck = [ "spsdk" ]; + passthru.tests.version = testers.testVersion { package = spsdk; }; + meta = with lib; { changelog = "https://github.com/nxp-mcuxpresso/spsdk/blob/${src.rev}/docs/release_notes.rst"; description = "NXP Secure Provisioning SDK"; homepage = "https://github.com/nxp-mcuxpresso/spsdk"; license = licenses.bsd3; maintainers = with maintainers; [ frogamic sbruder ]; + mainProgram = "spsdk"; }; } diff --git a/nixpkgs/pkgs/development/python-modules/svg2tikz/default.nix b/nixpkgs/pkgs/development/python-modules/svg2tikz/default.nix index 18ca0bd263e3..b6623d3b8009 100644 --- a/nixpkgs/pkgs/development/python-modules/svg2tikz/default.nix +++ b/nixpkgs/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/nixpkgs/pkgs/development/python-modules/svgelements/default.nix b/nixpkgs/pkgs/development/python-modules/svgelements/default.nix new file mode 100644 index 000000000000..22a7e2c5b1ad --- /dev/null +++ b/nixpkgs/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/nixpkgs/pkgs/development/python-modules/syncedlyrics/default.nix b/nixpkgs/pkgs/development/python-modules/syncedlyrics/default.nix index 48330988df83..267db53c14f7 100644 --- a/nixpkgs/pkgs/development/python-modules/syncedlyrics/default.nix +++ b/nixpkgs/pkgs/development/python-modules/syncedlyrics/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "syncedlyrics"; - version = "0.5.0"; + version = "0.6.0"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "rtcq"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-79dy1f5Pd/JGIpH/71E6IBg+AtR4zgHL4b/GRH1AFp0="; + hash = "sha256-SVB6hlVBk+0nNfJjp5zdv4A6FmVt1/NV4ov6qS1DlLI="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/systemd/default.nix b/nixpkgs/pkgs/development/python-modules/systemd/default.nix index ed8eb472dc50..da81905fca37 100644 --- a/nixpkgs/pkgs/development/python-modules/systemd/default.nix +++ b/nixpkgs/pkgs/development/python-modules/systemd/default.nix @@ -36,7 +36,9 @@ buildPythonPackage rec { export NIX_REDIRECTS=/etc/machine-id=$(realpath machine-id) \ LD_PRELOAD=${libredirect}/lib/libredirect.so - pytest $out/${python.sitePackages}/systemd + # Those tests assume /etc/machine-id to be available + # But our redirection technique does not work apparently + pytest $out/${python.sitePackages}/systemd -k 'not test_get_machine and not test_get_machine_app_specific and not test_reader_this_machine' ''; pythonImportsCheck = [ @@ -51,6 +53,6 @@ buildPythonPackage rec { homepage = "https://www.freedesktop.org/software/systemd/python-systemd/"; changelog = "https://github.com/systemd/python-systemd/blob/v${version}/NEWS"; license = licenses.lgpl21Plus; - maintainers = with maintainers; [ ]; + maintainers = with maintainers; [ raitobezarius ]; }; } diff --git a/nixpkgs/pkgs/development/python-modules/tempita/default.nix b/nixpkgs/pkgs/development/python-modules/tempita/default.nix index a45edb8d2673..344ed1ea68d9 100644 --- a/nixpkgs/pkgs/development/python-modules/tempita/default.nix +++ b/nixpkgs/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/nixpkgs/pkgs/development/python-modules/textual/default.nix b/nixpkgs/pkgs/development/python-modules/textual/default.nix index 72999fc61845..e4be329b0a9b 100644 --- a/nixpkgs/pkgs/development/python-modules/textual/default.nix +++ b/nixpkgs/pkgs/development/python-modules/textual/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { pname = "textual"; - version = "0.36.0"; + version = "0.37.1"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -31,7 +31,7 @@ buildPythonPackage rec { owner = "Textualize"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-GH5GhXHA/6r3UNeM4YW+khyh1HnyUQBFcSNFaJwFz9c="; + hash = "sha256-4ehq36j2n2wRMgos5x4LQ0QeELpWAOgpgTxEWjqFLJs="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/tldextract/default.nix b/nixpkgs/pkgs/development/python-modules/tldextract/default.nix index 1b2c1a7e6ba0..04a6762c8c90 100644 --- a/nixpkgs/pkgs/development/python-modules/tldextract/default.nix +++ b/nixpkgs/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/nixpkgs/pkgs/development/python-modules/torch/default.nix b/nixpkgs/pkgs/development/python-modules/torch/default.nix index 0dcc2fdba2d9..f9f6e377b139 100644 --- a/nixpkgs/pkgs/development/python-modules/torch/default.nix +++ b/nixpkgs/pkgs/development/python-modules/torch/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchFromGitHub, buildPythonPackage, python, +{ stdenv, lib, fetchFromGitHub, fetchpatch, buildPythonPackage, python, config, cudaSupport ? config.cudaSupport, cudaPackages, magma, useSystemNccl ? true, MPISupport ? false, mpi, @@ -51,18 +51,9 @@ }: let - inherit (lib) lists strings trivial; - inherit (cudaPackages) cudatoolkit cudaFlags cudnn nccl; -in + inherit (lib) attrsets lists strings trivial; + inherit (cudaPackages) cudaFlags cudnn nccl; -assert cudaSupport -> stdenv.isLinux; -assert cudaSupport -> (cudaPackages.cudaMajorVersion == "11"); - -# confirm that cudatoolkits are sync'd across dependencies -assert !(MPISupport && cudaSupport) || mpi.cudatoolkit == cudatoolkit; -assert !cudaSupport || magma.cudaPackages.cudatoolkit == cudatoolkit; - -let setBool = v: if v then "1" else "0"; # https://github.com/pytorch/pytorch/blob/v2.0.1/torch/utils/cpp_extension.py#L1744 @@ -103,23 +94,6 @@ let throw "No GPU targets specified" ); - cudatoolkit_joined = symlinkJoin { - name = "${cudatoolkit.name}-unsplit"; - # nccl is here purely for semantic grouping it could be moved to nativeBuildInputs - paths = [ cudatoolkit.out cudatoolkit.lib nccl.dev nccl.out ]; - }; - - # Normally libcuda.so.1 is provided at runtime by nvidia-x11 via - # LD_LIBRARY_PATH=/run/opengl-driver/lib. We only use the stub - # libcuda.so from cudatoolkit for running tests, so that we don’t have - # to recompile pytorch on every update to nvidia-x11 or the kernel. - cudaStub = linkFarm "cuda-stub" [{ - name = "libcuda.so.1"; - path = "${cudatoolkit}/lib/stubs/libcuda.so"; - }]; - cudaStubEnv = lib.optionalString cudaSupport - "LD_LIBRARY_PATH=${cudaStub}\${LD_LIBRARY_PATH:+:}$LD_LIBRARY_PATH "; - rocmtoolkit_joined = symlinkJoin { name = "rocm-merged"; @@ -131,6 +105,14 @@ let rocm-runtime rocm-opencl-runtime hipify ]; }; + + brokenConditions = attrsets.filterAttrs (_: cond: cond) { + "CUDA and ROCm are not mutually exclusive" = cudaSupport && rocmSupport; + "CUDA is not targeting Linux" = cudaSupport && !stdenv.isLinux; + "Unsupported CUDA version" = cudaSupport && (cudaPackages.cudaMajorVersion != "11"); + "MPI cudatoolkit does not match cudaPackages.cudatoolkit" = MPISupport && cudaSupport && (mpi.cudatoolkit != cudaPackages.cudatoolkit); + "Magma cudaPackages does not match cudaPackages" = cudaSupport && (magma.cudaPackages != cudaPackages); + }; in buildPythonPackage rec { pname = "torch"; # Don't forget to update torch-bin to the same version. @@ -160,6 +142,12 @@ in buildPythonPackage rec { # base is 10.12. Until we upgrade, we can fall back on the older # pthread support. ./pthreadpool-disable-gcd.diff + ] ++ lib.optionals stdenv.isLinux [ + # Propagate CUPTI to Kineto by overriding the search path with environment variables. + (fetchpatch { + url = "https://github.com/pytorch/pytorch/pull/108847/commits/7ae4d7c0e2dec358b4fe81538efe9da5eb580ec9.patch"; + hash = "sha256-skFaDg98xcJqJfzxWk+qhUxPLHDStqvd0mec3PgksIg="; + }) ]; postPatch = lib.optionalString rocmSupport '' @@ -184,6 +172,13 @@ in buildPythonPackage rec { --replace "set(ROCM_PATH \$ENV{ROCM_PATH})" \ "set(ROCM_PATH \$ENV{ROCM_PATH})''\nset(ROCM_VERSION ${lib.concatStrings (lib.intersperse "0" (lib.splitString "." hip.version))})" '' + # Detection of NCCL version doesn't work particularly well when using the static binary. + + lib.optionalString cudaSupport '' + substituteInPlace cmake/Modules/FindNCCL.cmake \ + --replace \ + 'message(FATAL_ERROR "Found NCCL header version and library version' \ + 'message(WARNING "Found NCCL header version and library version' + '' # error: no member named 'aligned_alloc' in the global namespace; did you mean simply 'aligned_alloc' # This lib overrided aligned_alloc hence the error message. Tltr: his function is linkable but not in header. + lib.optionalString (stdenv.isDarwin && lib.versionOlder stdenv.targetPlatform.darwinSdkVersion "11.0") '' @@ -192,12 +187,16 @@ in buildPythonPackage rec { inline void *aligned_alloc(size_t align, size_t size)' ''; + # NOTE(@connorbaker): Though we do not disable Gloo or MPI when building with CUDA support, caution should be taken + # when using the different backends. Gloo's GPU support isn't great, and MPI and CUDA can't be used at the same time + # without extreme care to ensure they don't lock each other out of shared resources. + # For more, see https://github.com/open-mpi/ompi/issues/7733#issuecomment-629806195. preConfigure = lib.optionalString cudaSupport '' export TORCH_CUDA_ARCH_LIST="${gpuTargetString}" - export CC=${cudatoolkit.cc}/bin/gcc CXX=${cudatoolkit.cc}/bin/g++ - '' + lib.optionalString (cudaSupport && cudnn != null) '' export CUDNN_INCLUDE_DIR=${cudnn.dev}/include export CUDNN_LIB_DIR=${cudnn.lib}/lib + export CUPTI_INCLUDE_DIR=${cudaPackages.cuda_cupti.dev}/include + export CUPTI_LIBRARY_DIR=${cudaPackages.cuda_cupti.lib}/lib '' + lib.optionalString rocmSupport '' export ROCM_PATH=${rocmtoolkit_joined} export ROCM_SOURCE_DIR=${rocmtoolkit_joined} @@ -256,6 +255,7 @@ in buildPythonPackage rec { PYTORCH_BUILD_NUMBER = 0; USE_SYSTEM_NCCL = setBool useSystemNccl; # don't build pytorch's third_party NCCL + USE_STATIC_NCCL = setBool useSystemNccl; # Suppress a weird warning in mkl-dnn, part of ideep in pytorch # (upstream seems to have fixed this in the wrong place?) @@ -286,12 +286,43 @@ in buildPythonPackage rec { pybind11 pythonRelaxDepsHook removeReferencesTo - ] ++ lib.optionals cudaSupport [ cudatoolkit_joined ] - ++ lib.optionals rocmSupport [ rocmtoolkit_joined ]; + ] ++ lib.optionals cudaSupport (with cudaPackages; [ + autoAddOpenGLRunpathHook + cuda_nvcc + ]) + ++ lib.optionals rocmSupport [ rocmtoolkit_joined ]; buildInputs = [ blas blas.provider pybind11 ] ++ lib.optionals stdenv.isLinux [ linuxHeaders_5_19 ] # TMP: avoid "flexible array member" errors for now - ++ lib.optionals cudaSupport [ cudnn.dev cudnn.lib nccl ] + ++ lib.optionals cudaSupport (with cudaPackages; [ + cuda_cccl.dev # <thrust/*> + cuda_cudart # cuda_runtime.h and libraries + cuda_cupti.dev # For kineto + cuda_cupti.lib # For kineto + cuda_nvcc.dev # crt/host_config.h; even though we include this in nativeBuildinputs, it's needed here too + cuda_nvml_dev.dev # <nvml.h> + cuda_nvrtc.dev + cuda_nvrtc.lib + cuda_nvtx.dev + cuda_nvtx.lib # -llibNVToolsExt + cudnn.dev + cudnn.lib + libcublas.dev + libcublas.lib + libcufft.dev + libcufft.lib + libcurand.dev + libcurand.lib + libcusolver.dev + libcusolver.lib + libcusparse.dev + libcusparse.lib + nccl.dev # Provides nccl.h AND a static copy of NCCL! + ] ++ lists.optionals (strings.versionOlder cudaVersion "11.8") [ + cuda_nvprof.dev # <cuda_profiler_api.h> + ] ++ lists.optionals (strings.versionAtLeast cudaVersion "11.8") [ + cuda_profiler_api.dev # <cuda_profiler_api.h> + ]) ++ lib.optionals rocmSupport [ openmp ] ++ lib.optionals (cudaSupport || rocmSupport) [ magma ] ++ lib.optionals stdenv.isLinux [ numactl ] @@ -335,7 +366,6 @@ in buildPythonPackage rec { checkPhase = with lib.versions; with lib.strings; concatStringsSep " " [ "runHook preCheck" - cudaStubEnv "${python.interpreter} test/run_test.py" "--exclude" (concatStringsSep " " [ @@ -404,6 +434,8 @@ in buildPythonPackage rec { inherit cudaSupport cudaPackages; # At least for 1.10.2 `torch.fft` is unavailable unless BLAS provider is MKL. This attribute allows for easy detection of its availability. blasProvider = blas.provider; + # To help debug when a package is broken due to CUDA support + inherit brokenConditions; } // lib.optionalAttrs cudaSupport { # NOTE: supportedCudaCapabilities isn't computed unless cudaSupport is true, so we can't use # it in the passthru set above because a downstream package might try to access it even @@ -419,6 +451,6 @@ in buildPythonPackage rec { license = licenses.bsd3; maintainers = with maintainers; [ teh thoughtpolice tscholak ]; # tscholak esp. for darwin-related builds platforms = with platforms; linux ++ lib.optionals (!cudaSupport && !rocmSupport) darwin; - broken = rocmSupport && cudaSupport; # CUDA and ROCm are mutually exclusive + broken = builtins.any trivial.id (builtins.attrValues brokenConditions); }; } diff --git a/nixpkgs/pkgs/development/python-modules/tplink-omada-client/default.nix b/nixpkgs/pkgs/development/python-modules/tplink-omada-client/default.nix index 4c8967a38802..bde5f96cf7cb 100644 --- a/nixpkgs/pkgs/development/python-modules/tplink-omada-client/default.nix +++ b/nixpkgs/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/nixpkgs/pkgs/development/python-modules/transformers/default.nix b/nixpkgs/pkgs/development/python-modules/transformers/default.nix index cd5af01e0b9a..5d677d2f5db2 100644 --- a/nixpkgs/pkgs/development/python-modules/transformers/default.nix +++ b/nixpkgs/pkgs/development/python-modules/transformers/default.nix @@ -51,7 +51,7 @@ buildPythonPackage rec { pname = "transformers"; - version = "4.31.0"; + version = "4.33.2"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -60,7 +60,7 @@ buildPythonPackage rec { owner = "huggingface"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-YbLI/CkRto8G4bV7ijUkB/0cc7LkfNBQxL1iNv8aWW4="; + hash = "sha256-i2ruOOkuEHHwzGT2Iqy+Pt1sBBUx43eiNkwf2Iqdcfc="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/tree-sitter/default.nix b/nixpkgs/pkgs/development/python-modules/tree-sitter/default.nix index 541051c8690c..d098859f5108 100644 --- a/nixpkgs/pkgs/development/python-modules/tree-sitter/default.nix +++ b/nixpkgs/pkgs/development/python-modules/tree-sitter/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "tree-sitter"; - version = "0.20.1"; + version = "0.20.2"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -17,7 +17,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "tree_sitter"; inherit version; - hash = "sha256-6T8ILFRdZkm8+11oHtJV6wBKbOIpiJcaEo9AaS/uxg0="; + hash = "sha256-CmwGq6pV3hdCQaR2tTYXO7ooJB0uqF0ZjTOqi/AJ8Cg="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/ttls/default.nix b/nixpkgs/pkgs/development/python-modules/ttls/default.nix index dfdb676d6fb7..29d36e43ef2f 100644 --- a/nixpkgs/pkgs/development/python-modules/ttls/default.nix +++ b/nixpkgs/pkgs/development/python-modules/ttls/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "ttls"; - version = "1.6.1"; + 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-W7r2XgH8SloL9l/Lw1xWLmjF8aMBHWFe2DQ3tkqu+JQ="; + hash = "sha256-WhngJfDu1Dcc4M5083o8ZBC1aSp4nOKOGPni2I/Llwg="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/twilio/default.nix b/nixpkgs/pkgs/development/python-modules/twilio/default.nix index 6d2cfc72c43b..078d1775e0a1 100644 --- a/nixpkgs/pkgs/development/python-modules/twilio/default.nix +++ b/nixpkgs/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/nixpkgs/pkgs/development/python-modules/type-infer/default.nix b/nixpkgs/pkgs/development/python-modules/type-infer/default.nix new file mode 100644 index 000000000000..7adbd97059c5 --- /dev/null +++ b/nixpkgs/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/nixpkgs/pkgs/development/python-modules/types-mock/default.nix b/nixpkgs/pkgs/development/python-modules/types-mock/default.nix index f072c83916cc..23c742798166 100644 --- a/nixpkgs/pkgs/development/python-modules/types-mock/default.nix +++ b/nixpkgs/pkgs/development/python-modules/types-mock/default.nix @@ -5,17 +5,21 @@ buildPythonPackage rec { pname = "types-mock"; - version = "5.1.0.1"; + version = "5.1.0.2"; + format = "setuptools"; src = fetchPypi { inherit pname version; - sha256 = "sha256-8H1Z3lDqgWq0A7pOJG/4CwCSY7N3vD93Tf3r8LQD+2A="; + hash = "sha256-3kjTdm5OMDTv2LJtqeCeSQjzHlMTel/i778fur7haZY="; }; - meta = { - description = "This is a PEP 561 type stub package for the mock package. It can be used by type-checking tools like mypy, pyright, pytype, PyCharm, etc. to check code that uses mock."; + # Module has no tests + doCheck = false; + + meta = with lib; { + description = "Type stub package for the mock package"; homepage = "https://pypi.org/project/types-mock"; - license = lib.licenses.asl20; - maintainers = with lib.maintainers; [ ]; + license = licenses.asl20; + maintainers = with maintainers; [ ]; }; } diff --git a/nixpkgs/pkgs/development/python-modules/types-pytz/default.nix b/nixpkgs/pkgs/development/python-modules/types-pytz/default.nix index 9d3fed278dca..54848a027df9 100644 --- a/nixpkgs/pkgs/development/python-modules/types-pytz/default.nix +++ b/nixpkgs/pkgs/development/python-modules/types-pytz/default.nix @@ -5,12 +5,12 @@ buildPythonPackage rec { pname = "types-pytz"; - version = "2023.3.0.1"; + version = "2023.3.1.0"; format = "setuptools"; src = fetchPypi { inherit pname version; - hash = "sha256-GnuNSqxwmBz6JEeKQerfzZagh8mG1vFQ13486zwr36s="; + hash = "sha256-jn0hmMukSnLfdiiIfJD2ilaOFEXxTbZGMa9Qw8q4wJA="; }; # Modules doesn't have tests diff --git a/nixpkgs/pkgs/development/python-modules/upcloud-api/default.nix b/nixpkgs/pkgs/development/python-modules/upcloud-api/default.nix index 5c0409be3728..17fec99811e3 100644 --- a/nixpkgs/pkgs/development/python-modules/upcloud-api/default.nix +++ b/nixpkgs/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/nixpkgs/pkgs/development/python-modules/xknxproject/default.nix b/nixpkgs/pkgs/development/python-modules/xknxproject/default.nix index 7de6ca3bc803..64ad5a1ebf82 100644 --- a/nixpkgs/pkgs/development/python-modules/xknxproject/default.nix +++ b/nixpkgs/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/nixpkgs/pkgs/development/python-modules/yalexs/default.nix b/nixpkgs/pkgs/development/python-modules/yalexs/default.nix index ed411bc3a7de..19d40b4f8051 100644 --- a/nixpkgs/pkgs/development/python-modules/yalexs/default.nix +++ b/nixpkgs/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/nixpkgs/pkgs/development/python-modules/yaramod/default.nix b/nixpkgs/pkgs/development/python-modules/yaramod/default.nix index 83f1f87c2c5d..1f459858dfa0 100644 --- a/nixpkgs/pkgs/development/python-modules/yaramod/default.nix +++ b/nixpkgs/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/nixpkgs/pkgs/development/python-modules/yolink-api/default.nix b/nixpkgs/pkgs/development/python-modules/yolink-api/default.nix index a2ac657c9d6a..8b27812166a0 100644 --- a/nixpkgs/pkgs/development/python-modules/yolink-api/default.nix +++ b/nixpkgs/pkgs/development/python-modules/yolink-api/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "yolink-api"; - version = "0.3.0"; + version = "0.3.1"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "YoSmart-Inc"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-t/e3DSpmrH48I6ZAmDljL5YblsY2/UWgPCcodi2A7Ro="; + hash = "sha256-bxaxjUKmhScku9mBjtuwiaT4TLTsRlro3y/XatyAfs0="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/yq/default.nix b/nixpkgs/pkgs/development/python-modules/yq/default.nix index 5b652910ea14..c730725581ac 100644 --- a/nixpkgs/pkgs/development/python-modules/yq/default.nix +++ b/nixpkgs/pkgs/development/python-modules/yq/default.nix @@ -13,11 +13,11 @@ buildPythonPackage rec { pname = "yq"; - version = "3.2.2"; + version = "3.2.3"; src = fetchPypi { inherit pname version; - hash = "sha256-jbt6DJN92/w90XXmR49AlgwUDT6LHxoDFd52OE1mZQo="; + hash = "sha256-Kcj+HTa09kFj9NATFMauIXU5hw9hAhbe5gJd+16vr7E="; }; patches = [ |