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/csvw | |
| 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/csvw')
| -rw-r--r-- | nixpkgs/pkgs/development/python-modules/csvw/default.nix | 23 |
1 files changed, 17 insertions, 6 deletions
diff --git a/nixpkgs/pkgs/development/python-modules/csvw/default.nix b/nixpkgs/pkgs/development/python-modules/csvw/default.nix index 67342d9eccc8..7ae79f4ec59f 100644 --- a/nixpkgs/pkgs/development/python-modules/csvw/default.nix +++ b/nixpkgs/pkgs/development/python-modules/csvw/default.nix @@ -1,13 +1,13 @@ { lib , buildPythonPackage , fetchFromGitHub +, pythonAtLeast , pythonOlder , attrs , isodate , python-dateutil , rfc3986 , uritemplate -, mock , pytestCheckHook , pytest-mock }: @@ -15,6 +15,8 @@ buildPythonPackage rec { pname = "csvw"; version = "1.11.0"; + format = "setuptools"; + disabled = pythonOlder "3.6"; src = fetchFromGitHub { @@ -24,10 +26,6 @@ buildPythonPackage rec { sha256 = "1393xwqawaxsflbq62vks92vv4zch8p6dd1mdvdi7j4vvf0zljkg"; }; - patchPhase = '' - substituteInPlace setup.cfg --replace "--cov" "" - ''; - propagatedBuildInputs = [ attrs isodate @@ -37,15 +35,28 @@ buildPythonPackage rec { ]; checkInputs = [ - mock pytestCheckHook pytest-mock ]; + patchPhase = '' + substituteInPlace setup.cfg \ + --replace "--cov" "" + ''; + disabledTests = [ # this test is flaky on darwin because it depends on the resolution of filesystem mtimes # https://github.com/cldf/csvw/blob/45584ad63ff3002a9b3a8073607c1847c5cbac58/tests/test_db.py#L257 "test_write_file_exists" + ] ++ lib.optionals (pythonAtLeast "3.10") [ + # https://github.com/cldf/csvw/issues/58 + "test_roundtrip_escapechar" + "test_escapequote_escapecharquotechar_final" + "test_doubleQuote" + ]; + + pythonImportsCheck = [ + "csvw" ]; meta = with lib; { |