From 166bf6d5e9a510d142406cefecfd9eb3fadadb13 Mon Sep 17 00:00:00 2001 From: Phillip Cloud <417981+cpcloud@users.noreply.github.com> Date: Sat, 21 Dec 2024 05:14:48 -0500 Subject: [PATCH] ci(setup-uv): remove default-enabled cache --- .github/workflows/check-generated-files.yml | 1 - .github/workflows/ibis-backends-cloud.yml | 2 -- .github/workflows/ibis-backends.yml | 6 ------ .github/workflows/ibis-benchmarks.yml | 2 -- .github/workflows/ibis-main.yml | 6 ------ .github/workflows/pre-release.yml | 2 -- justfile | 16 ++++++++++++---- requirements-dev.txt | 2 +- uv.lock | 10 +++++----- 9 files changed, 18 insertions(+), 29 deletions(-) diff --git a/.github/workflows/check-generated-files.yml b/.github/workflows/check-generated-files.yml index 7d081e728072..a26e7319795b 100644 --- a/.github/workflows/check-generated-files.yml +++ b/.github/workflows/check-generated-files.yml @@ -46,7 +46,6 @@ jobs: - name: install uv uses: astral-sh/setup-uv@v5.0.1 with: - enable-cache: true version: "0.4.x" - name: update apt-get diff --git a/.github/workflows/ibis-backends-cloud.yml b/.github/workflows/ibis-backends-cloud.yml index 74dec47ded99..6c5f9503f6bc 100644 --- a/.github/workflows/ibis-backends-cloud.yml +++ b/.github/workflows/ibis-backends-cloud.yml @@ -112,8 +112,6 @@ jobs: - name: install uv uses: astral-sh/setup-uv@v5.0.1 - with: - enable-cache: true - name: install additional deps if: matrix.backend.key == 'snowpark' diff --git a/.github/workflows/ibis-backends.yml b/.github/workflows/ibis-backends.yml index 2503dcd74573..660cff417dec 100644 --- a/.github/workflows/ibis-backends.yml +++ b/.github/workflows/ibis-backends.yml @@ -66,8 +66,6 @@ jobs: - name: install uv uses: astral-sh/setup-uv@v5.0.1 - with: - enable-cache: true - uses: extractions/setup-just@v2 env: @@ -488,8 +486,6 @@ jobs: - name: install uv uses: astral-sh/setup-uv@v5.0.1 - with: - enable-cache: true - name: install other deps if: matrix.backend.additional_deps != null @@ -605,8 +601,6 @@ jobs: - name: install uv uses: astral-sh/setup-uv@v5.0.1 - with: - enable-cache: true # it requires a version of pandas that pyspark is not compatible with - name: remove lonboard diff --git a/.github/workflows/ibis-benchmarks.yml b/.github/workflows/ibis-benchmarks.yml index 0040e5f35993..df922d52c840 100644 --- a/.github/workflows/ibis-benchmarks.yml +++ b/.github/workflows/ibis-benchmarks.yml @@ -31,8 +31,6 @@ jobs: - name: install uv uses: astral-sh/setup-uv@v5.0.1 - with: - enable-cache: true - name: install system dependencies run: sudo apt-get install -qq -y build-essential libgeos-dev freetds-dev unixodbc-dev diff --git a/.github/workflows/ibis-main.yml b/.github/workflows/ibis-main.yml index 03cf805885df..9e549ae0a47e 100644 --- a/.github/workflows/ibis-main.yml +++ b/.github/workflows/ibis-main.yml @@ -65,8 +65,6 @@ jobs: - name: install uv uses: astral-sh/setup-uv@v5.0.1 - with: - enable-cache: true - name: install ${{ matrix.os }} system dependencies if: matrix.os == 'ubuntu-latest' @@ -123,8 +121,6 @@ jobs: - name: install uv uses: astral-sh/setup-uv@v5.0.1 - with: - enable-cache: true - name: install system dependencies run: | @@ -158,8 +154,6 @@ jobs: - name: install uv uses: astral-sh/setup-uv@v5.0.1 - with: - enable-cache: true - uses: extractions/setup-just@v2 env: diff --git a/.github/workflows/pre-release.yml b/.github/workflows/pre-release.yml index ea597e0b0912..c1149b997fe9 100644 --- a/.github/workflows/pre-release.yml +++ b/.github/workflows/pre-release.yml @@ -31,8 +31,6 @@ jobs: - name: install uv uses: astral-sh/setup-uv@v5.0.1 - with: - enable-cache: true - uses: extractions/setup-just@v2 env: diff --git a/justfile b/justfile index 169f187c362b..0e892b2235fc 100644 --- a/justfile +++ b/justfile @@ -273,8 +273,6 @@ build-jupyterlite: rm -rf dist/ ibis_dev_version="$(just bump-version)" - uvx --from=toml-cli toml set --toml-path=pyproject.toml project.version "$ibis_dev_version" - sed -i "s/__version__ = \".+\"/__version__ = \"$ibis_dev_version\"/" ibis/__init__.py uv build --wheel git checkout pyproject.toml ibis/__init__.py @@ -303,6 +301,16 @@ docs-build-all: chat *args: zulip-term {{ args }} -# bump the version number to the next pre-release version -@bump-version: +# compute the next version number +@compute-version: uv run --only-group dev python ci/release/bump_version.py + +# bump the version number in necessary files +bump-version: + #!/usr/bin/env bash + + ibis_dev_version="$(just compute-version)" + uvx --from=toml-cli toml set --toml-path=pyproject.toml project.version "$ibis_dev_version" > /dev/null + sed -i 's/__version__ = .\+/__version__ = "'$ibis_dev_version'"/g' ibis/__init__.py + just lock > /dev/null + echo "$ibis_dev_version" diff --git a/requirements-dev.txt b/requirements-dev.txt index cd1b99f44f9a..59d0f7b26210 100644 --- a/requirements-dev.txt +++ b/requirements-dev.txt @@ -8,7 +8,7 @@ annotated-types==0.7.0 anyio==4.7.0 anywidget==0.9.13 appdirs==1.4.4 -appnope==0.1.4 ; sys_platform == 'darwin' +appnope==0.1.4 ; platform_system == 'Darwin' argon2-cffi==23.1.0 argon2-cffi-bindings==21.2.0 arro3-compute==0.4.5 diff --git a/uv.lock b/uv.lock index ddd307b946e8..1572d60ecff7 100644 --- a/uv.lock +++ b/uv.lock @@ -830,7 +830,7 @@ name = "click" version = "8.1.7" source = { registry = "https://pypi.org/simple" } dependencies = [ - { name = "colorama", marker = "sys_platform == 'win32'" }, + { name = "colorama", marker = "platform_system == 'Windows'" }, ] sdist = { url = "https://files.pythonhosted.org/packages/96/d3/f04c7bfcf5c1862a2a5b845c6b2b360488cf47af55dfa79c98f6a6bf98b5/click-8.1.7.tar.gz", hash = "sha256:ca9853ad459e787e2192211578cc907e7594e294c7ccc834310722b41b9ca6de", size = 336121 } wheels = [ @@ -2400,7 +2400,7 @@ name = "ipykernel" version = "6.29.5" source = { registry = "https://pypi.org/simple" } dependencies = [ - { name = "appnope", marker = "sys_platform == 'darwin'" }, + { name = "appnope", marker = "platform_system == 'Darwin'" }, { name = "comm" }, { name = "debugpy" }, { name = "ipython" }, @@ -3090,7 +3090,7 @@ dependencies = [ { name = "numpy" }, { name = "pandas" }, { name = "scipy" }, - { name = "tzdata", marker = "sys_platform == 'emscripten' or sys_platform == 'win32'" }, + { name = "tzdata", marker = "platform_system == 'Emscripten' or platform_system == 'Windows'" }, ] sdist = { url = "https://files.pythonhosted.org/packages/91/c3/9f83c374314b2b42e7aec65f3bf87046415ab265f209fa8a04eb6da822ee/mizani-0.13.1.tar.gz", hash = "sha256:e3247ea12c746c8104767d7e42a2d16473173c7bc314f298d8294a58f4653353", size = 765181 } wheels = [ @@ -5471,7 +5471,7 @@ name = "tqdm" version = "4.67.1" source = { registry = "https://pypi.org/simple" } dependencies = [ - { name = "colorama", marker = "sys_platform == 'win32'" }, + { name = "colorama", marker = "platform_system == 'Windows'" }, ] sdist = { url = "https://files.pythonhosted.org/packages/a8/4b/29b4ef32e036bb34e4ab51796dd745cdba7ed47ad142a9f4a1eb8e0c744d/tqdm-4.67.1.tar.gz", hash = "sha256:f8aef9c52c08c13a65f30ea34f4e5aac3fd1a34959879d7e59e63027286627f2", size = 169737 } wheels = [ @@ -5534,7 +5534,7 @@ name = "tzlocal" version = "5.2" source = { registry = "https://pypi.org/simple" } dependencies = [ - { name = "tzdata", marker = "sys_platform == 'win32'" }, + { name = "tzdata", marker = "platform_system == 'Windows'" }, ] sdist = { url = "https://files.pythonhosted.org/packages/04/d3/c19d65ae67636fe63953b20c2e4a8ced4497ea232c43ff8d01db16de8dc0/tzlocal-5.2.tar.gz", hash = "sha256:8d399205578f1a9342816409cc1e46a93ebd5755e39ea2d85334bea911bf0e6e", size = 30201 } wheels = [