python3Packages.arrow_1: merge into python3Packages.arrow
They are the same version.
This commit is contained in:
parent
60f5ecc76d
commit
882b692c4f
4 changed files with 18 additions and 51 deletions
|
@ -19,7 +19,7 @@ buildPythonApplication rec {
|
||||||
'';
|
'';
|
||||||
|
|
||||||
checkInputs = [ pytestCheckHook pytest-mock mock pytest-datafiles ];
|
checkInputs = [ pytestCheckHook pytest-mock mock pytest-datafiles ];
|
||||||
propagatedBuildInputs = [ arrow_1 click click-didyoumean requests ];
|
propagatedBuildInputs = [ arrow click click-didyoumean requests ];
|
||||||
nativeBuildInputs = [ installShellFiles ];
|
nativeBuildInputs = [ installShellFiles ];
|
||||||
|
|
||||||
meta = with lib; {
|
meta = with lib; {
|
||||||
|
|
|
@ -1,41 +0,0 @@
|
||||||
{ lib, buildPythonPackage, fetchPypi, pythonOlder
|
|
||||||
, simplejson, typing-extensions, python-dateutil, pytz, pytest-mock, sphinx
|
|
||||||
, dateparser, pytestcov, pytestCheckHook
|
|
||||||
}:
|
|
||||||
|
|
||||||
buildPythonPackage rec {
|
|
||||||
pname = "arrow";
|
|
||||||
version = "1.0.3";
|
|
||||||
|
|
||||||
disabled = pythonOlder "3.6";
|
|
||||||
|
|
||||||
src = fetchPypi {
|
|
||||||
inherit pname version;
|
|
||||||
sha256 = "0793badh4hgbk2c5g70hmbl7n3d4g5d87bcflld0w9rjwy59r71r";
|
|
||||||
};
|
|
||||||
|
|
||||||
propagatedBuildInputs = [ python-dateutil ]
|
|
||||||
++ lib.optionals (!pythonOlder "3.8") [ typing-extensions ];
|
|
||||||
|
|
||||||
checkInputs = [
|
|
||||||
dateparser
|
|
||||||
pytestCheckHook
|
|
||||||
pytestcov
|
|
||||||
pytest-mock
|
|
||||||
pytz
|
|
||||||
simplejson
|
|
||||||
sphinx
|
|
||||||
];
|
|
||||||
|
|
||||||
# ParserError: Could not parse timezone expression "America/Nuuk"
|
|
||||||
disabledTests = [
|
|
||||||
"test_parse_tz_name_zzz"
|
|
||||||
];
|
|
||||||
|
|
||||||
meta = with lib; {
|
|
||||||
description = "Python library for date manipulation";
|
|
||||||
homepage = "https://github.com/crsmithdev/arrow";
|
|
||||||
license = licenses.asl20;
|
|
||||||
maintainers = with maintainers; [ thoughtpolice oxzi ];
|
|
||||||
};
|
|
||||||
}
|
|
|
@ -1,29 +1,39 @@
|
||||||
{ lib, buildPythonPackage, fetchPypi, isPy27
|
{ lib
|
||||||
, nose, chai, simplejson, backports_functools_lru_cache
|
, buildPythonPackage
|
||||||
, python-dateutil, pytz, pytest-mock, sphinx, dateparser, pytestcov
|
, fetchPypi
|
||||||
|
, pythonOlder
|
||||||
|
, python-dateutil
|
||||||
|
, typing-extensions
|
||||||
, pytestCheckHook
|
, pytestCheckHook
|
||||||
|
, pytest-mock
|
||||||
|
, pytz
|
||||||
|
, simplejson
|
||||||
}:
|
}:
|
||||||
|
|
||||||
buildPythonPackage rec {
|
buildPythonPackage rec {
|
||||||
pname = "arrow";
|
pname = "arrow";
|
||||||
version = "1.0.3";
|
version = "1.0.3";
|
||||||
|
|
||||||
|
disabled = pythonOlder "3.6";
|
||||||
|
|
||||||
src = fetchPypi {
|
src = fetchPypi {
|
||||||
inherit pname version;
|
inherit pname version;
|
||||||
sha256 = "399c9c8ae732270e1aa58ead835a79a40d7be8aa109c579898eb41029b5a231d";
|
sha256 = "399c9c8ae732270e1aa58ead835a79a40d7be8aa109c579898eb41029b5a231d";
|
||||||
};
|
};
|
||||||
|
|
||||||
|
postPatch = ''
|
||||||
|
# no coverage reports
|
||||||
|
sed -i "/addopts/d" tox.ini
|
||||||
|
'';
|
||||||
|
|
||||||
propagatedBuildInputs = [ python-dateutil ]
|
propagatedBuildInputs = [ python-dateutil ]
|
||||||
++ lib.optionals isPy27 [ backports_functools_lru_cache ];
|
++ lib.optionals (pythonOlder "3.8") [ typing-extensions ];
|
||||||
|
|
||||||
checkInputs = [
|
checkInputs = [
|
||||||
dateparser
|
|
||||||
pytestCheckHook
|
pytestCheckHook
|
||||||
pytestcov
|
|
||||||
pytest-mock
|
pytest-mock
|
||||||
pytz
|
pytz
|
||||||
simplejson
|
simplejson
|
||||||
sphinx
|
|
||||||
];
|
];
|
||||||
|
|
||||||
# ParserError: Could not parse timezone expression "America/Nuuk"
|
# ParserError: Could not parse timezone expression "America/Nuuk"
|
||||||
|
|
|
@ -495,8 +495,6 @@ in {
|
||||||
|
|
||||||
arrow = callPackage ../development/python-modules/arrow { };
|
arrow = callPackage ../development/python-modules/arrow { };
|
||||||
|
|
||||||
arrow_1 = callPackage ../development/python-modules/arrow/1.nix { };
|
|
||||||
|
|
||||||
arviz = callPackage ../development/python-modules/arviz { };
|
arviz = callPackage ../development/python-modules/arviz { };
|
||||||
|
|
||||||
arxiv2bib = callPackage ../development/python-modules/arxiv2bib { };
|
arxiv2bib = callPackage ../development/python-modules/arxiv2bib { };
|
||||||
|
|
Loading…
Reference in a new issue