python3Packages.arrow_1: merge into python3Packages.arrow

They are the same version.
This commit is contained in:
Robert Schütz 2021-05-08 12:57:10 +02:00 committed by Jonathan Ringer
parent 60f5ecc76d
commit 882b692c4f
4 changed files with 18 additions and 51 deletions
pkgs
applications/office/watson
development/python-modules/arrow
top-level

View file

@ -19,7 +19,7 @@ buildPythonApplication rec {
'';
checkInputs = [ pytestCheckHook pytest-mock mock pytest-datafiles ];
propagatedBuildInputs = [ arrow_1 click click-didyoumean requests ];
propagatedBuildInputs = [ arrow click click-didyoumean requests ];
nativeBuildInputs = [ installShellFiles ];
meta = with lib; {

View file

@ -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 ];
};
}

View file

@ -1,29 +1,39 @@
{ lib, buildPythonPackage, fetchPypi, isPy27
, nose, chai, simplejson, backports_functools_lru_cache
, python-dateutil, pytz, pytest-mock, sphinx, dateparser, pytestcov
{ lib
, buildPythonPackage
, fetchPypi
, pythonOlder
, python-dateutil
, typing-extensions
, pytestCheckHook
, pytest-mock
, pytz
, simplejson
}:
buildPythonPackage rec {
pname = "arrow";
version = "1.0.3";
disabled = pythonOlder "3.6";
src = fetchPypi {
inherit pname version;
sha256 = "399c9c8ae732270e1aa58ead835a79a40d7be8aa109c579898eb41029b5a231d";
};
postPatch = ''
# no coverage reports
sed -i "/addopts/d" tox.ini
'';
propagatedBuildInputs = [ python-dateutil ]
++ lib.optionals isPy27 [ backports_functools_lru_cache ];
++ lib.optionals (pythonOlder "3.8") [ typing-extensions ];
checkInputs = [
dateparser
pytestCheckHook
pytestcov
pytest-mock
pytz
simplejson
sphinx
];
# ParserError: Could not parse timezone expression "America/Nuuk"

View file

@ -495,8 +495,6 @@ in {
arrow = callPackage ../development/python-modules/arrow { };
arrow_1 = callPackage ../development/python-modules/arrow/1.nix { };
arviz = callPackage ../development/python-modules/arviz { };
arxiv2bib = callPackage ../development/python-modules/arxiv2bib { };