From 963b3eff92991c43218da02176647e7721f64f2a Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 27 Apr 2024 19:05:41 +0200 Subject: [PATCH 1/5] python312Packages.potentials: 0.3.7 -> 0.3.8 --- pkgs/development/python-modules/potentials/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/potentials/default.nix b/pkgs/development/python-modules/potentials/default.nix index 4cad316d2a66..80b5adffa650 100644 --- a/pkgs/development/python-modules/potentials/default.nix +++ b/pkgs/development/python-modules/potentials/default.nix @@ -20,7 +20,7 @@ }: buildPythonPackage rec { - version = "0.3.7"; + version = "0.3.8"; pname = "potentials"; format = "setuptools"; @@ -28,7 +28,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - hash = "sha256-vkrNVRf9ntYSpf8nXmAmGjc+sQ4iFllisYHd9s+uQv0="; + hash = "sha256-ZXsqsqsgWntZUOuW1/2KAhsbnienHu6VFctxYkw+GCU="; }; propagatedBuildInputs = [ From dc78a65c671741def8aed9c5feed26d18c849ab7 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 27 Apr 2024 19:09:48 +0200 Subject: [PATCH 2/5] python312Packages.potentials: refactor --- .../python-modules/potentials/default.nix | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/potentials/default.nix b/pkgs/development/python-modules/potentials/default.nix index 80b5adffa650..5219c6e97822 100644 --- a/pkgs/development/python-modules/potentials/default.nix +++ b/pkgs/development/python-modules/potentials/default.nix @@ -14,15 +14,16 @@ , pythonOlder , requests , scipy +, setuptools , unidecode , xmltodict , yabadaba }: buildPythonPackage rec { - version = "0.3.8"; pname = "potentials"; - format = "setuptools"; + version = "0.3.8"; + pyproject = true; disabled = pythonOlder "3.7"; @@ -31,7 +32,11 @@ buildPythonPackage rec { hash = "sha256-ZXsqsqsgWntZUOuW1/2KAhsbnienHu6VFctxYkw+GCU="; }; - propagatedBuildInputs = [ + build-system = [ + setuptools + ]; + + dependencies = [ bibtexparser cdcs datamodeldict @@ -58,6 +63,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python API database tools for accessing the NIST Interatomic Potentials Repository"; homepage = "https://github.com/usnistgov/potentials"; + changelog = "https://github.com/usnistgov/potentials/releases/tag/v${version}"; license = licenses.mit; maintainers = with maintainers; [ fab ]; }; From 40dcc9bea6d45603ffca4bc820cc94497e777a6b Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 27 Apr 2024 19:11:34 +0200 Subject: [PATCH 3/5] python312Packages.yabadaba: 0.2.1 -> 0.2.2 Diff: https://github.com/usnistgov/yabadaba/compare/v0.2.1...v0.2.2 --- pkgs/development/python-modules/yabadaba/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/yabadaba/default.nix b/pkgs/development/python-modules/yabadaba/default.nix index bc8146a91489..450bfe61f99b 100644 --- a/pkgs/development/python-modules/yabadaba/default.nix +++ b/pkgs/development/python-modules/yabadaba/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "yabadaba"; - version = "0.2.1"; + version = "0.2.2"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "usnistgov"; repo = pname; rev = "v${version}"; - hash = "sha256-D3dzO+vhf1utBMmX2RUgvxuaPneFnXDseqfz6CMDmv4="; + hash = "sha256-NfvnUrTnOeNfiTMrcRtWU3a/Wb6qsDeQlk5jwZ1OpgI="; }; propagatedBuildInputs = [ From 0ef7f7e258923e5980ca7ff5381de259103d106d Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 27 Apr 2024 19:18:56 +0200 Subject: [PATCH 4/5] python312Packages.yabadaba: refactor --- .../python-modules/yabadaba/default.nix | 47 ++++++++++--------- 1 file changed, 24 insertions(+), 23 deletions(-) diff --git a/pkgs/development/python-modules/yabadaba/default.nix b/pkgs/development/python-modules/yabadaba/default.nix index 450bfe61f99b..7d5eb445d58d 100644 --- a/pkgs/development/python-modules/yabadaba/default.nix +++ b/pkgs/development/python-modules/yabadaba/default.nix @@ -1,33 +1,37 @@ -{ lib -, buildPythonPackage -, cdcs -, datamodeldict -, fetchFromGitHub -, ipython -, lxml -, numpy -, pandas -, pymongo -, pytestCheckHook -, pythonOlder -, tqdm +{ + lib, + buildPythonPackage, + cdcs, + datamodeldict, + fetchFromGitHub, + ipython, + lxml, + numpy, + pandas, + pymongo, + pytestCheckHook, + pythonOlder, + setuptools, + tqdm, }: buildPythonPackage rec { pname = "yabadaba"; version = "0.2.2"; - format = "setuptools"; + pyproject = true; disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "usnistgov"; - repo = pname; - rev = "v${version}"; + repo = "yabadaba"; + rev = "refs/tags/v${version}"; hash = "sha256-NfvnUrTnOeNfiTMrcRtWU3a/Wb6qsDeQlk5jwZ1OpgI="; }; - propagatedBuildInputs = [ + build-system = [ setuptools ]; + + dependencies = [ cdcs datamodeldict ipython @@ -38,13 +42,9 @@ buildPythonPackage rec { tqdm ]; - nativeCheckInputs = [ - pytestCheckHook - ]; + nativeCheckInputs = [ pytestCheckHook ]; - pythonImportsCheck = [ - "yabadaba" - ]; + pythonImportsCheck = [ "yabadaba" ]; preCheck = '' export HOME=$(mktemp -d); @@ -53,6 +53,7 @@ buildPythonPackage rec { meta = with lib; { description = "Abstraction layer allowing for common interactions with databases and records"; homepage = "https://github.com/usnistgov/yabadaba"; + changelog = "https://github.com/usnistgov/yabadaba/releases/tag/v${version}"; license = licenses.mit; maintainers = with maintainers; [ fab ]; }; From 9b268baa7ba135621ece46566d4df881ef469748 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 27 Apr 2024 19:20:30 +0200 Subject: [PATCH 5/5] python312Packages.potentials: format with nixfmt --- .../python-modules/potentials/default.nix | 49 +++++++++---------- 1 file changed, 23 insertions(+), 26 deletions(-) diff --git a/pkgs/development/python-modules/potentials/default.nix b/pkgs/development/python-modules/potentials/default.nix index 5219c6e97822..02da784d426a 100644 --- a/pkgs/development/python-modules/potentials/default.nix +++ b/pkgs/development/python-modules/potentials/default.nix @@ -1,23 +1,24 @@ -{ lib -, bibtexparser -, buildPythonPackage -, cdcs -, datamodeldict -, fetchPypi -, habanero -, ipywidgets -, lxml -, matplotlib -, numpy -, pandas -, pytestCheckHook -, pythonOlder -, requests -, scipy -, setuptools -, unidecode -, xmltodict -, yabadaba +{ + lib, + bibtexparser, + buildPythonPackage, + cdcs, + datamodeldict, + fetchPypi, + habanero, + ipywidgets, + lxml, + matplotlib, + numpy, + pandas, + pytestCheckHook, + pythonOlder, + requests, + scipy, + setuptools, + unidecode, + xmltodict, + yabadaba, }: buildPythonPackage rec { @@ -32,9 +33,7 @@ buildPythonPackage rec { hash = "sha256-ZXsqsqsgWntZUOuW1/2KAhsbnienHu6VFctxYkw+GCU="; }; - build-system = [ - setuptools - ]; + build-system = [ setuptools ]; dependencies = [ bibtexparser @@ -56,9 +55,7 @@ buildPythonPackage rec { # Project has no tests doCheck = false; - pythonImportsCheck = [ - "potentials" - ]; + pythonImportsCheck = [ "potentials" ]; meta = with lib; { description = "Python API database tools for accessing the NIST Interatomic Potentials Repository";