Skip to content

Commit c917e1f

Browse files
authored
fix(taskfile): Simplify python-component sources list to avoid go-task/task#2400 (fixes #872); Upgrade and pin go-task to v3.44.0 to avoid go-task/task#2401. (#1242)
1 parent a6e089b commit c917e1f

File tree

9 files changed

+14
-21
lines changed

9 files changed

+14
-21
lines changed

components/core/tools/scripts/lib_install/centos-stream-9/install-prebuilt-packages.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,13 +39,13 @@ case "$rpm_arch" in
3939
esac
4040

4141
# Install `task`
42-
# NOTE: We lock `task` to a version < 3.43 to avoid https://github.com/y-scope/clp/issues/872
42+
# NOTE: We lock `task` to version 3.44.0 to avoid https://github.com/y-scope/clp-ffi-js/issues/110
4343
task_pkg_path="$(mktemp -t --suffix ".rpm" task-pkg.XXXXXXXXXX)"
4444
curl \
4545
--fail \
4646
--location \
4747
--output "$task_pkg_path" \
4848
--show-error \
49-
"https://github.com/go-task/task/releases/download/v3.42.1/task_linux_${task_pkg_arch}.rpm"
49+
"https://github.com/go-task/task/releases/download/v3.44.0/task_linux_${task_pkg_arch}.rpm"
5050
dnf install --assumeyes "$task_pkg_path"
5151
rm "$task_pkg_path"

components/core/tools/scripts/lib_install/manylinux_2_28/install-prebuilt-packages.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,14 +29,14 @@ case "$rpm_arch" in
2929
esac
3030

3131
# Install `task`
32-
# NOTE: We lock `task` to a version < 3.43 to avoid https://github.com/y-scope/clp/issues/872
32+
# NOTE: We lock `task` to version 3.44.0 to avoid https://github.com/y-scope/clp-ffi-js/issues/110
3333
task_pkg_path=$(mktemp -t --suffix ".rpm" task-pkg.XXXXXXXXXX) || exit 1
3434
curl \
3535
--fail \
3636
--location \
3737
--output "$task_pkg_path" \
3838
--show-error \
39-
"https://github.com/go-task/task/releases/download/v3.42.1/task_linux_${task_pkg_arch}.rpm"
39+
"https://github.com/go-task/task/releases/download/v3.44.0/task_linux_${task_pkg_arch}.rpm"
4040
dnf install --assumeyes "$task_pkg_path"
4141
rm "$task_pkg_path"
4242

components/core/tools/scripts/lib_install/musllinux_1_2/install-prebuilt-packages.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,14 +30,14 @@ case "$arch" in
3030
esac
3131

3232
# Install `task`
33-
# NOTE: We lock `task` to a version < 3.43 to avoid https://github.com/y-scope/clp/issues/872
33+
# NOTE: We lock `task` to version 3.44.0 to avoid https://github.com/y-scope/clp-ffi-js/issues/110
3434
task_pkg_path=$(mktemp -t task-pkg.XXXXXXXXXX).tar.gz || exit 1
3535
curl \
3636
--fail \
3737
--location \
3838
--output "$task_pkg_path" \
3939
--show-error \
40-
"https://github.com/go-task/task/releases/download/v3.42.1/task_linux_${task_pkg_arch}.tar.gz"
40+
"https://github.com/go-task/task/releases/download/v3.44.0/task_linux_${task_pkg_arch}.tar.gz"
4141
tar -C /usr/local/bin -xzf "$task_pkg_path" task
4242
chmod +x /usr/local/bin/task
4343
rm "$task_pkg_path"

components/core/tools/scripts/lib_install/ubuntu-jammy/install-prebuilt-packages.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,14 +29,14 @@ DEBIAN_FRONTEND=noninteractive apt-get install --no-install-recommends -y \
2929
unzip
3030

3131
# Install `task`
32-
# NOTE: We lock `task` to a version < 3.43 to avoid https://github.com/y-scope/clp/issues/872
32+
# NOTE: We lock `task` to version 3.44.0 to avoid https://github.com/y-scope/clp-ffi-js/issues/110
3333
task_pkg_arch=$(dpkg --print-architecture)
3434
task_pkg_path="$(mktemp -t --suffix ".deb" task-pkg.XXXXXXXXXX)"
3535
curl \
3636
--fail \
3737
--location \
3838
--output "$task_pkg_path" \
3939
--show-error \
40-
"https://github.com/go-task/task/releases/download/v3.42.1/task_linux_${task_pkg_arch}.deb"
40+
"https://github.com/go-task/task/releases/download/v3.44.0/task_linux_${task_pkg_arch}.deb"
4141
dpkg --install "$task_pkg_path"
4242
rm "$task_pkg_path"

docs/README.md

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,7 @@ this project:
1313
the size of repo as we add and update images.
1414
* [Node.js] >= 16 to be able to [view the output](#viewing-the-output)
1515
* Python 3.10 or later
16-
* [Task] >= 3.40.0 and < 3.43.0
17-
* We constrain the version due to unresolved [issues][clp-issue-872].
16+
* [Task] 3.44.0
1817

1918
## Build Commands
2019

docs/src/dev-docs/building-package.md

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,7 @@ prebuilt version instead, check out the [releases](https://github.com/y-scope/cl
1313
* Python 3.9 or newer
1414
* python3-dev
1515
* python3-venv (for the version of Python installed)
16-
* [Task] >= 3.40.0 and < 3.43.0
17-
* We constrain the version due to unresolved [issues][clp-issue-872].
16+
* [Task] 3.44.0
1817

1918
## Setup
2019

docs/src/dev-docs/components-core/index.md

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,7 @@ CLP core is the low-level component that performs compression, decompression, an
99
* A recent compiler that fully supports C++20 features such as
1010
* std::span
1111
* std::source_location
12-
* [Task] >= 3.40.0 and < 3.43.0
13-
* We constrain the version due to unresolved [issues][clp-issue-872].
12+
* [Task] 3.44.0
1413

1514
To build, we require some source dependencies, packages from package managers, and libraries built
1615
from source.

docs/src/dev-docs/contributing-linting.md

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,7 @@ To run the linting tools, besides commonly installed tools like `tar`, you'll ne
1515
* `md5sum`
1616
* Python 3.9 or newer
1717
* python3-venv (for the version of Python installed)
18-
* [Task] >= 3.40.0 and < 3.43.0
19-
* Minimum version 3.40.0 is required for [yscope-dev-utils].
20-
* We constrain the version to < 3.43.0 due to unresolved [issues][clp-issue-872].
18+
* [Task] 3.44.0
2119
* [uv] >= 0.8
2220

2321
## Running the linters

taskfile.yaml

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -534,18 +534,16 @@ tasks:
534534
internal: true
535535
label: "{{.COMPONENT}}"
536536
vars:
537-
PACKAGE:
538-
sh: "echo {{.COMPONENT}} | tr - _"
539537
VENV_DIR: "{{.G_BUILD_DIR}}/{{.COMPONENT}}/venv"
540538
requires:
541539
vars: ["COMPONENT"]
542540
sources:
543541
- "{{.G_BUILD_DIR}}/{{.COMPONENT}}-venv.md5"
544-
- "{{.PACKAGE}}/**/*"
545542
- "{{.ROOT_DIR}}/requirements.txt"
546543
- "{{.TASKFILE}}"
547544
- "/etc/os-release"
548-
- "pyproject.toml"
545+
- "**/*"
546+
- exclude: "dist/**/*"
549547
dir: "components/{{.COMPONENT}}"
550548
generates:
551549
- "dist/*.whl"

0 commit comments

Comments
 (0)