openstack/deb-python-oauth2client
Code Issues Proposed changes

Fixed issue with installing gflags

Browse Source
This commit is contained in:
Joe Gregorio
2011-03-23 21:44:42 -04:00
parent 5d7dbb3d58
commit 01b9270815
3 changed files with 13 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
MANIFEST.in
View File

@@ -1,4 +1,6 @@
recursive-include tests *.py *.json recursive-include tests *.py *.json
recursive-include httplib2 *.py *.json
recursive-include uritemplate *.py *.json
recursive-include apiclient *.json *.py recursive-include apiclient *.json *.py
recursive-include docs *.html recursive-include docs *.html
recursive-include samples *.py *.png *.html *.yaml *.json recursive-include samples *.py *.png *.html *.yaml *.json

6
Makefile
View File

@@ -11,9 +11,9 @@ docs:
.PHONY: prerelease .PHONY: prerelease
prerelease: prerelease:
python2.4 runtests.py --exit_on_failure python2.4 runtests.py tests --exit_on_failure
python2.6 runtests.py --exit_on_failure python2.6 runtests.py tests --exit_on_failure
python2.7 runtests.py --exit_on_failure python2.7 runtests.py tests --exit_on_failure
-rm dist/* -rm dist/*
python setup.py clean python setup.py clean
python setup.py sdist python setup.py sdist

10
setup.py
View File

@@ -20,6 +20,8 @@ are not already installed.
import setup_utils import setup_utils
# Modules, not packages, that might need to be installed.
packages = [ packages = [
'apiclient', 'apiclient',
'oauth2client', 'oauth2client',
@@ -30,12 +32,15 @@ packages = [
'apiclient.contrib.moderator', 'apiclient.contrib.moderator',
'uritemplate', 'uritemplate',
] ]
py_modules = []
third_party_reqs = ['httplib2', 'gflags', 'gflags_validators'] third_party_packages = ['httplib2']
third_party_modules = ['gflags', 'gflags_validators']
# Don't clobber installed versions of third party libraries # Don't clobber installed versions of third party libraries
# with what we include. # with what we include.
packages.extend(setup_utils.get_missing_requirements(third_party_reqs)) packages.extend(setup_utils.get_missing_requirements(third_party_packages))
py_modules.extend(setup_utils.get_missing_requirements(third_party_modules))
try: try:
# Some people prefer setuptools, and may have that installed # Some people prefer setuptools, and may have that installed
@@ -54,6 +59,7 @@ setup(name="google-api-python-client",
author_email="jcgregorio@google.com", author_email="jcgregorio@google.com",
url="http://code.google.com/p/google-api-python-client/", url="http://code.google.com/p/google-api-python-client/",
packages=packages, packages=packages,
py_modules=py_modules,
package_data={ package_data={
'apiclient': ['contrib/*/*.json'] 'apiclient': ['contrib/*/*.json']
}, },