Skip to content

Commit

Permalink
Merge branch 'main' into pbs/scrape-release-20250212
Browse files Browse the repository at this point in the history
  • Loading branch information
tdyas authored Mar 2, 2025
2 parents 1e023df + 0db2969 commit 84e8b1f
Show file tree
Hide file tree
Showing 32 changed files with 10,231 additions and 13,394 deletions.
2 changes: 1 addition & 1 deletion 3rdparty/python/requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ fasteners==0.16.3
freezegun==1.2.1
ijson==3.2.3
libcst==1.4.0
packaging==21.3
packaging==24.2
pex==2.33.1
psutil==5.9.8
# This should be compatible with pytest.py, although it can be looser so that we don't
Expand Down
41 changes: 9 additions & 32 deletions 3rdparty/python/user_reqs.lock
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
// "libcst==1.4.0",
// "mypy-typing-asserts==0.1.1",
// "node-semver==0.9.0",
// "packaging==21.3",
// "packaging==24.2",
// "pex==2.33.1",
// "psutil==5.9.8",
// "pydevd-pycharm==203.5419.8",
Expand Down Expand Up @@ -1005,21 +1005,19 @@
"artifacts": [
{
"algorithm": "sha256",
"hash": "ef103e05f519cdc783ae24ea4e2e0f508a9c99b2d4969652eed6a2e1ea5bd522",
"url": "https://files.pythonhosted.org/packages/05/8e/8de486cbd03baba4deef4142bd643a3e7bbe954a784dc1bb17142572d127/packaging-21.3-py3-none-any.whl"
"hash": "09abb1bccd265c01f4a3aa3f7a7db064b36514d2cba19a2f694fe6150451a759",
"url": "https://files.pythonhosted.org/packages/88/ef/eb23f262cca3c0c4eb7ab1933c3b1f03d021f2c48f54763065b6f0e321be/packaging-24.2-py3-none-any.whl"
},
{
"algorithm": "sha256",
"hash": "dd47c42927d89ab911e606518907cc2d3a1f38bbd026385970643f9c5b8ecfeb",
"url": "https://files.pythonhosted.org/packages/df/9e/d1a7217f69310c1db8fdf8ab396229f55a699ce34a203691794c5d1cad0c/packaging-21.3.tar.gz"
"hash": "c228a6dc5e932d346bc5739379109d49e8853dd8223571c7c5b55260edc0b97f",
"url": "https://files.pythonhosted.org/packages/d0/63/68dbb6eb2de9cb10ee4c9c14a0148804425e13c4fb20d61cce69f53106da/packaging-24.2.tar.gz"
}
],
"project_name": "packaging",
"requires_dists": [
"pyparsing!=3.0.5,>=2.0.2"
],
"requires_python": ">=3.6",
"version": "21.3"
"requires_dists": [],
"requires_python": ">=3.8",
"version": "24.2"
},
{
"artifacts": [
Expand Down Expand Up @@ -1336,27 +1334,6 @@
"requires_python": ">=3.6",
"version": "1.5.0"
},
{
"artifacts": [
{
"algorithm": "sha256",
"hash": "506ff4f4386c4cec0590ec19e6302d3aedb992fdc02c761e90416f158dacf8e1",
"url": "https://files.pythonhosted.org/packages/1c/a7/c8a2d361bf89c0d9577c934ebb7421b25dc84bf3a8e3ac0a40aed9acc547/pyparsing-3.2.1-py3-none-any.whl"
},
{
"algorithm": "sha256",
"hash": "61980854fd66de3a90028d679a954d5f2623e83144b5afe5ee86f43d762e5f0a",
"url": "https://files.pythonhosted.org/packages/8b/1a/3544f4f299a47911c2ab3710f534e52fea62a633c96806995da5d25be4b2/pyparsing-3.2.1.tar.gz"
}
],
"project_name": "pyparsing",
"requires_dists": [
"jinja2; extra == \"diagrams\"",
"railroad-diagrams; extra == \"diagrams\""
],
"requires_python": ">=3.9",
"version": "3.2.1"
},
{
"artifacts": [
{
Expand Down Expand Up @@ -2354,7 +2331,7 @@
"libcst==1.4.0",
"mypy-typing-asserts==0.1.1",
"node-semver==0.9.0",
"packaging==21.3",
"packaging==24.2",
"pex==2.33.1",
"psutil==5.9.8",
"pydevd-pycharm==203.5419.8",
Expand Down
12 changes: 6 additions & 6 deletions build-support/cherry_pick/helper.js
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ class CherryPickHelper {
.sort((a, b) => semver.compare(semver.coerce(a), semver.coerce(b)));
const index = sorted_milestones.indexOf(milestone_title);
const relevant_milestones = sorted_milestones.slice(
index === -1 ? 0 : index
index === -1 ? 0 : index,
);
return relevant_milestones;
}
Expand All @@ -72,7 +72,7 @@ class CherryPickHelper {
...this.context.repo,
});
const workflow_url = workflows.workflows.filter(
(workflow) => workflow.name === this.context.workflow
(workflow) => workflow.name === this.context.workflow,
)[0].url;

await this.#add_failed_label();
Expand All @@ -83,14 +83,14 @@ class CherryPickHelper {
pull.merged_by.login
}: Please add the milestone to the PR and re-run the [Auto Cherry-Picker job](${workflow_url}) using the "Run workflow" button.
${this.#run_link}`
${this.#run_link}`,
);
this.core.setFailed(`PR missing milestone.`);
return null;
}

const milestones = await this.#get_relevant_milestones(
pull.milestone.title
pull.milestone.title,
);
return {
pr_num: this.pull_number,
Expand All @@ -110,11 +110,11 @@ ${this.#run_link}`
state: "open",
head: `${this.context.repo.owner}:${branch_name}`,
});
})
}),
).then((all_pulls) =>
all_pulls.map(({ data: pulls }, index) => {
return { ...matrix_info[index], pr_url: (pulls[0] || {}).html_url };
})
}),
);

