Skip to content

Commit 44e0b9c

Browse files
authored
use ruff only for linting and formatting (to match airflow repo) (#655)
* update requirements * remove black and isort * remove commented out stuff
1 parent f3d8ac7 commit 44e0b9c

File tree

4 files changed

+6
-61
lines changed

4 files changed

+6
-61
lines changed

.github/workflows/unit-tests.yml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -30,10 +30,6 @@ jobs:
3030
python -m pip install --upgrade pip
3131
pip install -r requirements.txt
3232
pip install -r requirements-dev.txt
33-
- name: Check Import Sort
34-
run: isort . --check --diff
35-
- name: Check Black
36-
run: black . --check --diff
3733
- name: Check Ruff
3834
run: ruff . --output-format github
3935
- name: Unit Tests

pyproject.toml

Lines changed: 0 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -14,40 +14,6 @@ include = ["v03_pipeline*"]
1414
exclude = ["v03_pipeline.bin", "v03_pipeline*test*"]
1515
namespaces = false
1616

17-
[tool.black]
18-
line-length = 88
19-
skip-string-normalization = true
20-
extend-exclude = '''
21-
(
22-
download_and_create_reference_datasets/v02
23-
| gcloud_dataproc
24-
| hail_scripts/computed_fields
25-
| hail_scripts/elasticsearch
26-
| hail_scripts/update_models
27-
| hail_scripts/utils
28-
| kubernetes
29-
| luigi_pipeline/lib
30-
| luigi_pipeline/seqr.*\.py$
31-
| luigi_pipeline/tests/data
32-
)
33-
'''
34-
35-
[tool.isort]
36-
include_trailing_comma = 'True'
37-
known_external_package = ['hail_scripts']
38-
line_length = 88
39-
profile = 'black'
40-
sections = ['FUTURE', 'STDLIB', 'THIRDPARTY', 'EXTERNAL_PACKAGE', 'FIRSTPARTY', 'LOCALFOLDER']
41-
skip_glob = [
42-
'download_and_create_reference_datasets/v02/*',
43-
'gcloud_dataproc/*',
44-
'hail_scripts/computed_fields/*',
45-
'hail_scripts/elasticsearch/*',
46-
'hail_scripts/update_models/*',
47-
'hail_scripts/utils/*',
48-
'kubernetes/*'
49-
]
50-
5117
[tool.mypy]
5218
packages = 'v03_pipeline'
5319
python_version = "3.10"
@@ -71,7 +37,6 @@ ignore = [
7137
"G004", # logging-f-string, these are fine for now
7238

7339
# Rule Groupings
74-
"I", # isort is enabled so this is unnecessary (for now, maybe we want to disable isort)
7540
"D", # pydocstyle is for docs... we have none
7641
"FBT", # flake-boolean-trap... disallows boolean args to functions... fixing this code will require refactors.
7742
"ANN", # flake8-annotations is for typed code

requirements-dev.in

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,7 @@
11
-c requirements.txt
2-
black>=23.7.0
32
coverage>=7.2.2
4-
isort>=5.12.0
53
mypy>=1.2.0
64
nose-py3>=1.6.3 # bug in regular nose here: https://github.com/nose-devs/nose/issues/1099#issuecomment-577647469
75
pip-tools>=6.12.3
86
responses>=0.23.1
9-
ruff>=0.0.259
7+
ruff>=0.1.8

requirements-dev.txt

Lines changed: 5 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,9 @@ alabaster==0.7.13
1010
# via sphinx
1111
babel==2.13.1
1212
# via sphinx
13-
black==23.11.0
14-
# via -r requirements-dev.in
1513
build==1.0.3
1614
# via pip-tools
17-
certifi==2023.7.22
15+
certifi==2023.11.17
1816
# via
1917
# -c requirements.txt
2018
# requests
@@ -25,7 +23,6 @@ charset-normalizer==3.3.2
2523
click==8.1.7
2624
# via
2725
# -c requirements.txt
28-
# black
2926
# pip-tools
3027
coverage==7.3.2
3128
# via
@@ -35,14 +32,12 @@ docutils==0.20.1
3532
# via
3633
# -c requirements.txt
3734
# sphinx
38-
idna==3.4
35+
idna==3.6
3936
# via
4037
# -c requirements.txt
4138
# requests
4239
imagesize==1.4.1
4340
# via sphinx
44-
isort==5.12.0
45-
# via -r requirements-dev.in
4641
jinja2==3.1.2
4742
# via
4843
# -c requirements.txt
@@ -54,9 +49,7 @@ markupsafe==2.1.3
5449
mypy==1.7.0
5550
# via -r requirements-dev.in
5651
mypy-extensions==1.0.0
57-
# via
58-
# black
59-
# mypy
52+
# via mypy
6053
nose-py3==1.6.3
6154
# via -r requirements-dev.in
6255
numpy==1.26.2
@@ -66,16 +59,11 @@ numpy==1.26.2
6659
packaging==23.2
6760
# via
6861
# -c requirements.txt
69-
# black
7062
# build
7163
# sphinx
72-
pathspec==0.11.2
73-
# via black
7464
pip-tools==7.3.0
7565
# via -r requirements-dev.in
76-
platformdirs==4.0.0
77-
# via black
78-
pygments==2.16.1
66+
pygments==2.17.2
7967
# via
8068
# -c requirements.txt
8169
# sphinx
@@ -92,7 +80,7 @@ requests==2.31.0
9280
# sphinx
9381
responses==0.24.1
9482
# via -r requirements-dev.in
95-
ruff==0.1.5
83+
ruff==0.1.10
9684
# via -r requirements-dev.in
9785
six==1.16.0
9886
# via
@@ -122,15 +110,13 @@ sphinxcontrib-serializinghtml==1.1.9
122110
# via sphinx
123111
tomli==2.0.1
124112
# via
125-
# black
126113
# build
127114
# mypy
128115
# pip-tools
129116
# pyproject-hooks
130117
typing-extensions==4.8.0
131118
# via
132119
# -c requirements.txt
133-
# black
134120
# mypy
135121
urllib3==2.0.7
136122
# via

0 commit comments

Comments
 (0)