Merge pull request #51542 from marsam/feature/update-python-svgwrite

pythonPackages.svgwrite: 1.1.6 -> 1.2.1
This commit is contained in:
Alexey Shmalko 2018-12-05 13:44:44 +02:00 committed by GitHub
commit d5090fe57c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 25 additions and 6 deletions

View File

@ -1,18 +1,28 @@
{ stdenv, buildPythonPackage, fetchPypi, isPy3k { stdenv, buildPythonPackage, fetchPypi, isPy3k, fetchpatch
, cairocffi, cssselect2, defusedxml, pillow, tinycss2 , cairocffi, cssselect2, defusedxml, pillow, tinycss2
, pytestrunner, pytestcov, pytest-flake8, pytest-isort }: , pytestrunner, pytestcov, pytest-flake8, pytest-isort }:
buildPythonPackage rec { buildPythonPackage rec {
pname = "CairoSVG"; pname = "CairoSVG";
version = "2.1.3"; version = "2.2.1";
disabled = !isPy3k; disabled = !isPy3k;
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
sha256 = "e512f555f576b6462b04b585c4ba4c09a43f3a8fec907b60ead21d7d00c550e9"; sha256 = "93c5b3204478c4e20c4baeb33807db5311b4420c21db2f21034a6deda998cb14";
}; };
patches = [
# Fix tests. Remove with the next release
(fetchpatch {
url = https://github.com/Kozea/CairoSVG/commit/1f403ad229f0e2782d6427a79f0fbeb6b76148b6.patch;
sha256 = "1dxpj5zh8wmx9f8pj11hrixd5jlaqq5xlcdnbl462bh29zj18l26";
})
];
LC_ALL="en_US.UTF-8";
propagatedBuildInputs = [ cairocffi cssselect2 defusedxml pillow tinycss2 ]; propagatedBuildInputs = [ cairocffi cssselect2 defusedxml pillow tinycss2 ];
checkInputs = [ pytestrunner pytestcov pytest-flake8 pytest-isort ]; checkInputs = [ pytestrunner pytestcov pytest-flake8 pytest-isort ];

View File

@ -36,6 +36,8 @@ buildPythonPackage rec {
${python.interpreter} tests/launch_tests.py ${python.interpreter} tests/launch_tests.py
''; '';
LC_ALL="en_US.UTF-8";
meta = { meta = {
description = "A Python module to visualise quantum circuit"; description = "A Python module to visualise quantum circuit";
homepage = https://github.com/nelimeee/qasm2image; homepage = https://github.com/nelimeee/qasm2image;

View File

@ -3,23 +3,30 @@
, fetchPypi , fetchPypi
, setuptools , setuptools
, pyparsing , pyparsing
, pytest
}: }:
buildPythonPackage rec { buildPythonPackage rec {
pname = "svgwrite"; pname = "svgwrite";
version = "1.1.6"; version = "1.2.1";
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
sha256 = "1f018813072aa4d7e95e58f133acb3f68fa7de0a0d89ec9402cc38406a0ec5b8"; extension = "zip";
sha256 = "72ef66c9fe367989823cb237ab7f012ac809dd3ba76c1b5ebd9aa61580e2e75e";
}; };
buildInputs = [ setuptools ]; buildInputs = [ setuptools ];
propagatedBuildInputs = [ pyparsing ]; propagatedBuildInputs = [ pyparsing ];
checkInputs = [ pytest ];
checkPhase = ''
pytest
'';
meta = with stdenv.lib; { meta = with stdenv.lib; {
description = "A Python library to create SVG drawings"; description = "A Python library to create SVG drawings";
homepage = https://bitbucket.org/mozman/svgwrite; homepage = https://github.com/mozman/svgwrite;
license = licenses.mit; license = licenses.mit;
}; };