let any_failed = false;
Expand Down
14 changes: 7 additions & 7 deletions build-support/cherry_pick/helper.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -102,13 +102,13 @@ test("get_prereqs fails when no milestone", async () => {
]);
expect(helper.octokit.rest.issues.createComment).toBeCalledTimes(1);
expect(
helper.octokit.rest.issues.createComment.mock.calls[0][0].body
helper.octokit.rest.issues.createComment.mock.calls[0][0].body,
).toEqual(
`I was unable to cherry-pick this PR; the milestone seems to be missing.
@steve_buscemi: Please add the milestone to the PR and re-run the [Auto Cherry-Picker job](<WORKFLOW_URL>) using the "Run workflow" button.
:robot: [Beep Boop here's my run link](https://github.com/pantsbuild/pants/actions/runs/5148273558)`
:robot: [Beep Boop here's my run link](https://github.com/pantsbuild/pants/actions/runs/5148273558)`,
);
expect(helper.core.setFailed).toBeCalledTimes(1);
});
Expand Down Expand Up @@ -202,7 +202,7 @@ test("cherry_pick_finished one pass one fail", async () => {
"auto-cherry-picking-failed",
]);
expect(
helper.octokit.rest.issues.createComment.mock.calls[0][0].body
helper.octokit.rest.issues.createComment.mock.calls[0][0].body,
).toEqual(
`I tried to automatically cherry-pick this change back to each relevant milestone, so that it is available in those older releases of Pants.
Expand Down Expand Up @@ -239,7 +239,7 @@ When you're done manually cherry-picking, please remove the \`needs-cherrypick\`
Thanks again for your contributions!
:robot: [Beep Boop here's my run link](https://github.com/pantsbuild/pants/actions/runs/5148273558)`
:robot: [Beep Boop here's my run link](https://github.com/pantsbuild/pants/actions/runs/5148273558)`,
);
});

