diff --git a/pkgs/applications/misc/jrnl/default.nix b/pkgs/applications/misc/jrnl/default.nix index 43d320a4c043..1e8113765f12 100644 --- a/pkgs/applications/misc/jrnl/default.nix +++ b/pkgs/applications/misc/jrnl/default.nix @@ -1,27 +1,32 @@ -{ lib -, fetchFromGitHub -, python3 -, testers -, jrnl +{ + lib, + fetchFromGitHub, + python3, + testers, + jrnl, }: python3.pkgs.buildPythonApplication rec { pname = "jrnl"; version = "4.1"; - format = "pyproject"; + pyproject = true; src = fetchFromGitHub { owner = "jrnl-org"; - repo = pname; + repo = "jrnl"; rev = "refs/tags/v${version}"; hash = "sha256-DtujXSDJWnOrHjVgJEJNKJMhSrNBHlR2hvHeHLSIF2o="; }; - nativeBuildInputs = with python3.pkgs; [ - poetry-core - ]; + postPatch = '' + # Support pytest_bdd 7.1.2 and later, https://github.com/jrnl-org/jrnl/pull/1878 + substituteInPlace tests/lib/when_steps.py \ + --replace-fail "from pytest_bdd.steps import inject_fixture" "from pytest_bdd.compat import inject_fixture" + ''; - propagatedBuildInputs = with python3.pkgs; [ + build-system = with python3.pkgs; [ poetry-core ]; + + dependencies = with python3.pkgs; [ asteval colorama cryptography @@ -43,14 +48,11 @@ python3.pkgs.buildPythonApplication rec { toml ]; - preCheck = '' export HOME=$(mktemp -d); ''; - pythonImportsCheck = [ - "jrnl" - ]; + pythonImportsCheck = [ "jrnl" ]; passthru.tests.version = testers.testVersion { package = jrnl; @@ -58,11 +60,14 @@ python3.pkgs.buildPythonApplication rec { }; meta = with lib; { - changelog = "https://github.com/jrnl-org/jrnl/releases/tag/v${version}"; - description = "Simple command line journal application that stores your journal in a plain text file"; + description = "Command line journal application that stores your journal in a plain text file"; homepage = "https://jrnl.sh/"; + changelog = "https://github.com/jrnl-org/jrnl/releases/tag/v${version}"; license = licenses.gpl3Only; - maintainers = with maintainers; [ bryanasdev000 zalakain ]; + maintainers = with maintainers; [ + bryanasdev000 + zalakain + ]; mainProgram = "jrnl"; }; } diff --git a/pkgs/by-name/el/elasticsearch-curator/package.nix b/pkgs/by-name/el/elasticsearch-curator/package.nix index 3e12c03cbece..6a142aeb1ac5 100644 --- a/pkgs/by-name/el/elasticsearch-curator/package.nix +++ b/pkgs/by-name/el/elasticsearch-curator/package.nix @@ -1,26 +1,25 @@ -{ lib -, elasticsearch-curator -, fetchFromGitHub -, nix-update-script -, python3 -, testers +{ + lib, + elasticsearch-curator, + fetchFromGitHub, + nix-update-script, + python3, + testers, }: python3.pkgs.buildPythonApplication rec { pname = "elasticsearch-curator"; - version = "8.0.12"; + version = "8.0.15"; format = "pyproject"; src = fetchFromGitHub { owner = "elastic"; repo = "curator"; rev = "refs/tags/v${version}"; - hash = "sha256-CU/8l5607eKodcdpMKu0Wdlg+K6YnFX6uoDju12NDR0="; + hash = "sha256-pW928jT9oL76RJuJgH7nhCvgWPzXixzqBKVYsaJy9xw="; }; - build-system = with python3.pkgs; [ - hatchling - ]; + build-system = with python3.pkgs; [ hatchling ]; dependencies = with python3.pkgs; [ certifi diff --git a/pkgs/development/python-modules/elastic-apm/default.nix b/pkgs/development/python-modules/elastic-apm/default.nix index 61ad6705fe9b..25ef39efea06 100644 --- a/pkgs/development/python-modules/elastic-apm/default.nix +++ b/pkgs/development/python-modules/elastic-apm/default.nix @@ -1,37 +1,39 @@ -{ lib -, stdenv -, aiohttp -, blinker -, buildPythonPackage -, certifi -, ecs-logging -, fetchFromGitHub -, httpx -, jinja2 -, jsonschema -, logbook -, mock -, pytest-asyncio -, pytest-bdd -, pytest-localserver -, pytest-mock -, pytest-random-order -, pytestCheckHook -, pythonOlder -, sanic -, sanic-testing -, setuptools -, starlette -, structlog -, tornado -, urllib3 -, webob -, wrapt +{ + lib, + stdenv, + aiohttp, + blinker, + buildPythonPackage, + certifi, + ecs-logging, + fetchFromGitHub, + httpx, + jinja2, + jsonschema, + logbook, + mock, + pytest-asyncio, + pytest-bdd, + pytest-localserver, + pytest-mock, + pytest-random-order, + pytestCheckHook, + pythonOlder, + pythonRelaxDepsHook, + sanic, + sanic-testing, + setuptools, + starlette, + structlog, + tornado, + urllib3, + webob, + wrapt, }: buildPythonPackage rec { pname = "elastic-apm"; - version = "6.21.3"; + version = "6.22.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -40,14 +42,16 @@ buildPythonPackage rec { owner = "elastic"; repo = "apm-agent-python"; rev = "refs/tags/v${version}"; - hash = "sha256-Ejix31cMyHOc/IGe4bRp/Nchm9Ps1cRYE8jIaIYlJjs="; + hash = "sha256-VuVx+QUiV4M/ebyv2uF/YZwfvcaPDJAEi55fXfoIttU="; }; - nativeBuildInputs = [ - setuptools - ]; + pythonRelaxDeps = [ "wrapt" ]; - propagatedBuildInputs = [ + build-system = [ setuptools ]; + + nativeBuildInputs = [ pythonRelaxDepsHook ]; + + dependencies = [ aiohttp blinker certifi @@ -76,21 +80,19 @@ buildPythonPackage rec { webob ]; - disabledTests = [ - "elasticapm_client" - ]; + disabledTests = [ "elasticapm_client" ]; - disabledTestPaths = [ - # Exclude tornado tests - "tests/contrib/asyncio/tornado/tornado_tests.py" - ] ++ lib.optionals stdenv.isDarwin [ - # Flaky tests on Darwin - "tests/utils/threading_tests.py" - ]; + disabledTestPaths = + [ + # Exclude tornado tests + "tests/contrib/asyncio/tornado/tornado_tests.py" + ] + ++ lib.optionals stdenv.isDarwin [ + # Flaky tests on Darwin + "tests/utils/threading_tests.py" + ]; - pythonImportsCheck = [ - "elasticapm" - ]; + pythonImportsCheck = [ "elasticapm" ]; meta = with lib; { description = "Python agent for the Elastic APM"; diff --git a/pkgs/development/python-modules/es-client/default.nix b/pkgs/development/python-modules/es-client/default.nix index 0a1b0bad5ad6..3204da1d5a97 100644 --- a/pkgs/development/python-modules/es-client/default.nix +++ b/pkgs/development/python-modules/es-client/default.nix @@ -1,26 +1,27 @@ -{ lib -, buildPythonPackage -, certifi -, click -, ecs-logging -, elastic-transport -, elasticsearch8 -, fetchFromGitHub -, hatchling -, mock -, pytest-asyncio -, pytestCheckHook -, pythonOlder -, pythonRelaxDepsHook -, pyyaml -, requests -, six -, voluptuous +{ + lib, + buildPythonPackage, + certifi, + click, + ecs-logging, + elastic-transport, + elasticsearch8, + fetchFromGitHub, + hatchling, + mock, + pytest-asyncio, + pytestCheckHook, + pythonOlder, + pythonRelaxDepsHook, + pyyaml, + requests, + six, + voluptuous, }: buildPythonPackage rec { pname = "es-client"; - version = "8.12.8"; + version = "8.13.1"; pyproject = true; disabled = pythonOlder "3.8"; @@ -29,17 +30,16 @@ buildPythonPackage rec { owner = "untergeek"; repo = "es_client"; rev = "refs/tags/v${version}"; - hash = "sha256-qv06zb3hIK/TeOZwtMXrV+n8mYSA/UKiyHvRyKEvZkQ="; + hash = "sha256-4v9SRWVG9p4kCob4C3by2JxNqX6L3yMHpbnMYEAM7A0="; }; pythonRelaxDeps = true; - nativeBuildInputs = [ - hatchling - pythonRelaxDepsHook - ]; + build-system = [ hatchling ]; - propagatedBuildInputs = [ + nativeBuildInputs = [ pythonRelaxDepsHook ]; + + dependencies = [ certifi click ecs-logging @@ -57,9 +57,7 @@ buildPythonPackage rec { requests ]; - pythonImportsCheck = [ - "es_client" - ]; + pythonImportsCheck = [ "es_client" ]; disabledTests = [ # Tests require network access diff --git a/pkgs/development/python-modules/pytest-bdd/default.nix b/pkgs/development/python-modules/pytest-bdd/default.nix index 3660dc709f31..025938b94264 100644 --- a/pkgs/development/python-modules/pytest-bdd/default.nix +++ b/pkgs/development/python-modules/pytest-bdd/default.nix @@ -1,71 +1,56 @@ -{ lib -, buildPythonPackage -, fetchFromGitHub -, fetchpatch -, mako -, parse -, parse-type -, poetry-core -, pytest -, pytestCheckHook -, pythonOlder -, typing-extensions +{ + lib, + buildPythonPackage, + fetchFromGitHub, + mako, + parse, + parse-type, + poetry-core, + pytest, + pytestCheckHook, + pythonOlder, + typing-extensions, }: buildPythonPackage rec { pname = "pytest-bdd"; - version = "6.1.1"; - format = "pyproject"; + version = "7.1.2"; + pyproject = true; disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "pytest-dev"; - repo = pname; + repo = "pytest-bdd"; rev = "refs/tags/${version}"; - hash = "sha256-+76jIgfDQPdIoesTr1+QUu8wmOnrdf4KT+TJr9F2Hqk="; + hash = "sha256-PC4VSsUU5qEFp/C/7OTgHINo8wmOo0w2d1Hpe0EnFzE="; }; - patches = [ - (fetchpatch { - name = "remove-setuptools.patch"; - url = "https://github.com/pytest-dev/pytest-bdd/commit/5d8eda3a30b47d3bd27849884a851adafca765cb.patch"; - hash = "sha256-G2WHaRKlQ9HINufh8wl7+ly7HfDGobMLzzlbwDwd+o8="; - }) - ]; + build-system = [ poetry-core ]; - nativeBuildInputs = [ - poetry-core - ]; + buildInputs = [ pytest ]; - buildInputs = [ - pytest - ]; - - propagatedBuildInputs = [ + dependencies = [ mako parse parse-type typing-extensions ]; - nativeCheckInputs = [ - pytestCheckHook - ]; + nativeCheckInputs = [ pytestCheckHook ]; preCheck = '' export PATH=$PATH:$out/bin ''; - pythonImportsCheck = [ - "pytest_bdd" - ]; + pythonImportsCheck = [ "pytest_bdd" ]; meta = with lib; { description = "BDD library for the pytest"; - mainProgram = "pytest-bdd"; homepage = "https://github.com/pytest-dev/pytest-bdd"; + changelog = "https://github.com/pytest-dev/pytest-bdd/blob/${version}/CHANGES.rst"; license = licenses.mit; maintainers = with maintainers; [ jm2dev ]; + mainProgram = "pytest-bdd"; }; }