Skip to content

Commit

Permalink
Merge pull request #234 from simphony/investigate-autosummary-problem
Browse files Browse the repository at this point in the history
Fix autosummary inability to find some modules. Removed obsolete documentation.
  • Loading branch information
stefanoborini authored Sep 15, 2016
2 parents 389cf6c + c44d187 commit f07b1e2
Show file tree
Hide file tree
Showing 4 changed files with 22 additions and 18 deletions.
1 change: 0 additions & 1 deletion doc/source/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@
#
import os
import sys
sys.path.append(os.path.abspath('../../'))
sys.path.append(os.path.abspath('.'))

from mock_missing import mock_modules
Expand Down
16 changes: 0 additions & 16 deletions doc/source/developer.rst
Original file line number Diff line number Diff line change
Expand Up @@ -39,19 +39,3 @@ for each user.
remoteappmanager.services.hub
remoteappmanager.services.reverse_proxy


REST tornado
------------

A generic implementation of Rest APIs using tornado.

.. autosummary::
:toctree: api
:template: module_template.rst

remoteappmanager.rest.exceptions
remoteappmanager.rest.registry
remoteappmanager.rest.resource
remoteappmanager.rest.rest_handler
remoteappmanager.rest.http.payloaded_http_error

17 changes: 17 additions & 0 deletions doc/source/mock_missing.py
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,23 @@ def mock_modules():
else:
del pamela

try:
import jupyterhub
except ImportError:
MOCK_MODULES.append('jupyterhub')
MOCK_MODULES.append('jupyterhub.auth')
MOCK_MODULES.append('jupyterhub.spawner')
else:
del jupyterhub

try:
import docker
except ImportError:
MOCK_MODULES.append('docker')
MOCK_MODULES.append('docker.errors')
else:
del docker

TYPES = {
mock_type: type(mock_type, bases, {'__module__': path})
for path, mock_type, bases in MOCK_TYPES}
Expand Down
6 changes: 5 additions & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,11 @@
# provides 2.11.1

on_rtd = os.environ.get('READTHEDOCS') == 'True'
if not on_rtd:
if on_rtd:
# These are the dependencies of jupyterhub that we need to have in order
# for our code to import on RTD.
requirements.extend(["sqlalchemy>=1.0"])
else:
requirements.extend(["jupyterhub>=0.7.0dev0", "docker-py>=1.8"])

# main setup configuration class
Expand Down

0 comments on commit f07b1e2

Please sign in to comment.