Skip to content
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

Jump to bottom

Remove USE_SETUPTOOLS_LATEST feature flag #5578

Merged
merged 1 commit into from Apr 29, 2019
Merged

Remove USE_SETUPTOOLS_LATEST feature flag #5578

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.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 0 additions & 2 deletions docs/guides/feature-flags.rst
View file
Open in desktop
Expand Up @@ -16,8 +16,6 @@ Available Flags

``USE_SPHINX_LATEST``: :featureflags:`USE_SPHINX_LATEST`

``USE_SETUPTOOLS_LATEST``: :featureflags:`USE_SETUPTOOLS_LATEST`

``ALLOW_DEPRECATED_WEBHOOKS``: :featureflags:`ALLOW_DEPRECATED_WEBHOOKS`

``PIP_ALWAYS_UPGRADE``: :featureflags:`PIP_ALWAYS_UPGRADE`
Expand Down
8 changes: 1 addition & 7 deletions readthedocs/doc_builder/python_environments.py
View file
Open in desktop
Expand Up @@ -275,13 +275,7 @@ def install_core_requirements(self):

requirements = [
'Pygments==2.3.1',
# Assume semver for setuptools version, support up to next backwards
# incompatible release
self.project.get_feature_value(
Feature.USE_SETUPTOOLS_LATEST,
positive='setuptools<41',
negative='setuptools<41',
),
'setuptools==41.0.1',
'docutils==0.14',
'mock==1.0.1',
'pillow==5.4.1',
Expand Down
2 changes: 0 additions & 2 deletions readthedocs/projects/models.py
View file
Open in desktop
Expand Up @@ -1336,7 +1336,6 @@ def add_features(sender, **kwargs):
# Feature constants - this is not a exhaustive list of features, features
# may be added by other packages
USE_SPHINX_LATEST = 'use_sphinx_latest'
USE_SETUPTOOLS_LATEST = 'use_setuptools_latest'
ALLOW_DEPRECATED_WEBHOOKS = 'allow_deprecated_webhooks'
PIP_ALWAYS_UPGRADE = 'pip_always_upgrade'
SKIP_SUBMODULES = 'skip_submodules'
Expand All @@ -1351,7 +1350,6 @@ def add_features(sender, **kwargs):

FEATURES = (
(USE_SPHINX_LATEST, _('Use latest version of Sphinx')),
(USE_SETUPTOOLS_LATEST, _('Use latest version of setuptools')),
(USE_PDF_LATEXMK, _('Use latexmk to build the PDF')),
(ALLOW_DEPRECATED_WEBHOOKS, _('Allow deprecated webhook views')),
(PIP_ALWAYS_UPGRADE, _('Always run pip install --upgrade')),
Expand Down