Minor cleanups:
* drop stale `Makefile` targets. * move scripts to a `scripts` dir.
This commit is contained in:
34
Makefile
34
Makefile
@@ -1,37 +1,5 @@
|
||||
pep8:
|
||||
find apiclient samples -name "*.py" | xargs pep8 --ignore=E111,E202
|
||||
|
||||
APP_ENGINE_PATH=../google_appengine
|
||||
|
||||
test:
|
||||
tox
|
||||
|
||||
.PHONY: coverage
|
||||
coverage:
|
||||
coverage erase
|
||||
find tests -name "test_*.py" | xargs --max-args=1 coverage run -a runtests.py
|
||||
coverage report
|
||||
coverage html
|
||||
|
||||
.PHONY: docs
|
||||
docs:
|
||||
./doc-build
|
||||
|
||||
.PHONY: prerelease
|
||||
oauth2_prerelease: test
|
||||
-rm -rf dist/
|
||||
-sudo rm -rf dist/
|
||||
-rm -rf snapshot/
|
||||
-sudo rm -rf snapshot/
|
||||
mkdir snapshot
|
||||
python expandsymlinks.py
|
||||
cd snapshot; python setup.py clean
|
||||
cd snapshot; python setup.py sdist --formats=gztar,zip
|
||||
|
||||
.PHONY: release
|
||||
oauth2_release: oauth2_prerelease
|
||||
@echo "This target will upload a new release to PyPi."
|
||||
@echo "Are you sure you want to proceed? (yes/no)"
|
||||
@read yn; if [ yes -ne $(yn) ]; then exit 1; fi
|
||||
@echo "Here we go..."
|
||||
cd snapshot; python setup.py sdist --formats=gztar,zip register upload
|
||||
scripts/doc-build
|
||||
|
@@ -1,58 +0,0 @@
|
||||
#!/usr/bin/python2.4
|
||||
# -*- coding: utf-8 -*-
|
||||
#
|
||||
# Copyright 2014 Google Inc. All rights reserved.
|
||||
#
|
||||
# Licensed under the Apache License, Version 2.0 (the "License");
|
||||
# you may not use this file except in compliance with the License.
|
||||
# You may obtain a copy of the License at
|
||||
#
|
||||
# http://www.apache.org/licenses/LICENSE-2.0
|
||||
#
|
||||
# Unless required by applicable law or agreed to in writing, software
|
||||
# distributed under the License is distributed on an "AS IS" BASIS,
|
||||
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
# See the License for the specific language governing permissions and
|
||||
# limitations under the License.
|
||||
|
||||
"""Copy files from source to dest expanding symlinks along the way.
|
||||
"""
|
||||
|
||||
from shutil import copytree
|
||||
|
||||
import argparse
|
||||
import sys
|
||||
|
||||
|
||||
# Ignore these files and directories when copying over files into the snapshot.
|
||||
IGNORE = set(['.hg', 'httplib2', 'oauth2', 'simplejson', 'static'])
|
||||
|
||||
# In addition to the above files also ignore these files and directories when
|
||||
# copying over samples into the snapshot.
|
||||
IGNORE_IN_SAMPLES = set(['googleapiclient', 'oauth2client', 'uritemplate'])
|
||||
|
||||
parser = argparse.ArgumentParser(description=__doc__)
|
||||
|
||||
parser.add_argument('--source', default='.',
|
||||
help='Directory name to copy from.')
|
||||
|
||||
parser.add_argument('--dest', default='snapshot',
|
||||
help='Directory name to copy to.')
|
||||
|
||||
|
||||
def _ignore(path, names):
|
||||
retval = set()
|
||||
if path != '.':
|
||||
retval = retval.union(IGNORE_IN_SAMPLES.intersection(names))
|
||||
retval = retval.union(IGNORE.intersection(names))
|
||||
return retval
|
||||
|
||||
|
||||
def main():
|
||||
copytree(FLAGS.source, FLAGS.dest, symlinks=True,
|
||||
ignore=_ignore)
|
||||
|
||||
|
||||
if __name__ == '__main__':
|
||||
FLAGS = parser.parse_args(sys.argv[1:])
|
||||
main()
|
@@ -19,7 +19,7 @@
|
||||
set -e
|
||||
|
||||
if [[ -z "${SKIP_GAE_SDK}" ]]; then
|
||||
docs/fetch_gae_sdk.py
|
||||
scripts/fetch_gae_sdk.py
|
||||
export PYTHONPATH="${PWD}/google_appengine:${PYTHONPATH}"
|
||||
fi
|
||||
|
4
tox.ini
4
tox.ini
@@ -44,14 +44,14 @@ deps =
|
||||
pyyaml
|
||||
sphinx
|
||||
sphinx-rtd-theme
|
||||
commands = ./doc-build
|
||||
commands = {toxinidir}/scripts/build-docs
|
||||
|
||||
[testenv:pushdocs]
|
||||
basepython = python2.7
|
||||
deps =
|
||||
{[testenv:docs]deps}
|
||||
ghp-import
|
||||
commands = ./push-docs
|
||||
commands = {toxinidir}/scripts/push-docs
|
||||
|
||||
[testenv:py26]
|
||||
basepython = python2.6
|
||||
|
Reference in New Issue
Block a user