From 3665ed719d442220706d283a913ea93fa452d7db Mon Sep 17 00:00:00 2001 From: tokoko Date: Tue, 30 Apr 2024 17:20:06 +0000 Subject: [PATCH 1/4] fix uv install, upgrade setup-python Signed-off-by: tokoko --- .../fork_pr_integration_tests_aws.yml | 34 ++++++++--------- .../fork_pr_integration_tests_gcp.yml | 32 +++++++--------- .../fork_pr_integration_tests_snowflake.yml | 32 +++++++--------- .github/workflows/build_wheels.yml | 6 +-- .github/workflows/java_master_only.yml | 36 ++++++++---------- .github/workflows/java_pr.yml | 38 +++++++++---------- .github/workflows/master_only.yml | 2 +- .github/workflows/nightly-ci.yml | 2 +- .github/workflows/publish.yml | 2 +- 9 files changed, 82 insertions(+), 102 deletions(-) diff --git a/.github/fork_workflows/fork_pr_integration_tests_aws.yml b/.github/fork_workflows/fork_pr_integration_tests_aws.yml index 4e418e6b22e..700c7bfc5f2 100644 --- a/.github/fork_workflows/fork_pr_integration_tests_aws.yml +++ b/.github/fork_workflows/fork_pr_integration_tests_aws.yml @@ -91,7 +91,7 @@ jobs: ref: refs/pull/${{ github.event.pull_request.number }}/merge submodules: recursive - name: Setup Python - uses: actions/setup-python@v3 + uses: actions/setup-python@v5 id: setup-python with: python-version: ${{ matrix.python-version }} @@ -109,25 +109,21 @@ jobs: aws-region: us-west-2 - name: Use AWS CLI run: aws sts get-caller-identity - - name: Get pip cache dir - id: pip-cache - run: | - echo "::set-output name=dir::$(pip cache dir)" - - name: pip cache - uses: actions/cache@v2 - with: - path: | - ${{ steps.pip-cache.outputs.dir }} - /opt/hostedtoolcache/Python - /Users/runner/hostedtoolcache/Python - key: ${{ runner.os }}-${{ steps.setup-python.outputs.python-version }}-pip-${{ hashFiles(format('**/py{0}-ci-requirements.txt', env.PYTHON)) }} - restore-keys: | - ${{ runner.os }}-${{ steps.setup-python.outputs.python-version }}-pip- - name: Upgrade pip version run: | - pip install --upgrade "pip>=21.3.1,<22.3" - - name: Install pip-tools - run: pip install pip-tools + pip install --upgrade "pip>=21.3.1,<23.2" + - name: Install uv + run: | + pip install uv + - name: Get uv cache dir + id: uv-cache + run: | + echo "::set-output name=dir::$(uv cache dir)" + - name: uv cache + uses: actions/cache@v4 + with: + path: ${{ steps.uv-cache.outputs.dir }} + key: ${{ runner.os }}-${{ steps.setup-python.outputs.python-version }}-uv-${{ hashFiles(format('**/py{0}-ci-requirements.txt', env.PYTHON)) }} - name: Install apache-arrow on ubuntu if: matrix.os == 'ubuntu-latest' run: | @@ -138,7 +134,7 @@ jobs: sudo apt update sudo apt install -y -V libarrow-dev - name: Install dependencies - run: make install-python-ci-dependencies + run: make install-python-ci-dependencies-uv - name: Setup Redis Cluster run: | docker pull vishnunair/docker-redis-cluster:latest diff --git a/.github/fork_workflows/fork_pr_integration_tests_gcp.yml b/.github/fork_workflows/fork_pr_integration_tests_gcp.yml index a6fc2110c55..684c61476ba 100644 --- a/.github/fork_workflows/fork_pr_integration_tests_gcp.yml +++ b/.github/fork_workflows/fork_pr_integration_tests_gcp.yml @@ -33,7 +33,7 @@ jobs: ref: refs/pull/${{ github.event.pull_request.number }}/merge submodules: recursive - name: Setup Python - uses: actions/setup-python@v3 + uses: actions/setup-python@v5 id: setup-python with: python-version: ${{ matrix.python-version }} @@ -53,25 +53,21 @@ jobs: project_id: ${{ secrets.GCP_PROJECT_ID }} - name: Use gcloud CLI run: gcloud info - - name: Get pip cache dir - id: pip-cache - run: | - echo "::set-output name=dir::$(pip cache dir)" - - name: pip cache - uses: actions/cache@v2 - with: - path: | - ${{ steps.pip-cache.outputs.dir }} - /opt/hostedtoolcache/Python - /Users/runner/hostedtoolcache/Python - key: ${{ runner.os }}-${{ steps.setup-python.outputs.python-version }}-pip-${{ hashFiles(format('**/py{0}-ci-requirements.txt', env.PYTHON)) }} - restore-keys: | - ${{ runner.os }}-${{ steps.setup-python.outputs.python-version }}-pip- - name: Upgrade pip version run: | pip install --upgrade "pip>=21.3.1,<23.2" - - name: Install pip-tools - run: pip install pip-tools + - name: Install uv + run: | + pip install uv + - name: Get uv cache dir + id: uv-cache + run: | + echo "::set-output name=dir::$(uv cache dir)" + - name: uv cache + uses: actions/cache@v4 + with: + path: ${{ steps.uv-cache.outputs.dir }} + key: ${{ runner.os }}-${{ steps.setup-python.outputs.python-version }}-uv-${{ hashFiles(format('**/py{0}-ci-requirements.txt', env.PYTHON)) }} - name: Install apache-arrow on ubuntu if: matrix.os == 'ubuntu-latest' run: | @@ -82,7 +78,7 @@ jobs: sudo apt update sudo apt install -y -V libarrow-dev - name: Install dependencies - run: make install-python-ci-dependencies + run: make install-python-ci-dependencies-uv - name: Setup Redis Cluster run: | docker pull vishnunair/docker-redis-cluster:latest diff --git a/.github/fork_workflows/fork_pr_integration_tests_snowflake.yml b/.github/fork_workflows/fork_pr_integration_tests_snowflake.yml index ee0e256eca6..d786a0f3ff3 100644 --- a/.github/fork_workflows/fork_pr_integration_tests_snowflake.yml +++ b/.github/fork_workflows/fork_pr_integration_tests_snowflake.yml @@ -33,7 +33,7 @@ jobs: ref: refs/pull/${{ github.event.pull_request.number }}/merge submodules: recursive - name: Setup Python - uses: actions/setup-python@v3 + uses: actions/setup-python@v5 id: setup-python with: python-version: ${{ matrix.python-version }} @@ -43,25 +43,21 @@ jobs: uses: actions/setup-go@v2 with: go-version: 1.18.0 - - name: Get pip cache dir - id: pip-cache - run: | - echo "::set-output name=dir::$(pip cache dir)" - - name: pip cache - uses: actions/cache@v2 - with: - path: | - ${{ steps.pip-cache.outputs.dir }} - /opt/hostedtoolcache/Python - /Users/runner/hostedtoolcache/Python - key: ${{ runner.os }}-${{ steps.setup-python.outputs.python-version }}-pip-${{ hashFiles(format('**/py{0}-ci-requirements.txt', env.PYTHON)) }} - restore-keys: | - ${{ runner.os }}-${{ steps.setup-python.outputs.python-version }}-pip- - name: Upgrade pip version run: | pip install --upgrade "pip>=21.3.1,<23.2" - - name: Install pip-tools - run: pip install pip-tools + - name: Install uv + run: | + pip install uv + - name: Get uv cache dir + id: uv-cache + run: | + echo "::set-output name=dir::$(uv cache dir)" + - name: uv cache + uses: actions/cache@v4 + with: + path: ${{ steps.uv-cache.outputs.dir }} + key: ${{ runner.os }}-${{ steps.setup-python.outputs.python-version }}-uv-${{ hashFiles(format('**/py{0}-ci-requirements.txt', env.PYTHON)) }} - name: Install apache-arrow on ubuntu if: matrix.os == 'ubuntu-latest' run: | @@ -72,7 +68,7 @@ jobs: sudo apt update sudo apt install -y -V libarrow-dev - name: Install dependencies - run: make install-python-ci-dependencies + run: make install-python-ci-dependencies-uv - name: Setup Redis Cluster run: | docker pull vishnunair/docker-redis-cluster:latest diff --git a/.github/workflows/build_wheels.yml b/.github/workflows/build_wheels.yml index 59d274c4941..f493a4084ff 100644 --- a/.github/workflows/build_wheels.yml +++ b/.github/workflows/build_wheels.yml @@ -57,7 +57,7 @@ jobs: steps: - uses: actions/checkout@v4 - name: Setup Python - uses: actions/setup-python@v3 + uses: actions/setup-python@v5 with: python-version: "3.9" architecture: x64 @@ -84,7 +84,7 @@ jobs: - uses: actions/checkout@v4 - name: Setup Python id: setup-python - uses: actions/setup-python@v3 + uses: actions/setup-python@v5 with: python-version: "3.10" architecture: x64 @@ -156,7 +156,7 @@ jobs: steps: - name: Setup Python id: setup-python - uses: actions/setup-python@v3 + uses: actions/setup-python@v5 with: python-version: ${{ matrix.python-version }} architecture: x64 diff --git a/.github/workflows/java_master_only.yml b/.github/workflows/java_master_only.yml index cb58b240fb2..b91e6494a13 100644 --- a/.github/workflows/java_master_only.yml +++ b/.github/workflows/java_master_only.yml @@ -22,7 +22,7 @@ jobs: with: submodules: 'true' - name: Setup Python - uses: actions/setup-python@v3 + uses: actions/setup-python@v5 id: setup-python with: python-version: "3.9" @@ -107,33 +107,29 @@ jobs: java-package: jdk architecture: x64 - name: Setup Python (to call feast apply) - uses: actions/setup-python@v3 + uses: actions/setup-python@v5 id: setup-python with: python-version: 3.9 architecture: x64 - - name: Get pip cache dir - id: pip-cache - run: | - echo "::set-output name=dir::$(pip cache dir)" - - name: pip cache - uses: actions/cache@v2 - with: - path: | - ${{ steps.pip-cache.outputs.dir }} - /opt/hostedtoolcache/Python - /Users/runner/hostedtoolcache/Python - key: ${{ runner.os }}-${{ steps.setup-python.outputs.python-version }}-pip-${{ hashFiles(format('**/py{0}-ci-requirements.txt', env.PYTHON)) }} - restore-keys: | - ${{ runner.os }}-${{ steps.setup-python.outputs.python-version }}-pip- - name: Upgrade pip version run: | pip install --upgrade "pip>=21.3.1,<23.2" - - name: Install pip-tools - run: pip install pip-tools + - name: Install uv + run: | + pip install uv + - name: Get uv cache dir + id: uv-cache + run: | + echo "::set-output name=dir::$(uv cache dir)" + - name: uv cache + uses: actions/cache@v4 + with: + path: ${{ steps.uv-cache.outputs.dir }} + key: ${{ runner.os }}-${{ steps.setup-python.outputs.python-version }}-uv-${{ hashFiles(format('**/py{0}-ci-requirements.txt', env.PYTHON)) }} - name: Install Python dependencies - run: make install-python-ci-dependencies - - uses: actions/cache@v2 + run: make install-python-ci-dependencies-uv + - uses: actions/cache@v4 with: path: ~/.m2/repository key: ${{ runner.os }}-it-maven-${{ hashFiles('**/pom.xml') }} diff --git a/.github/workflows/java_pr.yml b/.github/workflows/java_pr.yml index 8c7a03d2e50..4dc1c971978 100644 --- a/.github/workflows/java_pr.yml +++ b/.github/workflows/java_pr.yml @@ -85,7 +85,7 @@ jobs: with: submodules: 'true' - name: Setup Python - uses: actions/setup-python@v3 + uses: actions/setup-python@v5 id: setup-python with: python-version: "3.9" @@ -126,7 +126,7 @@ jobs: java-version: '11' java-package: jdk architecture: x64 - - uses: actions/setup-python@v3 + - uses: actions/setup-python@v5 with: python-version: '3.9' architecture: 'x64' @@ -155,32 +155,28 @@ jobs: - name: Use AWS CLI run: aws sts get-caller-identity - name: Setup Python (to call feast apply) - uses: actions/setup-python@v3 + uses: actions/setup-python@v5 id: setup-python with: python-version: 3.9 architecture: x64 - - name: Get pip cache dir - id: pip-cache - run: | - echo "::set-output name=dir::$(pip cache dir)" - - name: pip cache - uses: actions/cache@v2 - with: - path: | - ${{ steps.pip-cache.outputs.dir }} - /opt/hostedtoolcache/Python - /Users/runner/hostedtoolcache/Python - key: ${{ runner.os }}-${{ steps.setup-python.outputs.python-version }}-pip-${{ hashFiles(format('**/py{0}-ci-requirements.txt', env.PYTHON)) }} - restore-keys: | - ${{ runner.os }}-${{ steps.setup-python.outputs.python-version }}-pip- - name: Upgrade pip version run: | pip install --upgrade "pip>=21.3.1,<23.2" - - name: Install pip-tools - run: pip install pip-tools - - name: Install Python dependencies - run: make install-python-ci-dependencies + - name: Install uv + run: | + pip install uv + - name: Get uv cache dir + id: uv-cache + run: | + echo "::set-output name=dir::$(uv cache dir)" + - name: uv cache + uses: actions/cache@v4 + with: + path: ${{ steps.uv-cache.outputs.dir }} + key: ${{ runner.os }}-${{ steps.setup-python.outputs.python-version }}-uv-${{ hashFiles(format('**/py{0}-ci-requirements.txt', env.PYTHON)) }} + - name: Install dependencies + run: make install-python-ci-dependencies-uv - name: Run integration tests run: make test-java-integration - name: Save report diff --git a/.github/workflows/master_only.yml b/.github/workflows/master_only.yml index dd666d5588c..1fd9683a432 100644 --- a/.github/workflows/master_only.yml +++ b/.github/workflows/master_only.yml @@ -84,7 +84,7 @@ jobs: - uses: actions/checkout@v4 - name: Setup Python id: setup-python - uses: actions/setup-python@v3 + uses: actions/setup-python@v5 with: python-version: ${{ matrix.python-version }} architecture: x64 diff --git a/.github/workflows/nightly-ci.yml b/.github/workflows/nightly-ci.yml index 9afea5cb6f1..afcccb3b57b 100644 --- a/.github/workflows/nightly-ci.yml +++ b/.github/workflows/nightly-ci.yml @@ -200,7 +200,7 @@ jobs: if: matrix.os == 'macos-13' run: brew install apache-arrow - name: Install dependencies - run: make install-python-ci-dependencies + run: make install-python-ci-dependencies-uv - name: Setup Redis Cluster run: | docker pull vishnunair/docker-redis-cluster:latest diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index 872a54a80ae..2f951863fcd 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -158,7 +158,7 @@ jobs: java-version: '11' java-package: jdk architecture: x64 - - uses: actions/setup-python@v3 + - uses: actions/setup-python@v5 with: python-version: '3.9' architecture: 'x64' From 154c6475c8268ac9237913eb4d315feac1837d80 Mon Sep 17 00:00:00 2001 From: tokoko Date: Wed, 1 May 2024 14:48:18 +0000 Subject: [PATCH 2/4] try installing uv w/o pip Signed-off-by: tokoko --- .github/workflows/unit_tests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/unit_tests.yml b/.github/workflows/unit_tests.yml index 576da4e8f53..094ba7c2116 100644 --- a/.github/workflows/unit_tests.yml +++ b/.github/workflows/unit_tests.yml @@ -28,7 +28,7 @@ jobs: pip install --upgrade "pip>=21.3.1,<23.2" - name: Install uv run: | - pip install uv + curl -LsSf https://astral.sh/uv/install.sh | sh - name: Get uv cache dir id: uv-cache run: | From 9655f7184b24538fd9076ae86b01c790ddca4e32 Mon Sep 17 00:00:00 2001 From: tokoko Date: Wed, 1 May 2024 15:57:36 +0000 Subject: [PATCH 3/4] try installing uv w/o pip Signed-off-by: tokoko --- .github/workflows/unit_tests.yml | 3 --- 1 file changed, 3 deletions(-) diff --git a/.github/workflows/unit_tests.yml b/.github/workflows/unit_tests.yml index 094ba7c2116..76c1b0ad56d 100644 --- a/.github/workflows/unit_tests.yml +++ b/.github/workflows/unit_tests.yml @@ -23,9 +23,6 @@ jobs: with: python-version: ${{ matrix.python-version }} architecture: x64 - - name: Upgrade pip version - run: | - pip install --upgrade "pip>=21.3.1,<23.2" - name: Install uv run: | curl -LsSf https://astral.sh/uv/install.sh | sh From 5f27686da40492dd55160273a9afd73d2946e89e Mon Sep 17 00:00:00 2001 From: tokoko Date: Wed, 1 May 2024 16:30:41 +0000 Subject: [PATCH 4/4] try installing uv w/o pip Signed-off-by: tokoko --- .github/fork_workflows/fork_pr_integration_tests_aws.yml | 5 +---- .github/fork_workflows/fork_pr_integration_tests_gcp.yml | 5 +---- .../fork_workflows/fork_pr_integration_tests_snowflake.yml | 5 +---- .github/workflows/java_master_only.yml | 5 +---- .github/workflows/java_pr.yml | 5 +---- .github/workflows/linter.yml | 5 +---- .github/workflows/master_only.yml | 5 +---- .github/workflows/nightly-ci.yml | 5 +---- .github/workflows/pr_integration_tests.yml | 5 +---- .github/workflows/pr_local_integration_tests.yml | 5 +---- 10 files changed, 10 insertions(+), 40 deletions(-) diff --git a/.github/fork_workflows/fork_pr_integration_tests_aws.yml b/.github/fork_workflows/fork_pr_integration_tests_aws.yml index 700c7bfc5f2..563f9d20763 100644 --- a/.github/fork_workflows/fork_pr_integration_tests_aws.yml +++ b/.github/fork_workflows/fork_pr_integration_tests_aws.yml @@ -109,12 +109,9 @@ jobs: aws-region: us-west-2 - name: Use AWS CLI run: aws sts get-caller-identity - - name: Upgrade pip version - run: | - pip install --upgrade "pip>=21.3.1,<23.2" - name: Install uv run: | - pip install uv + curl -LsSf https://astral.sh/uv/install.sh | sh - name: Get uv cache dir id: uv-cache run: | diff --git a/.github/fork_workflows/fork_pr_integration_tests_gcp.yml b/.github/fork_workflows/fork_pr_integration_tests_gcp.yml index 684c61476ba..08106fe4f12 100644 --- a/.github/fork_workflows/fork_pr_integration_tests_gcp.yml +++ b/.github/fork_workflows/fork_pr_integration_tests_gcp.yml @@ -53,12 +53,9 @@ jobs: project_id: ${{ secrets.GCP_PROJECT_ID }} - name: Use gcloud CLI run: gcloud info - - name: Upgrade pip version - run: | - pip install --upgrade "pip>=21.3.1,<23.2" - name: Install uv run: | - pip install uv + curl -LsSf https://astral.sh/uv/install.sh | sh - name: Get uv cache dir id: uv-cache run: | diff --git a/.github/fork_workflows/fork_pr_integration_tests_snowflake.yml b/.github/fork_workflows/fork_pr_integration_tests_snowflake.yml index d786a0f3ff3..a765e37e1c0 100644 --- a/.github/fork_workflows/fork_pr_integration_tests_snowflake.yml +++ b/.github/fork_workflows/fork_pr_integration_tests_snowflake.yml @@ -43,12 +43,9 @@ jobs: uses: actions/setup-go@v2 with: go-version: 1.18.0 - - name: Upgrade pip version - run: | - pip install --upgrade "pip>=21.3.1,<23.2" - name: Install uv run: | - pip install uv + curl -LsSf https://astral.sh/uv/install.sh | sh - name: Get uv cache dir id: uv-cache run: | diff --git a/.github/workflows/java_master_only.yml b/.github/workflows/java_master_only.yml index b91e6494a13..127b6565c10 100644 --- a/.github/workflows/java_master_only.yml +++ b/.github/workflows/java_master_only.yml @@ -112,12 +112,9 @@ jobs: with: python-version: 3.9 architecture: x64 - - name: Upgrade pip version - run: | - pip install --upgrade "pip>=21.3.1,<23.2" - name: Install uv run: | - pip install uv + curl -LsSf https://astral.sh/uv/install.sh | sh - name: Get uv cache dir id: uv-cache run: | diff --git a/.github/workflows/java_pr.yml b/.github/workflows/java_pr.yml index 4dc1c971978..88a93f4cad0 100644 --- a/.github/workflows/java_pr.yml +++ b/.github/workflows/java_pr.yml @@ -160,12 +160,9 @@ jobs: with: python-version: 3.9 architecture: x64 - - name: Upgrade pip version - run: | - pip install --upgrade "pip>=21.3.1,<23.2" - name: Install uv run: | - pip install uv + curl -LsSf https://astral.sh/uv/install.sh | sh - name: Get uv cache dir id: uv-cache run: | diff --git a/.github/workflows/linter.yml b/.github/workflows/linter.yml index 2968a9d6e0d..48e43a2ca89 100644 --- a/.github/workflows/linter.yml +++ b/.github/workflows/linter.yml @@ -15,11 +15,8 @@ jobs: with: python-version: "3.9" architecture: x64 - - name: Upgrade pip version - run: | - pip install --upgrade "pip>=21.3.1,<23.2" - name: Install uv - run: pip install uv + run: curl -LsSf https://astral.sh/uv/install.sh | sh - name: Install dependencies run: | make install-python-ci-dependencies-uv diff --git a/.github/workflows/master_only.yml b/.github/workflows/master_only.yml index 1fd9683a432..b83f1023dcd 100644 --- a/.github/workflows/master_only.yml +++ b/.github/workflows/master_only.yml @@ -106,11 +106,8 @@ jobs: aws-region: us-west-2 - name: Use AWS CLI run: aws sts get-caller-identity - - name: Upgrade pip version - run: | - pip install --upgrade "pip>=21.3.1,<23.2" - name: Install uv - run: pip install uv + run: curl -LsSf https://astral.sh/uv/install.sh | sh - name: Get uv cache dir id: uv-cache run: | diff --git a/.github/workflows/nightly-ci.yml b/.github/workflows/nightly-ci.yml index afcccb3b57b..de9927393f5 100644 --- a/.github/workflows/nightly-ci.yml +++ b/.github/workflows/nightly-ci.yml @@ -173,11 +173,8 @@ jobs: aws-region: us-west-2 - name: Use AWS CLI run: aws sts get-caller-identity - - name: Upgrade pip version - run: | - pip install --upgrade "pip>=21.3.1,<23.2" - name: Install uv - run: pip install uv + run: curl -LsSf https://astral.sh/uv/install.sh | sh - name: Get uv cache dir id: uv-cache run: | diff --git a/.github/workflows/pr_integration_tests.yml b/.github/workflows/pr_integration_tests.yml index 5b59429bc71..1475c23d2d1 100644 --- a/.github/workflows/pr_integration_tests.yml +++ b/.github/workflows/pr_integration_tests.yml @@ -133,11 +133,8 @@ jobs: aws-region: us-west-2 - name: Use AWS CLI run: aws sts get-caller-identity - - name: Upgrade pip version - run: | - pip install --upgrade "pip>=21.3.1,<23.2" - name: Install uv - run: pip install uv + run: curl -LsSf https://astral.sh/uv/install.sh | sh - name: Get uv cache dir id: uv-cache run: | diff --git a/.github/workflows/pr_local_integration_tests.yml b/.github/workflows/pr_local_integration_tests.yml index 258f4e42403..ce1ec29a8d4 100644 --- a/.github/workflows/pr_local_integration_tests.yml +++ b/.github/workflows/pr_local_integration_tests.yml @@ -38,11 +38,8 @@ jobs: with: python-version: ${{ matrix.python-version }} architecture: x64 - - name: Upgrade pip version - run: | - pip install --upgrade "pip>=21.3.1,<23.2" - name: Install uv - run: pip install uv + run: curl -LsSf https://astral.sh/uv/install.sh | sh - name: Get uv cache dir id: uv-cache run: |