Revert "Updating relax-dependencies.patch"

This reverts commit 43362bd872ee56f7c3c391e84d7bfaf900de7f93.

+17 -18
+1 -1
pkgs/development/python-modules/tensorflow/default.nix
··· 110 owner = "tensorflow"; 111 repo = "tensorflow"; 112 rev = "v${version}"; 113 - sha256 = "1jdw2i1rq06zqd6aabh7bbm0avsg4pygnfmd7gviv0blhih9054l"; 114 }; 115 116 patches = [
··· 110 owner = "tensorflow"; 111 repo = "tensorflow"; 112 rev = "v${version}"; 113 + sha256 = "0v5qfzkfj9p7z50kp6zfq584n4pzyvjhsajbf5mpydgw4zm7af13"; 114 }; 115 116 patches = [
+16 -17
pkgs/development/python-modules/tensorflow/relax-dependencies.patch
··· 1 diff --git a/tensorflow/tools/pip_package/setup.py b/tensorflow/tools/pip_package/setup.py 2 - index 354657a7bfc..eac85d4dba0 100644 3 --- a/tensorflow/tools/pip_package/setup.py 4 +++ b/tensorflow/tools/pip_package/setup.py 5 - @@ -78,24 +78,24 @@ REQUIRED_PACKAGES = [ 6 - # NOTE: As numpy has releases that break semver guarantees and several other 7 - # deps depend on numpy without an upper bound, we must install numpy before 8 - # everything else. 9 - - 'numpy ~= 1.19.2', 10 - + 'numpy >= 1.19.2', 11 - # Install other dependencies 12 - 'absl-py ~= 0.10', 13 - 'astunparse ~= 1.6.3', 14 - 'flatbuffers ~= 1.12.0', 15 - 'google_pasta ~= 0.2', 16 - - 'h5py ~= 3.1.0', 17 - 'keras_preprocessing ~= 1.1.2', 18 - 'opt_einsum ~= 3.3.0', 19 + 'absl-py >= 0.10', 20 + 'astunparse >= 1.6.3', 21 + 'flatbuffers >= 1.12.0', 22 + 'google_pasta >= 0.2', 23 - + 'h5py >= 3.1.0', 24 + 'keras_preprocessing >= 1.1.2', 25 + 'opt_einsum >= 3.3.0', 26 'protobuf >= 3.9.2', 27 - 'six ~= 1.15.0', ··· 32 + 'six >= 1.15.0', 33 + 'termcolor >= 1.1.0', 34 + 'typing_extensions >= 3.7.4', 35 - + 'wheel >= 0.35', 36 + 'wrapt >= 1.12.1', 37 - # These packages need to be pinned exactly as newer versions are 38 # incompatible with the rest of the ecosystem 39 - - 'gast == 0.4.0', 40 - + 'gast >= 0.4.0', 41 # TensorFlow ecosystem packages that TF exposes API for 42 # These need to be in sync with the existing TF version 43 # They are updated during the release process 44 - @@ -127,7 +127,7 @@ if 'tf_nightly' in project_name: 45 # BoringSSL support. 46 # See https://github.com/tensorflow/tensorflow/issues/17882. 47 if sys.byteorder == 'little': 48 - - REQUIRED_PACKAGES.append('grpcio ~= 1.34.0') 49 - + REQUIRED_PACKAGES.append('grpcio >= 1.34.0') 50 51 52 # Packages which are only needed for testing code.
··· 1 diff --git a/tensorflow/tools/pip_package/setup.py b/tensorflow/tools/pip_package/setup.py 2 + index 65133afdafe..8ef6364ff7e 100644 3 --- a/tensorflow/tools/pip_package/setup.py 4 +++ b/tensorflow/tools/pip_package/setup.py 5 + @@ -75,23 +75,23 @@ if '--project_name' in sys.argv: 6 + # comment the versioning scheme. 7 + # NOTE: Please add test only packages to `TEST_PACKAGES` below. 8 + REQUIRED_PACKAGES = [ 9 - 'absl-py ~= 0.10', 10 - 'astunparse ~= 1.6.3', 11 - 'flatbuffers ~= 1.12.0', 12 - 'google_pasta ~= 0.2', 13 + - 'h5py ~= 2.10.0', 14 - 'keras_preprocessing ~= 1.1.2', 15 + - 'numpy ~= 1.19.2', 16 - 'opt_einsum ~= 3.3.0', 17 + 'absl-py >= 0.10', 18 + 'astunparse >= 1.6.3', 19 + 'flatbuffers >= 1.12.0', 20 + 'google_pasta >= 0.2', 21 + + 'h5py >= 2.10.0', 22 + 'keras_preprocessing >= 1.1.2', 23 + + 'numpy >= 1.19.1', 24 + 'opt_einsum >= 3.3.0', 25 'protobuf >= 3.9.2', 26 - 'six ~= 1.15.0', ··· 31 + 'six >= 1.15.0', 32 + 'termcolor >= 1.1.0', 33 + 'typing_extensions >= 3.7.4', 34 + + 'wheel >= 0.34.2', 35 + 'wrapt >= 1.12.1', 36 + # These packages needs to be pinned exactly as newer versions are 37 # incompatible with the rest of the ecosystem 38 + - 'gast == 0.3.3', 39 + + 'gast >= 0.3.3', 40 # TensorFlow ecosystem packages that TF exposes API for 41 # These need to be in sync with the existing TF version 42 # They are updated during the release process 43 + @@ -118,7 +118,7 @@ if 'tf_nightly' in project_name: 44 # BoringSSL support. 45 # See https://github.com/tensorflow/tensorflow/issues/17882. 46 if sys.byteorder == 'little': 47 + - REQUIRED_PACKAGES.append('grpcio ~= 1.32.0') 48 + + REQUIRED_PACKAGES.append('grpcio >= 1.31.0') 49 50 51 # Packages which are only needed for testing code.