Skip to content

Use consistent indentation in pyproject.toml #2847

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Sep 30, 2025
+21 −18
Merged

Use consistent indentation in pyproject.toml #2847

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
62f0ffc
Use consistent indentation in `pyproject.toml`
intgr Sep 29, 2025
282c79e
Merge branch 'master' into pyproject.toml-indentation
intgr Sep 29, 2025
c2803ac
lol, fix mypy_primer
intgr Sep 30, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions .editorconfig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,3 +11,6 @@ trim_trailing_whitespace = true

[*.{py, pyi}]
indent_size = 4

[*.toml]
indent_size = 2
2 changes: 1 addition & 1 deletion .github/workflows/mypy_primer.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ jobs:
shell: bash
run: |
cd django-stubs_to_test
MYPY_VERSION=$(grep mypy== pyproject.toml | sed -n 's/ "mypy==\([^;]*\).*",/\1/p')
MYPY_VERSION=$(grep mypy== pyproject.toml | sed -n 's/ "mypy==\([^;]*\).*",/\1/p')
Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Oh, that's why mypy_primer was failing 😆


echo "new commit"
git checkout $GITHUB_SHA
Expand Down
34 changes: 17 additions & 17 deletions pyproject.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,28 +47,28 @@ redis = ["redis", "types-redis"]

[dependency-groups]
tests = [
# Dev tools:
"pytest==8.4.2",
"pytest-mypy-plugins==3.2.0",
"pytest-shard==0.1.2",
"pytest-xdist==3.8.0",
# Django deps:
"django==5.2.6",
"mysqlclient==2.2.7",
"psycopg2-binary==2.9.10",
"jinja2==3.1.6",
"pyyaml==6.0.2",
# typing:
"mypy==1.18.1",
"django-stubs[compatible-mypy,oracle,redis]",
# Dev tools:
"pytest==8.4.2",
"pytest-mypy-plugins==3.2.0",
"pytest-shard==0.1.2",
"pytest-xdist==3.8.0",
# Django deps:
"django==5.2.6",
"mysqlclient==2.2.7",
"psycopg2-binary==2.9.10",
"jinja2==3.1.6",
"pyyaml==6.0.2",
# typing:
"mypy==1.18.1",
"django-stubs[compatible-mypy,oracle,redis]",
]
pyright = [
"pyright==1.1.405",
"pyright==1.1.405",
]

dev = [
{include-group = "tests"},
{include-group = "pyright"},
{include-group = "tests"},
{include-group = "pyright"},
]

[project.urls]
Expand Down
Loading