Fix dependency conflicts

csala · csala · commit 6dbcda493190 · 2021-01-09T17:19:37.000+01:00
diff --git a/requirements.txt b/requirements.txt
@@ -1,2 +1,3 @@
 # Requirements for development and mybinder environment
 -e .[dev]
+docutils<0.16,>=0.10  # Fix dependency conflict on mybinder
diff --git a/setup.py b/setup.py
@@ -20,12 +20,14 @@
 
 
 mlprimitives_requires = [
-    'mlprimitives>=0.3.0.dev0,<0.4',
+    'mlprimitives>=0.3.0,<0.4',
+    'h5py<2.11.0,>=2.10.0',  # <- tensorflow 2.3.2 conflict
+    'matplotlib<3.2.2,>=2.2.2',  # <- copulas 0.3.3
 ]
 
 examples_require = mlprimitives_requires + [
     'jupyter==1.0.0',
-    'baytune>=0.3.13.dev0,<0.4',
+    'baytune>=0.4.0,<0.5',
 ]
 
 
diff --git a/tox.ini b/tox.ini
@@ -9,6 +9,7 @@ python =
 
 [testenv]
 passenv = CI TRAVIS TRAVIS_*
+allowlist_externals = rm
 skipsdist = false
 skip_install = false
 extras = test

Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,3 @@`
`1`	`1`	`# Requirements for development and mybinder environment`
`2`	`2`	`-e .[dev]`
	`3`	`+docutils<0.16,>=0.10 # Fix dependency conflict on mybinder`
Original file line number	Diff line number	Diff line change
`@@ -20,12 +20,14 @@`
`20`	`20`
`21`	`21`
`22`	`22`	`mlprimitives_requires = [`
`23`		`- 'mlprimitives>=0.3.0.dev0,<0.4',`
	`23`	`+ 'mlprimitives>=0.3.0,<0.4',`
	`24`	`+ 'h5py<2.11.0,>=2.10.0', # <- tensorflow 2.3.2 conflict`
	`25`	`+ 'matplotlib<3.2.2,>=2.2.2', # <- copulas 0.3.3`
`24`	`26`	`]`
`25`	`27`
`26`	`28`	`examples_require = mlprimitives_requires + [`
`27`	`29`	`'jupyter==1.0.0',`
`28`		`- 'baytune>=0.3.13.dev0,<0.4',`
	`30`	`+ 'baytune>=0.4.0,<0.5',`
`29`	`31`	`]`
`30`	`32`
`31`	`33`