Skip to content

Commit

Permalink
Add dev and notebook dependencies. Add extra dependency installation …
Browse files Browse the repository at this point in the history
…to the test pipeline yml (feathr-ai#773)

Signed-off-by: Jun Ki Min <[email protected]>

Signed-off-by: Jun Ki Min <[email protected]>
  • Loading branch information
loomlike authored Oct 25, 2022
1 parent 5c17dee commit 84dfe3b
Show file tree
Hide file tree
Showing 2 changed files with 24 additions and 17 deletions.
11 changes: 4 additions & 7 deletions .github/workflows/pull_request_push_test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -87,8 +87,7 @@ jobs:
- name: Install Feathr Package
run: |
python -m pip install --upgrade pip
python -m pip install pytest pytest-xdist databricks-cli
python -m pip install -e ./feathr_project/
python -m pip install -e ./feathr_project/[all]
if [ -f requirements.txt ]; then pip install -r requirements.txt; fi
- name: Set env variable and upload jars
env:
Expand Down Expand Up @@ -165,8 +164,7 @@ jobs:
- name: Install Feathr Package
run: |
python -m pip install --upgrade pip
python -m pip install pytest pytest-xdist
python -m pip install -e ./feathr_project/
python -m pip install -e ./feathr_project/[all]
if [ -f requirements.txt ]; then pip install -r requirements.txt; fi
- name: Run Feathr with Azure Synapse
env:
Expand Down Expand Up @@ -226,9 +224,8 @@ jobs:
- name: Install Feathr Package
run: |
python -m pip install --upgrade pip
python -m pip install pytest pytest-xdist
python -m pip install -e ./feathr_project/
if [ -f requirements.txt ]; then pip install -r requirements.txt; fi
python -m pip install -e ./feathr_project/[all]
if [ -f requirements.txt ]; then pip install -r requirements.txt; fi
- name: Run Feathr with Local Spark
env:
PROJECT_CONFIG__PROJECT_NAME: "feathr_github_ci_local"
Expand Down
30 changes: 20 additions & 10 deletions feathr_project/setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,24 @@
sys.exit(-1)

VERSION = __version__ # noqa
os.environ["FEATHR_VERSION"] = VERSION
os.environ["FEATHR_VERSION]"] = VERSION

extras_require=dict(
dev=[
"black>=22.1.0", # formatter
"isort", # sort import statements
"pytest>=7",
"pytest-xdist",
"pytest-mock>=3.8.1",
],
notebook=[
"jupyter==1.0.0",
"matplotlib==3.6.1",
"papermill>=2.1.2,<3", # to test run notebooks
"scrapbook>=0.5.0,<1.0.0", # to scrap notebook outputs
],
)
extras_require["all"] = list(set(sum([*extras_require.values()], [])))

setup(
name='feathr',
Expand Down Expand Up @@ -63,7 +80,7 @@
# https://github.com/Azure/azure-sdk-for-python/pull/22891
# using a version lower than that to workaround this issue.
"azure-core<=1.22.1",
# 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),
# 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),
# 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.
# See this for more details: https://github.com/Azure/azure-sdk-for-python/issues/24765
"msrest<=0.6.21",
Expand All @@ -72,14 +89,7 @@
tests_require=[ # TODO: This has been depricated
"pytest",
],
extras_require=dict(
dev=[
"black>=22.1.0", # formatter
"isort", # sort import statements
"pytest>=7",
"pytest-mock>=3.8.1",
],
),
extras_require=extras_require,
entry_points={
'console_scripts': ['feathr=feathrcli.cli:cli']
},
Expand Down

0 comments on commit 84dfe3b

Please sign in to comment.