Add tests

README.md

@@ -27,9 +27,10 @@ An extremely fast Python linter, written in Rust.
 
 Ruff aims to be orders of magnitude faster than alternative tools while integrating more
 functionality behind a single, common interface. Ruff can be used to replace Flake8 (plus a variety
-of plugins), [`pydocstyle`](https://pypi.org/project/pydocstyle/), [`yesqa`](https://github.com/asottile/yesqa),
-and even a subset of [`pyupgrade`](https://pypi.org/project/pyupgrade/) and [`autoflake`](https://pypi.org/project/autoflake/)
-all while executing tens or hundreds of times faster than any individual tool.
+of plugins), [`isort`](https://pypi.org/project/isort/), [`pydocstyle`](https://pypi.org/project/pydocstyle/),
+[`yesqa`](https://github.com/asottile/yesqa), and even a subset of [`pyupgrade`](https://pypi.org/project/pyupgrade/)
+and [`autoflake`](https://pypi.org/project/autoflake/) all while executing tens or hundreds of times
+faster than any individual tool.
 
 (Coming from Flake8? Try [`flake8-to-ruff`](https://pypi.org/project/flake8-to-ruff/) to
 automatically convert your existing configuration.)
@@ -285,16 +286,16 @@ Ruff supports several workflows to aid in `noqa` management.
 
 First, Ruff provides a special error code, `M001`, to enforce that your `noqa` directives are
 "valid", in that the errors they _say_ they ignore are actually being triggered on that line (and
-thus suppressed). **You can run `ruff /path/to/file.py --extend-select M001` to flag unused `noqa`
-directives.**
+thus suppressed). You can run `ruff /path/to/file.py --extend-select M001` to flag unused `noqa`
+directives.
 
 Second, Ruff can _automatically remove_ unused `noqa` directives via its autofix functionality.
-**You can run `ruff /path/to/file.py --extend-select M001 --fix` to automatically remove unused
-`noqa` directives.**
+You can run `ruff /path/to/file.py --extend-select M001 --fix` to automatically remove unused
+`noqa` directives.
 
 Third, Ruff can _automatically add_ `noqa` directives to all failing lines. This is useful when
-migrating a new codebase to Ruff. **You can run `ruff /path/to/file.py --add-noqa` to automatically
-add `noqa` directives to all failing lines, with the appropriate error codes.**
+migrating a new codebase to Ruff. You can run `ruff /path/to/file.py --add-noqa` to automatically
+add `noqa` directives to all failing lines, with the appropriate error codes.
 
 ## Supported Rules
 
@@ -365,6 +366,14 @@ For more, see [pycodestyle](https://pypi.org/project/pycodestyle/2.9.1/) on PyPI
 | W292 | NoNewLineAtEndOfFile | No newline at end of file |  |
 | W605 | InvalidEscapeSequence | Invalid escape sequence: '\c' |  |
 
+### isort
+
+For more, see [isort](https://pypi.org/project/isort/5.10.1/) on PyPI.
+
+| Code | Name | Message | Fix |
+| ---- | ---- | ------- | --- |
+| I001 | UnsortedImports | Import block is un-sorted or un-formatted | 🛠 |
+
 ### pydocstyle
 
 For more, see [pydocstyle](https://pypi.org/project/pydocstyle/6.1.1/) on PyPI.
@@ -681,7 +690,7 @@ Today, Ruff can be used to replace Flake8 when used with any of the following pl
 - [`flake8-comprehensions`](https://pypi.org/project/flake8-comprehensions/)
 - [`flake8-bugbear`](https://pypi.org/project/flake8-bugbear/) (19/32)
 
-Ruff also implements the functionality that you get from [`yesqa`](https://github.com/asottile/yesqa),
+Ruff can also replace [`isort`](https://pypi.org/project/isort/), [`yesqa`](https://github.com/asottile/yesqa),
 and a subset of the rules implemented in [`pyupgrade`](https://pypi.org/project/pyupgrade/) (14/34).
 
 If you're looking to use Ruff, but rely on an unsupported Flake8 plugin, free to file an Issue.
@@ -702,6 +711,31 @@ on Rust at all.
 Ruff does not yet support third-party plugins, though a plugin system is within-scope for the
 project. See [#283](https://github.com/charliermarsh/ruff/issues/283) for more.
 
+### How does Ruff's import sorting compare to [`isort`](https://pypi.org/project/isort/)?
+
+Ruff's import sorting is intended to be equivalent to `isort` when used `profile = "black"` and
+`combine_as_imports = true`. Like `isort`, Ruff's import sorting is compatible with Black.
+
+Ruff is less configurable than `isort`, but supports the `known-first-party`, `known-third-party`,
+`extra-standard-library`, and `src` settings, like so:
+
+```toml
+[tool.ruff]
+select = [
+    # Pyflakes
+    "F",
+    # Pycodestyle
+    "E",
+    "W",
+    # isort
+    "I"
+]
+src = ["src", "tests"]
+
+[tool.ruff.isort]
+known-first-party = ["my_module1", "my_module2"]
+```
+
 ### Does Ruff support NumPy- or Google-style docstrings?
 
 Yes! To enable a specific docstring convention, start by enabling all `pydocstyle` error codes, and

flake8_to_ruff/src/converter.rs

@@ -208,6 +208,7 @@ mod tests {
         let actual = convert(&HashMap::from([]), None)?;
         let expected = Pyproject::new(Options {
             line_length: None,
+            src: None,
             fix: None,
             exclude: None,
             extend_exclude: None,
@@ -224,6 +225,7 @@ mod tests {
             target_version: None,
             flake8_annotations: None,
             flake8_quotes: None,
+            isort: None,
             pep8_naming: None,
         });
         assert_eq!(actual, expected);
@@ -239,6 +241,7 @@ mod tests {
         )?;
         let expected = Pyproject::new(Options {
             line_length: Some(100),
+            src: None,
             fix: None,
             exclude: None,
             extend_exclude: None,
@@ -255,6 +258,7 @@ mod tests {
             target_version: None,
             flake8_annotations: None,
             flake8_quotes: None,
+            isort: None,
             pep8_naming: None,
         });
         assert_eq!(actual, expected);
@@ -270,6 +274,7 @@ mod tests {
         )?;
         let expected = Pyproject::new(Options {
             line_length: Some(100),
+            src: None,
             fix: None,
             exclude: None,
             extend_exclude: None,
@@ -286,6 +291,7 @@ mod tests {
             target_version: None,
             flake8_annotations: None,
             flake8_quotes: None,
+            isort: None,
             pep8_naming: None,
         });
         assert_eq!(actual, expected);
@@ -301,6 +307,7 @@ mod tests {
         )?;
         let expected = Pyproject::new(Options {
             line_length: None,
+            src: None,
             fix: None,
             exclude: None,
             extend_exclude: None,
@@ -317,6 +324,7 @@ mod tests {
             target_version: None,
             flake8_annotations: None,
             flake8_quotes: None,
+            isort: None,
             pep8_naming: None,
         });
         assert_eq!(actual, expected);
@@ -332,6 +340,7 @@ mod tests {
         )?;
         let expected = Pyproject::new(Options {
             line_length: None,
+            src: None,
             fix: None,
             exclude: None,
             extend_exclude: None,
@@ -353,6 +362,7 @@ mod tests {
                 docstring_quotes: None,
                 avoid_escape: None,
             }),
+            isort: None,
             pep8_naming: None,
         });
         assert_eq!(actual, expected);
@@ -371,6 +381,7 @@ mod tests {
         )?;
         let expected = Pyproject::new(Options {
             line_length: None,
+            src: None,
             fix: None,
             exclude: None,
             extend_exclude: None,
@@ -422,6 +433,7 @@ mod tests {
             target_version: None,
             flake8_annotations: None,
             flake8_quotes: None,
+            isort: None,
             pep8_naming: None,
         });
         assert_eq!(actual, expected);
@@ -437,6 +449,7 @@ mod tests {
         )?;
         let expected = Pyproject::new(Options {
             line_length: None,
+            src: None,
             fix: None,
             exclude: None,
             extend_exclude: None,
@@ -459,6 +472,7 @@ mod tests {
                 docstring_quotes: None,
                 avoid_escape: None,
             }),
+            isort: None,
             pep8_naming: None,
         });
         assert_eq!(actual, expected);

resources/test/fixtures/isort/combine_import_froms.py

@@ -0,0 +1,5 @@
+from collections import Awaitable
+from collections import AsyncIterable
+from collections import Collection
+from collections import ChainMap
+from collections import MutableSequence, MutableMapping

resources/test/fixtures/isort/deduplicate_imports.py

@@ -0,0 +1,4 @@
+import os
+import os
+import os as os1
+import os as os2

resources/test/fixtures/isort/fit_line_length.py

@@ -0,0 +1 @@
+from collections import Collection

resources/test/fixtures/isort/import_from_after_import.py

@@ -0,0 +1,2 @@
+from collections import Collection
+import os

resources/test/fixtures/isort/leading_prefix.py

@@ -0,0 +1,6 @@
+x = 1; import sys
+import os
+
+if True:
+    x = 1; import sys
+    import os

test_cases/after/prefix.py → resources/test/fixtures/isort/no_reorder_within_section.py

@@ -1,3 +1,3 @@
-x = 1
-import sys
+# OK
 import os
+import sys

test_cases/after/bar.py → resources/test/fixtures/isort/preserve_indentation.py

@@ -1,5 +1,6 @@
-try:
+if True:
+    import sys
     import os
+else:
     import sys
-except:
     import os

test_cases/after/suffix.py → resources/test/fixtures/isort/reorder_within_section.py

@@ -1,3 +1,2 @@
 import sys
 import os
-x = 1

resources/test/fixtures/isort/separate_first_party_imports.py

@@ -0,0 +1,5 @@
+import sys
+import leading_prefix
+import numpy as np
+import os
+from leading_prefix import Class

test_cases/before/foo.py → resources/test/fixtures/isort/separate_future_imports.py

@@ -1,4 +1,3 @@
 import sys
 import os
 from __future__ import annotations
-import bar

resources/test/fixtures/isort/separate_third_party_imports.py

@@ -0,0 +1,4 @@
+import pandas as pd
+import sys
+import numpy as np
+import os

resources/test/fixtures/isort/trailing_suffix.py

@@ -0,0 +1,6 @@
+import sys
+import os; x = 1
+
+if True:
+    import sys
+    import os; x = 1

src/checks.rs

@@ -218,6 +218,7 @@ pub enum CheckCode {
 pub enum CheckCategory {
     Pyflakes,
     Pycodestyle,
+    Isort,
     Pydocstyle,
     Pyupgrade,
     PEP8Naming,
@@ -227,7 +228,6 @@ pub enum CheckCategory {
     Flake8Print,
     Flake8Quotes,
     Flake8Annotations,
-    ISort,
     Ruff,
     Meta,
 }
@@ -237,6 +237,7 @@ impl CheckCategory {
         match self {
             CheckCategory::Pycodestyle => "pycodestyle",
             CheckCategory::Pyflakes => "Pyflakes",
+            CheckCategory::Isort => "isort",
             CheckCategory::Flake8Builtins => "flake8-builtins",
             CheckCategory::Flake8Bugbear => "flake8-bugbear",
             CheckCategory::Flake8Comprehensions => "flake8-comprehensions",
@@ -246,7 +247,6 @@ impl CheckCategory {
             CheckCategory::Pyupgrade => "pyupgrade",
             CheckCategory::Pydocstyle => "pydocstyle",
             CheckCategory::PEP8Naming => "pep8-naming",
-            CheckCategory::ISort => "isort",
             CheckCategory::Ruff => "Ruff-specific rules",
             CheckCategory::Meta => "Meta rules",
         }
@@ -256,6 +256,7 @@ impl CheckCategory {
         match self {
             CheckCategory::Pycodestyle => Some("https://pypi.org/project/pycodestyle/2.9.1/"),
             CheckCategory::Pyflakes => Some("https://pypi.org/project/pyflakes/2.5.0/"),
+            CheckCategory::Isort => Some("https://pypi.org/project/isort/5.10.1/"),
             CheckCategory::Flake8Builtins => {
                 Some("https://pypi.org/project/flake8-builtins/2.0.1/")
             }
@@ -273,7 +274,6 @@ impl CheckCategory {
             CheckCategory::Pyupgrade => Some("https://pypi.org/project/pyupgrade/3.2.0/"),
             CheckCategory::Pydocstyle => Some("https://pypi.org/project/pydocstyle/6.1.1/"),
             CheckCategory::PEP8Naming => Some("https://pypi.org/project/pep8-naming/0.13.2/"),
-            CheckCategory::ISort => Some("https://pypi.org/project/isort/5.10.1/"),
             CheckCategory::Ruff => None,
             CheckCategory::Meta => None,
         }
@@ -906,7 +906,7 @@ impl CheckCode {
             CheckCode::N816 => CheckCategory::PEP8Naming,
             CheckCode::N817 => CheckCategory::PEP8Naming,
             CheckCode::N818 => CheckCategory::PEP8Naming,
-            CheckCode::I001 => CheckCategory::ISort,
+            CheckCode::I001 => CheckCategory::Isort,
             CheckCode::RUF001 => CheckCategory::Ruff,
             CheckCode::RUF002 => CheckCategory::Ruff,
             CheckCode::RUF003 => CheckCategory::Ruff,

src/isort/categorize.rs

@@ -16,7 +16,7 @@ pub enum ImportType {
 
 pub fn categorize(
     module_base: &str,
-    src_paths: &[PathBuf],
+    src: &[PathBuf],
     known_first_party: &BTreeSet<String>,
     known_third_party: &BTreeSet<String>,
     extra_standard_library: &BTreeSet<String>,
@@ -32,7 +32,7 @@ pub fn categorize(
     } else if KNOWN_STANDARD_LIBRARY.contains(module_base) {
         ImportType::StandardLibrary
     } else {
-        if find_local(src_paths, module_base) {
+        if find_local(src, module_base) {
             ImportType::FirstParty
         } else {
             ImportType::ThirdParty