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

Fix ReadTheDocs build #2546

Merged
merged 4 commits into from
Oct 5, 2018
Merged

Fix ReadTheDocs build #2546

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
e58e89d
contrib/s3: warn on boto3 dependency on import
jethron Oct 5, 2018
d709bad
docs: fix RTD build by correctly removing python-daemon dependency
jethron Oct 5, 2018
6d1a5bc
setup.py: clean up version_info check for enum34
jethron Oct 5, 2018
7e3a9a2
contrb/s3: Fix flake8 error
jethron Oct 5, 2018
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
10 changes: 7 additions & 3 deletions luigi/contrib/s3.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,9 +31,6 @@
import warnings
from multiprocessing.pool import ThreadPool

import botocore
from boto3.s3.transfer import TransferConfig

try:
from urlparse import urlsplit
except ImportError:
Expand All @@ -54,6 +51,13 @@

logger = logging.getLogger('luigi-interface')

try:
from boto3.s3.transfer import TransferConfig
import botocore
except ImportError:
logger.warning("Loading S3 module without the python package boto3. "
"Will crash at runtime if S3 functionality is used.")


# two different ways of marking a directory
# with a suffix in S3
Expand Down
7 changes: 2 additions & 5 deletions setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@
# the License.

import os
import sys

from setuptools import setup

Expand Down Expand Up @@ -41,18 +40,16 @@ def get_static_files(path):
'tornado>=4.0,<5',
# https://pagure.io/python-daemon/issue/18
'python-daemon<2.2.0',
'enum34>1.1.0;python_version<"3.4"',
]

if os.environ.get('READTHEDOCS', None) == 'True':
# So that we can build documentation for luigi.db_task_history and luigi.contrib.sqla
install_requires.append('sqlalchemy')
# readthedocs don't like python-daemon, see #1342
install_requires.remove('python-daemon<3.0')
install_requires.remove('python-daemon<2.2.0')
install_requires.append('sphinx>=1.4.4') # Value mirrored in doc/conf.py

if sys.version_info < (3, 4):
install_requires.append('enum34>1.1.0')

setup(
name='luigi',
version='2.7.9',
Expand Down