Skip to content

Commit

Permalink
Remove pinning of grpcio dependencies (#485)
Browse files Browse the repository at this point in the history
<!--  Thanks for sending a pull request!  Here are some tips for you:

1. Run unit tests and ensure that they are passing
2. If your change introduces any API changes, make sure to update the
e2e tests
3. Make sure documentation is updated for your PR!

-->

**What this PR does / why we need it**:
<!-- Explain here the context and why you're making the change. What is
the problem you're trying to solve. --->

With #465, we no longer need to
pin the `grpcio` related libraries, which will in turn constrain the
`protobuf` dependencies.

**Which issue(s) this PR fixes**:
<!--
*Automatically closes linked issue when PR is merged.
Usage: `Fixes #<issue number>`, or `Fixes (paste link of issue)`.
-->

Fixes #

**Does this PR introduce a user-facing change?**:
<!--
If no, just write "NONE" in the release-note block below.
If yes, a release note is required. Enter your extended release note in
the block below.
If the PR requires additional action from users switching to the new
release, include the string "action required".

For more information about release notes, see kubernetes' guide here:
http://git.k8s.io/community/contributors/guide/release-notes.md
-->

```release-note
Remove pinning of grpcio dependencies
```

**Checklist**

- [ ] Added unit test, integration, and/or e2e tests
- [ ] Tested locally
- [ ] Updated documentation
- [ ] Update Swagger spec if the PR introduce API changes
- [ ] Regenerated Golang and Python client if the PR introduce API
changes
  • Loading branch information
krithika369 authored Nov 3, 2023
1 parent 32ba4d6 commit fefc84e
Show file tree
Hide file tree
Showing 6 changed files with 2 additions and 11 deletions.
1 change: 0 additions & 1 deletion examples/custom-model/upi_v1/requirements.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
merlin-sdk
grpcio>=1.31.0,<1.49.0
caraml-upi-protos>=0.3.1
pandas
3 changes: 1 addition & 2 deletions examples/transformer/upi/requirements.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
pandas
cloudpickle==2.0.0
merlin-sdk
grpcio==1.22.0
merlin-sdk
2 changes: 1 addition & 1 deletion python/batch-predictor/main.py
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,7 @@ def main(spec_path, spark):
.builder \
.appName(args.job_name) \
.getOrCreate()
spark.conf.set("spark.sql.execution.arrow.enabled", "true")
spark.conf.set("spark.sql.execution.arrow.pyspark.enabled", "true")

print(f"Spark Conf: {spark.sparkContext.getConf().getAll()}")
if args.dry_run_path is not None:
Expand Down
1 change: 0 additions & 1 deletion python/batch-predictor/requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,4 @@ pyspark==3.0.1
mlflow>=1.26.1,<2.0.0
cloudpickle==2.0.0
pyarrow>=0.14.1,<=9.0.0
protobuf>=3.0,<5.0.0
file:${SDK_PATH}#egg=merlin-sdk
5 changes: 0 additions & 5 deletions python/pyfunc-server/requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,4 @@ uvloop>=0.15.2,<0.18.0
orjson>=2.6.8
tornado
caraml-upi-protos
# Starting 1.49.0, grpc uses protobuf 4.X which are incompatible with most of our dependencies
grpcio<1.49.0
grpcio-reflection<1.49.0
grpcio-tools<1.49.0
grpcio-health-checking<1.49.0
file:${SDK_PATH}#egg=merlin-sdk
1 change: 0 additions & 1 deletion python/sdk/setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,6 @@
TEST_REQUIRES = [
"google-cloud-bigquery-storage>=0.7.0",
"google-cloud-bigquery>=1.18.0",
"grpcio>=1.31.0,<1.49.0",
"joblib>=0.13.0,<1.2.0", # >=1.2.0 upon upgrade of kserve's version
"mypy>=0.812",
"pytest-cov",
Expand Down

0 comments on commit fefc84e

Please sign in to comment.