summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTimothy Crosley <timothy.crosley@gmail.com>2019-12-26 22:19:40 -0800
committerTimothy Crosley <timothy.crosley@gmail.com>2019-12-26 22:19:40 -0800
commit8baea2dd7c1ae2ee2c9331fed81b01c8f4d2569e (patch)
tree543cece28c0b924041dcaa877275300868ff9db2
parent955e5b73cff6ac54c91a3a4df46e9ef2fb772e18 (diff)
parentef8046c69bc98cca2b581af976a33beddc0e43c4 (diff)
downloadisort-8baea2dd7c1ae2ee2c9331fed81b01c8f4d2569e.tar.gz
Merge branch 'develop' of https://github.com/timothycrosley/isort into feature/contiguous-import-sorting
-rw-r--r--README.md3
-rw-r--r--tests/test_isort.py5
2 files changed, 3 insertions, 5 deletions
diff --git a/README.md b/README.md
index b6d5cb78..183aec72 100644
--- a/README.md
+++ b/README.md
@@ -43,8 +43,6 @@ Before isort:
```python
from my_lib import Object
-print("Hey")
-
import os
from my_lib import Object3
@@ -61,6 +59,7 @@ from __future__ import absolute_import
from third_party import lib3
+print("Hey")
print("yo")
```
diff --git a/tests/test_isort.py b/tests/test_isort.py
index 8b6ae620..40b22bb2 100644
--- a/tests/test_isort.py
+++ b/tests/test_isort.py
@@ -3849,7 +3849,6 @@ def test_standard_library_deprecates_user_issue_778() -> None:
assert SortImports(file_contents=test_input).output == test_input
-@pytest.mark.skip(reason="TODO: Failing for unknown reason.")
def test_settings_path_skip_issue_909(tmpdir) -> None:
base_dir = tmpdir.mkdir("project")
config_dir = base_dir.mkdir("conf")
@@ -3858,10 +3857,10 @@ def test_settings_path_skip_issue_909(tmpdir) -> None:
)
base_dir.join("file_glob_skip.py").write(
- "import os\n\n" 'print("Hello World")\n' "\nimport sys\n"
+ "import os\n\n" 'print("Hello World")\n' "\nimport sys\nimport os\n"
)
base_dir.join("file_to_be_skipped.py").write(
- "import os\n\n" 'print("Hello World")' "\nimport sys\n"
+ "import os\n\n" 'print("Hello World")' "\nimport sys\nimport os\n"
)
test_run_directory = os.getcwd()