From 02b02c9941ec6fad15af569a4e532bf06bc1331e Mon Sep 17 00:00:00 2001 From: TomaSajt <62384384+TomaSajt@users.noreply.github.com> Date: Mon, 6 May 2024 19:31:49 +0200 Subject: [PATCH] python312Packages.atsim-potentials: use pyproject = true, disable some tests for python312 --- .../atsim-potentials/default.nix | 30 +++++++++++++------ 1 file changed, 21 insertions(+), 9 deletions(-) diff --git a/pkgs/development/python-modules/atsim-potentials/default.nix b/pkgs/development/python-modules/atsim-potentials/default.nix index b06ef867c21f..d391ef74539e 100644 --- a/pkgs/development/python-modules/atsim-potentials/default.nix +++ b/pkgs/development/python-modules/atsim-potentials/default.nix @@ -1,6 +1,8 @@ { lib , buildPythonPackage +, pythonAtLeast , fetchFromGitHub +, setuptools , configparser , pyparsing , pytestCheckHook @@ -14,23 +16,22 @@ }: buildPythonPackage rec { - version = "0.4.1"; - format = "setuptools"; pname = "atsim-potentials"; + version = "0.4.1"; + pyproject = true; src = fetchFromGitHub { owner = "mjdrushton"; - repo = pname; + repo = "atsim-potentials"; rev = "refs/tags/${version}"; hash = "sha256-G7lNqwEUwAT0f7M2nUTCxpXOAl6FWKlh7tcsvbur1eM="; }; - postPatch = '' - # Remove conflicting openpyxl dependency version check - sed -i '/openpyxl==2.6.4/d' setup.py - ''; + build-system = [ + setuptools + ]; - propagatedBuildInputs = [ + dependencies = [ cexprtk configparser future @@ -46,10 +47,21 @@ buildPythonPackage rec { pytestCheckHook ]; + # these files try to import `distutils` removed in Python 3.12 + disabledTestPaths = lib.optionals (pythonAtLeast "3.12") [ + "tests/config/test_configuration_eam.py" + "tests/config/test_configuration_eam_fs.py" + "tests/config/test_configuration_pair.py" + "tests/test_dlpoly_writeTABEAM.py" + "tests/test_documentation_examples.py" + "tests/test_eam_adp_writer.py" + "tests/test_gulp_writer.py" + "tests/test_lammpsWriteEAM.py" + ]; + disabledTests = [ # Missing lammps executable "eam_tabulate_example2TestCase" - "test_pymath" ]; pythonImportsCheck = [ "atsim.potentials" ];