Skip to content

Commit 93f9eb7

Browse files
committed
Merge branch 'master' into gaugup/flake8-pytest-style
Signed-off-by: Gaurav Gupta <gaugup@microsoft.com>
2 parents 3075e33 + 195b638 commit 93f9eb7

8 files changed

Lines changed: 12 additions & 11 deletions

File tree

.github/workflows/code-scan.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ jobs:
2525

2626
steps:
2727
- name: Checkout repository
28-
uses: actions/checkout@v2
28+
uses: actions/checkout@v3
2929

3030
# Initializes the CodeQL tools for scanning.
3131
- name: Initialize CodeQL

.github/workflows/python-linting.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,9 @@ jobs:
1414
runs-on: ubuntu-latest
1515

1616
steps:
17-
- uses: actions/checkout@v2
17+
- uses: actions/checkout@v3
1818
- name: Set up Python 3.7
19-
uses: actions/setup-python@v2
19+
uses: actions/setup-python@v3
2020
with:
2121
python-version: 3.7
2222
- name: Install dependencies

.github/workflows/python-package-conda.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,9 @@ jobs:
99
max-parallel: 5
1010

1111
steps:
12-
- uses: actions/checkout@v2
12+
- uses: actions/checkout@v3
1313
- name: Set up Python 3.8
14-
uses: actions/setup-python@v2
14+
uses: actions/setup-python@v3
1515
with:
1616
python-version: 3.8
1717
- name: Add conda to system path

.github/workflows/python-publish.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,9 @@ jobs:
1414
runs-on: ubuntu-latest
1515

1616
steps:
17-
- uses: actions/checkout@v2
17+
- uses: actions/checkout@v3
1818
- name: Set up Python
19-
uses: actions/setup-python@v2
19+
uses: actions/setup-python@v3
2020
with:
2121
python-version: '3.x'
2222
- name: Install dependencies

.github/workflows/pythonpackage.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ jobs:
2121
- os: macos-latest
2222
python-version: 3.6
2323
steps:
24-
- uses: actions/checkout@v2
24+
- uses: actions/checkout@v3
2525
- name: Set up Python ${{ matrix.python-version }} ${{ matrix.os }}
2626
uses: actions/setup-python@v1
2727
with:

dice_ml/explainer_interfaces/dice_genetic.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -560,7 +560,7 @@ def label_decode_cfs(self, cfs_arr):
560560
if ret_df is None:
561561
ret_df = df
562562
else:
563-
ret_df = ret_df.append(df)
563+
ret_df = pd.concat([ret_df, df])
564564
return ret_df
565565

566566
def get_valid_feature_range(self, normalized=False):

dice_ml/explainer_interfaces/dice_random.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,7 @@ class of query_instance for binary classification.
122122
if cfs_df is None:
123123
cfs_df = rows_to_add.copy()
124124
else:
125-
cfs_df = cfs_df.append(rows_to_add)
125+
cfs_df = pd.concat([cfs_df, rows_to_add])
126126
cfs_df.drop_duplicates(inplace=True)
127127
# Always change at least 2 features before stopping
128128
if num_features_to_vary >= 2 and len(cfs_df) >= total_CFs:

requirements-linting.txt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ flake8-blind-except==0.1.1
44
flake8-breakpoint
55
flake8-builtins==1.5.3
66
flake8-logging-format==0.6.0
7-
flake8-nb==0.3.0
7+
flake8-nb==0.4.0
88
flake8-pytest-style
99
isort
10+
packaging

0 commit comments

Comments
 (0)