diff --git a/pip/requirements.txt b/pip/requirements.txt index a7108acd6d0..f5217a7a6b2 100644 --- a/pip/requirements.txt +++ b/pip/requirements.txt @@ -83,7 +83,6 @@ gitdb==4.0.5 GitPython==3.1.14 google-auth==1.27.0 google-auth-oauthlib==0.4.2 -google-common==0.0.1 google-pasta==0.2.0 grpcio==1.36.0 grpcio-tools==1.36.0 diff --git a/py3-googlePackages.spec b/py3-googlePackages.spec deleted file mode 100644 index 5a77d6e4d54..00000000000 --- a/py3-googlePackages.spec +++ /dev/null @@ -1,56 +0,0 @@ -### RPM external py3-googlePackages 1.0 -## INITENV +PATH PYTHON3PATH %{i}/${PYTHON3_LIB_SITE_PACKAGES} -Source: none - -Requires: python3 -BuildRequires: py3-google-common -BuildRequires: py3-protobuf - -%prep - -%build - -%install - -mkdir -p %{i}/${PYTHON3_LIB_SITE_PACKAGES} -for pkg in %builddirectpkgreqs ; do - SOURCE=%{cmsroot}/%{cmsplatf}/${pkg}/${PYTHON3_LIB_SITE_PACKAGES} - if [ -d $SOURCE ] ; then - echo "Checking for duplicates ...." - for f in $(ls $SOURCE) ; do - if [ -e %{i}/${PYTHON3_LIB_SITE_PACKAGES}/$f ] ; then - # https://github.com/jupyter/jupyter_core/issues/55 - now I delete jupyter.py from one of the providers - #backports is an example directory that can have multiple packages inside - if [ $f != "backports" ] ; then - if [ $f != "google" ] ; then - echo " Duplicate file found: $f" - exit 1 - fi - fi - - fi - done - echo "Copying $SOURCE in %{pkgrel}" -#try cp instead of rsync as we don't want to overwrite duplicate directories -# rsync -av $SOURCE/ %{i}/${PYTHON_LIB_SITE_PACKAGES}/ - cp -r ${SOURCE}/* %{i}/${PYTHON3_LIB_SITE_PACKAGES}/ - fi -done - -#and for bin -mkdir -p %{i}/bin -for pkg in %builddirectpkgreqs ; do - SOURCE=%{cmsroot}/%{cmsplatf}/${pkg}/bin - if [ -d $SOURCE ] ; then - echo "Checking for duplicates ...." - for f in $(ls $SOURCE) ; do - if [ -e %{i}/bin/$f ] ; then - echo " Duplicate file found: $f" - exit 1 - fi - done - echo "Copying $SOURCE in %{pkgrel}" - rsync -av $SOURCE/ %{i}/bin/ - fi -done - diff --git a/python_tools.spec b/python_tools.spec index a0451dd1fb6..27fd568bc92 100644 --- a/python_tools.spec +++ b/python_tools.spec @@ -13,9 +13,9 @@ Requires: py3-Theano Requires: py3-scikit-learn #save for the end Requires: py3-tensorflow -Requires: py3-googlePackages Requires: py3-cmsml Requires: py3-law +Requires: py3-protobuf Requires: py3-cloudpickle Requires: py3-tables @@ -167,7 +167,6 @@ Requires: py3-virtualenv-clone Requires: py3-asn1crypto Requires: py3-backcall Requires: py3-cffi -Requires: py3-google-common Requires: py3-jedi Requires: py3-parso Requires: py3-pycparser diff --git a/tensorflow-requires.file b/tensorflow-requires.file index 78117f1c9d0..66ab99f4bc1 100644 --- a/tensorflow-requires.file +++ b/tensorflow-requires.file @@ -1,5 +1,5 @@ Requires: python3 py3-numpy py3-mock py3-wheel py3-typing py3-typing_extensions Requires: py3-keras-applications py3-keras-preprocessing py3-future py3-wrapt py3-gast py3-setuptools -Requires: py3-cython py3-googlePackages py3-astor py3-six py3-termcolor py3-absl-py +Requires: py3-cython py3-protobuf py3-astor py3-six py3-termcolor py3-absl-py Requires: py3-opt-einsum py3-flatbuffers Requires: eigen protobuf zlib libpng libjpeg-turbo curl giflib sqlite grpc flatbuffers py3-pybind11