Skip to content

Commit

Permalink
Merge pull request #233 from simphony/fix-documentation-2
Browse files Browse the repository at this point in the history
Fix documentation on readthedocs
  • Loading branch information
stefanoborini authored Sep 15, 2016
2 parents 2837b85 + d540149 commit 389cf6c
Show file tree
Hide file tree
Showing 2 changed files with 25 additions and 14 deletions.
1 change: 0 additions & 1 deletion doc-requirements.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
sphinx>=1.4.4
astor>=0.5
git+https://github.com/simphony/traitlet-documenter.git
-r requirements.txt
38 changes: 25 additions & 13 deletions setup.py
Original file line number Diff line number Diff line change
@@ -1,28 +1,40 @@
import os
from setuptools import setup, find_packages

from remoteappmanager import __version__

VERSION = __version__


requirements = [
"setuptools>=21.0",
"traitlets>=4.1",
"tornado>=4.3",
"requests>=2.10.0",
"escapism>=0.0.1",
"jinja2>=2.8",
"jupyter_client>=4.3.0",
"click>=6.6",
"tabulate>=0.7.5",
]

# Unfortunately RTD cannot install jupyterhub because jupyterhub needs bower,
# and that is not available. We prevent the request for the unreleased jhub
# by skipping it if we are on RTD
# We also have problems with requests as docker-py wants <2.11 and RTD
# provides 2.11.1

on_rtd = os.environ.get('READTHEDOCS') == 'True'
if not on_rtd:
requirements.extend(["jupyterhub>=0.7.0dev0", "docker-py>=1.8"])

# main setup configuration class
setup(
name='remoteappmanager',
version=VERSION,
author='SimPhoNy Project',
description='Remote application manager sub-executable',
install_requires=[
"setuptools>=21.0",
"traitlets>=4.1",
"tornado>=4.3",
"docker-py>=1.8",
"requests>=2.10.0",
"escapism>=0.0.1",
"jinja2>=2.8",
"jupyterhub>=0.7.0dev0",
"jupyter_client>=4.3.0",
"click>=6.6",
"tabulate>=0.7.5",
],
install_requires=requirements,
packages=find_packages(),
include_package_data=True,
entry_points={
Expand Down

0 comments on commit 389cf6c

Please sign in to comment.