Skip to content

Commit

Permalink
remove gitignore setting from isort (#6872)
Browse files Browse the repository at this point in the history
  • Loading branch information
smackesey committed Mar 2, 2022
1 parent c808d3b commit e33302a
Show file tree
Hide file tree
Showing 5 changed files with 8 additions and 9 deletions.
3 changes: 1 addition & 2 deletions examples/docs_snippets/pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,8 @@
[tool.black]
line-length = 88
required-version = "22.1.0"
target_version = ['py36', 'py37', 'py38', 'py39', 'py310']
target-version = ['py36', 'py37', 'py38', 'py39', 'py310']

[tool.isort]
profile = 'black' # sets line-length to 88
case_sensitive = true
skip_gitignore = true
8 changes: 4 additions & 4 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ line-length = 100
required-version = "22.1.0"

# Ensure black's output will be compatible with all listed versions.
target_version = ['py36', 'py37', 'py38', 'py39', 'py310']
target-version = ['py36', 'py37', 'py38', 'py39', 'py310']

# ########################
# ##### ISORT
Expand All @@ -25,6 +25,9 @@ target_version = ['py36', 'py37', 'py38', 'py39', 'py310']
# [Config option reference]
# https://pycqa.github.io/isort/docs/configuration/options.html

# NOTE: File inclusion//exclusion/skip options are set at the invocation site
# and shouldn't be set in this config file.

[tool.isort]

# Sets a variety of default options for parentheses etc that are compatible with black.
Expand All @@ -33,8 +36,5 @@ profile = "black"
# Sorts uppercase imports before lowercase improts.
case_sensitive=true

# Isort will read skip info from gitignore (including subdirectory gitignores)
skip_gitignore=true

# profile=black just sets defaults, it won't read our line-length override in black's config
line_length=100
2 changes: 1 addition & 1 deletion python_modules/dagster/dagster/core/executor/base.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
from abc import abstractmethod, ABC
from abc import ABC, abstractmethod

from dagster.core.execution.retries import RetryMode

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
from abc import abstractmethod, ABC
from abc import ABC, abstractmethod
from typing import Dict, List, Optional

from dagster import DagsterEvent, DagsterInstance, check
Expand Down
2 changes: 1 addition & 1 deletion python_modules/dagster/setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,7 @@ def get_version() -> str:
"pylint==2.6.0",
],
"black": [
"black==22.1.0",
"black[jupyter]==22.1.0",
],
"isort": [
"isort==5.10.1",
Expand Down

0 comments on commit e33302a

Please sign in to comment.