From: Mike Bayer Date: Fri, 1 Jul 2016 14:39:05 +0000 (-0400) Subject: - revert the RTD reqs workaround, we are self-hosting now X-Git-Tag: rel_1_1_0b2~1 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f8781840aff51058bc8b1180012eed2a722a3e6f;p=thirdparty%2Fsqlalchemy%2Fsqlalchemy.git - revert the RTD reqs workaround, we are self-hosting now Change-Id: Ie11361147d497c6eb6418cdc850ed277dfbd1de4 --- diff --git a/doc/build/conf.py b/doc/build/conf.py index ec9313678f..a1b1fe81c6 100644 --- a/doc/build/conf.py +++ b/doc/build/conf.py @@ -13,25 +13,6 @@ import sys import os -import traceback - -def force_install_reqs(): - import logging - - log = logging.getLogger("pip") - handler = logging.StreamHandler(sys.stderr) - handler.setFormatter(logging.Formatter("[pip] %(message)s")) - log.addHandler(handler) - log.setLevel(logging.INFO) - - log.info("READTHEDOCS is set, force-installing requirements.txt") - - from pip.commands import install - req = os.path.join(os.path.dirname(__file__), "requirements.txt") - cmd = install.InstallCommand() - options, args = cmd.parse_args(["-v", "-U", "-r", req]) - cmd.run(options, args) - # If extensions (or modules to document with autodoc) are in another directory, # add these directories to sys.path here. If the directory is relative to the @@ -42,18 +23,6 @@ sys.path.insert(0, os.path.abspath('.')) import sqlalchemy -# attempt to force pip to definitely get the latest -# versions of libraries, see -# https://github.com/rtfd/readthedocs.org/issues/1293 -rtd = os.environ.get('READTHEDOCS', None) == 'True' -if rtd: - try: - force_install_reqs() - except: - traceback.print_exc() - - - # -- General configuration -----------------------------------------------------