Skip to content

Commit 83ee6e8

Browse files
committed
Remove flake8 and pydocstyle from pytest command
1 parent 46ed16b commit 83ee6e8

File tree

5 files changed

+13
-11
lines changed

5 files changed

+13
-11
lines changed

.github/workflows/deploy-pypi.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,9 @@ jobs:
2626
python -m pip install -e ".[dev]"
2727
- name: Test with pytest
2828
run: |
29-
pytest -v --flake8 --pydocstyle --cov=hiclass --cov-fail-under=90 --cov-report html
29+
flake8
30+
pydocstyle
31+
pytest -v --cov=hiclass --cov-fail-under=90 --cov-report html
3032
coverage xml
3133
- name: Upload Coverage to Codecov
3234
if: matrix.os == 'ubuntu-latest'

.github/workflows/test-pr.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,9 @@ jobs:
2727
python -m pip install -e ".[dev]"
2828
- name: Test with pytest
2929
run: |
30-
pytest -v --flake8 --pydocstyle --cov=hiclass --cov-fail-under=90 --cov-report html
30+
flake8
31+
pydocstyle hiclass tests
32+
pytest -v --cov=hiclass --cov-fail-under=90 --cov-report html
3133
coverage xml
3234
- name: Upload Coverage to Codecov
3335
uses: codecov/codecov-action@v2

hiclass/HierarchicalClassifier.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -443,7 +443,7 @@ def _fit_node_classifier(
443443
self, nodes, local_mode: bool = False, use_joblib: bool = False
444444
):
445445
def logging_wrapper(func, idx, node, node_length):
446-
self.logger_.info(f"fitting node {idx+1}/{node_length}: {str(node)}")
446+
self.logger_.info(f"fitting node {idx + 1}/{node_length}: {str(node)}")
447447
return func(self, node)
448448

449449
if self.n_jobs > 1:
@@ -481,7 +481,7 @@ def _fit_node_calibrator(
481481
self, nodes, local_mode: bool = False, use_joblib: bool = False
482482
):
483483
def logging_wrapper(func, idx, node, node_length):
484-
self.logger_.info(f"calibrating node {idx+1}/{node_length}: {str(node)}")
484+
self.logger_.info(f"calibrating node {idx + 1}/{node_length}: {str(node)}")
485485
return func(self, node)
486486

487487
if self.n_jobs > 1:

hiclass/LocalClassifierPerLevel.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -350,7 +350,7 @@ def _fit_digraph(self, local_mode: bool = False, use_joblib: bool = False):
350350
self.logger_.info("Fitting local classifiers")
351351

352352
def logging_wrapper(func, level, separator, max_level):
353-
self.logger_.info(f"fitting level {level+1}/{max_level}")
353+
self.logger_.info(f"fitting level {level + 1}/{max_level}")
354354
return func(self, level, separator)
355355

356356
if self.n_jobs > 1:
@@ -395,7 +395,7 @@ def _calibrate_digraph(self, local_mode: bool = False, use_joblib: bool = False)
395395
self.logger_.info("Fitting local calibrators")
396396

397397
def logging_wrapper(func, level, separator, max_level):
398-
self.logger_.info(f"calibrating level {level+1}/{max_level}")
398+
self.logger_.info(f"calibrating level {level + 1}/{max_level}")
399399
return func(self, level, separator)
400400

401401
if self.n_jobs > 1:

setup.py

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -35,11 +35,9 @@
3535
"ray": ["ray>=1.11.0"],
3636
"xai": ["shap==0.44.1", "xarray==2023.1.0"],
3737
"dev": [
38-
"flake8==4.0.1",
39-
"pytest==7.1.2",
40-
"pytest-flake8==1.1.1",
41-
"pydocstyle==6.1.1",
42-
"pytest-pydocstyle==2.3.0",
38+
"flake8",
39+
"pytest",
40+
"pydocstyle",
4341
"pytest-cov==3.0.0",
4442
"pyfakefs==5.3.5",
4543
"black==24.2.0",

0 commit comments

Comments
 (0)