Make lint happy?

Author: agjohnson

.gitignore

@@ -54,6 +54,7 @@ private_*
 readthedocs/htmlcov
 tags
 .python-version
+.tool-versions
 *.pyo
 .pytest_cache/
 scripts/travis/elasticsearch*
@@ -66,6 +67,8 @@ venv/
 ENV/
 env.bak/
 venv.bak/
+.direnv/
+.envrc
 
 dev.db-journal
 /readthedocs/settings/build_docker.py

docs/conf.py

@@ -18,13 +18,16 @@
 
 sys.path.insert(0, os.path.abspath('..'))
 sys.path.append(os.path.dirname(__file__))
-os.environ.setdefault("DJANGO_SETTINGS_MODULE", "readthedocs.settings.dev")
-
-from django.utils import timezone
-
-import django
-django.setup()
+os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'readthedocs.settings.dev')
 
+try:
+    # Nesting in try to avoid isort inflicting unwanted changes. It tries to
+    # move these imports above the very necessary sys.path manipulation.
+    import django
+    from django.utils import timezone
+    django.setup()
+except ImportError:
+    raise
 
 # Set here the variables you want for each docset.
 docsets = {
@@ -67,7 +70,7 @@
 copyright = '2010-{}, Read the Docs, Inc & contributors'.format(
     timezone.now().year
 )
-version = "7.4.2"
+version = '7.4.2'
 release = version
 exclude_patterns = ['_build']
 default_role = 'obj'
@@ -92,15 +95,15 @@
     'rtd-dev': ('https://dev.readthedocs.io/en/latest/', None),
 }
 myst_enable_extensions = [
-    "deflist",
+    'deflist',
 ]
 hoverxref_intersphinx = [
-   "sphinx",
-   "pip",
-   "nbsphinx",
-   "myst-nb",
-   "ipywidgets",
-   "jupytext",
+   'sphinx',
+   'pip',
+   'nbsphinx',
+   'myst-nb',
+   'ipywidgets',
+   'jupytext',
 ]
 htmlhelp_basename = 'ReadTheDocsdoc'
 latex_documents = [

readthedocs/__init__.py

@@ -1,5 +1,4 @@
 """Read the Docs."""
 
-import os.path
 
-__version__ = "7.4.2"
+__version__ = '7.4.2'

setup.cfg

@@ -6,7 +6,7 @@ description = Read the Docs builds and hosts documentation
 author = Read the Docs, Inc
 author_email = [email protected]
 url = http://readthedocs.org
-classifiers = 
+classifiers =
 	Development Status :: 5 - Production/Stable
 	Environment :: Web Environment
 	Intended Audience :: Developers