Merge pull request #281357 from fabaff/pydash-fix
python311Packages.pydash: 5.1.1 -> 7.0.6
This commit is contained in:
commit
8de6c0af20
@ -1,47 +1,63 @@
|
|||||||
{ stdenv
|
{ lib
|
||||||
, lib
|
, stdenv
|
||||||
, buildPythonPackage
|
, buildPythonPackage
|
||||||
, fetchFromGitHub
|
, fetchFromGitHub
|
||||||
, invoke
|
, invoke
|
||||||
, mock
|
, mock
|
||||||
, pytestCheckHook
|
, pytestCheckHook
|
||||||
, pythonOlder
|
, pythonOlder
|
||||||
|
, setuptools
|
||||||
, sphinx-rtd-theme
|
, sphinx-rtd-theme
|
||||||
|
, typing-extensions
|
||||||
}:
|
}:
|
||||||
|
|
||||||
buildPythonPackage rec {
|
buildPythonPackage rec {
|
||||||
pname = "pydash";
|
pname = "pydash";
|
||||||
version = "5.1.1";
|
version = "7.0.6";
|
||||||
format = "pyproject";
|
pyproject = true;
|
||||||
|
|
||||||
disabled = pythonOlder "3.6";
|
disabled = pythonOlder "3.7";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "dgilland";
|
owner = "dgilland";
|
||||||
repo = pname;
|
repo = "pydash";
|
||||||
rev = "v${version}";
|
rev = "refs/tags/v${version}";
|
||||||
hash = "sha256-VbuRzKwPMh5S4GZQYnh0sZOBi4LNFjMuol95tMC43b0=";
|
hash = "sha256-zwtUdP2fFFE5X0SDkBDetAQbKnZ1v24DGdzN3fQLa0A=";
|
||||||
};
|
};
|
||||||
|
|
||||||
nativeCheckInputs = [
|
|
||||||
invoke
|
|
||||||
mock
|
|
||||||
sphinx-rtd-theme
|
|
||||||
pytestCheckHook
|
|
||||||
];
|
|
||||||
|
|
||||||
postPatch = ''
|
postPatch = ''
|
||||||
sed -i "/--cov/d" setup.cfg
|
sed -i "/--cov/d" setup.cfg
|
||||||
sed -i "/--no-cov/d" setup.cfg
|
sed -i "/--no-cov/d" setup.cfg
|
||||||
'';
|
'';
|
||||||
|
|
||||||
|
nativeBuildInputs = [
|
||||||
|
setuptools
|
||||||
|
];
|
||||||
|
|
||||||
|
propagatedBuildInputs = [
|
||||||
|
typing-extensions
|
||||||
|
];
|
||||||
|
|
||||||
|
nativeCheckInputs = [
|
||||||
|
invoke
|
||||||
|
mock
|
||||||
|
pytestCheckHook
|
||||||
|
sphinx-rtd-theme
|
||||||
|
];
|
||||||
|
|
||||||
pythonImportsCheck = [
|
pythonImportsCheck = [
|
||||||
"pydash"
|
"pydash"
|
||||||
];
|
];
|
||||||
|
|
||||||
|
disabledTestPaths = [
|
||||||
|
# Disable mypy testing
|
||||||
|
"tests/pytest_mypy_testing/"
|
||||||
|
];
|
||||||
|
|
||||||
meta = with lib; {
|
meta = with lib; {
|
||||||
description = "Python utility libraries for doing stuff in a functional way";
|
description = "Python utility libraries for doing stuff in a functional way";
|
||||||
homepage = "https://pydash.readthedocs.io";
|
homepage = "https://pydash.readthedocs.io";
|
||||||
|
changelog = "https://github.com/dgilland/pydash/blob/v${version}/CHANGELOG.rst";
|
||||||
license = licenses.mit;
|
license = licenses.mit;
|
||||||
maintainers = with maintainers; [ ma27 ];
|
maintainers = with maintainers; [ ma27 ];
|
||||||
};
|
};
|
||||||
|
@ -1,24 +1,27 @@
|
|||||||
{ stdenv
|
{ lib
|
||||||
, lib
|
, stdenv
|
||||||
, buildPythonPackage
|
, buildPythonPackage
|
||||||
, fetchFromGitHub
|
|
||||||
, sphinx
|
|
||||||
, markdown
|
|
||||||
, commonmark
|
, commonmark
|
||||||
, recommonmark
|
, fetchFromGitHub
|
||||||
|
, markdown
|
||||||
, pydash
|
, pydash
|
||||||
|
, pytestCheckHook
|
||||||
|
, pythonOlder
|
||||||
, pyyaml
|
, pyyaml
|
||||||
|
, recommonmark
|
||||||
|
, setuptools
|
||||||
|
, sphinx
|
||||||
, unify
|
, unify
|
||||||
, yapf
|
, yapf
|
||||||
, python
|
|
||||||
}:
|
}:
|
||||||
|
|
||||||
buildPythonPackage rec {
|
buildPythonPackage rec {
|
||||||
pname = "sphinx-markdown-parser";
|
pname = "sphinx-markdown-parser";
|
||||||
version = "0.2.4";
|
version = "0.2.4";
|
||||||
format = "setuptools";
|
pyproject = true;
|
||||||
|
|
||||||
|
disabled = pythonOlder "3.8";
|
||||||
|
|
||||||
# PyPi release does not include requirements.txt
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "clayrisser";
|
owner = "clayrisser";
|
||||||
repo = "sphinx-markdown-parser";
|
repo = "sphinx-markdown-parser";
|
||||||
@ -28,20 +31,44 @@ buildPythonPackage rec {
|
|||||||
sha256 = "0i0hhapmdmh83yx61lxi2h4bsmhnzddamz95844g2ghm132kw5mv";
|
sha256 = "0i0hhapmdmh83yx61lxi2h4bsmhnzddamz95844g2ghm132kw5mv";
|
||||||
};
|
};
|
||||||
|
|
||||||
propagatedBuildInputs = [ sphinx markdown commonmark pydash pyyaml unify yapf recommonmark ];
|
nativeBuildInputs = [
|
||||||
|
setuptools
|
||||||
|
];
|
||||||
|
|
||||||
# Avoids running broken tests in test_markdown.py
|
propagatedBuildInputs = [
|
||||||
checkPhase = ''
|
commonmark
|
||||||
${python.interpreter} -m unittest -v tests/test_basic.py tests/test_sphinx.py
|
markdown
|
||||||
'';
|
pydash
|
||||||
|
pyyaml
|
||||||
|
recommonmark
|
||||||
|
unify
|
||||||
|
yapf
|
||||||
|
];
|
||||||
|
|
||||||
pythonImportsCheck = [ "sphinx_markdown_parser" ];
|
buildInputs = [
|
||||||
|
sphinx
|
||||||
|
];
|
||||||
|
|
||||||
|
nativeCheckInputs = [
|
||||||
|
pytestCheckHook
|
||||||
|
];
|
||||||
|
|
||||||
|
pythonImportsCheck = [
|
||||||
|
"sphinx_markdown_parser"
|
||||||
|
];
|
||||||
|
|
||||||
|
disabledTests = [
|
||||||
|
# AssertionError
|
||||||
|
"test_heading"
|
||||||
|
"test_headings"
|
||||||
|
"test_integration"
|
||||||
|
];
|
||||||
|
|
||||||
meta = with lib; {
|
meta = with lib; {
|
||||||
broken = (stdenv.isLinux && stdenv.isAarch64) || stdenv.isDarwin;
|
|
||||||
description = "Write markdown inside of docutils & sphinx projects";
|
description = "Write markdown inside of docutils & sphinx projects";
|
||||||
homepage = "https://github.com/clayrisser/sphinx-markdown-parser";
|
homepage = "https://github.com/clayrisser/sphinx-markdown-parser";
|
||||||
license = licenses.mit;
|
license = licenses.mit;
|
||||||
maintainers = with maintainers; [ FlorianFranzen ];
|
maintainers = with maintainers; [ FlorianFranzen ];
|
||||||
|
broken = (stdenv.isLinux && stdenv.isAarch64) || stdenv.isDarwin;
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
@ -1,26 +1,47 @@
|
|||||||
{ lib
|
{ lib
|
||||||
, buildPythonPackage
|
, buildPythonPackage
|
||||||
, fetchFromGitHub
|
, fetchFromGitHub
|
||||||
|
, pythonOlder
|
||||||
|
, setuptools
|
||||||
|
, pytestCheckHook
|
||||||
, untokenize
|
, untokenize
|
||||||
, unittestCheckHook
|
|
||||||
}:
|
}:
|
||||||
|
|
||||||
buildPythonPackage rec {
|
buildPythonPackage rec {
|
||||||
pname = "unify";
|
pname = "unify";
|
||||||
version = "0.5";
|
version = "0.5";
|
||||||
format = "setuptools";
|
pyproject = true;
|
||||||
|
|
||||||
|
disabled = pythonOlder "3.9";
|
||||||
|
|
||||||
# PyPi release is missing tests (see https://github.com/myint/unify/pull/18)
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "myint";
|
owner = "myint";
|
||||||
repo = "unify";
|
repo = "unify";
|
||||||
rev = "v${version}";
|
rev = "refs/tags/v${version}";
|
||||||
sha256 = "1l6xxygaigacsxf0g5f7w5gpqha1ava6mcns81kqqy6vw91pyrbi";
|
hash = "sha256-cWV/Q+LbeIxnQNqyatRWQUF8X+HHlQdc10y9qJ7v3dA=";
|
||||||
};
|
};
|
||||||
|
|
||||||
propagatedBuildInputs = [ untokenize ];
|
nativeBuildInputs = [
|
||||||
|
setuptools
|
||||||
|
];
|
||||||
|
|
||||||
nativeCheckInputs = [ unittestCheckHook ];
|
propagatedBuildInputs = [
|
||||||
|
untokenize
|
||||||
|
];
|
||||||
|
|
||||||
|
nativeCheckInputs = [
|
||||||
|
pytestCheckHook
|
||||||
|
];
|
||||||
|
|
||||||
|
pythonImportsCheck = [
|
||||||
|
"unify"
|
||||||
|
];
|
||||||
|
|
||||||
|
disabledTests = [
|
||||||
|
# https://github.com/myint/unify/issues/21
|
||||||
|
"test_format_code"
|
||||||
|
"test_format_code_with_backslash_in_comment"
|
||||||
|
];
|
||||||
|
|
||||||
meta = with lib; {
|
meta = with lib; {
|
||||||
description = "Modifies strings to all use the same quote where possible";
|
description = "Modifies strings to all use the same quote where possible";
|
||||||
|
Loading…
Reference in New Issue
Block a user