public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #91918 from DamienCassou/vdirsync-0.16.8

Browse Source 
vdirsyncer: 0.16.7 -> 0.16.8
This commit is contained in:
Damien Cassou 2020-07-11 11:53:00 +02:00 committed by GitHub
commit e1efaa951f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
pkgs/development/python-modules/vdirsyncer/stable.nix
View File

@ -1,9 +1,7 @@
{ stdenv { stdenv
, pythonAtLeast
, buildPythonPackage , buildPythonPackage
, fetchPypi , fetchPypi
, isPy27 , isPy27
, fetchpatch
, click , click
, click-log , click-log
, click-threading , click-threading
@ -11,25 +9,21 @@
, requests , requests
, requests_oauthlib # required for google oauth sync , requests_oauthlib # required for google oauth sync
, atomicwrites , atomicwrites
, milksnake
, shippai
, hypothesis , hypothesis
, pytest , pytestCheckHook
, pytest-localserver , pytest-localserver
, pytest-subtesthack , pytest-subtesthack
, setuptools_scm , setuptools_scm
}: }:
# Packaging documentation at:
# https://github.com/pimutils/vdirsyncer/blob/0.16.7/docs/packaging.rst
buildPythonPackage rec { buildPythonPackage rec {
version = "0.16.7"; version = "0.16.8";
pname = "vdirsyncer"; pname = "vdirsyncer";
disabled = isPy27; disabled = isPy27;
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
sha256 = "6c9bcfb9bcb01246c83ba6f8551cf54c58af3323210755485fc23bb7848512ef"; sha256 = "bfdb422f52e1d4d60bd0635d203fb59fa7f613397d079661eb48e79464ba13c5";
}; };
propagatedBuildInputs = [ propagatedBuildInputs = [
@ -46,43 +40,25 @@ buildPythonPackage rec {
checkInputs = [ checkInputs = [
hypothesis hypothesis
pytest pytestCheckHook
pytest-localserver pytest-localserver
pytest-subtesthack pytest-subtesthack
]; ];
patches = [
# Fixes for hypothesis: https://github.com/pimutils/vdirsyncer/pull/779
(fetchpatch {
url = "https://github.com/pimutils/vdirsyncer/commit/22ad88a6b18b0979c5d1f1d610c1d2f8f87f4b89.patch";
sha256 = "0dbzj6jlxhdidnm3i21a758z83sdiwzhpd45pbkhycfhgmqmhjpl";
})
];
postPatch = '' postPatch = ''
# Invalid argument: 'perform_health_check' is not a valid setting substituteInPlace setup.py --replace "click>=5.0,<6.0" "click"
substituteInPlace tests/conftest.py \
--replace "perform_health_check=False" ""
substituteInPlace tests/unit/test_repair.py \
--replace $'@settings(perform_health_check=False) # Using the random module for UIDs\n' ""
''; '';
checkPhase = '' preCheck = ''
make DETERMINISTIC_TESTS=true PYTEST_ARGS="--deselect=tests/system/cli/test_sync.py::test_verbosity" test export DETERMINISTIC_TESTS=true
''; '';
# Tests started to fail lately, for any python version even as low as 3.5 but
# if you enable the check, you'll see even severer errors with a higher then disabledTests = [ "test_verbosity" ];
# 3.5 python version. Hence it's marked as broken for higher then 3.5 and the
# checks are disabled unconditionally. As a general end user advice, use the
# normal "unstable" `vdirsyncer` derivation, not this one.
doCheck = false;
meta = with stdenv.lib; { meta = with stdenv.lib; {
homepage = "https://github.com/pimutils/vdirsyncer"; homepage = "https://github.com/pimutils/vdirsyncer";
description = "Synchronize calendars and contacts"; description = "Synchronize calendars and contacts";
license = licenses.mit; license = licenses.mit;
# vdirsyncer (unstable) works with mainline python versions
broken = (pythonAtLeast "3.6");
maintainers = with maintainers; [ loewenheim ]; maintainers = with maintainers; [ loewenheim ];
}; };
} }