From 4bc117cc7366c3a413aacb60fb069666fb9a4a1f Mon Sep 17 00:00:00 2001 From: Manuel Kaufmann Date: Wed, 26 Jan 2022 21:58:41 +0100 Subject: [PATCH] Config: remove pipfile from schema We don't support Pipfile and we decided we won't implement it for now (see https://github.com/readthedocs/readthedocs.org/issues/3181). I'm removing it from the schema and also its tests. --- .../rtd_tests/fixtures/spec/v2/schema.yml | 18 +---- .../rtd_tests/tests/test_build_config.py | 69 ------------------- 2 files changed, 1 insertion(+), 86 deletions(-) diff --git a/readthedocs/rtd_tests/fixtures/spec/v2/schema.yml b/readthedocs/rtd_tests/fixtures/spec/v2/schema.yml index b669299dfd7..d6d5572ddce 100644 --- a/readthedocs/rtd_tests/fixtures/spec/v2/schema.yml +++ b/readthedocs/rtd_tests/fixtures/spec/v2/schema.yml @@ -64,7 +64,7 @@ python: system_packages: bool(required=False) # Installation of packages and requiremens - install: list(any(include('python-install-requirements'), include('python-install'), include('python-install-pipfile')), required=False) + install: list(any(include('python-install-requirements'), include('python-install'), required=False) python-install-requirements: # The path to the requirements file from the root of the project @@ -83,22 +83,6 @@ python-install: # Default: [] extra_requirements: list(str(), required=False) -python-install-pipfile: - # The path to the directory that contains the Pipfile - pipfile: path() - - # Add the --dev option to pipenv install - # Default: false - dev: bool(required=False) - - # Add the --ignore-pipfile option to pipenv install - # Default: false - ignore_pipfile: bool(required=False) - - # Add the --skip-lock option to pipenv install - # Default: true - skip_lock: bool(required=False) - sphinx: # The builder type for the sphinx documentation # Default: 'html' diff --git a/readthedocs/rtd_tests/tests/test_build_config.py b/readthedocs/rtd_tests/tests/test_build_config.py index a0fd290b327..2d1c0d1a0e5 100644 --- a/readthedocs/rtd_tests/tests/test_build_config.py +++ b/readthedocs/rtd_tests/tests/test_build_config.py @@ -329,75 +329,6 @@ def test_python_install_extra_requirements_empty(tmpdir, value): assertValidConfig(tmpdir, content.format(value=value)) -@pytest.mark.parametrize('pipfile', ['another_docs/', '.', 'project/']) -def test_python_install_pipfile(tmpdir, pipfile): - utils.apply_fs( - tmpdir, { - 'another_docs': { - 'Pipfile': '', - }, - 'project': {}, - 'Pipfile': '', - }, - ) - content = ''' -version: "2" -python: - install: - - pipfile: {} - ''' - assertValidConfig(tmpdir, content.format(pipfile)) - - -@pytest.mark.parametrize('pipfile', ['docs/', '.', 'project/']) -def test_python_install_pipfile_invalid(tmpdir, pipfile): - utils.apply_fs(tmpdir, {}) - content = ''' -version: "2" -python: - install: - - pipfile: {} - ''' - content.format(pipfile) - assertInvalidConfig(tmpdir, content, ['is not a path']) - - -@pytest.mark.parametrize('value', ['true', 'false']) -def test_python_install_pipfile_dev(tmpdir, value): - content = ''' -version: "2" -python: - install: - - pipfile: . - dev: {value} - ''' - assertValidConfig(tmpdir, content.format(value=value)) - - -@pytest.mark.parametrize('value', ['true', 'false']) -def test_python_install_pipfile_skip_lock(tmpdir, value): - content = ''' -version: "2" -python: - install: - - pipfile: . - skip_lock: {value} - ''' - assertValidConfig(tmpdir, content.format(value=value)) - - -@pytest.mark.parametrize('value', ['true', 'false']) -def test_python_install_pipfile_ignore_pipfile(tmpdir, value): - content = ''' -version: "2" -python: - install: - - pipfile: . - ignore_pipfile: {value} - ''' - assertValidConfig(tmpdir, content.format(value=value)) - - @pytest.mark.parametrize('value', ['true', 'false']) def test_python_system_packages(tmpdir, value): content = '''