Expand All @@ -262,10 +262,10 @@ test("cherry_pick_finished all pass", async () => {

expect(helper.octokit.rest.issues.removeLabel).toBeCalledTimes(1);
expect(helper.octokit.rest.issues.removeLabel.mock.calls[0][0].name).toEqual(
"needs-cherrypick"
"needs-cherrypick",
);
expect(
helper.octokit.rest.issues.createComment.mock.calls[0][0].body
helper.octokit.rest.issues.createComment.mock.calls[0][0].body,
).toEqual(
`I tried to automatically cherry-pick this change back to each relevant milestone, so that it is available in those older releases of Pants.
Expand All @@ -277,6 +277,6 @@ Successfully opened <URL for 2.16.x>.
Thanks again for your contributions!
:robot: [Beep Boop here's my run link](https://github.com/pantsbuild/pants/actions/runs/5148273558)`
:robot: [Beep Boop here's my run link](https://github.com/pantsbuild/pants/actions/runs/5148273558)`,
);
});
2 changes: 1 addition & 1 deletion build-support/cloudflare/redirect2githubpages.js
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@ async function handleRequest(event) {
Promise.all([
sendToGA4(event.request.headers, url.host, pathname),
sendToUA(event.request.headers, url.host, pathname),
])
]),
);
return Response.redirect(destinationURL, 302);
}
Expand Down
16 changes: 15 additions & 1 deletion docs/notes/2.26.x.md
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,17 @@ To enable this option, add the following to your `pants.toml`
publish_noninteractively = true
```

#### Javascript

The Node.js runtime was upgraded from version [22.6.0](https://github.com/nodejs/node/releases/tag/v22.14.0) to version [22.14.0](https://github.com/nodejs/node/releases/tag/v22.14.0).

The default package managers were upgraded to their latest, non-breaking, versions:

npm: 10.8.2 -> 10.9.2
pnpm: 9.5.0 -> 9.15.6
yarn: 1.22.22

[Prettier](https://www.pantsbuild.org/stable/reference/subsystems/prettier) default version was upgraded from [2.6.2](https://github.com/prettier/prettier/releases/tag/2.6.2) to [3.5.2](https://github.com/prettier/prettier/releases/tag/3.5.2).

#### Python

Expand All @@ -91,8 +102,11 @@ A bug in the Django backend has been fixed so that a repo may have no Django app

[Pytype](https://www.pantsbuild.org/stable/reference/subsystems/pytype) was updated to version 2024.9.13 - which is the [last to support Python 3.8 and Python 3.9](https://github.com/google/pytype/blob/main/CHANGELOG).

The Python Build Standalone backend (`pants.backend.python.providers.experimental.python_build_standalone`) has release metadata current through PBS release `20250212`.
[Pyright](https://www.pantsbuild.org/stable/reference/subsystems/pyright) was updated from version [1.1.383](https://github.com/microsoft/pyright/releases/tag/1.1.383) to [1.1.396](https://github.com/microsoft/pyright/releases/tag/1.1.396).

The Python backend uses the PyPI `packaging` distribution to parse Python version numbers. In upgrading `packaging` from v21.3 to v24.2, support for parsing "legacy" Python versions was removed. We do not anticipate an issue here (since [PEP 440](https://peps.python.org/pep-0440/) has been around since 2013), but please contact the maintainers if an issue does arise.

The Python Build Standalone backend (`pants.backend.python.providers.experimental.python_build_standalone`) has release metadata current through PBS release `20250212`.

#### Shell

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,8 @@
# Copyright 2023 Pants project contributors (see CONTRIBUTORS.md).
# Licensed under the Apache License, Version 2.0 (see LICENSE).

# Delete and re-generate these files using the following commands (updating versions as needed):
# corepack [email protected] install --lockfile-only
# corepack [email protected] install --lockfile-only
# corepack [email protected] install --mode update-lockfile
resources(sources=["package-lock.json", "pnpm-lock.yaml", "yarn.lock"])
Loading

0 comments on commit 84e8b1f

Please sign in to comment.