diff --git a/pkgs/development/python-modules/gdsfactory/default.nix b/pkgs/development/python-modules/gdsfactory/default.nix index b2282a04a1c0..0499fd810b80 100644 --- a/pkgs/development/python-modules/gdsfactory/default.nix +++ b/pkgs/development/python-modules/gdsfactory/default.nix @@ -2,8 +2,11 @@ lib, buildPythonPackage, fetchFromGitHub, - pytestCheckHook, + + # build-system flit-core, + + # dependencies jinja2, loguru, matplotlib, @@ -32,21 +35,25 @@ ipykernel, attrs, graphviz, + pyglet, + typing-extensions, + # tests jsondiff, jsonschema, pytest-regressions, + pytestCheckHook, }: buildPythonPackage rec { pname = "gdsfactory"; - version = "8.18.1"; + version = "9.5.1"; pyproject = true; src = fetchFromGitHub { owner = "gdsfactory"; repo = "gdsfactory"; - rev = "v${version}"; - hash = "sha256-wDz8QpRgu40FB8+otnGsHVn2e6/SWXIZgA1aeMqMhPQ="; + tag = "v${version}"; + hash = "sha256-z8zKPbWLl554MZq6/Iy3ecvwWiRpy57VYji8xHR+JBo="; }; build-system = [ flit-core ]; @@ -80,13 +87,15 @@ buildPythonPackage rec { ipykernel attrs graphviz + pyglet + typing-extensions ]; nativeCheckInputs = [ jsondiff jsonschema - pytestCheckHook pytest-regressions + pytestCheckHook ]; pythonRelaxDeps = [ @@ -99,10 +108,11 @@ buildPythonPackage rec { pythonImportsCheck = [ "gdsfactory" ]; - meta = with lib; { + meta = { description = "Python library to generate GDS layouts"; homepage = "https://github.com/gdsfactory/gdsfactory"; - license = licenses.mit; - maintainers = with maintainers; [ fbeffa ]; + changelog = "https://github.com/gdsfactory/gdsfactory/blob/v${version}/CHANGELOG.md"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ fbeffa ]; }; } diff --git a/pkgs/development/python-modules/kfactory/default.nix b/pkgs/development/python-modules/kfactory/default.nix index 3652d517d048..2f661515e329 100644 --- a/pkgs/development/python-modules/kfactory/default.nix +++ b/pkgs/development/python-modules/kfactory/default.nix @@ -2,37 +2,43 @@ lib, buildPythonPackage, fetchFromGitHub, - pytestCheckHook, + + # build-system setuptools, setuptools-scm, - klayout, + + # dependencies aenum, cachetools, gitpython, + klayout, loguru, + numpy, pydantic, pydantic-settings, rectangle-packer, requests, + ruamel-yaml, ruamel-yaml-string, scipy, tomli, toolz, typer, - numpy, - ruamel-yaml, + + # tests + pytestCheckHook, }: buildPythonPackage rec { pname = "kfactory"; - version = "0.21.7"; + version = "1.4.4"; pyproject = true; src = fetchFromGitHub { owner = "gdsfactory"; repo = "kfactory"; - rev = "v${version}"; - sha256 = "sha256-VLhAJ5rOBKEO1FDCnlaseA+SmrMSoyS+BaEzjdHm59Y="; + tag = "v${version}"; + hash = "sha256-/dhlAcrqQP/YeKGhnBAVMEy80X3yShn65ywoZMRU/ZM="; }; build-system = [ @@ -63,15 +69,16 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook ]; - # https://github.com/gdsfactory/kfactory/issues/511 disabledTestPaths = [ + # https://github.com/gdsfactory/kfactory/issues/511 "tests/test_pdk.py" ]; - meta = with lib; { + meta = { description = "KLayout API implementation of gdsfactory"; homepage = "https://github.com/gdsfactory/kfactory"; - license = licenses.mit; - maintainers = with maintainers; [ fbeffa ]; + changelog = "https://github.com/gdsfactory/kfactory/blob/v${version}/CHANGELOG.md"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ fbeffa ]; }; }