Skip to content

Commit e6fc736

Browse files
ElliotNguyen68ElliotNguyen68
authored
Merge branch 'feast-dev:master' into master
2 parents a5313b5 + 817995c commit e6fc736

File tree

8 files changed

+24
-18
lines changed

8 files changed

+24
-18
lines changed

‎.github/workflows/lint_pr.yml‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,13 @@ on:
77
- edited
88
- synchronize
99

10+
permissions:
11+
# read-only perms specified due to use of pull_request_target in lieu of security label check
12+
pull-requests: read
13+
1014
jobs:
1115
validate-title:
12-
# when using pull_request_target, all jobs MUST have this if check for 'ok-to-test' or 'approved' for security purposes.
1316
if:
14-
((github.event.action == 'labeled' && (github.event.label.name == 'approved' || github.event.label.name == 'lgtm' || github.event.label.name == 'ok-to-test')) ||
15-
(github.event.action != 'labeled' && (contains(github.event.pull_request.labels.*.name, 'ok-to-test') || contains(github.event.pull_request.labels.*.name, 'approved') || contains(github.event.pull_request.labels.*.name, 'lgtm')))) &&
1617
github.repository == 'feast-dev/feast'
1718
name: Validate PR title
1819
runs-on: ubuntu-latest

‎.github/workflows/pr_integration_tests.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ jobs:
8686
strategy:
8787
fail-fast: false
8888
matrix:
89-
python-version: [ "3.8", "3.10" ]
89+
python-version: [ "3.10" ]
9090
os: [ ubuntu-latest ]
9191
env:
9292
OS: ${{ matrix.os }}
@@ -167,4 +167,4 @@ jobs:
167167
SNOWFLAKE_CI_PASSWORD: ${{ secrets.SNOWFLAKE_CI_PASSWORD }}
168168
SNOWFLAKE_CI_ROLE: ${{ secrets.SNOWFLAKE_CI_ROLE }}
169169
SNOWFLAKE_CI_WAREHOUSE: ${{ secrets.SNOWFLAKE_CI_WAREHOUSE }}
170-
run: pytest -n 8 --cov=./ --cov-report=xml --color=yes sdk/python/tests --integration --durations=5 --timeout=1200 --timeout_method=thread
170+
run: pytest -n 8 --cov=./ --cov-report=xml --color=yes sdk/python/tests --integration --durations=5 --timeout=1200 --timeout_method=thread

‎.github/workflows/pr_local_integration_tests.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ jobs:
1919
strategy:
2020
fail-fast: false
2121
matrix:
22-
python-version: [ "3.8", "3.10" ]
22+
python-version: [ "3.10" ]
2323
os: [ ubuntu-latest ]
2424
env:
2525
OS: ${{ matrix.os }}

‎.github/workflows/unit_tests.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ jobs:
77
strategy:
88
fail-fast: false
99
matrix:
10-
python-version: [ "3.8", "3.9", "3.10" ]
10+
python-version: [ "3.9", "3.10" ]
1111
os: [ ubuntu-latest, macOS-latest ]
1212
exclude:
1313
- os: macOS-latest

‎docs/reference/offline-stores/spark.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
The Spark offline store provides support for reading [SparkSources](../data-sources/spark.md).
66

7-
* Entity dataframes can be provided as a SQL query or can be provided as a Pandas dataframe. A Pandas dataframes will be converted to a Spark dataframe and processed as a temporary view.
7+
* Entity dataframes can be provided as a SQL query, Pandas dataframe or can be provided as a Pyspark dataframe. A Pandas dataframes will be converted to a Spark dataframe and processed as a temporary view.
88

99
## Disclaimer
1010

‎java/serving/src/test/resources/docker-compose/feast10/entrypoint.sh‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@ set -e
44

55
# feast root directory is expected to be mounted (eg, by docker compose)
66
cd /mnt/feast
7-
pip install -e '.[redis]'
7+
pip install -e '.[grpcio,redis]'
88

99
cd /app
1010
python materialize.py
11-
feast serve_transformations --port 8080
11+
feast serve_transformations --port 8080

‎setup.py‎

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -44,10 +44,6 @@
4444
"click>=7.0.0,<9.0.0",
4545
"colorama>=0.3.9,<1",
4646
"dill~=0.3.0",
47-
"grpcio>=1.56.2,<2",
48-
"grpcio-tools>=1.56.2,<2",
49-
"grpcio-reflection>=1.56.2,<2",
50-
"grpcio-health-checking>=1.56.2,<2",
5147
"mypy-protobuf==3.1",
5248
"Jinja2>=2,<4",
5349
"jsonschema",
@@ -143,7 +139,14 @@
143139

144140
IBIS_REQUIRED = [
145141
"ibis-framework",
146-
"ibis-substrait"
142+
"ibis-substrait",
143+
]
144+
145+
GRPCIO_REQUIRED = [
146+
"grpcio>=1.56.2,<2",
147+
"grpcio-tools>=1.56.2,<2",
148+
"grpcio-reflection>=1.56.2,<2",
149+
"grpcio-health-checking>=1.56.2,<2",
147150
]
148151

149152
DUCKDB_REQUIRED = [
@@ -209,6 +212,7 @@
209212
+ ROCKSET_REQUIRED
210213
+ HAZELCAST_REQUIRED
211214
+ IBIS_REQUIRED
215+
+ GRPCIO_REQUIRED
212216
)
213217

214218

@@ -375,6 +379,7 @@ def run(self):
375379
"docs": DOCS_REQUIRED,
376380
"cassandra": CASSANDRA_REQUIRED,
377381
"hazelcast": HAZELCAST_REQUIRED,
382+
"grpcio": GRPCIO_REQUIRED,
378383
"rockset": ROCKSET_REQUIRED,
379384
"ibis": IBIS_REQUIRED,
380385
"duckdb": DUCKDB_REQUIRED

‎ui/yarn.lock‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6461,9 +6461,9 @@ invariant@^2.2.4:
64616461
loose-envify "^1.0.0"
64626462

64636463
ip@^1.1.0:
6464-
version "1.1.5"
6465-
resolved "https://registry.yarnpkg.com/ip/-/ip-1.1.5.tgz#bdded70114290828c0a039e72ef25f5aaec4354a"
6466-
integrity sha1-vd7XARQpCCjAoDnnLvJfWq7ENUo=
6464+
version "1.1.9"
6465+
resolved "https://registry.yarnpkg.com/ip/-/ip-1.1.9.tgz#8dfbcc99a754d07f425310b86a99546b1151e396"
6466+
integrity sha512-cyRxvOEpNHNtchU3Ln9KC/auJgup87llfQpQ+t5ghoC/UhL16SWzbueiCsdTnWmqAWl7LadfuwhlqmtOaqMHdQ==
64676467

64686468
ipaddr.js@1.9.1:
64696469
version "1.9.1"

0 commit comments

Comments
 (0)