python3Packages.tensorflow_2: relax h5py dependency

This commit is contained in:
Martin Weinelt 2020-12-12 18:51:11 +01:00
parent 817b7e54eb
commit bc65777671
No known key found for this signature in database
GPG key ID: 87C1E9888F856759
2 changed files with 9 additions and 4 deletions

View file

@ -110,7 +110,7 @@ let
# Fixes for NixOS jsoncpp # Fixes for NixOS jsoncpp
../system-jsoncpp.patch ../system-jsoncpp.patch
./lift-gast-restriction.patch ./relax-dependencies.patch
# see https://github.com/tensorflow/tensorflow/issues/40688 # see https://github.com/tensorflow/tensorflow/issues/40688
(fetchpatch { (fetchpatch {

View file

@ -1,11 +1,16 @@
diff --git a/tensorflow/tools/pip_package/setup.py b/tensorflow/tools/pip_package/setup.py diff --git a/tensorflow/tools/pip_package/setup.py b/tensorflow/tools/pip_package/setup.py
index 992f2eae22..d9386f9b13 100644 index 594e74f40c0..bfbf010144f 100644
--- a/tensorflow/tools/pip_package/setup.py --- a/tensorflow/tools/pip_package/setup.py
+++ b/tensorflow/tools/pip_package/setup.py +++ b/tensorflow/tools/pip_package/setup.py
@@ -56,5 +56,5 @@ REQUIRED_PACKAGES = [ @@ -54,9 +54,9 @@ _VERSION = '2.3.1'
REQUIRED_PACKAGES = [
'absl-py >= 0.7.0',
'astunparse == 1.6.3', 'astunparse == 1.6.3',
- 'gast == 0.3.3', - 'gast == 0.3.3',
+ 'gast >= 0.3.3', + 'gast >= 0.3.3',
'google_pasta >= 0.1.8', 'google_pasta >= 0.1.8',
'h5py >= 2.10.0, < 2.11.0', - 'h5py >= 2.10.0, < 2.11.0',
+ 'h5py >= 2.10.0',
'keras_preprocessing >= 1.1.1, < 1.2', 'keras_preprocessing >= 1.1.1, < 1.2',
# TODO(mihaimaruseac): numpy 1.19.0 has ABI breakage
# https://github.com/numpy/numpy/pull/15355