python3Packages: provide setuptools-scm with toml[i] by default and remove duplicated toml packages
Some packages seem to still require toml despite setuptools-scm having switched to tomli. If it is missing the version number in dist.into is set to 0.0.0 and silently all version pins break.
This commit is contained in:
parent
684acec3e9
commit
2016ebd1fd
|
@ -1,4 +1,4 @@
|
|||
{ lib, buildPythonPackage, fetchPypi, isPy3k, six, mock, pytestCheckHook, setuptools, setuptools-scm, toml }:
|
||||
{ lib, buildPythonPackage, fetchPypi, isPy3k, six, mock, pytestCheckHook, setuptools, setuptools-scm }:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "ansi2html";
|
||||
|
@ -11,7 +11,7 @@ buildPythonPackage rec {
|
|||
sha256 = "0f124ea7efcf3f24f1f9398e527e688c9ae6eab26b0b84e1299ef7f94d92c596";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ setuptools-scm toml ];
|
||||
nativeBuildInputs = [ setuptools-scm ];
|
||||
propagatedBuildInputs = [ six setuptools ];
|
||||
|
||||
preCheck = "export PATH=$PATH:$out/bin";
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
{ lib, fetchPypi, fetchpatch, buildPythonPackage,
|
||||
setuptools-scm, toml, six, astroid, pytest
|
||||
setuptools-scm, six, astroid, pytest
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
|
@ -21,7 +21,7 @@ buildPythonPackage rec {
|
|||
})
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [ setuptools-scm toml six astroid ];
|
||||
propagatedBuildInputs = [ setuptools-scm six astroid ];
|
||||
|
||||
checkInputs = [ pytest ];
|
||||
|
||||
|
|
|
@ -1,6 +1,4 @@
|
|||
{ lib, stdenv, buildPythonPackage, fetchPypi, setuptools-scm
|
||||
, toml
|
||||
}:
|
||||
{ lib, stdenv, buildPythonPackage, fetchPypi, setuptools-scm }:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "configparser";
|
||||
|
@ -14,7 +12,7 @@ buildPythonPackage rec {
|
|||
# No tests available
|
||||
doCheck = false;
|
||||
|
||||
nativeBuildInputs = [ setuptools-scm toml ];
|
||||
nativeBuildInputs = [ setuptools-scm ];
|
||||
|
||||
preConfigure = ''
|
||||
export LC_ALL=${if stdenv.isDarwin then "en_US" else "C"}.UTF-8
|
||||
|
|
|
@ -3,7 +3,6 @@
|
|||
, fetchPypi
|
||||
, isPy27
|
||||
, setuptools-scm
|
||||
, toml
|
||||
, pytestCheckHook
|
||||
}:
|
||||
|
||||
|
@ -17,7 +16,7 @@ buildPythonPackage rec {
|
|||
sha256 = "41a23f6788962e9775e40e2ecfb1d6455d02de315022afeedd3c5dc070019d73";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ setuptools-scm toml ];
|
||||
nativeBuildInputs = [ setuptools-scm ];
|
||||
|
||||
checkInputs = [ pytestCheckHook ];
|
||||
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
{ lib, buildPythonPackage, fetchPypi, isPy3k
|
||||
, six, jaraco_logging, jaraco_text, jaraco_stream, pytz, jaraco_itertools
|
||||
, setuptools-scm, jaraco_collections, importlib-metadata, toml
|
||||
, setuptools-scm, jaraco_collections, importlib-metadata
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
|
@ -28,7 +28,6 @@ buildPythonPackage rec {
|
|||
pytz
|
||||
jaraco_itertools
|
||||
jaraco_collections
|
||||
toml
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
{ lib, buildPythonPackage, fetchFromGitHub, isPy27
|
||||
, setuptools-scm, toml
|
||||
, setuptools-scm
|
||||
, more-itertools
|
||||
, pytestCheckHook
|
||||
}:
|
||||
|
@ -20,7 +20,7 @@ buildPythonPackage rec {
|
|||
|
||||
SETUPTOOLS_SCM_PRETEND_VERSION = version;
|
||||
|
||||
nativeBuildInputs = [ setuptools-scm toml ];
|
||||
nativeBuildInputs = [ setuptools-scm ];
|
||||
|
||||
propagatedBuildInputs = [ more-itertools ];
|
||||
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
{ lib, buildPythonPackage, fetchPypi
|
||||
, setuptools-scm, toml
|
||||
, setuptools-scm
|
||||
, more-itertools, backports_functools_lru_cache }:
|
||||
|
||||
buildPythonPackage rec {
|
||||
|
@ -11,7 +11,7 @@ buildPythonPackage rec {
|
|||
sha256 = "bfcf7da71e2a0e980189b0744b59dba6c1dcf66dcd7a30f8a4413e478046b314";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ setuptools-scm toml ];
|
||||
nativeBuildInputs = [ setuptools-scm ];
|
||||
|
||||
propagatedBuildInputs = [ more-itertools backports_functools_lru_cache ];
|
||||
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
{ lib, buildPythonPackage, fetchPypi, pythonOlder, isPy27, six
|
||||
, pytest, backports_unittest-mock, keyring, setuptools-scm, toml
|
||||
, pytest, backports_unittest-mock, keyring, setuptools-scm
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
|
@ -17,7 +17,7 @@ buildPythonPackage rec {
|
|||
--replace "--flake8" ""
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [ setuptools-scm toml ];
|
||||
nativeBuildInputs = [ setuptools-scm ];
|
||||
propagatedBuildInputs = [ six ];
|
||||
|
||||
checkInputs = [ pytest keyring ] ++ lib.optional (pythonOlder "3.3") backports_unittest-mock;
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
{ lib, buildPythonPackage, fetchPypi, toml }:
|
||||
{ lib, buildPythonPackage, fetchPypi, toml, tomli }:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "setuptools-scm";
|
||||
|
@ -12,7 +12,9 @@ buildPythonPackage rec {
|
|||
sha256 = "sha256-0ZJaacsH6bKUFqJ1ufrbAJojwUis6QWy+yIGSabBjpI=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ toml ];
|
||||
# TODO: figure out why both toml and tomli are needed when only tomli is listed in setuptools-scm
|
||||
# if not both are listed some packages like zipp silently fallback to a 0.0.0 version number and break version pins in other packages
|
||||
propagatedBuildInputs = [ toml tomli ];
|
||||
|
||||
# Requires pytest, circular dependency
|
||||
doCheck = false;
|
||||
|
|
|
@ -9,7 +9,6 @@
|
|||
, xmlsec
|
||||
, pkgconfig
|
||||
, setuptools-scm
|
||||
, toml
|
||||
, lxml
|
||||
, hypothesis
|
||||
}:
|
||||
|
@ -28,7 +27,7 @@ buildPythonPackage rec {
|
|||
./reset-lxml-in-tests.patch
|
||||
];
|
||||
|
||||
nativeBuildInputs = [ pkg-config pkgconfig setuptools-scm toml ];
|
||||
nativeBuildInputs = [ pkg-config pkgconfig setuptools-scm ];
|
||||
|
||||
buildInputs = [ xmlsec libxslt libxml2 libtool ];
|
||||
|
||||
|
|
|
@ -5,7 +5,6 @@
|
|||
, pytest
|
||||
, pytest-flake8
|
||||
, more-itertools
|
||||
, toml
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
|
@ -17,7 +16,7 @@ buildPythonPackage rec {
|
|||
sha256 = "f5812b1e007e48cff63449a5e9f4e7ebea716b4111f9c4f9a645f91d579bf0c4";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ setuptools-scm toml ];
|
||||
nativeBuildInputs = [ setuptools-scm ];
|
||||
|
||||
propagatedBuildInputs = [ more-itertools ];
|
||||
|
||||
|
|
Loading…
Reference in a new issue