Skip to content

Drop six #7890

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

Merged
merged 1 commit into from
Feb 24, 2021
Merged

Drop six #7890

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 0 additions & 2 deletions readthedocs/doc_builder/python_environments.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -364,7 +364,6 @@ def install_core_requirements(self):
'mock==1.0.1',
'pillow==5.4.1',
'alabaster>=0.7,<0.8,!=0.7.5',
'six',
'commonmark==0.8.1',
'recommonmark==0.5.0',
]
Expand Down Expand Up @@ -658,7 +657,6 @@ def _get_core_requirements(self):
# Install pip-only things.
pip_requirements = [
'recommonmark',
'six',
]

if self.config.doctype == 'mkdocs':
Expand Down
7 changes: 5 additions & 2 deletions readthedocs/doc_builder/templates/doc_builder/conf.py.tmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,12 +12,15 @@
# conf.py.tmpl file found in the readthedocs.org codebase:
# https://github.com/rtfd/readthedocs.org/blob/master/readthedocs/doc_builder/templates/doc_builder/conf.py.tmpl
#

# Note: this file should't rely on extra depencies.

import importlib
import sys
import os.path
from six import string_types

# Borrowed from six.
PY3 = sys.version_info[0] == 3
string_types = str if PY3 else basestring

from sphinx import version_info

Expand Down
3 changes: 0 additions & 3 deletions readthedocs/rtd_tests/tests/test_doc_building.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1194,7 +1194,6 @@ def setUp(self):
'mock',
'pillow',
'alabaster',
'six',
]
self.base_conda_requirements = [
'mock',
Expand Down Expand Up @@ -1374,7 +1373,6 @@ def test_install_core_requirements_sphinx_conda(self, checkout_path):
conda_requirements = self.base_conda_requirements + conda_sphinx
pip_requirements = [
'recommonmark',
'six',
'readthedocs-sphinx-ext',
]

Expand Down Expand Up @@ -1416,7 +1414,6 @@ def test_install_core_requirements_mkdocs_conda(self, checkout_path):
conda_requirements = self.base_conda_requirements
pip_requirements = [
'recommonmark',
'six',
'mkdocs',
]

Expand Down