|
3 | 3 | from django.test import TestCase
|
4 | 4 | from django_dynamic_fixture import get
|
5 | 5 |
|
6 |
| -import six |
7 |
| - |
8 | 6 | from readthedocs_build.config import BuildConfig, ProjectConfig, InvalidConfig
|
9 | 7 | from readthedocs.builds.models import Version
|
10 | 8 | from readthedocs.projects.models import Project
|
11 |
| -from readthedocs.doc_builder.config import ConfigWrapper, load_yaml_config |
| 9 | +from readthedocs.doc_builder.config import load_yaml_config |
12 | 10 |
|
13 | 11 |
|
14 | 12 | def create_load(config=None):
|
@@ -128,7 +126,7 @@ def test_python_invalid_version_in_config(self, load_config):
|
128 | 126 | self.project.container_image = 'readthedocs/build:2.0'
|
129 | 127 | self.project.save()
|
130 | 128 | with self.assertRaises(InvalidConfig):
|
131 |
| - config = load_yaml_config(self.version) |
| 129 | + load_yaml_config(self.version) |
132 | 130 |
|
133 | 131 | def test_install_project(self, load_config):
|
134 | 132 | load_config.side_effect = create_load()
|
@@ -189,11 +187,7 @@ def test_conda(self, load_config):
|
189 | 187 | self.assertEqual(config.conda_file, None)
|
190 | 188 |
|
191 | 189 | def test_requirements_file(self, load_config):
|
192 |
| - if six.PY3: |
193 |
| - import pytest |
194 |
| - pytest.xfail("test_requirements_file is known to fail on 3.6") |
195 |
| - |
196 |
| - requirements_file = 'wsgi.py' if six.PY2 else 'readthedocs/wsgi.py' |
| 190 | + requirements_file = 'wsgi.py' |
197 | 191 | load_config.side_effect = create_load({
|
198 | 192 | 'requirements_file': requirements_file
|
199 | 193 | })
|
|
0 commit comments