Hello community, here is the log from the commit of package google-cloud-sdk for openSUSE:Factory checked in at 2015-02-22 17:26:26 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/google-cloud-sdk (Old) and /work/SRC/openSUSE:Factory/.google-cloud-sdk.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "google-cloud-sdk" Changes: -------- --- /work/SRC/openSUSE:Factory/google-cloud-sdk/google-cloud-sdk.changes 2014-03-11 09:32:15.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.google-cloud-sdk.new/google-cloud-sdk.changes 2015-02-22 17:26:27.000000000 +0100 @@ -1,0 +2,139 @@ +Sat Jan 31 22:26:53 UTC 2015 - rjschwei@suse.com + +- Add patches: + + gsutil_noVersioCheckOrUpdate.patch + + gsutil_respectBotoCfgKeyword.patch + + hidePathMangeling.patch + Remove patches: + - gcloudFixPath.patch + - gsutilSupportBotoCfgKeyword.patch + +- Update to version 0.9.44 bnc#915479 + + Fixes applied to the google/appengine-gobase image for managed VMs. + + Tab completion for gcloud SQL commands. + + Support added for authenticating service accounts with JSON keys. + If using JSON keys, PyOpenSSL is no longer a dependency. + + Suport for local ssds in instance templates for gcloud compute. + + Progress Bars. + + Compute Instances start/ stop commands. + + Bug Fixes. + + Added support for local SSD. + + Added support for Google Compute Engine Instance Templates in + compute component. + + Overhaul of 'gcloud sql' + ~ Updated the output for all commands. + ~ Updated usage for 'gcloud sql ssl-certs create'. + + Added support for creating and maintaining Cloud SQL read replica instances. + ~ Added --master-instance-name property that can be set during replica + creation to indicate the replication master for the read replica instance. + ~ Added --enable-database-replication, --no-enable-database-replication + flags that can be used to start, stop replication for the read replica + instance. + ~ Added 'promote-replica' command that promotes a read replica instance into + a stand-alone Cloud SQL instance. + + Added several new features to the compute component: + ~ Implemented new subcommands for interacting with HTTP load balancing: + - gcloud compute url-maps add-host-rule + - gcloud compute url-maps add-path-matcher + - gcloud compute url-maps remove-host-rule + - gcloud compute url-maps remove-path-matcher + - gcloud compute url-maps set-default-service + ~ Added support for automatically generating initial Windows username and + password when creating a virtual machine instance from a Windows + image or a disk initializaed from a Windows image. + ~ Added a new scope alias for Cloud SQL administration: 'sql-admin'. + + The compute component is now in General Availability. + ~ Added new 'compute/zone' and 'compute/region' properties that + can be used to set a default zone and region. To set the + properties, run 'gcloud config set compute/zone ZONE' and 'gcloud + config set compute/region REGION'. + ~ Added support for overriding disk auto-deletion during instance + deletion. + ~ Updated the output of commands that mutate resources to be more + human-friendly. The --format flag can be used for more verbose + output. + ~ Replaced all 'get' subcommands with 'describe' subcommands (e.g., + 'gcloud compute instances get' has been replaced with 'gcloud + compute instances describe'). + ~ Renamed the 'firewalls' collection to 'firewall-rules'. + ~ Added support to the 'addresses' collection for interacting with + global addresses. + + Updated gcutil to 1.16.3 and various AppEngine runtimes to 1.9.7 binaries. + + Support running several modules by gcloud app run and fixed output errors. + + Limit gcloud upgrade nags to once per day. + + Bring help files up to date (for example improved the documentation + for DM 'templates create' and 'deployments create'). + + Added prompting for regions and zones to most subcommands of the + compute component. + + Added new subcommands to the compute component for adding and removing + backends from backend services. + + Added --ssh-flags to 'gcloud compute ssh' for passing additional flags + to ssh. + + Added image alias support for the --image flag in the compute component. + + Added --shell mode to all gcloud commands + ~ Type a partial command followed by '--shell' to drop into a sub shell + at that point in the command tree. + ~ Eg: + $ gcloud compute --shell + gcloud compute $ instances list + gcloud compute $ copy-files ... + + Updated gsutil to 4.3 + + Allow installed crcmod to be used by default with gsutil by enabling + site packages + +------------------------------------------------------------------- +Fri Jun 27 14:16:56 UTC 2014 - rschweikert@suse.com + +- Disable the Google built in "component" management and version upgrade + mechanism + + add hideImplicitVersionMgmt.patch + +------------------------------------------------------------------- +Sat Jun 21 10:41:36 UTC 2014 - rschweikert@suse.com + +- Fix setup file to properly include package data embedded in + googlecloudsdk package, previously *.json files were missing + +------------------------------------------------------------------- +Tue Jun 17 13:43:52 UTC 2014 - rschweikert@suse.com + +- Remove debug print from setup.py +- Include templated html files as data files, these are used by the + auth setup workflow + +------------------------------------------------------------------- +Fri Jun 6 14:34:11 UTC 2014 - rschweikert@suse.com + +- Remove unnecessary dependency on python-oauth2 + +------------------------------------------------------------------- +Thu Jun 5 14:11:50 UTC 2014 - rschweikert@suse.com + +- Update to version 0.9.25 + + 'gcloud preview app deploy' and '... run' argument updates. + + 'gcloud config *' argument updates. + + Updated all AppEngine tools to 1.9.5 + - https://code.google.com/p/googleappengine/wiki/SdkReleaseNotes + - https://code.google.com/p/googleappengine/wiki/SdkForJavaReleaseNotes + + gcloud now has App Engine and Cloud Datastore integration. + - Commands can be found under `gcloud preview app` and + `gcloud preview datastore` + + New `gcloud compute` tool for working with compute engine (RC) + - Run `gcloud components update compute` to install + - Run `gcloud help compute` for more information + + Updated all AppEngine tools to 1.9.4 + - https://code.google.com/p/googleappengine/wiki/SdkReleaseNotes + - https://code.google.com/p/googleappengine/wiki/SdkForJavaReleaseNotes + + Added color to error and warning messages (on Linux and Mac) + - To disable, run `gcloud config set disable_color true` + + New 'gcloud help command' + - Displays man style extended help for commands (where available). + + New 'gcloud auth activate-service-account' command + - Used to authenticate with gcloud using a service account key file. + - See: https://developers.google.com/storage/docs/authentication#service_accounts +- Enable "big query" install and use + + add patch bqHideDeps.patch +- Fix use of gcloud command + + add patch gcloudFixPath.patch + +------------------------------------------------------------------- Old: ---- google-cloud-sdk-0.9.18.tar.bz2 gsutilSupportBotoCfgKeyword.patch New: ---- bqHideDeps.patch google-cloud-sdk-0.9.44.tar.bz2 gsutil_noVersioCheckOrUpdate.patch gsutil_respectBotoCfgKeyword.patch hideImplicitVersionMgmt.patch hidePathMangeling.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ google-cloud-sdk.spec ++++++ --- /var/tmp/diff_new_pack.lO4GAV/_old 2015-02-22 17:26:28.000000000 +0100 +++ /var/tmp/diff_new_pack.lO4GAV/_new 2015-02-22 17:26:28.000000000 +0100 @@ -1,7 +1,7 @@ # -# spec file for package gcutils +# spec file for package google-cloud-sdk # -# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -15,41 +15,54 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # + Name: google-cloud-sdk -Version: 0.9.18 +Version: 0.9.44 Release: 0 -License: Apache-2.0 Summary: Tools for Google Cloud Services -URL: https://dl.google.com/dl/cloudsdk/release +License: Apache-2.0 Group: System/Management +# Get the filename to download from +# https://dl.google.com/dl/cloudsdk/release/sha1.txt +Url: https://dl.google.com/dl/cloudsdk/release Source0: %{name}-%{version}.tar.bz2 Source1: setup.py Patch1: gsutilHideDeps.patch Patch2: gcutilHideDeps.patch -Patch3: gsutilSupportBotoCfgKeyword.patch -Patch4: gcutilNoInternalVersionCheck.patch +Patch3: gcutilNoInternalVersionCheck.patch +Patch4: bqHideDeps.patch +Patch5: hideImplicitVersionMgmt.patch +Patch6: hidePathMangeling.patch +Patch7: gsutil_noVersioCheckOrUpdate.patch +Patch8: gsutil_respectBotoCfgKeyword.patch Requires: google-api-python-client => 1.2 Requires: python +Requires: python-SocksiPy Requires: python-argcomplete Requires: python-argparse -Requires: python-boto +Requires: python-boto => 2.30.0 Requires: python-crcmod +Requires: python-docker-py +Requires: python-gcs-oauth2-boto-plugin Requires: python-google-apputils Requires: python-httplib2 => 0.8 Requires: python-ipaddr Requires: python-iso8601 Requires: python-python-gflags +Requires: python-python-mimeparse +Requires: python-requests Requires: python-retry_decorator Requires: python-setuptools -Requires: python-SocksiPy +Requires: python-six Requires: python-uritemplate +Requires: python-websocket-client Requires: python-yaml Provides: gcutils > 1.13.0 Provides: gsutils > 3.42 Obsoletes: gcutils <= 1.13.0 Obsoletes: gsutils <= 3.42 BuildRequires: python-setuptools -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root +BuildRoot: %{_tmppath}/%{name}-%{version}-build %if 0%{?suse_version} && 0%{?suse_version} <= 1110 %{!?python_sitelib: %global python_sitelib %(python -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} @@ -62,12 +75,34 @@ manage resources on Google Cloud Platform, including App Engine, Compute Engine, Cloud Storage, Cloud SQL, and BigQuery. +%package doc +Summary: Documentation for google-cloud-sdk +Group: System/Management +PreReq: google-cloud-sdk = %version + +%description doc +This package provides html documentation for google-cloud-sdk + +%package gsutil-tests +Summary: Test for gsutil +Group: System/Management +PreReq: google-cloud-sdk = %version + +%description gsutil-tests +This package provides test cases for gsutil. The functionality for gsutil +is not yet integrated into the gcloud master command utility. + %prep %setup -q -%patch1 -p1 +%patch1 %patch2 -p1 %patch3 -p1 -%patch4 -p1 +%patch4 +%patch5 +%patch6 +%patch7 +%patch8 + cp %{SOURCE1} %{_builddir}/%{name}-%{version} %build @@ -78,78 +113,107 @@ pushd platform/gcutil python setup.py build popd +pushd platform/bq +python setup.py build +popd %install +# Leave it to Google to set silly permissions, fix it +chmod -x help/man/man1/* +find . -name "*.html" | xargs chmod -x +find . -name "*.json" | xargs chmod -x +find . -name "*_test.py" | xargs chmod +x +find lib/protorpc -name "*.py" | xargs chmod -x +# Remove shebang from files intended for import +sed -i 1d lib/protorpc/*.py +sed -i 1d lib/protorpc/webapp/*.py +sed -i 1d lib/protorpc/wsgi/*.py +# Install gcloud python setup.py install --prefix=%{_prefix} --root=%{buildroot} +install -d %{buildroot}/%{_bindir} +install -d %{buildroot}/%{_defaultdocdir}/%{name} +install -d %{buildroot}/%{_mandir} +install -d %{buildroot}/%{_sysconfdir}/bash_completion.d +cp -r help/man/man1 %{buildroot}/%{_mandir} +cp completion.bash.inc %{buildroot}/%{_sysconfdir}/bash_completion.d/gcloud.sh +cp -r lib/googlecloudsdk/gcloud/reference/* %{buildroot}/%{_defaultdocdir}/%{name} +echo "#!/bin/sh" > %{buildroot}/%{_bindir}/gcloud +echo "python %{python_sitelib}/googlecloudsdk/gcloud/gcloud.py \"\$@\"" >> %{buildroot}/%{_bindir}/gcloud +chmod +x %{buildroot}/%{_bindir}/gcloud +# Install gsutil pushd platform/gsutil python setup.py install --prefix=%{_prefix} --root=%{buildroot} popd +# install gcutil pushd platform/gcutil python setup.py install --prefix=%{_prefix} --root=%{buildroot} +popd +# Install bigquery +pushd platform/bq +python setup.py install --prefix=%{_prefix} --root=%{buildroot} +popd %files %defattr(-,root,root,-) -%doc LICENSE README RELEASE_NOTES -# gcloud stuff +# man pages for gcloud +%doc %{_mandir}/* +## gcloud stuff %dir %{python_sitelib}/google +%dir %{python_sitelib}/googlecloudapis +%dir %{python_sitelib}/googlecloudsdk %dir %{python_sitelib}/google_cloud_sdk-%{version}-py%{py_ver}.egg-info %{_bindir}/gcloud %{python_sitelib}/google/* -%{python_sitelib}/*egg-info/* +%{python_sitelib}/googlecloudapis/* +%{python_sitelib}/googlecloudsdk/* +%{python_sitelib}/google_cloud_sdk-%{version}-py%{py_ver}.egg-info/* +%config %{_sysconfdir}/bash_completion.d/gcloud.sh # integrated gsutil %dir %{python_sitelib}/gslib %dir %{python_sitelib}/gslib/addlhelp %dir %{python_sitelib}/gslib/commands %dir %{python_sitelib}/gslib/data -%dir %{python_sitelib}/gslib/third_party +# tests are accessed during regular command execution, go figure %dir %{python_sitelib}/gslib/tests -%dir %{python_sitelib}/gsutil-3.42-py%{py_ver}.egg-info +# Note third_party contains protorpc which appears to be another +# implementation of the included dependency. Leave it to Google to +# mis-manage even in house developed dependencies. +%dir %{python_sitelib}/gslib/third_party +%dir %{python_sitelib}/gsutil-4.7-py%{py_ver}.egg-info %doc %{python_sitelib}/gslib/CHECKSUM %doc %{python_sitelib}/gslib/README %doc %{python_sitelib}/gslib/VERSION %{python_sitelib}/gslib/addlhelp/* %{python_sitelib}/gslib/commands/* %{python_sitelib}/gslib/data/* -%{python_sitelib}/gslib/third_party/* %{python_sitelib}/gslib/tests/* +%{python_sitelib}/gsutil-4.7-py%{py_ver}.egg-info/* +%{python_sitelib}/gslib/third_party/* %{python_sitelib}/gslib/*.py* %{_bindir}/gsutil # integrated gcutil %dir %{python_sitelib}/gcutil_lib -%dir %{python_sitelib}/gcutil_lib/compute -%dir %{python_sitelib}/gcutil_lib/table -%dir %{python_sitelib}/gcutil-1.14.0-py%{py_ver}.egg-info -%{python_sitelib}/gcutil_lib/__* -%{python_sitelib}/gcutil_lib/api_context_parser.* -%{python_sitelib}/gcutil_lib/auth_helper.* -%{python_sitelib}/gcutil_lib/*_cmds.* -%{python_sitelib}/gcutil_lib/command_base.* -%{python_sitelib}/gcutil_lib/compute/* -%{python_sitelib}/gcutil_lib/flags_cache.* -%{python_sitelib}/gcutil_lib/gce_api.* -%{python_sitelib}/gcutil_lib/gcutil.* -%{python_sitelib}/gcutil_lib/gcutil_* -%{python_sitelib}/gcutil_lib/metadata.* -%{python_sitelib}/gcutil_lib/metadata_lib.* -%{python_sitelib}/gcutil_lib/path_initializer.* -%{python_sitelib}/gcutil_lib/scopes.* -%{python_sitelib}/gcutil_lib/ssh_keys.* -%{python_sitelib}/gcutil_lib/table/* -%{python_sitelib}/gcutil_lib/thread_pool.* -%{python_sitelib}/gcutil_lib/utils.* -%{python_sitelib}/gcutil_lib/version.* -%{python_sitelib}/gcutil_lib/version_checker.* -%{python_sitelib}/gcutil_lib/whoami.* +%dir %{python_sitelib}/gcutil-1.16.5-py%{py_ver}.egg-info +%{python_sitelib}/gcutil_lib/* +%{python_sitelib}/gcutil-1.16.5-py%{py_ver}.egg-info/* %{_bindir}/gcutil -%{python_sitelib}/gcutil_lib/*_test.* -%{python_sitelib}/gcutil_lib/mock_api.* -%{python_sitelib}/gcutil_lib/mock_api_parser.* -%{python_sitelib}/gcutil_lib/mock_api_server.* -%{python_sitelib}/gcutil_lib/mock_api_types.* -%{python_sitelib}/gcutil_lib/mock_lists.* -%{python_sitelib}/gcutil_lib/mock_metadata.* -%{python_sitelib}/gcutil_lib/mock_timer.* -%{python_sitelib}/gcutil_lib/old_mock* - +# integrated bq +%dir %{python_sitelib}/discovery +%dir %{python_sitelib}/bigquery-2.0.18-py%{py_ver}.egg-info +%{python_sitelib}/discovery/* +%{python_sitelib}/bigquery_client.* +%{python_sitelib}/bq* +%{python_sitelib}/bigquery-2.0.18-py%{py_ver}.egg-info/* +%{python_sitelib}/table_formatter.* +%{_bindir}/bq +# built in dependency on protorpc, not available as stand alone code stream +%dir %{python_sitelib}/protorpc +%{python_sitelib}/protorpc/* + +%files doc +%defattr(-,root,root) +%dir %{_defaultdocdir}/%{name} +%doc LICENSE README RELEASE_NOTES +%doc %{_defaultdocdir}/%{name}/* %changelog ++++++ bqHideDeps.patch ++++++ --- platform/bq/setup.py.orig +++ platform/bq/setup.py @@ -24,13 +24,14 @@ from setuptools import setup # pylint: # Configure the required packages and scripts to install, depending on # Python version and OS. -REQUIRED_PACKAGES = [ - 'google-apputils', - 'python-gflags', - 'google-api-python-client==1.2', - 'oauth2client==1.2', - 'httplib2', - ] +#REQUIRED_PACKAGES = [ +# 'google-apputils', +# 'python-gflags', +# 'google-api-python-client==1.2', +# 'oauth2client==1.2', +# 'httplib2', +# ] +REQUIRED_PACKAGES = [] CONSOLE_SCRIPTS = [ 'bq = bq:run_main', ] ++++++ gcutilHideDeps.patch ++++++ --- /var/tmp/diff_new_pack.lO4GAV/_old 2015-02-22 17:26:28.000000000 +0100 +++ /var/tmp/diff_new_pack.lO4GAV/_new 2015-02-22 17:26:28.000000000 +0100 @@ -1,7 +1,7 @@ -Index: google-cloud-sdk-0.9.16/platform/gcutil/setup.py +Index: google-cloud-sdk-0.9.41/platform/gcutil/setup.py =================================================================== ---- google-cloud-sdk-0.9.16.orig/platform/gcutil/setup.py -+++ google-cloud-sdk-0.9.16/platform/gcutil/setup.py +--- google-cloud-sdk-0.9.41.orig/platform/gcutil/setup.py ++++ google-cloud-sdk-0.9.41/platform/gcutil/setup.py @@ -22,19 +22,19 @@ except ImportError: ROOT = os.path.dirname(os.path.realpath(__file__)) ++++++ gcutilNoInternalVersionCheck.patch ++++++ --- /var/tmp/diff_new_pack.lO4GAV/_old 2015-02-22 17:26:28.000000000 +0100 +++ /var/tmp/diff_new_pack.lO4GAV/_new 2015-02-22 17:26:28.000000000 +0100 @@ -1,7 +1,7 @@ -Index: google-cloud-sdk-0.9.16/platform/gcutil/lib/google_compute_engine/gcutil_lib/version_checker.py +Index: google-cloud-sdk-0.9.41/platform/gcutil/lib/google_compute_engine/gcutil_lib/version_checker.py =================================================================== ---- google-cloud-sdk-0.9.16.orig/platform/gcutil/lib/google_compute_engine/gcutil_lib/version_checker.py -+++ google-cloud-sdk-0.9.16/platform/gcutil/lib/google_compute_engine/gcutil_lib/version_checker.py +--- google-cloud-sdk-0.9.41.orig/platform/gcutil/lib/google_compute_engine/gcutil_lib/version_checker.py ++++ google-cloud-sdk-0.9.41/platform/gcutil/lib/google_compute_engine/gcutil_lib/version_checker.py @@ -45,7 +45,7 @@ CACHE_TTL_SEC = 24 * 60 * 60 FLAGS = flags.FLAGS ++++++ google-cloud-sdk-0.9.18.tar.bz2 -> google-cloud-sdk-0.9.44.tar.bz2 ++++++ ++++ 418345 lines of diff (skipped) ++++++ gsutilHideDeps.patch ++++++ --- /var/tmp/diff_new_pack.lO4GAV/_old 2015-02-22 17:26:31.000000000 +0100 +++ /var/tmp/diff_new_pack.lO4GAV/_new 2015-02-22 17:26:31.000000000 +0100 @@ -1,46 +1,49 @@ -Index: google-cloud-sdk-0.9.16/platform/gsutil/setup.py -=================================================================== ---- google-cloud-sdk-0.9.16.orig/platform/gsutil/setup.py -+++ google-cloud-sdk-0.9.16/platform/gsutil/setup.py -@@ -32,24 +32,24 @@ management tasks, including: +--- platform/gsutil/setup.py.orig ++++ platform/gsutil/setup.py +@@ -34,27 +34,27 @@ management tasks, including: * Editing object and bucket ACLs. """ -requires = [ -- 'boto==2.22.1', +- 'boto==2.30.0', +- 'crcmod>=1.7', +- 'gcs-oauth2-boto-plugin>=1.8', - 'httplib2>=0.8', -- 'python-gflags>=2.0', -- 'google-api-python-client>=1.1', +- 'oauth2client>=1.4.1', - 'pyOpenSSL>=0.13', -- 'crcmod>=1.7', +- 'python-gflags>=2.0', +- 'retry_decorator>=1.0.0', +- 'six>=1.8.0', +#requires = [ -+# 'boto==2.22.1', ++# 'boto==2.30.0', ++# 'crcmod>=1.7', ++# 'gcs-oauth2-boto-plugin>=1.8', +# 'httplib2>=0.8', -+# 'python-gflags>=2.0', -+# 'google-api-python-client>=1.1', ++# 'oauth2client>=1.4.1', +# 'pyOpenSSL>=0.13', -+# 'crcmod>=1.7', ++# 'python-gflags>=2.0', ++# 'retry_decorator>=1.0.0', ++# 'six>=1.8.0', # Not using 1.02 because of: # https://code.google.com/p/socksipy-branch/issues/detail?id=3 - 'SocksiPy-branch==1.01', -- 'retry_decorator>=1.0.0', -] +# 'SocksiPy-branch==1.01', -+# 'retry_decorator>=1.0.0', +#] -dependency_links = [ +#dependency_links = [ # Note: this commit ID should be kept in sync with the 'third_party/boto' # entry in 'git submodule status'. -- 'https://github.com/boto/boto/archive/7cb344c382c3acb95038cf54bf8a84d5242318b...', + # pylint: disable=line-too-long +- 'https://github.com/boto/boto/archive/34e0dcfaa778ee469ca08ae487a0bd4021a8e0d...', -] -+# 'https://github.com/boto/boto/archive/7cb344c382c3acb95038cf54bf8a84d5242318b...', ++# 'https://github.com/boto/boto/archive/34e0dcfaa778ee469ca08ae487a0bd4021a8e0d...', +#] CURDIR = os.path.abspath(os.path.dirname(__file__)) BOTO_DIR = os.path.join(CURDIR, 'third_party', 'boto') -@@ -154,8 +154,8 @@ setup( +@@ -161,8 +161,8 @@ setup( 'gsutil = gslib.__main__:main', ], }, ++++++ gsutil_noVersioCheckOrUpdate.patch ++++++ --- platform/gsutil/gslib/command_runner.py.orig +++ platform/gsutil/gslib/command_runner.py @@ -299,6 +299,7 @@ class CommandRunner(object): # gsutil tarball). # - user is using a Cloud SDK install (which should only be updated via # gcloud components update) + return False # Check and update disabled for distribution provided code logger = logging.getLogger() gs_host = boto.config.get('Credentials', 'gs_host', None) if (not IsRunningInteractively() ++++++ gsutil_respectBotoCfgKeyword.patch ++++++ --- platform/gsutil/gslib/util.py.orig +++ platform/gsutil/gslib/util.py @@ -378,6 +378,9 @@ def GetCertsFile(): f.close() disk_certs_file = fname certs_file = disk_certs_file + elif certs_file == 'system': + certs_file = None + return certs_file ++++++ hideImplicitVersionMgmt.patch ++++++ --- lib/googlecloudsdk/gcloud/gcloud.py.orig +++ lib/googlecloudsdk/gcloud/gcloud.py @@ -103,8 +103,8 @@ def CreateCLI(): pkg_root = cli.GoogleCloudSDKPackageRoot() loader.AddModule('auth', os.path.join(pkg_root, 'gcloud', 'sdktools', 'auth')) loader.AddModule('bigquery', os.path.join(pkg_root, 'bigquery', 'commands')) - loader.AddModule('components', - os.path.join(pkg_root, 'gcloud', 'sdktools', 'components')) +# loader.AddModule('components', +# os.path.join(pkg_root, 'gcloud', 'sdktools', 'components')) loader.AddModule('compute', os.path.join(pkg_root, 'compute', 'subcommands')) loader.AddModule('config', os.path.join(pkg_root, 'gcloud', 'sdktools', 'config')) ++++++ hidePathMangeling.patch ++++++ --- lib/googlecloudsdk/gcloud/gcloud.py.orig +++ lib/googlecloudsdk/gcloud/gcloud.py @@ -77,7 +77,7 @@ def _DoStartupChecks(): if not platforms.Platform.Current().IsSupported(): sys.exit(1) -_SetPriorityCloudSDKPath() +#_SetPriorityCloudSDKPath() _DoStartupChecks() ++++++ setup.py ++++++ --- /var/tmp/diff_new_pack.lO4GAV/_old 2015-02-22 17:26:31.000000000 +0100 +++ /var/tmp/diff_new_pack.lO4GAV/_new 2015-02-22 17:26:31.000000000 +0100 @@ -16,13 +16,18 @@ if __name__ == '__main__': os.system('rm -rf lib/google/apputils') + os.system('touch lib/googlecloudsdk/gcloud/sdktools/__init__.py') allPckgs = glob.glob('lib/*') excludePckgs = [] for name in allPckgs: - if name.find('google') != -1: + if name.find('google') != -1 or name.find('protorpc') != -1: continue - excludePckgs.append(name.split(os.sep)[-1]) + # Creating an exclude list is unreliable, some packages still + # get pushed into site-packages. Remove the code instead + os.system('rm -rf %s' %name) + # excludePckgs.append(name.split(os.sep)[-1]) + pkg = setuptools.find_packages('lib',exclude=excludePckgs) setuptools.setup( name='google-cloud-sdk', description=( @@ -31,10 +36,13 @@ license='Apache 2', author='Google', author_email='google-cloud-sdk@googlegroups.com', - version='0.9.18', + version='0.9.44', packages=setuptools.find_packages('lib',exclude=excludePckgs), + package_data={ + 'googlecloudsdk' : [os.path.join('core', '*.json'), + os.path.join('core', 'credentials', '*.html')], + }, package_dir={ '': 'lib', }, - scripts = ['bin/gcloud'] ) -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org