forked from feast-dev/feast
-
Notifications
You must be signed in to change notification settings - Fork 4
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #139 from ExpediaGroup/feast_merge_sep_2024
fix: Merged changes from feast open source
- Loading branch information
Showing
321 changed files
with
18,197 additions
and
4,208 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,13 @@ | ||
| FROM mcr.microsoft.com/vscode/devcontainers/python:3.9-buster | ||
|
|
||
| USER vscode | ||
| RUN curl -LsSf https://astral.sh/uv/install.sh | sh | ||
| RUN curl -fsSL https://pixi.sh/install.sh | bash | ||
| ENV PATH=$PATH:/home/vscode/.cargo/bin | ||
| ENV PYTHON=3.9 | ||
| RUN uv venv ~/.local | ||
| ENV VIRTUAL_ENV=~/.local | ||
| ENV PATH=$VIRTUAL_ENV/bin:$PATH | ||
| USER root | ||
|
|
||
|
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,13 +1,33 @@ | ||
| // For format details, see https://aka.ms/devcontainer.json. For config options, see the | ||
| // README at: https://github.com/devcontainers/templates/tree/main/src/docker-existing-dockerfile | ||
| { | ||
| "name": "feast-devcontainer", | ||
| "image": "mcr.microsoft.com/devcontainers/base:ubuntu", | ||
| "features": { | ||
| "ghcr.io/devcontainers/features/docker-in-docker:2": { | ||
| "version": "latest" | ||
| }, | ||
| "ghcr.io/devcontainers/features/python:1": { | ||
| "version": "3.9" | ||
| } | ||
| }, | ||
| "postCreateCommand": "pip install -e '.[dev]' && make compile-protos-python" | ||
| "name": "feast-devcontainer", | ||
| "build": { | ||
| // Sets the run context to one level up instead of the .devcontainer folder. | ||
| "context": "..", | ||
| // Update the 'dockerFile' property if you aren't using the standard 'Dockerfile' filename. | ||
| "dockerfile": "Dockerfile" | ||
| }, | ||
|
|
||
| // Features to add to the dev container. More info: https://containers.dev/features. | ||
| "features": { | ||
| "ghcr.io/devcontainers/features/docker-in-docker:2": { | ||
| "version": "latest" | ||
| }, | ||
| "ghcr.io/devcontainers-contrib/features/maven-sdkman:2": { | ||
| "jdkVersion": "11.0.24-amzn" | ||
| } | ||
| }, | ||
|
|
||
| // Use 'forwardPorts' to make a list of ports inside the container available locally. | ||
| // "forwardPorts": [], | ||
|
|
||
| // Uncomment the next line to run commands after the container is created. | ||
| "postCreateCommand": "make install-python-ci-dependencies-uv-venv" | ||
|
|
||
| // Configure tool-specific properties. | ||
| // "customizations": {}, | ||
|
|
||
| // Uncomment to connect as an existing user other than the container default. More info: https://aka.ms/dev-containers-non-root. | ||
| // "remoteUser": "root" | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| 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. |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,44 @@ | ||
| # Steps to Sync the Fork from the Upstream Repository (feast-dev/feast) | ||
|
|
||
| This guide provides step-by-step instructions to sync your fork with the upstream repository changes. | ||
|
|
||
| ## Step 1: Create a New Branch | ||
| ```sh | ||
| git checkout -b GIT_BRANCH_NAME | ||
| ``` | ||
| ## Step 2: Add the Upstream Remote Repository | ||
| ```sh | ||
| git remote add upstream https://github.com/feast-dev/feast.git | ||
| git fetch upstream | ||
| ``` | ||
| ## Step 3: Find the Common Ancestor | ||
| ```sh | ||
| git merge-base GIT_BRANCH_NAME upstream/master | ||
| ``` | ||
| ## Step 4: Merge to a Specific Commit | ||
| You don't need to merge all pending commits. You can pick a commit and repeat this process until you complete all the pending commits. | ||
| ```sh | ||
| git merge GIT_COMMIT_HASH | ||
| ``` | ||
| ## Step 5: Resolve the Merge Conflicts | ||
| IntelliJ IDE has a good Merge conflict resolution tool. | ||
| ## Step 6: Regenerate requirements file | ||
| ```sh | ||
| make lock-python-dependencies-all # Unable to run pixi commands on Mac | ||
| or | ||
| pip install uv | ||
| make lock-python-dependencies-uv-all | ||
| ``` | ||
| ## Step 7: Create a virtual environment and Run the tests locally. Resolve the issues identified. | ||
| ```sh | ||
| python -m venv .venv | ||
| source .venv/bin/activate | ||
| make install-python-ci-dependencies-uv-venv | ||
| make test-python-unit | ||
| make test-python-universal # Snowflake tests may fail. Rest all should pass. | ||
| ``` | ||
| ## Step 8: Push the Changes to Your Fork and create Pull Request for Review | ||
| ```sh | ||
| git push origin GIT_BRANCH_NAME | ||
| ``` | ||
| ## Step 9: Review and Merge your changes (not Squash Merge) |
Oops, something went wrong.