Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove deploy constraint #18

Closed
wants to merge 3 commits into from
Closed

Remove deploy constraint #18

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c9ddd31
Remove deploy constraint
Nate-Wilkins Jul 30, 2016
2434e4b
Release 1.4.2
Nate-Wilkins Jul 30, 2016
665ea33
(fix) use target_dir for deploy
Nate-Wilkins Jul 31, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

setup(
name = 'travis-sphinx',
version = '1.4.1',
version = '1.4.2',
description=('Manages building sphinx documentation and deploying documentation to gh-pages via travis'),
author='Grant Mercer',
author_email='[email protected]',
Expand Down
8 changes: 1 addition & 7 deletions travis_sphinx.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ def deploy_docs(target_dir, branches, pr_flag):
print('uploading docs...')
sys.stdout.flush()
run('git', 'clone', 'https://github.com/davisp/ghp-import')
run('./ghp-import/ghp_import.py', '-n', 'target/doc/build')
run('./ghp-import/ghp_import.py', '-n', target_dir)
run('git', 'push', '-fq', 'https://%[email protected]/%s.git'
% (token, repo), 'gh-pages')
else:
Expand Down Expand Up @@ -93,14 +93,8 @@ def main():
usage()
sys.exit(2)
if opt in ('-s', '--source'):
if sys.argv[-1] == 'deploy':
print('source option not allowed for deploy')
sys.exit(2)
source_dir = arg
if opt in ('-o', '--outdir'):
if sys.argv[-1] == 'deploy':
print('outdir option not allowed for deploy')
sys.exit(2)
target_dir = arg
if opt in ('-n', '--nowarn'):
flags.remove('-W')
Expand Down