Skip to content

Commit 84dfe3b

Browse files
authored
Add dev and notebook dependencies. Add extra dependency installation to the test pipeline yml (#773)
Signed-off-by: Jun Ki Min <42475935+loomlike@users.noreply.github.com> Signed-off-by: Jun Ki Min <42475935+loomlike@users.noreply.github.com>
1 parent 5c17dee commit 84dfe3b

2 files changed

Lines changed: 24 additions & 17 deletions

File tree

.github/workflows/pull_request_push_test.yml

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -87,8 +87,7 @@ jobs:
8787
- name: Install Feathr Package
8888
run: |
8989
python -m pip install --upgrade pip
90-
python -m pip install pytest pytest-xdist databricks-cli
91-
python -m pip install -e ./feathr_project/
90+
python -m pip install -e ./feathr_project/[all]
9291
if [ -f requirements.txt ]; then pip install -r requirements.txt; fi
9392
- name: Set env variable and upload jars
9493
env:
@@ -165,8 +164,7 @@ jobs:
165164
- name: Install Feathr Package
166165
run: |
167166
python -m pip install --upgrade pip
168-
python -m pip install pytest pytest-xdist
169-
python -m pip install -e ./feathr_project/
167+
python -m pip install -e ./feathr_project/[all]
170168
if [ -f requirements.txt ]; then pip install -r requirements.txt; fi
171169
- name: Run Feathr with Azure Synapse
172170
env:
@@ -226,9 +224,8 @@ jobs:
226224
- name: Install Feathr Package
227225
run: |
228226
python -m pip install --upgrade pip
229-
python -m pip install pytest pytest-xdist
230-
python -m pip install -e ./feathr_project/
231-
if [ -f requirements.txt ]; then pip install -r requirements.txt; fi
227+
python -m pip install -e ./feathr_project/[all]
228+
if [ -f requirements.txt ]; then pip install -r requirements.txt; fi
232229
- name: Run Feathr with Local Spark
233230
env:
234231
PROJECT_CONFIG__PROJECT_NAME: "feathr_github_ci_local"

feathr_project/setup.py

Lines changed: 20 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,24 @@
1515
sys.exit(-1)
1616

1717
VERSION = __version__ # noqa
18-
os.environ["FEATHR_VERSION"] = VERSION
18+
os.environ["FEATHR_VERSION]"] = VERSION
19+
20+
extras_require=dict(
21+
dev=[
22+
"black>=22.1.0", # formatter
23+
"isort", # sort import statements
24+
"pytest>=7",
25+
"pytest-xdist",
26+
"pytest-mock>=3.8.1",
27+
],
28+
notebook=[
29+
"jupyter==1.0.0",
30+
"matplotlib==3.6.1",
31+
"papermill>=2.1.2,<3", # to test run notebooks
32+
"scrapbook>=0.5.0,<1.0.0", # to scrap notebook outputs
33+
],
34+
)
35+
extras_require["all"] = list(set(sum([*extras_require.values()], [])))
1936

2037
setup(
2138
name='feathr',
@@ -63,7 +80,7 @@
6380
# https://github.com/Azure/azure-sdk-for-python/pull/22891
6481
# using a version lower than that to workaround this issue.
6582
"azure-core<=1.22.1",
66-
# azure-core 1.22.1 is dependent on msrest==0.6.21, if an environment(AML) has a different version of azure-core (say 1.24.0),
83+
# azure-core 1.22.1 is dependent on msrest==0.6.21, if an environment(AML) has a different version of azure-core (say 1.24.0),
6784
# it brings a different version of msrest(0.7.0) which is incompatible with azure-core==1.22.1. Hence we need to pin it.
6885
# See this for more details: https://github.com/Azure/azure-sdk-for-python/issues/24765
6986
"msrest<=0.6.21",
@@ -72,14 +89,7 @@
7289
tests_require=[ # TODO: This has been depricated
7390
"pytest",
7491
],
75-
extras_require=dict(
76-
dev=[
77-
"black>=22.1.0", # formatter
78-
"isort", # sort import statements
79-
"pytest>=7",
80-
"pytest-mock>=3.8.1",
81-
],
82-
),
92+
extras_require=extras_require,
8393
entry_points={
8494
'console_scripts': ['feathr=feathrcli.cli:cli']
8595
},

0 commit comments

Comments
 (0)