Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

vdirsyncer: 0.16.7 -> 0.16.8 #91918

Merged
merged 1 commit into from
Jul 11, 2020
Merged

vdirsyncer: 0.16.7 -> 0.16.8 #91918

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
42 changes: 9 additions & 33 deletions pkgs/development/python-modules/vdirsyncer/stable.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,35 +1,29 @@
{ stdenv
, pythonAtLeast
, buildPythonPackage
, fetchPypi
, isPy27
, fetchpatch
, click
, click-log
, click-threading
, requests_toolbelt
, requests
, requests_oauthlib # required for google oauth sync
, atomicwrites
, milksnake
, shippai
, hypothesis
, pytest
, pytestCheckHook
, pytest-localserver
, pytest-subtesthack
, setuptools_scm
}:

# Packaging documentation at:
# https://github.com/pimutils/vdirsyncer/blob/0.16.7/docs/packaging.rst
buildPythonPackage rec {
version = "0.16.7";
version = "0.16.8";
pname = "vdirsyncer";
disabled = isPy27;

src = fetchPypi {
inherit pname version;
sha256 = "6c9bcfb9bcb01246c83ba6f8551cf54c58af3323210755485fc23bb7848512ef";
sha256 = "bfdb422f52e1d4d60bd0635d203fb59fa7f613397d079661eb48e79464ba13c5";
};

propagatedBuildInputs = [
Expand All @@ -46,43 +40,25 @@ buildPythonPackage rec {

checkInputs = [
hypothesis
pytest
pytestCheckHook
pytest-localserver
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 = ''
# Invalid argument: 'perform_health_check' is not a valid setting
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' ""
substituteInPlace setup.py --replace "click>=5.0,<6.0" "click"
'';

checkPhase = ''
make DETERMINISTIC_TESTS=true PYTEST_ARGS="--deselect=tests/system/cli/test_sync.py::test_verbosity" test
preCheck = ''
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
# 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;

disabledTests = [ "test_verbosity" ];

meta = with stdenv.lib; {
homepage = "https://github.com/pimutils/vdirsyncer";
description = "Synchronize calendars and contacts";
license = licenses.mit;
# vdirsyncer (unstable) works with mainline python versions
broken = (pythonAtLeast "3.6");
maintainers = with maintainers; [ loewenheim ];
};
}