Skip to content

Commit

Permalink
Merge branch 'master' into test-import-no-extras
Browse files Browse the repository at this point in the history
  • Loading branch information
tokoko authored Sep 18, 2024
2 parents 8eec3e7 + 0fb76e9 commit cbe330c
Show file tree
Hide file tree
Showing 4 changed files with 19 additions and 10 deletions.
2 changes: 1 addition & 1 deletion CONTRIBUTING.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
<h1>Development Guide: Main Feast Repository</h1>

> Please see [Development Guide](https://docs.feast.dev/project/development-guide) for project level development instructions, including instructions for Maintainers.
> Please see [Development Guide](docs/project/development-guide.md) for project level development instructions, including instructions for Maintainers.
2 changes: 2 additions & 0 deletions docs/community.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@

## Links & Resources

* [Come say hi on Slack!](https://communityinviter.com/apps/feastopensource/feast-the-open-source-feature-store)
* As a part of the Linux Foundation, we ask community members to adhere to the [Linux Foundation Code of Conduct](https://events.linuxfoundation.org/about/code-of-conduct/)
* [GitHub Repository](https://github.com/feast-dev/feast/): Find the complete Feast codebase on GitHub.
* [Community Governance Doc](https://github.com/feast-dev/feast/blob/master/community): See the governance model of Feast, including who the maintainers are and how decisions are made.
* [Google Folder](https://drive.google.com/drive/u/0/folders/1jgMHOPDT2DvBlJeO9LCM79DP4lm4eOrR): This folder is used as a central repository for all Feast resources. For example:
Expand Down
11 changes: 11 additions & 0 deletions pyproject.toml
Original file line number Diff line number Diff line change
@@ -1,3 +1,14 @@
[build-system]
requires = [
"grpcio-tools>=1.56.2,<2",
"mypy-protobuf>=3.1",
"pybindgen==0.22.0",
"setuptools>=60",
"setuptools_scm>=6.2",
"sphinx!=4.0.0",
"wheel",
]

[tool.setuptools_scm]
# Including this section is comparable to supplying use_scm_version=True in setup.py.

Expand Down
14 changes: 5 additions & 9 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,9 @@
import shutil
import subprocess
import sys

from pathlib import Path

from setuptools import find_packages, setup, Command
from setuptools import Command, find_packages, setup
from setuptools.command.build_ext import build_ext as _build_ext
from setuptools.command.build_py import build_py
from setuptools.command.develop import develop
Expand All @@ -43,7 +42,6 @@
"mmh3",
"numpy>=1.22,<2",
"pandas>=1.4.3,<3",
"protobuf>=4.24.0,<5.0.0",
"pyarrow>=4",
"pydantic>=2.0.0",
"pygments>=2.12.0,<3",
Expand Down Expand Up @@ -102,7 +100,7 @@
"psycopg[binary,pool]>=3.0.0,<4",
]

OPENTELEMETRY = ["prometheus_client","psutil"]
OPENTELEMETRY = ["prometheus_client", "psutil"]

MYSQL_REQUIRED = ["pymysql", "types-PyMySQL"]

Expand Down Expand Up @@ -139,7 +137,6 @@

GRPCIO_REQUIRED = [
"grpcio>=1.56.2,<2",
"grpcio-tools==1.56.2", # TODO why isn't this a dev dependency?
"grpcio-reflection>=1.56.2,<2",
"grpcio-health-checking>=1.56.2,<2",
]
Expand All @@ -160,6 +157,7 @@
"virtualenv==20.23.0",
"cryptography>=35.0,<43",
"ruff>=0.3.3",
"grpcio-tools>=1.56.2,<2",
"grpcio-testing>=1.56.2,<2",
# FastAPI does not correctly pull starlette dependency on httpx see thread(https://github.com/tiangolo/fastapi/issues/5656).
"httpx>=0.23.3",
Expand Down Expand Up @@ -402,10 +400,8 @@ def run(self):
entry_points={"console_scripts": ["feast=feast.cli:cli"]},
use_scm_version=use_scm_version,
setup_requires=[
"grpcio-tools==1.56.2",
"grpcio>=1.56.2,<2",
"mypy-protobuf==3.1",
"protobuf>=4.24.0,<5.0.0",
"grpcio-tools>=1.56.2,<2",
"mypy-protobuf>=3.1",
"pybindgen==0.22.0",
"setuptools_scm>=6.2",
],
Expand Down

0 comments on commit cbe330c

Please sign in to comment.