Skip to content

Commit 8181e9d

Browse files
emgeeeemgeee
authored
chore: Clean up makefile (feast-dev#4799)
* clean up dependency installation makefile tasks Signed-off-by: Matt Green <emgeee@users.noreply.github.com> * rewrite lock-python-dependencies-all to be more DRY Signed-off-by: Matt Green <emgeee@users.noreply.github.com> * update environment setup docs Signed-off-by: Matt Green <emgeee@users.noreply.github.com> * update smoke test Signed-off-by: Matt Green <emgeee@users.noreply.github.com> * small change Signed-off-by: Matt Green <emgeee@users.noreply.github.com> --------- Signed-off-by: Matt Green <emgeee@users.noreply.github.com>
1 parent a617a6c commit 8181e9d

17 files changed

Lines changed: 84 additions & 94 deletions

‎.devcontainer/devcontainer.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
// "forwardPorts": [],
2424

2525
// Uncomment the next line to run commands after the container is created.
26-
// "postCreateCommand": "make install-python-ci-dependencies-uv-venv"
26+
// "postCreateCommand": "make install-python-dependencies-dev"
2727

2828
// Configure tool-specific properties.
2929
// "customizations": {},

‎.github/fork_workflows/fork_pr_integration_tests_aws.yml‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ jobs:
7373
sudo apt update
7474
sudo apt install -y -V libarrow-dev
7575
- name: Install dependencies
76-
run: make install-python-ci-dependencies-uv
76+
run: make install-python-dependencies-ci
7777
- name: Setup Redis Cluster
7878
run: |
7979
docker pull vishnunair/docker-redis-cluster:latest
@@ -85,5 +85,3 @@ jobs:
8585
pytest -n 8 --cov=./ --cov-report=xml --color=yes sdk/python/tests --integration --durations=5 --timeout=1200 --timeout_method=thread -k "File and not Snowflake and not BigQuery and not minio_registry"
8686
pytest -n 8 --cov=./ --cov-report=xml --color=yes sdk/python/tests --integration --durations=5 --timeout=1200 --timeout_method=thread -k "dynamo and not Snowflake and not BigQuery and not minio_registry"
8787
pytest -n 8 --cov=./ --cov-report=xml --color=yes sdk/python/tests --integration --durations=5 --timeout=1200 --timeout_method=thread -k "Redshift and not Snowflake and not BigQuery and not minio_registry"
88-
89-

‎.github/fork_workflows/fork_pr_integration_tests_gcp.yml‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ jobs:
7575
sudo apt update
7676
sudo apt install -y -V libarrow-dev
7777
- name: Install dependencies
78-
run: make install-python-ci-dependencies-uv
78+
run: make install-python-dependencies-ci
7979
- name: Setup Redis Cluster
8080
run: |
8181
docker pull vishnunair/docker-redis-cluster:latest
@@ -86,4 +86,3 @@ jobs:
8686
run: |
8787
pytest -n 8 --cov=./ --cov-report=xml --color=yes sdk/python/tests --integration --durations=5 --timeout=1200 --timeout_method=thread -k "BigQuery and not dynamo and not Redshift and not Snowflake and not minio_registry"
8888
pytest -n 8 --cov=./ --cov-report=xml --color=yes sdk/python/tests --integration --durations=5 --timeout=1200 --timeout_method=thread -k "File and not dynamo and not Redshift and not Snowflake and not minio_registry"
89-

‎.github/fork_workflows/fork_pr_integration_tests_snowflake.yml‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ jobs:
6565
sudo apt update
6666
sudo apt install -y -V libarrow-dev
6767
- name: Install dependencies
68-
run: make install-python-ci-dependencies-uv
68+
run: make install-python-dependencies-ci
6969
- name: Setup Redis Cluster
7070
run: |
7171
docker pull vishnunair/docker-redis-cluster:latest
@@ -82,4 +82,3 @@ jobs:
8282
run: |
8383
pytest -n 8 --cov=./ --cov-report=xml --color=yes sdk/python/tests --integration --durations=5 --timeout=1200 --timeout_method=thread -k "Snowflake and not dynamo and not Redshift and not Bigquery and not gcp and not minio_registry"
8484
pytest -n 8 --cov=./ --cov-report=xml --color=yes sdk/python/tests --integration --durations=5 --timeout=1200 --timeout_method=thread -k "File and not dynamo and not Redshift and not Bigquery and not gcp and not minio_registry"
85-

‎.github/workflows/java_master_only.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,7 @@ jobs:
126126
key: ${{ runner.os }}-${{ steps.setup-python.outputs.python-version }}-uv-${{ hashFiles(format('**/py{0}-ci-requirements.txt', env.PYTHON)) }}
127127

128128
- name: Install Python dependencies
129-
run: make install-python-ci-dependencies-uv
129+
run: make install-python-dependencies-ci
130130
- uses: actions/cache@v4
131131
with:
132132
path: ~/.m2/repository

‎.github/workflows/java_pr.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -180,7 +180,7 @@ jobs:
180180
path: ${{ steps.uv-cache.outputs.dir }}
181181
key: ${{ runner.os }}-${{ steps.setup-python.outputs.python-version }}-uv-${{ hashFiles(format('**/py{0}-ci-requirements.txt', env.PYTHON)) }}
182182
- name: Install dependencies
183-
run: make install-python-ci-dependencies-uv
183+
run: make install-python-dependencies-ci
184184
- name: Run integration tests
185185
run: make test-java-integration
186186
- name: Save report

‎.github/workflows/linter.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,6 @@ jobs:
1919
run: curl -LsSf https://astral.sh/uv/install.sh | sh
2020
- name: Install dependencies
2121
run: |
22-
make install-python-ci-dependencies-uv
22+
make install-python-dependencies-ci
2323
- name: Lint python
2424
run: make lint-python

‎.github/workflows/master_only.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ jobs:
6565
path: ${{ steps.uv-cache.outputs.dir }}
6666
key: ${{ runner.os }}-${{ steps.setup-python.outputs.python-version }}-uv-${{ hashFiles(format('**/py{0}-ci-requirements.txt', env.PYTHON)) }}
6767
- name: Install dependencies
68-
run: make install-python-ci-dependencies-uv
68+
run: make install-python-dependencies-ci
6969
- name: Setup Redis Cluster
7070
run: |
7171
docker pull vishnunair/docker-redis-cluster:latest
@@ -130,4 +130,4 @@ jobs:
130130
make push-${{ matrix.component }}-docker REGISTRY=${REGISTRY} VERSION=${GITHUB_SHA}
131131
132132
docker tag ${REGISTRY}/${{ matrix.component }}:${GITHUB_SHA} ${REGISTRY}/${{ matrix.component }}:develop
133-
docker push ${REGISTRY}/${{ matrix.component }}:develop
133+
docker push ${REGISTRY}/${{ matrix.component }}:develop

‎.github/workflows/nightly-ci.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -141,7 +141,7 @@ jobs:
141141
if: matrix.os == 'macos-13'
142142
run: brew install apache-arrow
143143
- name: Install dependencies
144-
run: make install-python-ci-dependencies-uv
144+
run: make install-python-dependencies-ci
145145
- name: Setup Redis Cluster
146146
run: |
147147
docker pull vishnunair/docker-redis-cluster:latest
@@ -154,4 +154,4 @@ jobs:
154154
SNOWFLAKE_CI_PASSWORD: ${{ secrets.SNOWFLAKE_CI_PASSWORD }}
155155
SNOWFLAKE_CI_ROLE: ${{ secrets.SNOWFLAKE_CI_ROLE }}
156156
SNOWFLAKE_CI_WAREHOUSE: ${{ secrets.SNOWFLAKE_CI_WAREHOUSE }}
157-
run: make test-python-integration
157+
run: make test-python-integration

‎.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
path: ${{ steps.uv-cache.outputs.dir }}
8787
key: ${{ runner.os }}-${{ steps.setup-python.outputs.python-version }}-uv-${{ hashFiles(format('**/py{0}-ci-requirements.txt', env.PYTHON)) }}
8888
- name: Install dependencies
89-
run: make install-python-ci-dependencies-uv
89+
run: make install-python-dependencies-ci
9090
- name: Setup Redis Cluster
9191
run: |
9292
docker pull vishnunair/docker-redis-cluster:latest
@@ -100,4 +100,4 @@ jobs:
100100
SNOWFLAKE_CI_PASSWORD: ${{ secrets.SNOWFLAKE_CI_PASSWORD }}
101101
SNOWFLAKE_CI_ROLE: ${{ secrets.SNOWFLAKE_CI_ROLE }}
102102
SNOWFLAKE_CI_WAREHOUSE: ${{ secrets.SNOWFLAKE_CI_WAREHOUSE }}
103-
run: make test-python-integration
103+
run: make test-python-integration

0 commit comments

Comments
 (0)