Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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 .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ install:
- conda config --add channels conda-forge # For sphinxcontrib.autoprogram
- conda update -q conda
- conda info -a
- conda create -q -n test-environment python=$TRAVIS_PYTHON_VERSION requests cryptography sphinx pyflakes sphinxcontrib-autoprogram pytest sphinx-issues pyyaml
- conda create -q -n test-environment python=$TRAVIS_PYTHON_VERSION requests cryptography sphinx pyflakes sphinxcontrib-autoprogram pytest sphinx-issues pyyaml pynacl
- source activate test-environment

script:
Expand Down
17 changes: 8 additions & 9 deletions doctr/__init__.py
Original file line number Diff line number Diff line change
@@ -1,19 +1,18 @@
from .local import (encrypt_variable, encrypt_to_file, GitHub_post,
from .local import (encrypt_variable_travis, encrypt_to_file, GitHub_post,
generate_GitHub_token, upload_GitHub_deploy_key, generate_ssh_key,
check_repo_exists, guess_github_repo)
from .travis import (decrypt_file, setup_deploy_key, get_token, run,
setup_GitHub_push, checkout_deploy_branch, deploy_branch_exists,
set_git_user_email, create_deploy_branch, copy_to_tmp, sync_from_log,
commit_docs, push_docs, get_current_repo, find_sphinx_build_dir)
from .travis import Travis

from .ci import sync_from_log, copy_to_tmp, find_sphinx_build_dir

__all__ = [
'encrypt_variable', 'encrypt_to_file', 'GitHub_post',
'encrypt_variable_travis', 'encrypt_to_file', 'GitHub_post',
'generate_GitHub_token', 'upload_GitHub_deploy_key', 'generate_ssh_key',
'check_repo_exists', 'guess_github_repo',

'decrypt_file', 'setup_deploy_key', 'get_token', 'run',
'setup_GitHub_push', 'set_git_user_email', 'checkout_deploy_branch', 'deploy_branch_exists',
'create_deploy_branch', 'copy_to_tmp', 'sync_from_log', 'commit_docs', 'push_docs', 'get_current_repo', 'find_sphinx_build_dir'
'Travis',

'sync_from_log', 'copy_to_tmp', 'find_sphinx_build_dir',
]

from ._version import get_versions
Expand Down
222 changes: 149 additions & 73 deletions doctr/__main__.py

Large diffs are not rendered by default.

Loading