diff options
author | Alyssa Ross <hi@alyssa.is> | 2022-02-22 10:43:06 +0000 |
---|---|---|
committer | Alyssa Ross <hi@alyssa.is> | 2022-03-11 16:17:56 +0000 |
commit | ca1aada113c0ebda1ab8667199f6453f8e01c4fc (patch) | |
tree | 55e402280096f62eb0bc8bcad5ce6050c5a0aec7 /nixpkgs/pkgs/development/python-modules/cftime | |
parent | e4df5a52a6a6531f32626f57205356a773ac2975 (diff) | |
parent | 93883402a445ad467320925a0a5dbe43a949f25b (diff) | |
download | nixlib-ca1aada113c0ebda1ab8667199f6453f8e01c4fc.tar nixlib-ca1aada113c0ebda1ab8667199f6453f8e01c4fc.tar.gz nixlib-ca1aada113c0ebda1ab8667199f6453f8e01c4fc.tar.bz2 nixlib-ca1aada113c0ebda1ab8667199f6453f8e01c4fc.tar.lz nixlib-ca1aada113c0ebda1ab8667199f6453f8e01c4fc.tar.xz nixlib-ca1aada113c0ebda1ab8667199f6453f8e01c4fc.tar.zst nixlib-ca1aada113c0ebda1ab8667199f6453f8e01c4fc.zip |
Merge commit '93883402a445ad467320925a0a5dbe43a949f25b'
Conflicts: nixpkgs/nixos/modules/programs/ssh.nix nixpkgs/pkgs/applications/networking/browsers/firefox/packages.nix nixpkgs/pkgs/data/fonts/noto-fonts/default.nix nixpkgs/pkgs/development/go-modules/generic/default.nix nixpkgs/pkgs/development/interpreters/ruby/default.nix nixpkgs/pkgs/development/libraries/mesa/default.nix
Diffstat (limited to 'nixpkgs/pkgs/development/python-modules/cftime')
-rw-r--r-- | nixpkgs/pkgs/development/python-modules/cftime/default.nix | 42 |
1 files changed, 25 insertions, 17 deletions
diff --git a/nixpkgs/pkgs/development/python-modules/cftime/default.nix b/nixpkgs/pkgs/development/python-modules/cftime/default.nix index aeebc762701f..3991dc6bf685 100644 --- a/nixpkgs/pkgs/development/python-modules/cftime/default.nix +++ b/nixpkgs/pkgs/development/python-modules/cftime/default.nix @@ -1,27 +1,24 @@ -{ buildPythonPackage -, fetchPypi -, pytestCheckHook -, coveralls -, pytest-cov +{ lib +, buildPythonPackage , cython +, fetchPypi , numpy +, pytestCheckHook +, pythonOlder }: buildPythonPackage rec { pname = "cftime"; - version = "1.5.1.1"; + version = "1.5.2"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "6dc4d76ec7fe5a2d3c00dbe6604c757f1319613b75ef157554ef3648bf102a50"; + sha256 = "375d37d9ab8bf501c048e44efce2276296e3d67bb276e891e0e93b0a8bbb988a"; }; - checkInputs = [ - pytestCheckHook - coveralls - pytest-cov - ]; - nativeBuildInputs = [ cython numpy @@ -31,11 +28,22 @@ buildPythonPackage rec { numpy ]; - # ERROR test/test_cftime.py - ModuleNotFoundError: No module named 'cftime._cft... - doCheck = false; + checkInputs = [ + pytestCheckHook + ]; + + postPatch = '' + sed -i "/--cov/d" setup.cfg + ''; + + pythonImportsCheck = [ + "cftime" + ]; - meta = { + meta = with lib; { description = "Time-handling functionality from netcdf4-python"; + homepage = "https://github.com/Unidata/cftime"; + license = licenses.mit; + maintainers = with maintainers; [ ]; }; - } |