From 46675d2a8d016fab9b0934774577ecd6fd63728c Mon Sep 17 00:00:00 2001 From: Joe Gregorio Date: Wed, 20 Jun 2012 12:15:24 -0400 Subject: [PATCH] Distribute the samples separately from the library source. Fixes issue #155. Reviewed in http://codereview.appspot.com/6304106/. --- MANIFEST.in | 4 ---- MANIFEST_oauth2client.in | 1 - Makefile | 5 +++++ README | 17 +++++------------ 4 files changed, 10 insertions(+), 17 deletions(-) diff --git a/MANIFEST.in b/MANIFEST.in index e44052a..3c2c492 100644 --- a/MANIFEST.in +++ b/MANIFEST.in @@ -2,10 +2,6 @@ recursive-include tests *.py *.json recursive-include tests/data *.json *.sh *.p12 *.pem *.jpg *.png recursive-include uritemplate *.py recursive-include apiclient *.json *.py -recursive-include samples *.py *.png *.html *.yaml *.json -include samples/gtaskqueue_sample/gtaskqueue/gen_appengine_access_token -include samples/gtaskqueue_sample/gtaskqueue/gtaskqueue -include samples/gtaskqueue_sample/gtaskqueue/gtaskqueue_puller include runtests.py include CHANGELOG include LICENSE diff --git a/MANIFEST_oauth2client.in b/MANIFEST_oauth2client.in index 7c2986a..5c82446 100644 --- a/MANIFEST_oauth2client.in +++ b/MANIFEST_oauth2client.in @@ -1,2 +1 @@ -recursive-include samples *.py *.png *.html *.yaml *.json include README diff --git a/Makefile b/Makefile index f488113..dd3a2dc 100644 --- a/Makefile +++ b/Makefile @@ -34,6 +34,9 @@ prerelease: python expand-symlinks.py cd snapshot; python setup.py clean cd snapshot; python setup.py sdist --formats=gztar,zip + cd snapshot; tar czf google-api-python-client-samples-$(shell python setup.py --version).tar.gz samples + cd snapshot; zip -r google-api-python-client-samples-$(shell python setup.py --version).zip samples + .PHONY: release release: prerelease @@ -45,6 +48,8 @@ release: prerelease wget "http://support.googlecode.com/svn/trunk/scripts/googlecode_upload.py" -O googlecode_upload.py python googlecode_upload.py --summary="google-api-python-client Version $(shell python setup.py --version)" --project=google-api-python-client snapshot/dist/*.tar.gz python googlecode_upload.py --summary="google-api-python-client Version $(shell python setup.py --version)" --project=google-api-python-client snapshot/dist/*.zip + python googlecode_upload.py --summary="Samples for google-api-python-client Version $(shell python setup.py --version)" --project=google-api-python-client snapshot/google-api-python-client-samples-*.tar.gz + python googlecode_upload.py --summary="Samples for google-api-python-client Version $(shell python setup.py --version)" --project=google-api-python-client snapshot/google-api-python-client-samples-*.zip .PHONY: oauth2_prerelease oauth2_prerelease: diff --git a/README b/README index 48ed3a9..ce5c2d9 100644 --- a/README +++ b/README @@ -4,21 +4,15 @@ This is python client library for Google's discovery based APIs. Installation ============ -To install, simply say +To install, simply use pip or easy_install: + + $ pip --upgrade google-api-python-client $ easy_install --upgrade google-api-python-client +See the Developers Guide for more detailed instructions and documentation: -Running -======= - -After following the install directions (using setup.py or setpath.sh) you -should be able to cd to samples/plus and run plus.py from there, which will use -the apiclient library to retrieve a snippet of text from each entry in Google -Plus. The first time you run it you will be prompted to authorize the -application to access your plus information. - - $ python samples/plus/plus.py + http://code.google.com/p/google-api-python-client/wiki/GettingStarted Third Party Libraries @@ -29,7 +23,6 @@ These libraries will be installed when you install the client library: http://code.google.com/p/httplib2 http://code.google.com/p/uri-templates http://code.google.com/p/python-gflags -http://github.com/simplegeo/python-oauth2 Depending on your version of Python, these libraries may also be installed: