diff --git a/docs/conf.py b/docs/conf.py index da7d36929ec..d209c55402b 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -8,7 +8,6 @@ sys.path.append(os.path.dirname(__file__)) os.environ.setdefault("DJANGO_SETTINGS_MODULE", "readthedocs.settings.dev") -from django.conf import settings from django.utils import timezone import django @@ -32,7 +31,6 @@ def get_version(): 'doc_extensions', 'sphinx_tabs.tabs', 'sphinx-prompt', - 'recommonmark', 'notfound.extension', 'hoverxref.extension', 'sphinx_search.extension', @@ -40,10 +38,9 @@ def get_version(): ] templates_path = ['_templates'] -source_suffix = ['.rst', '.md'] master_doc = 'index' -project = u'Read the Docs' +project = 'Read the Docs' copyright = '2010-{}, Read the Docs, Inc & contributors'.format( timezone.now().year ) @@ -59,12 +56,12 @@ def get_version(): } htmlhelp_basename = 'ReadTheDocsdoc' latex_documents = [ - ('index', 'ReadTheDocs.tex', u'Read the Docs Documentation', - u'Eric Holscher, Charlie Leifer, Bobby Grace', 'manual'), + ('index', 'ReadTheDocs.tex', 'Read the Docs Documentation', + 'Eric Holscher, Charlie Leifer, Bobby Grace', 'manual'), ] man_pages = [ - ('index', 'read-the-docs', u'Read the Docs Documentation', - [u'Eric Holscher, Charlie Leifer, Bobby Grace'], 1) + ('index', 'read-the-docs', 'Read the Docs Documentation', + ['Eric Holscher, Charlie Leifer, Bobby Grace'], 1) ] exclude_patterns = [ diff --git a/requirements/docker.txt b/requirements/docker.txt index b952b63ead9..a70075a1b53 100644 --- a/requirements/docker.txt +++ b/requirements/docker.txt @@ -12,7 +12,7 @@ django-redis-cache==2.1.3 # pyup: ignore pillow==8.2.0 # local debugging tools -watchdog==2.0.3 +watchdog==2.1.1 datadiff==2.0.0 ipdb==0.13.7 pdbpp==0.10.2 @@ -25,4 +25,4 @@ jedi>0.17,<0.18 # pyup: ignore argh==0.26.2 # run tests -tox==3.23.0 +tox==3.23.1 diff --git a/requirements/docs.txt b/requirements/docs.txt index a51a3d91959..b553befeceb 100644 --- a/requirements/docs.txt +++ b/requirements/docs.txt @@ -1,16 +1,10 @@ # Packages required to build docs, independent of application dependencies -Sphinx==3.5.4 +# Our deps aren't ready for 4.0 yet. +# - sphinx-tabs +Sphinx==3.5.4 # pyup: <4.0 Pygments==2.9.0 -# doctuils==0.15 produces this error -# File "python3.6/site-packages/docutils/parsers/rst/states.py", line 882, in interpreted -# nodes[0][0].rawsource = unescape(text, True) -# AttributeError: 'str' object has no attribute 'rawsource' File "python3.6/site-packages/docutils/parsers/rst/states.py", line 882, in interpreted -# nodes[0][0].rawsource = unescape(text, True) -# AttributeError: 'str' object has no attribute 'rawsource' -docutils==0.14 # pyup: ignore - sphinx_rtd_theme==0.5.2 sphinx-tabs==2.1.0 sphinx-intl==2.0.1 @@ -25,8 +19,6 @@ sphinxemoji==0.1.8 sphinxcontrib-httpdomain==1.7.0 sphinx-prompt==1.4.0 sphinx-notfound-page==0.6 -commonmark==0.9.1 -recommonmark==0.7.1 sphinx-autobuild==2021.3.14 # Linting diff --git a/requirements/pip.txt b/requirements/pip.txt index 048ce2ca2f4..d4d1968ee9c 100644 --- a/requirements/pip.txt +++ b/requirements/pip.txt @@ -1,9 +1,9 @@ # Base packages pip==21.1.1 -virtualenv==20.4.4 +virtualenv==20.4.6 -django==2.2.20 # pyup: <2.3 +django==2.2.22 # pyup: <2.3 django-extensions==3.1.3 django_polymorphic==3.0.0 django-autoslug==1.9.8 @@ -11,7 +11,7 @@ django-autoslug==1.9.8 djangorestframework==3.12.4 # For intersphinx during builds -Sphinx==3.5.4 +Sphinx==4.0.0 # Filtering for the REST API django-filter==2.4.0 @@ -19,7 +19,7 @@ django-filter==2.4.0 drf-flex-fields==0.9.0 drf-extensions==0.7.0 -django-vanilla-views==2.0.0 +django-vanilla-views==3.0.0 jsonfield==3.1.0 requests==2.25.1 diff --git a/requirements/testing.txt b/requirements/testing.txt index 538c5239f83..8c384e25ce8 100644 --- a/requirements/testing.txt +++ b/requirements/testing.txt @@ -3,7 +3,7 @@ -r pip.txt django-dynamic-fixture==3.1.1 -pytest==6.2.3 +pytest==6.2.4 pytest-custom-exit-code==0.3.0 pytest-django==4.2.0 pytest-xdist==2.2.1 @@ -20,7 +20,7 @@ execnet==1.8.0 Mercurial==4.4.2 # pyup: ignore yamale==2.2.0 # pyup: <3.0 -pytest-mock==3.6.0 +pytest-mock==3.6.1 # local debugging tools datadiff==2.0.0