Remove FORCE_SPHINX_FROM_VENV

Author: stsewd

readthedocs/doc_builder/backends/sphinx.py

@@ -282,15 +282,10 @@ def build(self):
         return cmd_ret.successful
 
     def get_sphinx_cmd(self):
-        if self.project.has_feature(Feature.FORCE_SPHINX_FROM_VENV):
-            return (
-                self.python_env.venv_bin(filename='python'),
-                '-m',
-                'sphinx',
-            )
         return (
-            'python',
-            self.python_env.venv_bin(filename='sphinx-build'),
+            self.python_env.venv_bin(filename='python'),
+            '-m',
+            'sphinx',
         )
 
     def sphinx_parallel_arg(self):

readthedocs/projects/models.py

@@ -1596,10 +1596,8 @@ def add_features(sender, **kwargs):
     INDEX_FROM_HTML_FILES = 'index_from_html_files'
     SEARCH_SUBPROJECTS_ON_DEFAULT_VERSION = 'search_subprojects_on_default_version'
 
-    FORCE_SPHINX_FROM_VENV = 'force_sphinx_from_venv'
     LIST_PACKAGES_INSTALLED_ENV = 'list_packages_installed_env'
     VCS_REMOTE_LISTING = 'vcs_remote_listing'
-    STORE_PAGEVIEWS = 'store_pageviews'
     SPHINX_PARALLEL = 'sphinx_parallel'
     USE_SPHINX_BUILDERS = 'use_sphinx_builders'
     DEDUPLICATE_BUILDS = 'deduplicate_builds'
@@ -1726,10 +1724,6 @@ def add_features(sender, **kwargs):
             ),
         ),
 
-        (
-            FORCE_SPHINX_FROM_VENV,
-            _('Force to use Sphinx from the current virtual environment'),
-        ),
         (
             LIST_PACKAGES_INSTALLED_ENV,
             _(
@@ -1741,10 +1735,6 @@ def add_features(sender, **kwargs):
             VCS_REMOTE_LISTING,
             _('Use remote listing in VCS (e.g. git ls-remote) if supported for sync versions'),
         ),
-        (
-            STORE_PAGEVIEWS,
-            _('Store pageviews for this project'),
-        ),
         (
             SPHINX_PARALLEL,
             _('Use "-j auto" when calling sphinx-build'),