From 438effdc7ab5a25248697fa014f1825d4256c948 Mon Sep 17 00:00:00 2001 From: clement Date: Sat, 4 Jan 2025 03:52:29 +0100 Subject: [PATCH 1/3] maintainers: add clemjvdm --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 950d650649a0..732113c4db36 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -4165,6 +4165,12 @@ githubId = 71959829; name = "Cleeyv"; }; + clemjvdm = { + email = "clement.jvdm@gmail.com"; + github = "clemjvdm"; + githubId = 131002498; + name = "clement"; + }; clerie = { email = "nix@clerie.de"; github = "clerie"; From ee611d1c87045b66933d610896a68097f0ab9c13 Mon Sep 17 00:00:00 2001 From: clement Date: Sat, 4 Jan 2025 19:23:21 +0100 Subject: [PATCH 2/3] python312Packages.pytest-lsp: init at 0.4.3 --- .../python-modules/pytest-lsp/default.nix | 47 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 49 insertions(+) create mode 100644 pkgs/development/python-modules/pytest-lsp/default.nix diff --git a/pkgs/development/python-modules/pytest-lsp/default.nix b/pkgs/development/python-modules/pytest-lsp/default.nix new file mode 100644 index 000000000000..4fa32e477d79 --- /dev/null +++ b/pkgs/development/python-modules/pytest-lsp/default.nix @@ -0,0 +1,47 @@ +{ + lib, + fetchPypi, + buildPythonPackage, + hatchling, + pygls, + pytestCheckHook, + pytest-asyncio, +}: + +buildPythonPackage rec { + pname = "pytest-lsp"; + version = "0.4.3"; + pyproject = true; + + src = fetchPypi { + inherit version; + pname = "pytest_lsp"; + hash = "sha256-ND9r2i+qMg7V/Ld8lCDScDzlZdHRRP6CfjGYp9wpkRw="; + }; + + build-system = [ + hatchling + ]; + + dependencies = [ + pygls + pytest-asyncio + ]; + + nativeCheckInputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ "pytest_lsp" ]; + + meta = { + homepage = "https://github.com/swyddfa/lsp-devtools"; + changelog = "https://github.com/swyddfa/lsp-devtools/blob/develop/lib/pytest-lsp/CHANGES.md"; + description = "Pytest plugin for writing end-to-end tests for language servers"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ + clemjvdm + fliegendewurst + ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 7a1259039077..5dfba3db4565 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -10552,6 +10552,8 @@ self: super: with self; { pytask = callPackage ../development/python-modules/pytask { }; + pytest-lsp = callPackage ../development/python-modules/pytest-lsp { }; + pytest-mockito = callPackage ../development/python-modules/pytest-mockito { }; pytest-pudb = callPackage ../development/python-modules/pytest-pudb { }; From a7229e0793572c3ab7d8b47a6ecd0a5ad097b70e Mon Sep 17 00:00:00 2001 From: clement Date: Mon, 6 Jan 2025 23:49:17 +0100 Subject: [PATCH 3/3] python312Packages.pygerber: init at 2.4.2 --- .../python-modules/pygerber/default.nix | 106 ++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 108 insertions(+) create mode 100644 pkgs/development/python-modules/pygerber/default.nix diff --git a/pkgs/development/python-modules/pygerber/default.nix b/pkgs/development/python-modules/pygerber/default.nix new file mode 100644 index 000000000000..d0c0690bc5b4 --- /dev/null +++ b/pkgs/development/python-modules/pygerber/default.nix @@ -0,0 +1,106 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + pythonOlder, + # build-system + poetry-core, + + # dependencies + numpy, + click, + pillow, + pydantic, + pyparsing, + typing-extensions, + + # optional dependencies + pygls, + lsprotocol, + drawsvg, + pygments, + shapely, + + # test + filelock, + dulwich, + tzlocal, + pytest-xdist, + pytest-cov, + pytest-lsp, + pytest-asyncio, + pytest-mock, + pytestCheckHook, + +}: + +buildPythonPackage rec { + pname = "pygerber"; + version = "2.4.2"; + pyproject = true; + + disabled = pythonOlder "3.8"; + + src = fetchFromGitHub { + owner = "Argmaster"; + repo = "pygerber"; + tag = "v${version}"; + hash = "sha256-N+9I59WiWXSXr7RrPzb7GFSqfjrd0q51AzalNFV4xEQ="; + }; + + build-system = [ poetry-core ]; + dependencies = [ + numpy + click + pillow + pydantic + pyparsing + typing-extensions + ]; + + passthru.optional-dependencies = { + language_server = [ + pygls + lsprotocol + ]; + svg = [ drawsvg ]; + pygments = [ pygments ]; + shapely = [ shapely ]; + all = [ + pygls + lsprotocol + drawsvg + pygments + shapely + ]; + }; + + nativeCheckInputs = [ + pytest-asyncio + pytest-cov + pytest-xdist + pytest-lsp + pytest-mock + pytestCheckHook + tzlocal + drawsvg + dulwich + filelock + ]; + + disabledTestPaths = [ + # require network access + "test/gerberx3/test_assets.py" + "test/gerberx3/test_language_server/tests.py" + ]; + + pythonImportsCheck = [ "pygerber" ]; + + meta = { + description = "Implementation of the Gerber X3/X2 format, based on Ucamco's The Gerber Layer Format Specification"; + homepage = "https://github.com/Argmaster/pygerber"; + changelog = "https://argmaster.github.io/pygerber/stable/Changelog.html"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ clemjvdm ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 5dfba3db4565..a213f0ad897f 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -10414,6 +10414,8 @@ self: super: with self; { pygelf = callPackage ../development/python-modules/pygelf { }; + pygerber = callPackage ../development/python-modules/pygerber { }; + pygments-style-github = callPackage ../development/python-modules/pygments-style-github { }; pygnmi = callPackage ../development/python-modules/pygnmi { };