Skip to content

Commit 369f252

Browse files
committed
No versioned dependency on pytest - causes troubles and is not really requiring 3.6
1 parent fb981a5 commit 369f252

File tree

3 files changed

+18
-1
lines changed

3 files changed

+18
-1
lines changed

debian/changelog

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,11 @@
1+
nipype (1.1.7-2) neurodebian; urgency=medium
2+
3+
* d/p/deb_no_strict_versions
4+
- do not require recent pytest - version was boosted upstream only to
5+
workaround problems with some CIs, and now forbids us to use backport
6+
7+
-- Yaroslav Halchenko <debian@onerussian.com> Mon, 14 Jan 2019 12:30:32 -0500
8+
19
nipype (1.1.7-1) unstable; urgency=medium
210

311
* Fresh upstream release

debian/patches/deb_no_neurdflib

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
+ #'neurdflib',
1010
'click>=%s' % CLICK_MIN_VERSION,
1111
'funcsigs',
12-
'pytest>=%s' % PYTEST_MIN_VERSION,
12+
'pytest',
1313
--- a/requirements.txt
1414
+++ b/requirements.txt
1515
@@ -7,7 +7,7 @@ nibabel>=2.1.0

debian/patches/deb_no_strict_versions

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,3 +16,12 @@
1616
CLICK_MIN_VERSION = '6.6.0'
1717
PYDOT_MIN_VERSION = '1.2.3'
1818

19+
@@ -147,7 +148,7 @@ REQUIRES = [
20+
'neurdflib',
21+
'click>=%s' % CLICK_MIN_VERSION,
22+
'funcsigs',
23+
- 'pytest>=%s' % PYTEST_MIN_VERSION,
24+
+ 'pytest',
25+
'pytest-xdist',
26+
'mock',
27+
# 'pydotplus',

0 commit comments

Comments
 (0)